From 9c569aa9b55e08fd58ac76ae1132e53fdb9888d1 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期一, 06 四月 2026 20:46:02 +0800
Subject: [PATCH] #入库退回

---
 src/main/java/com/zy/core/plugin/NormalProcess.java |   72 +++++++++++++++++++++++++----------
 1 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/zy/core/plugin/NormalProcess.java b/src/main/java/com/zy/core/plugin/NormalProcess.java
index 32e3481..1d3c135 100644
--- a/src/main/java/com/zy/core/plugin/NormalProcess.java
+++ b/src/main/java/com/zy/core/plugin/NormalProcess.java
@@ -1,15 +1,11 @@
 package com.zy.core.plugin;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.core.common.Cools;
-import com.zy.asrs.domain.param.CreateInTaskParam;
+import com.zy.asrs.utils.Utils;
 import com.zy.asrs.entity.BasDevp;
-import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.service.BasDevpService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.common.model.StartupDto;
 import com.zy.common.service.CommonService;
 import com.zy.common.utils.RedisUtil;
 import com.zy.core.News;
@@ -23,18 +19,15 @@
 import com.zy.core.model.command.StationCommand;
 import com.zy.core.model.protocol.StationProtocol;
 import com.zy.core.plugin.api.MainProcessPluginApi;
-import com.zy.core.plugin.store.StoreInTaskContext;
 import com.zy.core.plugin.store.StoreInTaskGenerationService;
 import com.zy.core.plugin.store.StoreInTaskPolicy;
 import com.zy.core.thread.StationThread;
 import com.zy.core.utils.CrnOperateProcessUtils;
 import com.zy.core.utils.StationOperateProcessUtils;
-import com.zy.core.utils.WmsOperateUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -51,11 +44,7 @@
     @Autowired
     private BasDevpService basDevpService;
     @Autowired
-    private WrkMastService wrkMastService;
-    @Autowired
     private RedisUtil redisUtil;
-    @Autowired
-    private WmsOperateUtils wmsOperateUtils;
     @Autowired
     private StoreInTaskGenerationService storeInTaskGenerationService;
     @Autowired
@@ -88,17 +77,38 @@
      * 鍏ュ簱绔欙紝鏍规嵁鏉＄爜鎵弿鐢熸垚鍏ュ簱宸ヤ綔妗�
      */
     public synchronized void generateStoreWrkFile() {
-        storeInTaskGenerationService.generate(this);
+        submitGenerateStoreTasks();
     }
 
-    @Override
-    public boolean matchCandidate(StoreInTaskContext context) {
-        StationProtocol stationProtocol = context.getStationProtocol();
-        return stationProtocol.isAutoing()
-                && stationProtocol.isLoading()
-                && stationProtocol.isInEnable()
-                && stationProtocol.getTaskNo() > 0
-                && !Cools.isEmpty(stationProtocol.getBarcode());
+    private void submitGenerateStoreTasks() {
+        List<BasDevp> basDevps = basDevpService.list(new QueryWrapper<>());
+        for (BasDevp basDevp : basDevps) {
+            StationThread stationThread = (StationThread) SlaveConnection.get(SlaveType.Devp, basDevp.getDevpNo());
+            if (stationThread == null) {
+                continue;
+            }
+
+            Map<Integer, StationProtocol> stationMap = stationThread.getStatusMap();
+            if (stationMap == null || stationMap.isEmpty()) {
+                continue;
+            }
+
+            List<StationObjModel> barcodeStations = getBarcodeStations(basDevp);
+            for (StationObjModel stationObjModel : barcodeStations) {
+                Integer stationId = stationObjModel == null ? null : stationObjModel.getStationId();
+                if (stationId == null || !stationMap.containsKey(stationId)) {
+                    continue;
+                }
+
+                StationProtocol stationProtocol = stationMap.get(stationId);
+                if (!canSubmitGenerateStoreTask(basDevp, stationThread, stationObjModel, stationProtocol)) {
+                    continue;
+                }
+
+                storeInTaskGenerationService.submitGenerateStoreTask(this, basDevp, stationObjModel, 0L,
+                        () -> storeInTaskGenerationService.generate(this, basDevp, stationObjModel));
+            }
+        }
     }
 
     //妫�娴嬪叆搴撶珯鏄惁鏈変换鍔＄敓鎴愶紝骞跺惎鍔ㄥ叆搴�
@@ -137,6 +147,9 @@
                 ) {
                     StationCommand command = stationThread.getCommand(StationCommandType.MOVE, commonService.getWorkNo(WrkIoType.ENABLE_IN.id), stationId, entity.getBarcodeStation().getStationId(), 0);
                     stationCommandDispatcher.dispatch(basDevp.getDevpNo(), command, "normal-process", "enable-in");
+                    if (entity.getBarcodeStation() != null && entity.getBarcodeStation().getStationId() != null) {
+                        Utils.precomputeInTaskEnableRow(entity.getBarcodeStation().getStationId());
+                    }
                     redisUtil.set(RedisKeyType.GENERATE_ENABLE_IN_STATION_DATA_LIMIT.key + stationId, "lock", 15);
                     News.info("{}绔欑偣鍚姩鍏ュ簱鎴愬姛锛屾暟鎹寘:{}", stationId, JSON.toJSONString(command));
                 }
@@ -144,4 +157,21 @@
         }
     }
 
+    private boolean canSubmitGenerateStoreTask(BasDevp basDevp,
+                                               StationThread stationThread,
+                                               StationObjModel stationObjModel,
+                                               StationProtocol stationProtocol) {
+        return canRequestStoreIn(stationProtocol);
+    }
+
+    private boolean canRequestStoreIn(StationProtocol stationProtocol) {
+        return stationProtocol != null
+                && stationProtocol.getError() <= 0
+                && stationProtocol.isAutoing()
+                && stationProtocol.isLoading()
+                && stationProtocol.isInEnable()
+                && stationProtocol.getTaskNo() > 0
+                && !Cools.isEmpty(stationProtocol.getBarcode());
+    }
+
 }

--
Gitblit v1.9.1