From 54ae57e37026d2feab98edf02cfc8872a915e8a1 Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 08 十月 2022 09:03:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 4 ++--
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 2 +-
2 files changed, 3 insertions(+), 3 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 8848ddb..7672a11 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -103,7 +103,7 @@
for (DevpSlave devp : slaveProperties.getDevp()) {
// 閬嶅巻鍏ュ簱鍙�
for (DevpSlave.Sta inSta : devp.getInSta()) {
-// inSta.setStaNo(102);
+ inSta.setStaNo(102);
// 鑾峰彇鏉＄爜鎵弿浠俊鎭�
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, inSta.getBarcode());
if (barcodeThread == null) {
@@ -167,7 +167,7 @@
try {
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-// locTypeDto.setLocType1((short)1);
+ locTypeDto.setLocType1((short)1);
SearchLocParam param = new SearchLocParam();
param.setBarcode(barcode);
param.setIoType(1);
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 49141d7..d80a469 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -191,7 +191,7 @@
OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB102.0", (short) 96);
if(result3.IsSuccess) {
for(int i=0; i<48; i++){
- startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result.Content, i*2);
+ startSignal[i] = siemensS7Net.getByteTransform().TransInt16(result3.Content, i*2);
}
}
// OperateResultExOne<Short> result2 = siemensS7Net.ReadInt16("DB200.0");
--
Gitblit v1.9.1