From e4279da0f49517ada6e25a978e5df60f7c1e6997 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 四月 2026 09:45:51 +0800
Subject: [PATCH] #入库任务限制控制进输送

---
 src/main/java/com/zy/core/utils/StationOperateProcessUtils.java |   64 +++++++++++++-------------------
 1 files changed, 26 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
index 5c852ad..3950d8b 100644
--- a/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/StationOperateProcessUtils.java
@@ -53,19 +53,9 @@
     @Autowired
     private BasCrnpService basCrnpService;
 
-    //鎵ц杈撻�佺珯鐐瑰叆搴撲换鍔�
-    public synchronized void stationInExecute() {
-        stationRegularDispatchProcessor.stationInExecute();
-    }
-
     // 鎵ц鍗曚釜绔欑偣鐨勫叆搴撲换鍔′笅鍙�
     public void stationInExecute(BasDevp basDevp, StationObjModel stationObjModel) {
         stationRegularDispatchProcessor.stationInExecute(basDevp, stationObjModel);
-    }
-
-    //鎵ц鍫嗗灈鏈鸿緭閫佺珯鐐瑰嚭搴撲换鍔�
-    public synchronized void crnStationOutExecute() {
-        stationOutboundDispatchProcessor.crnStationOutExecute();
     }
 
     // 鎵ц鍗曚釜鍑哄簱浠诲姟瀵瑰簲鐨勮緭閫佺珯鐐逛笅鍙�
@@ -73,9 +63,9 @@
         stationOutboundDispatchProcessor.crnStationOutExecute(wrkMast);
     }
 
-    //鎵ц鍙屽伐浣嶅爢鍨涙満杈撻�佺珯鐐瑰嚭搴撲换鍔�
-    public synchronized void dualCrnStationOutExecute() {
-        stationOutboundDispatchProcessor.dualCrnStationOutExecute();
+    // 鎵ц鍗曚釜鍙屽伐浣嶅嚭搴撲换鍔″搴旂殑杈撻�佺珯鐐逛笅鍙�
+    public void dualCrnStationOutExecute(WrkMast wrkMast) {
+        stationOutboundDispatchProcessor.dualCrnStationOutExecute(wrkMast);
     }
 
     // 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀埌杈剧洰鏍囩珯鍙�
@@ -110,29 +100,14 @@
         }
     }
 
-    // 妫�娴嬩换鍔¤浆瀹屾垚
-    public void checkTaskToComplete() {
-        stationRegularDispatchProcessor.checkTaskToComplete();
-    }
-
     // 妫�娴嬪崟涓嚭搴撲换鍔℃槸鍚﹀彲浠ヨ浆瀹屾垚
     public void checkTaskToComplete(WrkMast wrkMast) {
         stationRegularDispatchProcessor.checkTaskToComplete(wrkMast);
     }
 
-    //妫�娴嬭緭閫佺珯鐐规槸鍚﹁繍琛屽牭濉�
-    public void checkStationRunBlock() {
-        stationRerouteProcessor.checkStationRunBlock();
-    }
-
     // 妫�娴嬪崟涓珯鐐规槸鍚﹁繍琛屽牭濉�
     public void checkStationRunBlock(BasDevp basDevp, Integer stationId) {
         stationRerouteProcessor.checkStationRunBlock(basDevp, stationId);
-    }
-
-    //妫�娴嬭緭閫佺珯鐐逛换鍔″仠鐣欒秴鏃跺悗閲嶆柊璁＄畻璺緞
-    public void checkStationIdleRecover() {
-        stationRerouteProcessor.checkStationIdleRecover();
     }
 
     // 妫�娴嬪崟涓珯鐐逛换鍔″仠鐣欒秴鏃跺悗鐨勬仮澶嶅鐞�
@@ -158,19 +133,9 @@
                         WrkStsType.STATION_RUN.sts));
     }
 
-    // 妫�娴嬪嚭搴撴帓搴�
-    public synchronized void checkStationOutOrder() {
-        stationRerouteProcessor.checkStationOutOrder();
-    }
-
     // 妫�娴嬪崟涓珯鐐圭殑鍑哄簱鎺掑簭
     public void checkStationOutOrder(BasDevp basDevp, StationObjModel stationObjModel) {
         stationRerouteProcessor.checkStationOutOrder(basDevp, stationObjModel);
-    }
-
-    // 鐩戞帶缁曞湀绔欑偣
-    public synchronized void watchCircleStation() {
-        stationRerouteProcessor.watchCircleStation();
     }
 
     // 鐩戞帶鍗曚釜缁曞湀绔欑偣
@@ -241,6 +206,29 @@
         }
     }
 
+    public void submitDualCrnStationOutTasks(long minIntervalMs) {
+        submitDualCrnStationOutTasks(MainProcessLane.DUAL_STATION_OUT, minIntervalMs);
+    }
+
+    public void submitDualCrnStationOutTasks(MainProcessLane lane, long minIntervalMs) {
+        List<WrkMast> wrkMasts = wrkMastService.list(new QueryWrapper<WrkMast>()
+                .eq("wrk_sts", WrkStsType.OUTBOUND_RUN_COMPLETE.sts)
+                .isNotNull("dual_crn_no"));
+        for (WrkMast wrkMast : wrkMasts) {
+            Integer laneKey = wrkMast == null ? null : wrkMast.getSourceStaNo();
+            if (laneKey == null) {
+                laneKey = wrkMast == null ? null : wrkMast.getWrkNo();
+            }
+            mainProcessTaskSubmitter.submitKeyedSerialTask(
+                    lane,
+                    laneKey,
+                    "dualCrnStationOutExecute",
+                    minIntervalMs,
+                    () -> dualCrnStationOutExecute(wrkMast)
+            );
+        }
+    }
+
     public void submitStationOutExecuteFinishTasks(long minIntervalMs) {
         submitStationOutExecuteFinishTasks(MainProcessLane.STATION_OUT_FINISH, minIntervalMs);
     }

--
Gitblit v1.9.1