From 49cf92d200288feaf43ce94eb2638cb51d54f02a Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期四, 27 六月 2024 14:38:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 14 +++-----------
1 files changed, 3 insertions(+), 11 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 8381771..1da0bca 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -5726,7 +5726,7 @@
if (staProtocolRGVOther == null) {
return false;
}
-
+ System.out.println();
if (staProtocolRGV.rgvBoolean(1) && staProtocolRGVOther.rgvBoolean(1)){
if (staProtocolRGV.getNowRow() != staProtocolRGVOther.getNowRow()){
//绉昏蛋 == > 2
@@ -7019,16 +7019,8 @@
continue;
}
- StaProtocol staProtocolRGVEnd = devpThread.getStation().get(wrkMastExecute.getRgvEndId());
- if (staProtocolRGVEnd == null) {
- continue;
- } else {
- staProtocolRGVEnd = staProtocolRGVEnd.clone();
- }
- if (staProtocolRGVEnd == null) {
- continue;
- }
- if (staProtocolRGV.getNowRow() == staProtocolRGVEnd.getNowRow()
+
+ if ( staProtocolRGV.rgvBoolean(2)
&& staProtocolRGV.getNowRow() == SteAndJarUtil.getRgvJarNowRow(wrkMastExecute.getJarId())){
//璋冭溅 == > 鍙栬揣瀹屾垚澶嶄綅
if (!jarRgvGetFuTake(wrkMastExecute,true)){
--
Gitblit v1.9.1