From d0cd998f775255ad1ba89f5cd60ed3eb89e00404 Mon Sep 17 00:00:00 2001
From: cpT <1@123>
Date: 星期二, 01 七月 2025 10:16: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 695a0e9..f9d8209 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -668,6 +668,9 @@
}
CrnSlave crnSlave = new CrnSlave(crn);
+ if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
+ continue;
+ }
if (!crn.getId().equals(crnProtocol.getLaneNo())) {
for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -828,6 +831,9 @@
}
CrnSlave crn = new CrnSlave(crnSlave);
+ if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
+ continue;
+ }
if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
for (CrnSlave crnOther : slaveProperties.getCrn()) {
@@ -984,7 +990,7 @@
// 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
CrnCommand crnCommand = new CrnCommand();
crnCommand.setCrnNo(slave.getId()); // 鍫嗗灈鏈虹紪鍙�
- crnCommand.setCrnNo(crnProtocol.getLaneNo()); // 鍫嗗灈鏈哄贩閬撶紪鍙�
+ crnCommand.setLaneNo(crnProtocol.getLaneNo()); // 鍫嗗灈鏈哄贩閬撶紪鍙�
crnCommand.setTaskNo(taskWrk.getWrkNo().shortValue()); // 宸ヤ綔鍙�
crnCommand.setAckFinish((short) 0); // 浠诲姟瀹屾垚纭浣�
crnCommand.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡: 搴撲綅绉昏浆
@@ -1329,6 +1335,9 @@
}
CrnSlave crn = new CrnSlave(crnSlave);
+ if (Cools.isEmpty(crnProtocol.getLoaded()) || crnProtocol.getLoaded()==0){
+ continue;
+ }
if (!crnSlave.getId().equals(crnProtocol.getLaneNo())) {
for (CrnSlave crnOther : slaveProperties.getCrn()) {
--
Gitblit v1.9.1