From 3b08b4868e19a653aa5d61e22868a1c81f23d217 Mon Sep 17 00:00:00 2001
From: zjj <zjj123456>
Date: 星期四, 01 八月 2024 16:39:27 +0800
Subject: [PATCH] #1
---
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 8 +++++++-
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 6 +++---
2 files changed, 10 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 64e5db0..2089b32 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -162,7 +162,8 @@
}
if (!back && staProtocol.isBarcodeErr()) {
errMsg = "鎵爜澶辫触";
- back = true;
+ log.error("鐗╂枡鐮佹壂鐮佸け璐�");
+// back = true;
}
// 閫�鍥�
if (back) {
@@ -302,6 +303,11 @@
MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, "鑷姩缁勬墭澶辫触锛侊紒锛乥arcodeMat==>"+barcodeMat));
News.error(methodName + "==>缁勬墭澶辫触:璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", wmsUrl + "/rpc/pakin/yk/loc/v33", JSON.toJSONString(param), response);
}
+ try{
+ Thread.sleep(500);
+ } catch (Exception e){
+
+ }
} else {
staProtocol.setWorkNo(wrkNo);
wrkNo++;
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 8e12740..eb078f2 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -75,7 +75,7 @@
add(0); add(1); add(2);
}};
public static final ArrayList<Integer> BarcodeListMat = new ArrayList<Integer>() {{
- add(3); add(4); add(5);
+ add(3); add(4);
}};
public static final ArrayList<Integer> staNosErrList = new ArrayList<Integer>() {{
add(106); add(107); add(159);
@@ -304,11 +304,11 @@
}
//鏉＄爜鎵弿鍣�
ArrayList<Integer> barcodeListMat = BarcodeListMat;
- OperateResultExOne<byte[]> result2Mat = siemensS7Net.Read("DB101.840", (short) (barcodeListMat.size() * 8));
+ OperateResultExOne<byte[]> result2Mat = siemensS7Net.Read("DB103.0", (short) (barcodeListMat.size() * 30));
if (result2Mat.IsSuccess) {
for (int i = 0; i < barcodeListMat.size(); i++) {
Integer barcodeId = barcodeListMat.get(i);
- String barcode = siemensS7Net.getByteTransform().TransString(result2Mat.Content,i*8,8, "UTF-8");
+ String barcode = siemensS7Net.getByteTransform().TransString(result2Mat.Content,i*30,30, "UTF-8");
BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, barcodeId + 1);
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
--
Gitblit v1.9.1