From 939982c26431a7f5c192028ab15a0121ac7eb65c Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 12:02:08 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 0810e67..bb0de91 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -635,7 +635,7 @@
                         }
                         String sourceLocNo = "1200305";
                         String locNo = "1100105";
-                        if (i == 0) {
+                        if (wrkMast.getShuttleNo() == 1) {
                             if (wrkMast.getStaNo() == 1013) {
                                 sourceLocNo = "1200301";
                                 locNo = "1100101";
@@ -660,7 +660,9 @@
                                 }
                             }
                         }
-
+                        if (loc.contains(locNo)) {
+                            locNo = "0900105";
+                        }
 
                         boolean dispatchShuttle = shuttleDispatchUtils.shuttleMoveGenerate(wrkMast.getWrkNo(), sourceLocNo, locNo, wrkMast.getShuttleNo(), null, false);
                         if (!dispatchShuttle) {

--
Gitblit v1.9.1