From 3c9c2fb935c34351f616351c0af2e0ace98a55b2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 27 五月 2021 13:51:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 3 +++
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 4 ++--
2 files changed, 5 insertions(+), 2 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 0bc1134..30b2c4c 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -100,6 +100,9 @@
for (DevpSlave.Sta inSta : devp.getInSta()) {
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
+ if (barcodeThread == null) {
+ continue;
+ }
String barcode = barcodeThread.getBarcode();
if(!Cools.isEmpty(barcode)) {
log.info("{}鍙锋潯鐮佹壂鎻忓櫒妫�娴嬫潯鐮佷俊鎭細{}", inSta.getBarcode(), barcode);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index a2680a0..d7d0030 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -220,9 +220,9 @@
write1 = siemensS7Net.Write("DB100." + (index*2 + 70), staProtocol.getStaNo()); // 鐩爣绔�
// 浜屾湡
} else {
- write = siemensS7Net.Write("DB100." + (index-35)*2 + 180, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
+ write = siemensS7Net.Write("DB100." + ((index-35)*2 + 180), staProtocol.getWorkNo()); // 宸ヤ綔鍙�
Thread.sleep(100);
- write1 = siemensS7Net.Write("DB100." + (index-35)*2 + 198, staProtocol.getStaNo()); // 鐩爣绔�
+ write1 = siemensS7Net.Write("DB100." + ((index-35)*2 + 198), staProtocol.getStaNo()); // 鐩爣绔�
}
if (!write.IsSuccess || !write1.IsSuccess) {
--
Gitblit v1.9.1