From 6a71dd91fc77040eab3ffc37a52f039e293f2a73 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 12 四月 2026 18:41:56 +0800
Subject: [PATCH] #条码站申请入库增加入库模式判断
---
src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java | 66 ++++++++++++++++++++++++++++----
1 files changed, 57 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java b/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
index 72f2b96..a0e7e35 100644
--- a/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
+++ b/src/main/java/com/zy/core/thread/impl/v5/StationV5StatusReader.java
@@ -17,12 +17,15 @@
import com.zy.core.model.protocol.StationProtocol;
import com.zy.core.network.ZyStationConnectDriver;
import com.zy.core.network.entity.ZyStationStatusEntity;
+import com.zy.core.task.DeviceAsyncLogPublisher;
import com.zy.core.thread.support.RecentStationArrivalTracker;
-import com.zy.core.utils.DeviceLogRedisKeyBuilder;
+import com.zy.core.thread.support.StationErrLogSupport;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashSet;
import java.util.List;
public class StationV5StatusReader {
@@ -30,7 +33,9 @@
private final DeviceConfig deviceConfig;
private final RedisUtil redisUtil;
private final RecentStationArrivalTracker recentArrivalTracker;
+ private final DeviceAsyncLogPublisher devpAsyncLogPublisher;
private final List<StationProtocol> statusList = new ArrayList<>();
+ private volatile List<Integer> taskNoList = new ArrayList<>();
private boolean initialized = false;
private long deviceDataLogTime = System.currentTimeMillis();
@@ -40,6 +45,7 @@
this.deviceConfig = deviceConfig;
this.redisUtil = redisUtil;
this.recentArrivalTracker = recentArrivalTracker;
+ this.devpAsyncLogPublisher = SpringUtils.getBean(DeviceAsyncLogPublisher.class);
}
public void readStatus(ZyStationConnectDriver zyStationConnectDriver) {
@@ -74,6 +80,7 @@
int deviceLogCollectTime = initialized ? Utils.getDeviceLogCollectTime() : 200;
List<ZyStationStatusEntity> zyStationStatusEntities = zyStationConnectDriver.getStatus();
+ LinkedHashSet<Integer> taskNoSet = new LinkedHashSet<>();
for (ZyStationStatusEntity statusEntity : zyStationStatusEntities) {
for (StationProtocol stationProtocol : statusList) {
if (stationProtocol.getStationId().equals(statusEntity.getStationId())) {
@@ -95,6 +102,18 @@
stationProtocol.setTaskWriteIdx(statusEntity.getTaskWriteIdx());
stationProtocol.setTaskBufferItems(statusEntity.getTaskBufferItems());
stationProtocol.setIoMode(statusEntity.getIoMode());
+ stationProtocol.setInBarcodeError(statusEntity.isInBarcodeError());
+ if (statusEntity.getTaskNo() != null && statusEntity.getTaskNo() > 0) {
+ taskNoSet.add(statusEntity.getTaskNo());
+ }
+ if (statusEntity.getTaskBufferItems() != null) {
+ statusEntity.getTaskBufferItems().forEach(item -> {
+ Integer bufferTaskNo = item == null ? null : item.getTaskNo();
+ if (bufferTaskNo != null && bufferTaskNo > 0) {
+ taskNoSet.add(bufferTaskNo);
+ }
+ });
+ }
recentArrivalTracker.observe(statusEntity.getStationId(), statusEntity.getTaskNo(), statusEntity.isLoading());
}
@@ -105,24 +124,53 @@
}
}
}
+ taskNoList = new ArrayList<>(taskNoSet);
OutputQueue.DEVP.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",
DateUtils.convert(new Date()), deviceConfig.getDeviceNo()));
+ StationErrLogSupport.sync(deviceConfig, redisUtil, statusList);
if (System.currentTimeMillis() - deviceDataLogTime > deviceLogCollectTime) {
- DeviceDataLog deviceDataLog = new DeviceDataLog();
- deviceDataLog.setOriginData(JSON.toJSONString(zyStationStatusEntities));
- deviceDataLog.setWcsData(JSON.toJSONString(statusList));
- deviceDataLog.setType(String.valueOf(SlaveType.Devp));
- deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
- deviceDataLog.setCreateTime(new Date());
-
- redisUtil.set(DeviceLogRedisKeyBuilder.build(deviceDataLog), deviceDataLog, 60 * 60 * 24);
+ Date createTime = new Date();
+ HashMap<Integer, ZyStationStatusEntity> originDataMap = buildStationStatusMap(zyStationStatusEntities);
+ for (int i = 0; i < statusList.size(); i++) {
+ StationProtocol stationProtocol = statusList.get(i);
+ if (stationProtocol == null || stationProtocol.getStationId() == null) {
+ continue;
+ }
+ DeviceDataLog deviceDataLog = new DeviceDataLog();
+ ZyStationStatusEntity originEntity = originDataMap.get(stationProtocol.getStationId());
+ deviceDataLog.setOriginData(originEntity == null ? null : JSON.toJSONString(originEntity));
+ deviceDataLog.setWcsData(JSON.toJSONString(stationProtocol));
+ deviceDataLog.setType(String.valueOf(SlaveType.Devp));
+ deviceDataLog.setDeviceNo(deviceConfig.getDeviceNo());
+ deviceDataLog.setStationId(stationProtocol.getStationId());
+ deviceDataLog.setCreateTime(createTime);
+ devpAsyncLogPublisher.publishLatest(deviceDataLog);
+ }
deviceDataLogTime = System.currentTimeMillis();
}
}
+ private HashMap<Integer, ZyStationStatusEntity> buildStationStatusMap(List<ZyStationStatusEntity> zyStationStatusEntities) {
+ HashMap<Integer, ZyStationStatusEntity> map = new HashMap<>();
+ if (zyStationStatusEntities == null) {
+ return map;
+ }
+ for (ZyStationStatusEntity statusEntity : zyStationStatusEntities) {
+ if (statusEntity == null || statusEntity.getStationId() == null) {
+ continue;
+ }
+ map.put(statusEntity.getStationId(), statusEntity);
+ }
+ return map;
+ }
+
public List<StationProtocol> getStatusList() {
return statusList;
}
+
+ public List<Integer> getTaskNoList() {
+ return taskNoList;
+ }
}
--
Gitblit v1.9.1