From b176072388747abb438990157bfa305b215b4b90 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 14 四月 2026 21:59:39 +0800
Subject: [PATCH] 我们现在讨论一下系统找库位方案, 如何实现,对现有找库位规则进行整改,数据库也要整改 1、要能方便的填写单伸堆垛机或双伸堆垛机的深浅库位配置 2、根据设备状态分配库位,离线设备不分配 3、库位分配要均衡到每一个设备  4、库位高度需要匹配到对应库位信息,低库位能向上兼容  5、空托盘优先放在locType2库位=1的库位,没有这种库位了,允许放到其他库位 6、给入库站点设置有限去那些堆垛机,其次去那些堆垛机,弄成页面可以配置入库站点 7、在系统配置新增优先放前几列的配置,当入库的货物是高频货物时放在前几列 8、组托中会标识该托盘是高频还是低频,如果是高频则从前往后找库位,如果是低频则从后往前找库位 9、找库位时locMast中whsType字段无用

---
 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java |   25 +++++++++++++++++++++++--
 1 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
index b2df62c..89927a7 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -79,6 +79,13 @@
         try {
             Integer wrkNo = null;
             String orderNo = null;
+            String matnr = null;
+            String specs = null;
+            String zpallet = null;
+            String batch = null;
+            String sku = null;
+            String memo = null;
+            Double anfme = null;
             Date modiTimeStart = null, modiTimeEnd = null;
             for (Map.Entry<String, Object> entry : param.entrySet()) {
                 String val = String.valueOf(entry.getValue());
@@ -93,11 +100,25 @@
                     wrkNo = Integer.parseInt(val);
                 } else if (entry.getKey().equals("order_no")) {
                     orderNo = val;
+                } else if (entry.getKey().equals("specs")) {
+                    specs = val;
+                } else if (entry.getKey().equals("zpallet")) {
+                    zpallet = val;
+                } else if (entry.getKey().equals("batch")) {
+                    batch = val;
+                } else if (entry.getKey().equals("anfme")) {
+                    anfme = Double.parseDouble(val);
+                }else if (entry.getKey().equals("matnr")) {
+                    matnr = val;
+                }else if (entry.getKey().equals("sku")) {
+                    sku = val;
+                }else if (entry.getKey().equals("memo")) {
+                    memo = val;
                 }
             }
-            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo, modiTimeStart, modiTimeEnd, curr, limit);
+            List<WrkDetlLog> wrkDetlLogs = wrkDetlLogService.selectWrkDetlLogs(wrkNo, orderNo,matnr,specs,zpallet,batch,sku,memo,anfme, modiTimeStart, modiTimeEnd, curr, limit);
             Page<WrkDetlLog> page1 = new Page<WrkDetlLog>(curr, limit).setRecords(wrkDetlLogs);
-            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo, modiTimeStart, modiTimeEnd));
+            page1.setTotal(wrkDetlLogService.selectWrkDetlLogsTotal(wrkNo, orderNo,matnr,specs,zpallet,batch,sku,memo,anfme, modiTimeStart, modiTimeEnd));
             return R.ok(page1);
         } catch (Exception e) {
             return R.error("寮傚父" + e);

--
Gitblit v1.9.1