From 239472db59769113160d0366dda93067bc7e9a23 Mon Sep 17 00:00:00 2001
From: hmpc <hmpc>
Date: 星期四, 21 十一月 2024 16:46:34 +0800
Subject: [PATCH] *谁改的啊，不提交。
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 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 1a6f127..270c862 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -236,12 +236,20 @@
runRgv:
for (List<WrkMast> wrkMastList : wrkMastLists){
for (WrkMast wrkMast: wrkMastList){
+
log.error("瀛樺湪浠诲姟锛孯GV鍙�={}锛屼换鍔℃暟鎹�={}", rgvId, JSON.toJSON(wrkMast));
rgvId++;
- BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", 1L));
+ BasCircularShuttle basCircularShuttle = basCircularShuttleService.selectOne(new EntityWrapper<BasCircularShuttle>().eq("rgv_id", rgvId));
RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, basCircularShuttle.getRgvNo());
RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
+ if (rgvProtocol == null){
+ continue ;
+ }
+ List<WrkMast> wrkMasts = wrkMastService.selectList(new EntityWrapper<WrkMast>().eq("rgv_no", rgvProtocol.getRgvNo()).eq("wrk_sts", 2L));
+ if (!wrkMasts.isEmpty()){
+ continue ;
+ }
if (rgvProtocol != null
&& rgvProtocol.modeType == RgvModeType.AUTO
&& (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
@@ -276,6 +284,7 @@
break runRgv;
}
}
+
}
}
--
Gitblit v1.9.1