From 013c2ef0869f8599ac71444d256a70271bc5171d Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 06 十一月 2025 18:34:58 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 21 ++++++++++++++-------
1 files changed, 14 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 4a7fde6..2a1996b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -116,7 +116,6 @@
@Autowired
private BasPlcerrorLogServiceImpl basPlcerrorLogService;
public Long currentTimeMilliConnectCrnAuto= 0L;
- public int[] signIntOut= new int[]{0,0,0,0,0};
public void generateStoreWrkFile() {
try {
@@ -2820,13 +2819,17 @@
boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);// 鍏ュ簱
if (crnStnToLocDemo){
crnProtocol.setLastIo("O");
+ } else if (!crnProtocol.isSignIntOut()){
+ crnProtocol.setLastIo("O");
}
} else if (basCrnp.getOutEnable().equals("Y")) {
boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);// 鍑哄簱
- if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] >= crnProtocol.getLocMastDemoCount()){
+ if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
crnProtocol.setLastIo("I");
- } else if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] < crnProtocol.getLocMastDemoCount()){
- signIntOut[crnSlave.getId()-1] = signIntOut[crnSlave.getId()-1]+1;
+ } else if (locToCrnStnDemo){
+ crnProtocol.setSignIntOut(true);
+ } else if (!crnProtocol.isSignIntOut()){
+ crnProtocol.setLastIo("I");
}
}
}
@@ -2834,15 +2837,19 @@
else if (crnProtocol.getLastIo().equals("O")) {
if (basCrnp.getOutEnable().equals("Y")) {
boolean locToCrnStnDemo = this.locToCrnStnDemo(crnSlave, crnProtocol);// 鍑哄簱
- if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] >= crnProtocol.getLocMastDemoCount()){
+ if (locToCrnStnDemo && crnProtocol.isSignIntOut()){
crnProtocol.setLastIo("I");
- } else if (locToCrnStnDemo && signIntOut[crnSlave.getId()-1] < crnProtocol.getLocMastDemoCount()){
- signIntOut[crnSlave.getId()-1] = signIntOut[crnSlave.getId()-1]+1;
+ } else if (locToCrnStnDemo){
+ crnProtocol.setSignIntOut(true);
+ } else if (!crnProtocol.isSignIntOut()){
+ crnProtocol.setLastIo("I");
}
} else if (basCrnp.getInEnable().equals("Y")) {
boolean crnStnToLocDemo = this.crnStnToLocDemo(crnSlave, crnProtocol);// 鍏ュ簱
if (crnStnToLocDemo){
crnProtocol.setLastIo("O");
+ } else if (!crnProtocol.isSignIntOut()){
+ crnProtocol.setLastIo("O");
}
}
}
--
Gitblit v1.9.1