From a81c56cc9d0766914a5cd932cb61bf94dce27bc8 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 九月 2024 13:07:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/zb-md-wcs' into zb-md-wcs
---
src/main/java/com/zy/core/thread/SiemensDevpThread.java | 281 ++++++++++++++++++--------------------------------------
1 files changed, 91 insertions(+), 190 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SiemensDevpThread.java b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
index 70a9ffa..d05c434 100644
--- a/src/main/java/com/zy/core/thread/SiemensDevpThread.java
+++ b/src/main/java/com/zy/core/thread/SiemensDevpThread.java
@@ -45,81 +45,19 @@
public static final ArrayList<Integer> staNos1 = new ArrayList<Integer>() {{
- add(1001);add(1002);add(1003);add(1004);add(1005);
- add(1006);add(1007);add(1008);add(1009);add(1010);
- add(1011);add(1012);add(1013);add(1014);add(1015);
- add(1016);add(1017);add(1018);add(1019);add(1020);
- add(1021);add(1022);add(1023);add(1024);add(1025);
- }};
+ add(1001);add(1002);
- public static final ArrayList<Integer> staNos2 = new ArrayList<Integer>() {{
- add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
- add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
- add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
}};
-
- public static final ArrayList<Integer> staNos3 = new ArrayList<Integer>() {{
- add(5001);add(5002);
- }};
-
- public static final ArrayList<Integer> staNos4 = new ArrayList<Integer>() {{
- add(3001);add(3002);add(3003);add(3004);add(3005);
- add(3006);add(3007);add(3008);add(3009);add(3010);
- add(3011);add(3012);
- }};
-
- public static final ArrayList<Integer> staNos5 = new ArrayList<Integer>() {{
- add(4001);add(4002);add(4003);add(4004);add(4005);add(4006);add(4007);
- }};
-
- public static final ArrayList<Integer> staNos6 = new ArrayList<Integer>() {{
- add(4010);add(4011);add(4012);add(4013);add(4014);add(4015);add(4016);
- }};
-
public static final ArrayList<Integer> writeStaNos1 = new ArrayList<Integer>() {{
- add(1001);add(1002);add(1003);add(1004);add(1005);
- add(1006);add(1007);add(1008);add(1009);add(1010);
- add(1011);add(1012);add(1013);add(1014);add(1015);
- add(1016);add(1017);add(1018);add(1019);add(1020);
- add(1021);add(1022);add(1023);add(1024);add(1025);
- }};
+ add(1001);add(1002);
- public static final ArrayList<Integer> writeStaNos2 = new ArrayList<Integer>() {{
- add(2001);add(2002);add(2101);add(2102);add(2301);add(2302);
- add(2303);add(2304);add(2305);add(2306);add(2003);add(2004);add(2005);
- add(2006);add(2103);add(2104);add(2105);add(2106);add(2107);
}};
-
- public static final ArrayList<Integer> writeStaNos3 = new ArrayList<Integer>() {{
- add(5001);add(5002);
- }};
-
- public static final ArrayList<Integer> writeStaNos4 = new ArrayList<Integer>() {{
- add(3001);
- add(3007);
- add(3012);
- }};
-
- public static final ArrayList<Integer> writeStaNos5 = new ArrayList<Integer>() {{
- add(4001);add(4007);
- }};
-
- public static final ArrayList<Integer> writeStaNos6 = new ArrayList<Integer>() {{
- add(4010);add(4016);
- }};
-
public static final ArrayList<Integer> errorStaNos1 = new ArrayList<Integer>() {{
- add(1002);add(1012);
+ add(1001);add(1002);
}};
- public static final ArrayList<Integer> errorStaNos2 = new ArrayList<Integer>() {{
- add(2107);
- }};
- public static final ArrayList<Integer> errorStaNos4 = new ArrayList<Integer>() {{
- add(3007);add(3012);
- }};
/**
* 鏉＄爜鏁伴噺
@@ -144,16 +82,6 @@
switch (slave.getId()) {
case 1:
return staNos1;
- case 2:
- return staNos2;
- case 3:
- return staNos3;
- case 4:
- return staNos4;
- case 5:
- return staNos5;
- case 6:
- return staNos6;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -163,16 +91,6 @@
switch (slave.getId()) {
case 1:
return writeStaNos1;
- case 2:
- return writeStaNos2;
- case 3:
- return writeStaNos3;
- case 4:
- return writeStaNos4;
- case 5:
- return writeStaNos5;
- case 6:
- return writeStaNos6;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -182,10 +100,6 @@
switch (slave.getId()) {
case 1:
return errorStaNos1;
- case 2:
- return errorStaNos2;
- case 4:
- return errorStaNos4;
default:
throw new CoolException("鑾峰彇绔欑偣澶辫触锛�");
}
@@ -205,17 +119,12 @@
switch (step) {
// 璇绘暟鎹�
case 1:
- if (slave.getId() ==3){
- read30();
- }else {
- read();
- }
-
+ read();
break;
// 鍐欐暟鎹� ID+鐩爣绔�
case 2:
- write((StaProtocol)task.getData());
- break;
+ write((StaProtocol)task.getData());
+ break;
default:
break;
}
@@ -254,38 +163,27 @@
private void read() throws InterruptedException {
ArrayList<Integer> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
- if (result.IsSuccess) {
+ OperateResultExOne<byte[]> result1 = null;
+ result1 = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 4));
+ if (result1.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*4, 1);
+ short count = siemensS7Net.getByteTransform().TransInt16(result1.Content, i * 4 + 2);
StaProtocol staProtocol = station.get(siteId);
if (null == staProtocol) {
staProtocol = new StaProtocol();
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
- staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 )); // 鐩爣绔�
- }
- }
- Thread.sleep(200);
- OperateResultExOne<byte[]> result1 = null;
- result1 = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
- if (result1.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result1.Content, i*8+6, 2);
- StaProtocol staProtocol = station.get(siteId);
staProtocol.setAutoing(status[0]); // 鑷姩
staProtocol.setLoading(status[1]); // 鏈夌墿
staProtocol.setInEnable(status[2]); // 鍙叆
staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
- staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
- staProtocol.setHigh(status[6]); // 楂樺簱浣�
- staProtocol.setLow(status[7]); // 浣庡簱浣�
- staProtocol.setEmptyOutPalletRequire(status[8]); // 绌烘墭鐩樺彲鍑洪渶姹備俊鍙�
- staProtocol.setEmptyInPalletRequire(status[9]); // 绌烘墭鐩樺彲鍏ラ渶姹備俊鍙�
+ staProtocol.setForce(status[4]);
+ staProtocol.setAmount(count);
+ staProtocol.setLow(true);
+
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
@@ -307,89 +205,66 @@
}
}
}
- }
-
- //鎶ヨ淇℃伅
- Thread.sleep(200);
- OperateResultExOne<byte[]> result3 = null;
- result3 = siemensS7Net.Read("DB101.200.0", (short) (getErrorStaNo().size() * 4));
- if (result3.IsSuccess) {
- for (int i = 0; i < getErrorStaNo().size(); i++) {
- Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
-// staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 搴撲綅楂樺害
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
- staProtocol.setFrontErr(status[0]);
- staProtocol.setBackErr(status[1]);
- staProtocol.setHighErr(status[2]);
- staProtocol.setLeftErr(status[3]);
- staProtocol.setRightErr(status[4]);
- staProtocol.setWeightErr(status[5]);
- staProtocol.setBarcodeErr(status[6]);
+ } else if (slave.getId() == 7) {
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result2 = null;
+ result2 = siemensS7Net.Read("DB101.104.0", (short) (barcodeSize * 8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeSize; i++) {
+ String barcode = siemensS7Net.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+ BarcodeThread barcodeThread = (BarcodeThread) SlaveConnection.get(SlaveType.Barcode, i + 4);
+ if (!Cools.isEmpty(barcodeThread) && !barcodeThread.getBarcode().equals(barcode)) {
+ barcodeThread.setBarcode(barcode);
+ }
+ }
}
}
- if (result.IsSuccess && !Cools.isEmpty(result1) && result1.IsSuccess) {
-
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
-
- // 鏍规嵁瀹炴椂淇℃伅鏇存柊鏁版嵁搴�
- try {
- List<BasDevp> basDevps = new ArrayList<>();
- for (Integer siteId : staNos) {
+ if (slave.getId() ==1){
+ //鎶ヨ淇℃伅
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = null;
+ result3 = siemensS7Net.Read("DB101.200.0", (short) (getErrorStaNo().size() * 4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < getErrorStaNo().size(); i++) {
+ Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
StaProtocol staProtocol = station.get(siteId);
- basDevps.add(staProtocol.toSqlModel());
+// staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 搴撲綅楂樺害
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+ staProtocol.setFrontErr(status[0]);
+ staProtocol.setBackErr(status[1]);
+ staProtocol.setHighErr(status[2]);
+ staProtocol.setLeftErr(status[3]);
+ staProtocol.setRightErr(status[4]);
+ staProtocol.setWeightErr(status[5]);
+ staProtocol.setBarcodeErr(status[6]);
}
- BasDevpService basDevpService = SpringUtils.getBean(BasDevpService.class);
- if (null != basDevpService && !basDevpService.updateBatchById(basDevps)) {
- throw new Exception("鏇存柊鏁版嵁搴撴暟鎹け璐�");
- }
- } catch (Exception e) {
- e.printStackTrace();
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戞洿鏂版暟鎹簱鏁版嵁澶辫触 ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
- log.error("鏇存柊鏁版嵁搴撴暟鎹け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
}
-
- } else {
- OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戣鍙栬緭閫佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{1}] [ip:{2}] [port:{3}] [rack:{4}] [slot:{5}]", DateUtils.convert(new Date()), slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot()));
-// log.error("璇诲彇杈撻�佺嚎plc鐘舵�佷俊鎭け璐� ===>> [id:{}] [ip:{}] [port:{}] [rack:{}] [slot:{}]", slave.getId(), slave.getIp(), slave.getPort(), slave.getRack(), slave.getSlot());
- }
- }
-
- private void read30() throws InterruptedException {
- ArrayList<Integer> staNos = getStaNo();
- int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size() * 8));
-
- result = siemensS7Net.Read("DB101.0", (short) (getStaNo().size()*4));
- if (result.IsSuccess) {
- for (int i = 0; i < staNoSize; i++) {
- Integer siteId = staNos.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*4, 1);
- short count = siemensS7Net.getByteTransform().TransInt16(result.Content, i * 4 + 2);
-
- StaProtocol staProtocol = station.get(siteId);
- if (null == staProtocol) {
- staProtocol = new StaProtocol();
- staProtocol.setSiteId(siteId);
- station.put(siteId, staProtocol);
+ } else if (slave.getId() == 7) {
+ //鎶ヨ淇℃伅
+ Thread.sleep(200);
+ OperateResultExOne<byte[]> result3 = null;
+ result3 = siemensS7Net.Read("DB101.96.0", (short) (getErrorStaNo().size() * 4));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < getErrorStaNo().size(); i++) {
+ Integer siteId = getErrorStaNo().get(i); // 绔欑偣缂栧彿
+ StaProtocol staProtocol = station.get(siteId);
+// staProtocol.setLocType1(siemensS7Net.getByteTransform().TransInt16(result.Content, i*4)); // 搴撲綅楂樺害
+ boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, i*4+2, 1);
+ staProtocol.setFrontErr(status[0]);
+ staProtocol.setBackErr(status[1]);
+ staProtocol.setHighErr(status[2]);
+ staProtocol.setLeftErr(status[3]);
+ staProtocol.setRightErr(status[4]);
+ staProtocol.setWeightErr(status[5]);
+ staProtocol.setBarcodeErr(status[6]);
}
- staProtocol.setAutoing(status[0]); // 鑷姩
- staProtocol.setLoading(status[1]); // 鏈夌墿
- staProtocol.setInEnable(status[2]); // 鍙叆
- staProtocol.setOutEnable(status[3]);// 鍙嚭
- staProtocol.setForce(status[4]);
- staProtocol.setAmount(count);
-
- if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
- staProtocol.setPakMk(true);
- }
}
}
- if (result.IsSuccess) {
+ if (!Cools.isEmpty(result1) && result1.IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -426,9 +301,9 @@
}
ArrayList<Integer> staNos = getWriteStaNo();
int index = staNos.indexOf(staProtocol.getSiteId());
- OperateResult write = siemensS7Net.Write("DB100." + index*6, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
+ OperateResult write = siemensS7Net.Write("DB100." + index*4, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
Thread.sleep(500);
- OperateResult write1 = siemensS7Net.Write("DB100." + (index*6+4), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write1 = siemensS7Net.Write("DB100." + (index*4+2), staProtocol.getStaNo()); // 鐩爣绔�
if (!write.IsSuccess || !write1.IsSuccess) {
staProtocol = station.get(staProtocol.getSiteId());
@@ -444,6 +319,32 @@
}
/**
+ * 鍐欏叆 ID+鐩爣绔� =====> 鍗曠珯鐐瑰啓鍏�
+ */
+ private void write10(StaProtocol staProtocol) throws InterruptedException {
+ if (null == staProtocol) {
+ return;
+ }
+ ArrayList<Integer> staNos = getWriteStaNo();
+ int index = staNos.indexOf(staProtocol.getSiteId());
+ OperateResult write = siemensS7Net.Write("DB100." + index*10, staProtocol.getWorkNo().intValue()); // 宸ヤ綔鍙�
+ OperateResult write1 = siemensS7Net.Write("DB100." + (index*10+4), staProtocol.getStaNo()); // 鐩爣绔�
+ OperateResult write2 = siemensS7Net.Write("DB100." + (index*10+6), staProtocol.getMatnr()); // 鐩爣绔�
+
+ if (!write.IsSuccess || !write1.IsSuccess || !write2.IsSuccess) {
+ staProtocol = station.get(staProtocol.getSiteId());
+ if (staProtocol.getWorkNo() == 0 && staProtocol.getStaNo() ==0) {
+ staProtocol.setPakMk(true);
+ }
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={1}锛岀珯鐐规暟鎹�={2}", slave.getId(), JSON.toJSON(staProtocol)));
+ log.error("鍐欏叆杈撻�佺嚎绔欑偣鏁版嵁澶辫触銆傝緭閫佺嚎plc缂栧彿={}锛岀珯鐐规暟鎹�={}", slave.getId(), JSON.toJSON(staProtocol));
+ } else {
+ OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆� 杈撻�佺嚎鍛戒护涓嬪彂 [id:{1}] >>>>> {2}", DateUtils.convert(new Date()), slave.getId(), JSON.toJSON(staProtocol)));
+ log.info("杈撻�佺嚎鍛戒护涓嬪彂 [id:{}] >>>>> 鍛戒护涓嬪彂锛� {}", slave.getId(), JSON.toJSON(staProtocol));
+ }
+ }
+
+ /**
* 蹇冭烦
*/
private void heartbeat(){
--
Gitblit v1.9.1