From 52ea5fd92596267379be7924deb27de6cb10632b Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期四, 04 十二月 2025 20:33:46 +0800
Subject: [PATCH] 称重及值仓页面及逻辑

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java |   94 ++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 81 insertions(+), 13 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
index 007066b..1c17e61 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutRecordService.java
@@ -8,6 +8,7 @@
 import com.fzzy.igds.domain.InoutRecord;
 import com.fzzy.igds.mapper.InoutRecordMapper;
 import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.StringUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -37,35 +38,102 @@
      * @param param
      */
     public void listPageInout(Page<InoutRecord> page, InoutParam param) {
+        if(StringUtils.isBlank(param.getCompanyId())){
+            param.setCompanyId(ContextUtil.getCompanyId());
+        }
+        if(StringUtils.isBlank(param.getDeptId())){
+            param.setDeptId(ContextUtil.subDeptId(null));
+        }
+        QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
+        inoutRecordMapper.selectPage(page, queryWrapper);
+    }
+
+    /**
+     * 鏌ヨ鏁版嵁闆嗗悎
+     * @param param
+     */
+    public List<InoutRecord> listInout(InoutParam param) {
+        if(StringUtils.isBlank(param.getCompanyId())){
+            param.setCompanyId(ContextUtil.getCompanyId());
+        }
+        if(StringUtils.isBlank(param.getDeptId())){
+            param.setDeptId(ContextUtil.subDeptId(null));
+        }
+        QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
+
+        return inoutRecordMapper.selectList(queryWrapper);
+    }
+
+    /**
+     * 灏佽鏌ヨ鏉′欢
+     * @param param
+     */
+    public QueryWrapper<InoutRecord> getQueryWrapper(InoutParam param) {
         QueryWrapper<InoutRecord> queryWrapper = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(param.getCompanyId())) {
+            queryWrapper.eq("company_id", param.getCompanyId());
+        }
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }
+        if (StringUtils.isNotBlank(param.getCustomerName())) {
+            queryWrapper.like("customer_name", param.getCustomerName());
+        }
 
-        param.setCompanyId(ContextUtil.getCompanyId());
-        param.setDeptId(ContextUtil.subDeptId(null));
-        queryWrapper.eq("company_id", param.getCompanyId());
-        queryWrapper.eq("dept_id", param.getDeptId());
-
+        if (StringUtils.isNotBlank(param.getId())) {
+            queryWrapper.eq("id", param.getId());
+        }
+        if (StringUtils.isNotBlank(param.getPlateNum())) {
+            queryWrapper.eq("plate_num", param.getPlateNum());
+        }
+        if (StringUtils.isNotBlank(param.getWeightTag())) {
+            //鏌ヨ寰呯О閲嶇殑
+            queryWrapper.likeRight("progress", param.getWeightTag());
+        }
+        if (StringUtils.isNotBlank(param.getProgressTag())) {
+            //鏈畬鎴愮殑
+            queryWrapper.ne("progress", param.getProgressTag());
+        }
+        if (StringUtils.isNotBlank(param.getProgress())) {
+            queryWrapper.eq("progress", param.getProgress());
+        }
+        if (StringUtils.isNotBlank(param.getFoodVariety())) {
+            queryWrapper.eq("food_variety", param.getFoodVariety());
+        }
+        if (StringUtils.isNotBlank(param.getCheckStatus())) {
+            queryWrapper.eq("check_status", param.getCheckStatus());
+        }
         if (StringUtils.isNotBlank(param.getDepotId())) {
             queryWrapper.eq("depot_id", param.getDepotId());
         }
         if (StringUtils.isNotBlank(param.getType())) {
             queryWrapper.eq("type", param.getType());
         }
+        if (null != param.getStart()) {
+            queryWrapper.ge("create_time", DateUtil.getCurZero(param.getStart()));
+        }
+        if (null != param.getEnd()) {
+            queryWrapper.le("create_time", DateUtil.getNextZero(param.getEnd()));
+        }
+        queryWrapper.eq("record_status", "NORMAL"); //姝ｅ父鐘舵�佺殑鍗曞瓙
         queryWrapper.orderByDesc("create_time");
-        inoutRecordMapper.selectPage(page, queryWrapper);
+
+        return queryWrapper;
     }
 
 
     /**
-     * 鏍规嵁id鏌ヨ鏁版嵁
-     * @param id
+     * 鏌ヨ鏁版嵁
+     * @param param
      * @return
      */
-    public InoutRecord selectById(String id) {
-        if(StringUtils.isBlank(id)){
-            return null;
-
+    public InoutRecord selectOne(InoutParam param) {
+        if(StringUtils.isBlank(param.getCompanyId())){
+            param.setCompanyId(ContextUtil.getCompanyId());
         }
-        return inoutRecordMapper.selectById(id);
+        QueryWrapper<InoutRecord> queryWrapper = getQueryWrapper(param);
+
+        return inoutRecordMapper.selectOne(queryWrapper);
     }
 
     /**

--
Gitblit v1.9.3