From fc94238a57a2b90a9938fa2b628b7bcd2774f6d5 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 七月 2024 13:52:18 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 faa0281..ac168bb 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1233,7 +1233,7 @@
} else {
staProtocol = staProtocol.clone();
}
- if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
+ if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == null || staProtocol.getWorkNo() == 0)) {
// 鍒ゆ柇鍚婅溅鏄惁瀹為檯宸插畬鎴愶紝涓旂數鑴戠姸鎬佸湪move涓紝浠ュ鐢佃剳杩涜鏇存柊宸ヤ綔妗�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn,crnNo);
@@ -4561,7 +4561,7 @@
sign[0] = 2;
sign[1] = 1;
}
- return false;
+ break;
case 3:
if (crnProtocol.getStatusTypeTwo() == CrnStatusType.IDLE
&& crnProtocol.getTaskNoTwo() == 0
@@ -4579,7 +4579,7 @@
sign[0] = 2;
sign[1] = 2;
}
- return false;
+ break;
default:
}
}
--
Gitblit v1.9.1