From f8eb00f7cd88205547e07517846f987e356647d2 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 21 十月 2023 17:45:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 12 ++++++++----
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
2 files changed, 10 insertions(+), 6 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 98047a1..094320d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2159,9 +2159,9 @@
continue;
}
- if (staProtocol309.isAutoing() && staProtocol309.isLoading()) {
+ if (staProtocol309.isAutoing() && staProtocol309.isLoading() && staProtocol309.isInEnable()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 11);//308绔欐潯鐮佸櫒
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 9);//308绔欐潯鐮佸櫒
if (barcodeThread == null) {
continue;
}
@@ -2169,10 +2169,13 @@
if(!Cools.isEmpty(barcode)) {
//閫氱煡AGV鍙栬揣
agvRestockCall("CS-301-001-01@3", barcode);
+ log.info("閫氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
}
- } else if (staProtocol312.isAutoing() && staProtocol312.isLoading()) {
+ }
+
+ if (staProtocol312.isAutoing() && staProtocol312.isLoading() && staProtocol312.isInEnable()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 12);//311绔欐潯鐮佸櫒
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 10);//311绔欐潯鐮佸櫒
if (barcodeThread == null) {
continue;
}
@@ -2180,6 +2183,7 @@
if(!Cools.isEmpty(barcode)) {
//閫氱煡AGV鍙栬揣
agvRestockCall("CS-302-001-01@3", barcode);
+ log.info("閫氱煡AGV鍙栬揣锛屾潯鐮佸彿锛�" + barcode);
}
}
}
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index e184c27..14b7d60 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -41,7 +41,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
- private int barcodeSize = 9;
+ private int barcodeSize = 10;
public static final ArrayList<Integer> staNos = new ArrayList<Integer>() {{
add(100);add(101);
add(102);add(103);
@@ -174,7 +174,7 @@
//璇绘潯鐮�
Thread.sleep(100);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 88);
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB1000.200", (short) 98);
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
String barcode = null;
--
Gitblit v1.9.1