From 5989fd098fea045da7a3612d2c9b0da38b2d1d27 Mon Sep 17 00:00:00 2001
From: lsh <lsh>
Date: 星期日, 26 五月 2024 08:32:16 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 16 +++++++++++++++-
1 files changed, 15 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 e7993b7..9196e54 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2099,7 +2099,7 @@
continue;
}
if (!locMast.getLocSts().equals("S") && !locMast.getLocSts().equals("Q")) {
- log.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", wrkMast.getLocNo(), locMast.getLocSts());
+ log.error("鍏ュ簱鎿嶄綔搴撲綅鐘舵�佷笉绗﹀悎--鐘舵��, 搴撲綅鍙�={}锛屽簱浣嶇姸鎬�={}", locMast.getLocNo(), locMast.getLocSts());
continue;
}
@@ -2893,6 +2893,9 @@
*/
public synchronized void storeFinishedTwo() {
for (CrnSlave crn : slaveProperties.getCrn()) {
+ if (crn.getId()<3 || crn.getId()>5){
+ continue;
+ }
// 鑾峰彇鍫嗗灈鏈轰俊鎭�
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crn.getId());
CrnProtocol crnProtocol = crnThread.getCrnProtocol();
@@ -4725,6 +4728,8 @@
case 6:////鎻愬崌
// signWork = qwe();
break;
+ case 7:////浣嶇Щ
+ break;
default:
break;
}
@@ -4747,6 +4752,8 @@
break;
case 6:////鎻愬崌
// signWork = rgvRunWrkMastEmptyStaPut();
+ break;
+ case 7:////浣嶇Щ
break;
default:
break;
@@ -5491,4 +5498,11 @@
}
}
+ /**
+ * 鍏ュ嚭搴� ===>> 灏忚溅浣滀笟涓嬪彂
+ */
+ public synchronized boolean steIoExecute(Integer sign) {
+ return false;
+ }
+
}
--
Gitblit v1.9.1