From 470718b6f7de2688807a59b4e32f437624c51499 Mon Sep 17 00:00:00 2001
From: Junjie <DELL@qq.com>
Date: 星期四, 15 一月 2026 16:06:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/network/real/ZyStationRealConnect.java | 100 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
index c73de43..f3fab96 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationRealConnect.java
@@ -18,10 +18,12 @@
import com.zy.core.News;
import com.zy.core.cache.OutputQueue;
import com.zy.core.model.CommandResponse;
+import com.zy.core.model.StationObjModel;
import com.zy.core.model.command.StationCommand;
import com.zy.core.network.api.ZyStationConnectApi;
import com.zy.core.network.entity.ZyStationStatusEntity;
import java.util.Collections;
+import java.util.Comparator;
import java.util.List;
import java.text.MessageFormat;
@@ -34,7 +36,7 @@
public class ZyStationRealConnect implements ZyStationConnectApi {
private List<ZyStationStatusEntity> statusList;
- private List<ZyStationStatusEntity> barcodeStatusList;
+ private List<StationObjModel> barcodeOriginList;
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
@@ -87,14 +89,20 @@
}
statusList = JSONObject.parseArray(basDevp.getStationList(), ZyStationStatusEntity.class);
- barcodeStatusList = JSONObject.parseArray(basDevp.getBarcodeStationList(), ZyStationStatusEntity.class);
+ if (statusList != null) {
+ statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
+ }
+ barcodeOriginList = basDevp.getBarcodeStationList$();
}
- OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 2));
+ OperateResultExOne<byte[]> result = siemensNet.Read("DB101.0", (short) (statusList.size() * 8));
if (result.IsSuccess) {
for (int i = 0; i < statusList.size(); i++) {
ZyStationStatusEntity statusEntity = statusList.get(i); // 绔欑偣缂栧彿
- boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 2, 2);
+ statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8)); // 宸ヤ綔鍙�
+ statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result.Content, i * 8 + 4)); // 鐩爣绔�
+
+ boolean[] status = siemensNet.getByteTransform().TransBool(result.Content, i * 8 + 6, 2);
statusEntity.setAutoing(status[0]); // 鑷姩
statusEntity.setLoading(status[1]); // 鏈夌墿
statusEntity.setInEnable(status[2]); // 鍙叆
@@ -104,27 +112,62 @@
}
}
- OperateResultExOne<byte[]> result1 = siemensNet.Read("DB100.0", (short) (statusList.size() * 4));
- if (result1.IsSuccess) {
- for (int i = 0; i < statusList.size(); i++) {
- ZyStationStatusEntity statusEntity = statusList.get(i);
- statusEntity.setTaskNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4)); // 宸ヤ綔鍙�
- statusEntity.setTargetStaNo((int) siemensNet.getByteTransform().TransInt16(result1.Content, i * 4 + 2)); // 鐩爣绔�
+ // 鏉＄爜鎵弿鍣�
+ OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.840", (short) (barcodeOriginList.size() * 8));
+ if (result2.IsSuccess) {
+ for (int i = 0; i < barcodeOriginList.size(); i++) {
+ ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
+ if (barcodeEntity == null) {
+ continue;
+ }
+ String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 8, 8, "UTF-8");
+ barcode = barcode.trim();
+ barcodeEntity.setBarcode(barcode);
}
}
- // 鏉＄爜鎵弿鍣�
- OperateResultExOne<byte[]> result2 = siemensNet.Read("DB101.100", (short) (statusList.size() * 10));
- if (result2.IsSuccess) {
- for (int i = 0; i < barcodeStatusList.size(); i++) {
- ZyStationStatusEntity barcodeEntity = barcodeStatusList.get(i);
- ZyStationStatusEntity statusEntity = findStatusEntity(barcodeEntity.getStationId());
- if (statusEntity == null) {
+ // 鎶ヨ淇℃伅
+ OperateResultExOne<byte[]> result3 = siemensNet.Read("DB101.800", (short) (barcodeOriginList.size() * 3));
+ if (result3.IsSuccess) {
+ for (int i = 0; i < barcodeOriginList.size(); i++) {
+ ZyStationStatusEntity barcodeEntity = findStatusEntityByBarcodeIdx(i + 1);
+ if (barcodeEntity == null) {
continue;
}
- String barcode = siemensNet.getByteTransform().TransString(result2.Content, i * 10 + 2, 8, "UTF-8");
- barcode = barcode.trim();
- barcodeEntity.setBarcode(barcode);
+
+ barcodeEntity.setPalletHeight((int) siemensNet.getByteTransform().TransInt16(result3.Content, i * 3)); // 楂樹綆淇″彿
+
+ StringBuilder sb = new StringBuilder();
+ boolean[] status1 = siemensNet.getByteTransform().TransBool(result3.Content, i * 3 + 2, 1);
+
+ if(status1[0]){
+ sb.append("鍓嶈秴闄愭姤璀�;");
+ }
+ if(status1[1]) {
+ sb.append("鍚庤秴闄愭姤璀�;");
+ }
+ if(status1[2]) {
+ sb.append("瓒呴珮鎶ヨ;");
+ }
+ if(status1[3]) {
+ sb.append("宸﹁秴鎶ヨ;");
+ }
+ if(status1[4]) {
+ sb.append("鍙宠秴鎶ヨ;");
+ }
+ if(status1[5]) {
+ sb.append("瓒呴噸鎶ヨ;");
+ }
+ if(status1[6]) {
+ sb.append("鎵爜澶辫触;");
+ }
+
+ if(sb.length() > 0) {
+ barcodeEntity.setError(1);
+ }else {
+ barcodeEntity.setError(0);
+ }
+ barcodeEntity.setErrorMsg(sb.toString());
}
}
@@ -232,4 +275,21 @@
}
return -1;
}
+
+ private ZyStationStatusEntity findStatusEntityByBarcodeIdx(Integer barcodeIdx) {
+ Integer stationId = null;
+ for (StationObjModel stationObjModel : barcodeOriginList) {
+ if (stationObjModel.getBarcodeIdx().equals(barcodeIdx)) {
+ stationId = stationObjModel.getStationId();
+ break;
+ }
+ }
+
+ for (ZyStationStatusEntity zyStationStatusEntity : statusList) {
+ if(zyStationStatusEntity.getStationId().equals(stationId)) {
+ return zyStationStatusEntity;
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.1