From 80d97d40c44165674ee0168be5f08c8ca52d3c06 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 09 六月 2025 09:36:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
index bfdc8e9..cae1327 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/MainProcess.java
@@ -47,12 +47,16 @@
 
                     // 鍏ュ簱  ===>> 鍏ュ簱绔欏埌鍫嗗灈鏈虹珯锛屾牴鎹潯鐮佹壂鎻忕敓鎴愬叆搴撳伐浣滄。
                     mainService.generateInboundWrk(); // 缁勬墭
+                    mainService.palletInbound();//鍏ュ簱-鎵樼洏杩涘簱
+                    // 瑙f瀽绉诲簱宸ヤ綔妗�
+                    mainService.analyzeMoveTask();
                     // 瑙f瀽鍑哄簱宸ヤ綔妗�
                     mainService.analyzeOutBoundTask();
                     // 瑙f瀽鍏ュ簱宸ヤ綔妗�
                     mainService.analyzeInBoundTask();
-                    // 瑙f瀽灏忚溅绉诲姩宸ヤ綔妗�
-                    mainService.analyzeMoveTask();
+
+                    // 瑙f瀽灏忚溅杞借揣绉诲姩宸ヤ綔妗�
+                    mainService.analyzeLadenMoveTask();
                     // 鍑哄簱  ===>> 宸ヤ綔妗d俊鎭啓鍏ed鏄剧ず鍣�
                     mainService.ledExecute();
                     // 鍏朵粬  ===>> LED鏄剧ず鍣ㄥ浣嶏紝鏄剧ず榛樿淇℃伅

--
Gitblit v1.9.1