From ebf0db91e09be33fcbfe97ed5b91965dc2e61dfd Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 01 八月 2024 10:54:26 +0800
Subject: [PATCH] 1. 托盘管理 2. 入库通知档导入功能 3. 工作档明细 新增来源单据类型及单据编号 4. 库存明细统计表 增加一栏ERP数量(需跟ERP确认接口实现方式)。 5. 存货档案、单据管理、库存管理可以支持模糊搜索(各个单据界面)。

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java |   29 ++++++++++++++++++++++++++++-
 1 files changed, 28 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
index 9b924f1..0ae7e51 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/common/domain/PageParam.java
@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.function.Consumer;
 
 /**
  * Created by vincent on 2/13/2024
@@ -65,8 +66,16 @@
         return this.buildWrapper(false);
     }
 
-    @SuppressWarnings("all")
+    public QueryWrapper<T> buildWrapper(Consumer<QueryWrapper<T>> consumer) {
+        return this.buildWrapper(false, consumer);
+    }
+
     public QueryWrapper<T> buildWrapper(boolean like) {
+        return this.buildWrapper(like, null);
+    }
+
+    @SuppressWarnings("all")
+    public QueryWrapper<T> buildWrapper(boolean like, Consumer<QueryWrapper<T>> consumer) {
         QueryWrapper<T> queryWrapper = new QueryWrapper<>();
         Map<String, Object> map = where.getMap();
         for (String key : map.keySet()) {
@@ -96,6 +105,10 @@
                 }
 
             }
+        }
+
+        if (null != consumer) {
+            consumer.accept(queryWrapper);
         }
 
         Field[] fields = null;
@@ -143,4 +156,18 @@
         return queryWrapper;
     }
 
+    public Map<String, Object> pickOutMap() {
+        return pickOutMap(false);
+    }
+
+    public Map<String, Object> pickOutMap(boolean mergeCondition) {
+        Map<String, Object> map = where.getMap();
+        if (mergeCondition) {
+            if (!Cools.isEmpty(where.getCondition())) {
+                map.put("condition", where.getCondition());
+            }
+        }
+        return map;
+    }
+
 }

--
Gitblit v1.9.1