From fcb71b8fc63f74cd00d3faa76c73f4c5566ee352 Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期三, 07 五月 2025 23:23:09 +0800
Subject: [PATCH] 解决提升机在本层，而没有锁提升机的问题
---
src/main/java/com/zy/core/thread/impl/FyDevpThread.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
index efed1ca..64edd4f 100644
--- a/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
+++ b/src/main/java/com/zy/core/thread/impl/FyDevpThread.java
@@ -41,7 +41,7 @@
private SiemensS7Net siemensS7Net;
private Map<Integer, StaProtocol> station = new ConcurrentHashMap<>();
- public IoModeType ioModeOf2_5 = IoModeType.NONE;
+ public IoModeType ioModeOf2_5 = IoModeType.PAKOUT_MODE;
private short heartBeatVal = 1;
private int barcodeSize = 10;
@@ -147,13 +147,11 @@
if (null == staProtocol) {
staProtocol = new StaProtocol();
staProtocol.setSiteId(siteId);
-
if (siteId == 1015) {
staProtocol.setLocNo("1200301");
} else if (siteId == 1026) {
staProtocol.setLocNo("1200305");
}
-
station.put(siteId, staProtocol);
}
Thread.sleep(300);
@@ -164,19 +162,27 @@
staProtocol.setInEnable(status[3]); // 鍙叆
staProtocol.setOutEnable(status[4]);// 鍙嚭
+
staProtocol.setBackErr(status[5]);
staProtocol.setLeftErr(status[6]);
staProtocol.setRightErr(status[7]);
- staProtocol.setHighErr(status[8]);
- staProtocol.setWeightErr(status[9]);
- staProtocol.setLow(status[10]);
- staProtocol.setHigh(status[11]);
+// staProtocol.setHighErr(status[8]);
+// staProtocol.setWeightErr(status[9]);
+// staProtocol.setLow(status[10]);
+// staProtocol.setHigh(status[11]);
+
+ boolean[] status2 = siemensS7Net.getByteTransform().TransBool(result.Content, i * 26 + 1, 2);
+ staProtocol.setHighErr(status2[0]);
+ staProtocol.setWeightErr(status2[1]);
+ staProtocol.setLow(status2[2]);
+ staProtocol.setHigh(status2[3]);
+ staProtocol.setBarcodeErr(status2[4]);
// staProtocol.setInEnable(status[13]); // 鍙叆
// staProtocol.setOutEnable(status[14]);// 鍙嚭
staProtocol.setWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 2)); // 宸ヤ綔鍙�
- staProtocol.setStaNo((short) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4)); // 鐩爣绔�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 4)); // 鐩爣绔�
staProtocol.setFinishWorkNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 26 + 6)); //宸插畬鎴愬伐浣滃彿
staProtocol.setBarcode(siemensS7Net.getByteTransform().TransString(result.Content, i * 26 + 10, 12, "UTF-8").trim()); //鏉＄爜
staProtocol.setWeight(siemensS7Net.getByteTransform().TransInt32(result.Content, i * 26 + 22)); //閲嶉噺
@@ -200,11 +206,7 @@
BasDevp sqlModel = staProtocol.toSqlModel();
stations.add(sqlModel);
- //鏆傛椂鍐欏叆鏁版嵁搴�
- BasDevp basDevp = basConveyorStaService.selectById(sta);
- if (basDevp == null) {
- basConveyorStaService.insert(sqlModel);
- }
+
}
if (!stations.isEmpty()) {
if (null != basConveyorStaService && !basConveyorStaService.updateBatchById(stations)) {
@@ -300,13 +302,18 @@
// 鏇存柊鍏ュ嚭搴撴ā寮�
- private void updateIoMode() throws InterruptedException {
+ private void updateIoMode() {
if (this.ioModeOf2_5 != null && (this.ioModeOf2_5.id == 0 || this.ioModeOf2_5.id == 1)) {
- if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id).IsSuccess) {
- station.get(1031).setOutInModel(this.ioModeOf2_5.id);
- station.get(1032).setOutInModel(this.ioModeOf2_5.id);
+ short[] array = new short[1];
+ array[0] = this.ioModeOf2_5.id;
+ if (!siemensS7Net.Write("DB83.80", this.ioModeOf2_5.id == 1).IsSuccess) {
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐�", this.ioModeOf2_5));
log.error("銆恵0}銆戝啓鍏ヨ緭閫佺嚎2.5F鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎plc缂栧彿={}", this.ioModeOf2_5);
+ } else {
+ if (station.get(1031) != null) {
+ station.get(1031).setOutInModel(this.ioModeOf2_5.id);
+ station.get(1032).setOutInModel(this.ioModeOf2_5.id);
+ }
}
}
--
Gitblit v1.9.1