From 236edf0559e2d5a6031b1df56a69454baa0357e5 Mon Sep 17 00:00:00 2001
From: zzgtfwq <zzgtfwq>
Date: 星期二, 09 十二月 2025 14:26:44 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 44 +++++++++++++++++++++++++++++++-------------
1 files changed, 31 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 252da3e..ba4aeeb 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -43,6 +43,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
private short heartBeatVal = 1;
+ private boolean result = false;
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
add(101);add(102);add(103);add(104);add(105);add(106);add(107);add(108);add(109);add(110);
add(111);add(112);add(113);add(114);add(115);add(116);add(117);add(118);add(119);add(120);
@@ -53,6 +54,13 @@
add(201);add(202);add(203);add(204);add(205);add(206);add(207);add(208);add(209);add(210);
add(211);add(212);add(213);add(214);add(215);add(216);add(217);add(218);add(219);add(220);
add(221);add(222);add(224);add(225);
+ }};
+ public static final ArrayList<Integer> staNos1W = new ArrayList<Integer>() {{
+ add(118);add(121);add(124);
+ }};
+
+ public static final ArrayList<Integer> staNos2W = new ArrayList<Integer>() {{
+ add(218);add(221);add(224);
}};
private boolean connectDev = false;
public Long currentTimeMilliConnectDev= 0L;
@@ -79,6 +87,16 @@
return staNos1;
case 2:
return staNos2;
+ default:
+ throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
+ }
+ }
+ private ArrayList<Integer> getStaNoW() {
+ switch (slave.getId()) {
+ case 1:
+ return staNos1W;
+ case 2:
+ return staNos2W;
default:
throw new CoolException("鏈嶅姟鍣ㄥ紓甯�");
}
@@ -319,24 +337,24 @@
}
}
}
- int[] staW = new int[]{1004,1014,1020};
+ ArrayList<Integer> staW = getStaNoW();
//鏉＄爜
// Thread.sleep(50);
- OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB400.100.0",(short) (barcodeSize*8));
+ OperateResultExOne<byte[]> result2 = siemensS7Net.Read("DB101.212",(short) (barcodeSize*8));
if (result2.IsSuccess) {
for (int i = 0; i < barcodeSize; i++) {
- Integer siteId = staW[i]; // 绔欑偣缂栧彿
+ Integer siteId = staW.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
station.put(siteId, staProtocol);
}
- String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,6, "UTF-8");
- BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1);
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content,i*8,8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 1+3*slave.getId());
if(!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
barcodeThread.setBarcode(barcode);
- if (!Cools.isEmpty(barcode) && !barcode.equals("000000")){
+ if (!Cools.isEmpty(barcode) && !barcode.equals("00000000")){
staProtocol.setBarcodeNow(barcode);
} else if (Cools.isEmpty(barcode)){
staProtocol.setBarcodeNow("-");
@@ -349,10 +367,10 @@
//鏉＄爜
// Thread.sleep(50);
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB400.148.0",(short) (staW.length*4));
+ OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.200",(short) (staW.size()*4));
if (result3.IsSuccess) {
- for (int i = 0; i < staW.length; i++) {
- Integer siteId = staW[i]; // 绔欑偣缂栧彿
+ for (int i = 0; i < staW.size(); i++) {
+ Integer siteId = staW.get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
@@ -460,11 +478,11 @@
//浠诲姟涓嬪彂鎴愬姛鏍囪瘑
boolean writeFlag = false;
while(writeCount < 5){
- OperateResult writeResult1 = siemensS7Net.Write("DB101." + index*8, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
- OperateResult writeResult2 = siemensS7Net.Write("DB101." + (index*8+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ OperateResult writeResult2 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo().shortValue()); // 鐩爣绔�
+ OperateResult writeResult1 = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo()); // 宸ヤ綔鍙�
if(writeResult1.IsSuccess && writeResult2.IsSuccess){
Thread.sleep(200);
- OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB101.0" + index*8, (short)4);
+ OperateResultExOne<byte[]> readResult = siemensS7Net.Read("DB100.0" + index*6, (short)4);
if(readResult.IsSuccess){
Integer workNo = siemensS7Net.getByteTransform().TransInt32(readResult.Content, 0);
@@ -542,7 +560,7 @@
//鏇存柊浠诲姟姝ュ簭
TaskWrkService taskWrkService = SpringUtils.getBean(TaskWrkService.class);
- TaskWrk taskWrk = taskWrkService.selectByWrkNo(staProtocol.getWorkNo());
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(staProtocol.getWorkNo());
if (taskWrk != null) {
taskWrk.setCommandStep(taskWrk.getCommandStep() + 1);//鏇存柊鎸囦护姝ュ簭
taskWrkService.updateById(taskWrk);
--
Gitblit v1.9.1