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/WaitPakinLogController.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
index ab32674..d0d8bc2 100644
--- a/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
+++ b/src/main/java/com/zy/asrs/controller/WaitPakinLogController.java
@@ -45,7 +45,7 @@
         convert(param, wrapper);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
         else {
-            wrapper.orderBy("id", false);
+            wrapper.orderBy("modi_time", false);
         }
         return R.ok(waitPakinLogService.selectPage(new Page<>(curr, limit), wrapper));
     }
@@ -73,7 +73,7 @@
 	@RequestMapping(value = "/waitPakinLog/update/auth")
 	@ManagerAuth
     public R update(WaitPakinLog waitPakinLog){
-        if (Cools.isEmpty(waitPakinLog) || null==waitPakinLog.getId()){
+        if (Cools.isEmpty(waitPakinLog)){
             return R.error();
         }
         waitPakinLogService.updateById(waitPakinLog);
@@ -113,8 +113,8 @@
         List<Map<String, Object>> result = new ArrayList<>();
         for (WaitPakinLog waitPakinLog : page.getRecords()){
             Map<String, Object> map = new HashMap<>();
-            map.put("id", waitPakinLog.getId());
-            map.put("value", waitPakinLog.getId());
+            map.put("id", waitPakinLog.getZpallet());
+            map.put("value", waitPakinLog.getZpallet());
             result.add(map);
         }
         return R.ok(result);

--
Gitblit v1.9.1