From b352221d2a2f4a8e8a1f9a12dda54fa32a8f7e4e Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 22 六月 2024 14:44:46 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
index c1c59c1..3ea5461 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/thread/impl/SuopaiSiemensDevpThread.java
@@ -17,6 +17,8 @@
import com.zy.asrs.wcs.rcs.News;
import com.zy.asrs.wcs.rcs.cache.OutputQueue;
import com.zy.asrs.wcs.rcs.entity.Device;
+import com.zy.asrs.wcs.rcs.model.dto.WorkModeTypeDto;
+import com.zy.asrs.wcs.rcs.model.enums.WorkModeType;
import com.zy.asrs.wcs.rcs.model.protocol.StaProtocol;
import com.zy.asrs.wcs.rcs.thread.DevpThread;
import lombok.extern.slf4j.Slf4j;
@@ -44,9 +46,21 @@
*/
private int barcodeSize = 2;
+ /**
+ * 鍏ュ嚭搴撴ā寮�
+ * 0锛氭湭鐭�
+ * 1锛氬叆搴撳惎鍔ㄤ腑
+ * 2.鍏ュ簱妯″紡
+ * 3.鍑哄簱鍚姩涓� 锛堜笉鑳界敓鎴愬叆搴撳伐浣滄。锛�
+ * 4.鍑哄簱妯″紡
+ */
+ private Map<Integer, WorkModeTypeDto> workModeTypes = new ConcurrentHashMap<>();
+
public SuopaiSiemensDevpThread(Device device, RedisUtil redisUtil) {
this.device = device;
this.redisUtil = redisUtil;
+
+ workModeTypes.put(101, new WorkModeTypeDto(101, WorkModeType.NONE, "DB1001.120"));
}
private ArrayList<BasConveyorSta> getStaNo() {
@@ -86,9 +100,10 @@
}
private void read() throws InterruptedException {
+ updateWorkMode();
ArrayList<BasConveyorSta> staNos = getStaNo();
int staNoSize = staNos.size();
- OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.100", (short) (staNoSize*8));
+ OperateResultExOne<byte[]> result = siemensS7Net.Read("DB1000.100", (short) (staNoSize * 40));
if (result.IsSuccess) {
for (int i = 0; i < staNoSize; i++) {
BasConveyorSta siteStation = staNos.get(i);
@@ -99,42 +114,21 @@
staProtocol.setSiteId(siteId);
station.put(siteId, staProtocol);
}
- staProtocol.setStaNo( siemensS7Net.getByteTransform().TransInt16(result.Content, i*8 + 4 )); // 鐩爣绔�
- Thread.sleep(300);
- staProtocol.setWorkNo((short) siemensS7Net.getByteTransform().TransInt32(result.Content, i * 8)); // 宸ヤ綔鍙�
-
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result.Content, i*8+6, 2);
- 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.setWorkNo((short) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 2)); // 宸ヤ綔鍙�
+ staProtocol.setStaNo(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 4)); // 鐩爣绔�
+ staProtocol.setAutoing(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 6) == 2); // 鑷姩
+ staProtocol.setLoading(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 32) == 1); // 鏈夌墿
+ staProtocol.setInEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 14) == 1); // 鍙叆
+ staProtocol.setOutEnable(siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 14) == 2);// 鍙嚭
+ staProtocol.setWorkMode((int) siemensS7Net.getByteTransform().TransInt16(result.Content, i * 40 + 8));// 宸ヤ綔妯″紡
+// staProtocol.setEmptyMk(status[4]); // 绌烘澘淇″彿
+// staProtocol.setFullPlt(status[5]); // 婊℃墭鐩�
+// staProtocol.setHigh(status[6]); // 楂樺簱浣�
+// staProtocol.setLow(status[7]); // 浣庡簱浣�
if (!staProtocol.isPakMk() && !staProtocol.isLoading()) {
staProtocol.setPakMk(true);
}
- }
- }
-
- Thread.sleep(200);
- ArrayList<BasConveyorSta> errorStaNo = getStaNo();
- OperateResultExOne<byte[]> result3 = siemensS7Net.Read("DB101.800.0", (short) (errorStaNo.size() * 4));
- if (result3.IsSuccess) {
- for (int i = 0; i < errorStaNo.size(); i++) {
- BasConveyorSta siteStation = errorStaNo.get(i);
- Integer siteId = siteStation.getSiteNo(); // 绔欑偣缂栧彿
- StaProtocol staProtocol = station.get(siteId);
- boolean[] status = siemensS7Net.getByteTransform().TransBool(result3.Content, (i * 4 + 2), 2);
- 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]);//鎵爜澶辫触
}
}
@@ -198,7 +192,7 @@
public boolean writeWorkNo(int siteId, short workNo) {
int index = findStaNosIndex(siteId);
- OperateResult write = siemensS7Net.Write("DB100." + index*6, workNo); // 宸ヤ綔鍙�
+ OperateResult write = siemensS7Net.Write("DB1001." + (index * 20 + 100 + 2), workNo); // 宸ヤ綔鍙�
if (!write.IsSuccess) {
StaProtocol staProtocol = station.get(siteId);
@@ -219,7 +213,7 @@
public boolean writeStaNo(int siteId,short staNo) {
int index = findStaNosIndex(siteId);
- OperateResult write = siemensS7Net.Write("DB100." + (index*6+4), staNo); // 鐩爣绔�
+ OperateResult write = siemensS7Net.Write("DB1001." + (index * 20 + 100 + 4), staNo); // 鐩爣绔�
if (!write.IsSuccess) {
StaProtocol staProtocol = station.get(siteId);
@@ -237,11 +231,13 @@
}
@Override
- public boolean writeWorkSta(int siteId, short staNo, short workNo) {
+ public boolean writeWorkSta(int siteId, short workNo, short staNo) {
int index = findStaNosIndex(siteId);
- OperateResult write1 = siemensS7Net.Write("DB100." + index*6, workNo); // 宸ヤ綔鍙�
- OperateResult write2 = siemensS7Net.Write("DB100." + (index*6+4), staNo); // 鐩爣绔�
+ String workNoAddress = "DB1001." + (index * 20 + 100 + 2);
+ String staNoAddress = "DB1001." + (index * 20 + 100 + 4);
+ OperateResult write1 = siemensS7Net.Write(workNoAddress, workNo); // 宸ヤ綔鍙�
+ OperateResult write2 = siemensS7Net.Write(staNoAddress, staNo); // 鐩爣绔�
if (!(write1.IsSuccess && write2.IsSuccess)) {
StaProtocol staProtocol = station.get(siteId);
@@ -287,4 +283,29 @@
staProtocol.setPakMk(pakMk);
}
}
+
+ private void updateWorkMode() {
+ for (Map.Entry<Integer, WorkModeTypeDto> entry : workModeTypes.entrySet()) {
+ WorkModeTypeDto workModeTypeDto = entry.getValue();
+ WorkModeType workModeType = workModeTypeDto.getWorkModeType();
+ if (workModeType != WorkModeType.NONE) {
+ if (!siemensS7Net.Write(workModeTypeDto.getAddress(), workModeType.id).IsSuccess) {
+ OutputQueue.DEVP.offer(MessageFormat.format("鍐欏叆杈撻�佺嚎{}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={}", workModeTypeDto.getSiteId(), device.getId()));
+ log.error("鍐欏叆杈撻�佺嚎{}鍏ュ嚭搴撴ā寮忓け璐ャ�傝緭閫佺嚎缂栧彿={}", workModeTypeDto.getSiteId(), device.getId());
+ }
+ }
+ }
+ }
+
+ @Override
+ public boolean switchWorkMode(int siteId, int workMode) {
+ WorkModeTypeDto workModeTypeDto = workModeTypes.get(siteId);
+ if(workModeTypeDto == null) {
+ return false;
+ }
+
+ workModeTypeDto.setWorkModeType(WorkModeType.get((short) workMode));
+ workModeTypes.put(siteId, workModeTypeDto);
+ return true;
+ }
}
--
Gitblit v1.9.1