From 9ea4fda8bd24942bedd72de72c2983cbaed6af65 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 31 三月 2026 17:08:51 +0800
Subject: [PATCH] #出入库模式
---
src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
index ea6e8c9..482eea7 100644
--- a/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
+++ b/src/main/java/com/zy/core/network/real/ZyStationV4RealConnect.java
@@ -69,6 +69,7 @@
private List<ZyStationStatusEntity> statusList;
private List<StationObjModel> barcodeOriginList;
+ private List<StationObjModel> inStationOriginList;
private SiemensS7Net siemensNet;
private DeviceConfig deviceConfig;
private RedisUtil redisUtil;
@@ -126,6 +127,7 @@
statusList.sort(Comparator.comparing(ZyStationStatusEntity::getStationId));
}
barcodeOriginList = basDevp.getBarcodeStationList$();
+ inStationOriginList = sortStationObjModelsByStationId(basDevp.getInStationList$());
}
if (siemensNet == null) {
@@ -253,6 +255,19 @@
String alarmMsg = buildConveyorCommonAlarmMessage(status1, status2, status3, status4);
applyAlarmMessage(statusEntity, mergeAlarmMessages(statusEntity.getErrorMsg(), alarmMsg));
+ }
+ }
+
+ // 鍑哄叆搴撴ā寮�
+ OperateResultExOne<byte[]> result6 = siemensNet.Read("DB167.2", (short) (inStationOriginList.size() * 2));
+ if (result6.IsSuccess) {
+ for (int i = 0; i < inStationOriginList.size(); i++) {
+ ZyStationStatusEntity inStationEntity = findStatusEntityByInStationIdx(i);
+ if (inStationEntity == null) {
+ continue;
+ }
+ Integer ioMode = normalizeIoMode((int) siemensNet.getByteTransform().TransInt16(result6.Content, i * 2));
+ inStationEntity.setIoMode(ioMode);
}
}
@@ -394,6 +409,17 @@
return null;
}
+ private ZyStationStatusEntity findStatusEntityByInStationIdx(Integer idx) {
+ Integer stationId = findInStationIdByOrder(inStationOriginList, idx);
+
+ for (ZyStationStatusEntity zyStationStatusEntity : statusList) {
+ if(zyStationStatusEntity.getStationId().equals(stationId)) {
+ return zyStationStatusEntity;
+ }
+ }
+ return null;
+ }
+
private int getTaskWriteIdx(int stationIdx, Integer taskWriteIdx) {
int useIdx = -1;
if (stationIdx < 0 || taskWriteIdx == null || taskWriteIdx <= 0) {
@@ -480,6 +506,32 @@
return current + append;
}
+ static Integer normalizeIoMode(Integer rawMode) {
+ if (rawMode == null) {
+ return null;
+ }
+ if (rawMode == 1 || rawMode == 2) {
+ return rawMode;
+ }
+ return null;
+ }
+
+ static Integer findInStationIdByOrder(List<StationObjModel> inStationOriginList, Integer orderIdx) {
+ if (inStationOriginList == null || orderIdx == null || orderIdx < 0 || orderIdx >= inStationOriginList.size()) {
+ return null;
+ }
+ StationObjModel stationObjModel = inStationOriginList.get(orderIdx);
+ return stationObjModel == null ? null : stationObjModel.getStationId();
+ }
+
+ static List<StationObjModel> sortStationObjModelsByStationId(List<StationObjModel> stationObjModels) {
+ if (stationObjModels == null) {
+ return Collections.emptyList();
+ }
+ stationObjModels.sort(Comparator.comparing(StationObjModel::getStationId, Comparator.nullsLast(Integer::compareTo)));
+ return stationObjModels;
+ }
+
private static void appendConveyorCommonAlarmMessages(StringBuilder sb, boolean[] status, int startIdx) {
if (status == null) {
return;
--
Gitblit v1.9.1