From 46f8920cdcbff803b8b51a927ad40f33ce060b32 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 22 四月 2026 20:43:49 +0800
Subject: [PATCH] 出库下发流程按照进仓编号的前后顺序下发;配置一个出库进仓编号出库数量阀值; 当运行中的进仓编号任务WrkSts=25、14、15并且小于该阀值时下发下一个进仓编号的出库任务

---
 src/main/java/com/zy/asrs/controller/WrkDetlLogController.java |   10 ++++++++--
 1 files changed, 8 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 dd97c89..89927a7 100644
--- a/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WrkDetlLogController.java
@@ -83,6 +83,8 @@
             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()) {
@@ -108,11 +110,15 @@
                     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,matnr,specs,zpallet,batch,anfme, 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,matnr,specs,zpallet,batch,anfme, 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