From a4cfd6abc3e46cfff3170b9bd8d00a29e7c866c7 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 15 九月 2025 09:04:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 ee2cdbd..3d60cd3 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -863,15 +863,18 @@
// 鍙湁褰撳爢鍨涙満绌洪棽 骞朵笖 鏃犱换鍔℃椂鎵嶇户缁墽琛�
if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO
&& crnProtocol.getLoaded() == 0 && crnProtocol.getForkPos() == 0) {
+ if (crn.getId() == 5){
+ continue;
+ }
// 濡傛灉鏈�杩戜竴娆℃槸鍏ュ簱妯″紡
if (crnProtocol.getLastIo().equals("I")) {
if (basCrnp.getInEnable().equals("Y")) {
- if (crn.getId() == 5){
- continue;
- }
+ log.info("杩涘叆鍏ュ簱绋嬪簭,crn:"+crn.getId());
this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
crnProtocol.setLastIo("O");
+
} else if (basCrnp.getOutEnable().equals("Y")) {
+ log.info("杩涘叆鍑哄簱绋嬪簭,crn:"+crn.getId());
this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
crnProtocol.setLastIo("I");
}
@@ -879,13 +882,11 @@
// 濡傛灉鏈�杩戜竴娆℃槸鍑哄簱妯″紡
else if (crnProtocol.getLastIo().equals("O")) {
if (basCrnp.getOutEnable().equals("Y")) {
+ log.info("杩涘叆鍑哄簱绋嬪簭,crn:"+crn.getId());
this.locToCrnStn(crn, crnProtocol); // 鍑哄簱
crnProtocol.setLastIo("I");
} else if (basCrnp.getInEnable().equals("Y")) {
- if (crn.getId() == 5){
- continue;
- }
-
+ log.info("杩涘叆鍏ュ簱绋嬪簭,crn:"+crn.getId());
this.crnStnToLoc(crn, crnProtocol); // 鍏ュ簱
crnProtocol.setLastIo("O");
}
--
Gitblit v1.9.1