From cfdeb9cc1eceb83f96137e285587704c1799c849 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 02 八月 2025 09:06:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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 2e096af..0810e67 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -602,7 +602,7 @@
/**
* 鍑哄簱鍒板嚭搴撳彛
*/
- public synchronized void stnToOutStn() {
+ public synchronized void stnToOutStn(int i) {
ShuttleThread shuttleThread1 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, 1);
ShuttleThread shuttleThread2 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, 2);
ShuttleProtocol status1 = shuttleThread1.getStatus();
@@ -633,21 +633,35 @@
if (wrkMast == null) {
continue;
}
-
String sourceLocNo = "1200305";
String locNo = "1100105";
- if (wrkMast.getStaNo() == 1013) {
- sourceLocNo = "1200301";
- locNo = "1100101";
- if (loc.contains(locNo)) {
+ if (i == 0) {
+ if (wrkMast.getStaNo() == 1013) {
+ sourceLocNo = "1200301";
locNo = "1100101";
+ if (loc.contains(locNo)) {
+ locNo = "1100101";
+ }
+ } else {
+ if (loc.contains(locNo)) {
+ locNo = "1100105";
+ }
}
} else {
- if (loc.contains(locNo)) {
- locNo = "1100105";
+ if (wrkMast.getStaNo() == 1013) {
+ sourceLocNo = "1200301";
+ locNo = "1000101";
+ if (loc.contains(locNo)) {
+ locNo = "1000101";
+ }
+ } else {
+ if (loc.contains(locNo)) {
+ locNo = "1000105";
+ }
}
}
+
boolean dispatchShuttle = shuttleDispatchUtils.shuttleMoveGenerate(wrkMast.getWrkNo(), sourceLocNo, locNo, wrkMast.getShuttleNo(), null, false);
if (!dispatchShuttle) {
News.taskInfo(wrkMast.getWrkNo(), "{}灏忚溅锛屾尓杞﹁皟搴﹁嚦鍙栬揣鐐瑰け璐�", wrkMast.getShuttleNo());
--
Gitblit v1.9.1