From a5629ea57dbdc0219af11caff3c0b316c84041d3 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 27 五月 2023 15:33:56 +0800
Subject: [PATCH] 消防，BUG
---
src/main/java/com/zy/core/thread/SiemensCrnThread.java | 7 ++++---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 2 +-
2 files changed, 5 insertions(+), 4 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 786bbc9..45544ce 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -166,7 +166,7 @@
try {
//String pack=barcode.substring(6);//pack鐮�
- String pack="MJY0136 0200";
+ String pack="MJY0136 0300";
barcode=barcode.substring(0,6);//鎵樼洏鐮�
LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
locTypeDto.setLocType1((short)1);
diff --git a/src/main/java/com/zy/core/thread/SiemensCrnThread.java b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
index 238dc3e..b489297 100644
--- a/src/main/java/com/zy/core/thread/SiemensCrnThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensCrnThread.java
@@ -236,7 +236,7 @@
log.error("鍫嗗灈鏈哄啓鍏ュ懡浠や负绌�");
return false;
}
- convertRow(command);
+// convertRow(command);
command.setCrnNo(slave.getId());
short[] array = new short[12];
array[0] = command.getAckFinish();
@@ -252,8 +252,9 @@
array[10] = command.getDestinationStaNo();
array[11] = command.getCommand();
OperateResult result = siemensNet.Write("DB100.0", array);
- OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
-
+ if (command.getAckFinish() == 0){
+ OperateResult result2 = siemensNet.Write("DB100.20", command.getBarcode());
+ }
if (command.getAckFinish() == 0) {
short commandFinish = 1;
--
Gitblit v1.9.1