From f635f7f72a2bf43e204215cc672afe420e720e86 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 27 八月 2025 11:19:05 +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 | 16 ++++++++++++++++
src/main/java/com/zy/asrs/controller/TVController.java | 16 ++++++++--------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TVController.java b/src/main/java/com/zy/asrs/controller/TVController.java
index 4589c83..107e64f 100644
--- a/src/main/java/com/zy/asrs/controller/TVController.java
+++ b/src/main/java/com/zy/asrs/controller/TVController.java
@@ -315,20 +315,20 @@
List<WrkMast> wrkMastList2 = null;
switch (ledId) {
case 1:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014, 1022, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013, 1021, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011));
break;
case 2:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1022, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1021, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1014));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1013));
break;
case 3:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1025));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1024));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1022));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1021));
break;
case 4:
- wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1012, 1014, 1022));
- wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1011, 1013, 1021));
+ wrkMastList1 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("source_sta_no", 1025));
+ wrkMastList2 = wrkMastService.selectList(new EntityWrapper<WrkMast>().in("sta_no", 1024));
break;
default:
break;
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 bb0de91..a9f0dbf 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2500,6 +2500,22 @@
if (basShuttleCharge == null) {
return false;
}
+ try {
+ ShuttleThread shuttleThread2 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo() == 1 ? 2 : 1);
+ if (shuttleThread2 == null) {
+ return false;
+ }
+ ShuttleProtocol shuttleProtocol2 = shuttleThread2.getStatus();
+ if (shuttleProtocol2 == null) {
+ return false;
+ }
+ if (shuttleProtocol2.getCurrentLocNo().equals(basShuttleCharge.getWaitLocNo())) {
+ String locNo = Utils.getLocNo(Utils.getRow(basShuttleCharge.getWaitLocNo()) + 1, Utils.getBay(basShuttleCharge.getWaitLocNo()), Utils.getLev(basShuttleCharge.getWaitLocNo()));
+ basShuttleCharge.setWaitLocNo(locNo);
+ }
+ } catch (Exception e) {
+ log.error("瀵绘壘鏂扮殑寰呮満浣�,{}", e);
+ }
//璋冨害灏忚溅鍘诲緟鏈轰綅
boolean dispatched = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), basShuttleCharge.getWaitLocNo(), wrkMast.getShuttleNo());
--
Gitblit v1.9.1