From 6ec25c0e89ea9a416ab8d8b5abeb23de2b621c35 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 28 八月 2025 16:32:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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 138e4e3..fcc6307 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -750,6 +750,7 @@
if ((wrkMast.getIoType() != 12 && wrkMast.getIoType() < 100) || wrkMast.getStaNo() == null || wrkMast.getSourceStaNo() == null) {
continue;
}
+
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -818,7 +819,7 @@
} else {
staProtocolOut = staProtocolOut.clone();
}
- if(staProtocolOut.getWorkNo() != null &&staProtocolOut.getStaNo() == 4006){
+ if(staProtocolOut.getWorkNo() != null && staProtocolOut.getStaNo() == 4006){
WrkMast wrkMastOut = wrkMastMapper.selectByWrkNo(staProtocolOut.getWorkNo());
WrkMast wrkMast = wrkMastMapper.selectByWrkNo(9997);
if(wrkMast == null){
@@ -2699,7 +2700,9 @@
if (rgvProtocol.getStatusType() == RgvStatusType.IDLE &&
rgvProtocol.getModeType() == RgvModeType.AUTO
&& !rgvProtocol.isLoaded1ing() //鐜板満淇敼锛氬彔鐩樻満锛屼笉婊￠兘绠楁棤鐗╋紝鎬庝箞鍒ゆ柇闇�瑕佽窡鐢垫帶瀵规帴
- && (rgvProtocol.getTaskNo1()==0)
+ && rgvProtocol.getTaskNo1()==0
+ && !rgvProtocol.isLoaded2ing()
+ && rgvProtocol.getTaskNo2()==0
&&rgvThread.isPakMk()
) {
BasRgvMap basRgvMap = basRgvMapMapper.selectById(rgvProtocol.getRgvNo());
@@ -2715,7 +2718,9 @@
if (rgvProtocolOther.getStatusType() == RgvStatusType.IDLE
&& rgvProtocolOther.getModeType() == RgvModeType.AUTO
&& !rgvProtocolOther.isLoaded1ing()
- && (rgvProtocolOther.getTaskNo1()==0)
+ && rgvProtocolOther.getTaskNo1()==0
+ && !rgvProtocolOther.isLoaded2ing()
+ && rgvProtocolOther.getTaskNo2()==0
&&rgvThreadOther.isPakMk()
){
//瀵瑰伐浣滄。杩涜鍒ゆ柇
@@ -3492,7 +3497,7 @@
// if (staNos.contains(wrkMastSta.getStaStart())) {//闈炲叆搴撳彛锛堝嚭搴撳彛锛夐檺鍒�
// continue;
// }
-// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta); //鍛戒护涓嬪彂
+// boolean sign = rgvTakeFullAll(basRgvMap.getRgvNo(), wrkMastSta,null); //鍛戒护涓嬪彂
// wrkEnable = true;
// if (sign){
// wrkMastSta.setWrkSts(1);
--
Gitblit v1.9.1