From ffc3b1151655f258fb1db0b24c3434bd294b0598 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期日, 05 十月 2025 10:35:32 +0800
Subject: [PATCH] 联调
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 51 +++++++++++++++++++++++----------------------------
1 files changed, 23 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 943e1ad..a6b6cd8 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -46,13 +46,12 @@
private StaError1 staError1;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(1101);
- add(1102);
- add(1103);
- add(1104);
- add(1105);
- add(1106);
- add(1107);
+ add(1001);
+ add(1002);
+ add(1003);
+ add(1004);
+ add(1005);
+ add(1006);
}};
@@ -62,15 +61,11 @@
public static final ArrayList<Integer> staNosErrList1 = new ArrayList<Integer>() {{
- add(102);
+ add(1005);
}};
public static final ArrayList<Integer> staNoWeight1 = new ArrayList<Integer>() {{
- add(101);
- add(102);
- add(103);
- add(104);
- add(105);
+ add(1005);
}};
@@ -414,21 +409,21 @@
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
News.error("SiemensDevp" + " - 4" + " - 鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
}
-// else {
-// //dang 101,201zhan xaifazhiling qingchu tiaoxingsaomaolide shuju shanchu
-// if (staProtocol.getSiteId()==101){
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
-// log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
-// barcodeThread.clearBarcode();
-// }
-// if (staProtocol.getSiteId()==201){
-// BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 2);
-// log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
-// barcodeThread.clearBarcode();
-// }
-// OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
-// News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
-// }
+ else {
+ //dang 101,201zhan xaifazhiling qingchu tiaoxingsaomaolide shuju shanchu
+ if (staProtocol.getSiteId()==101){
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 1);
+ log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
+ barcodeThread.clearBarcode();
+ }
+ if (staProtocol.getSiteId()==201){
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, 2);
+ log.info("qingchutiaoma,{}",barcodeThread.getBarcode());
+ barcodeThread.clearBarcode();
+ }
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ News.info("SiemensDevp"+" - 5"+" - 杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
}
// 鏇存柊鍏ュ嚭搴撴ā寮�
--
Gitblit v1.9.1