From 8c2d952e4ea6925a04d083c0e73817f2c3400049 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期四, 21 八月 2025 14:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/fyxc_shuttle_wcs' into fyxc_shuttle_wcs
---
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