From 83d4b701a5df0db075d895bf59bdd66b4e1e321d Mon Sep 17 00:00:00 2001
From: Administrator <XS@163.COM>
Date: 星期六, 25 四月 2026 20:53:06 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java |   40 +++++++++++++++++++++++++++++-----------
 1 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
index 729790b..b205006 100644
--- a/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
+++ b/src/main/java/com/zy/core/utils/CrnOperateProcessUtils.java
@@ -61,7 +61,7 @@
     @Autowired
     private MainProcessTaskSubmitter mainProcessTaskSubmitter;
 
-    public synchronized void crnIoExecute() {
+    public void crnIoExecute() {
         Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
         if (systemConfigMapObj != null) {
             HashMap<String, String> systemConfigMap = (HashMap<String, String>) systemConfigMapObj;
@@ -91,7 +91,7 @@
     }
 
     //鍏ュ嚭搴�  ===>>  鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂
-    public synchronized void crnIoExecuteNormal() {
+    public void crnIoExecuteNormal() {
         List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
         for (BasCrnp basCrnp : basCrnps) {
             crnIoExecuteNormal(basCrnp);
@@ -173,7 +173,7 @@
         }
     }
 
-    private synchronized boolean crnExecuteIn(BasCrnp basCrnp, CrnThread crnThread) {
+    private boolean crnExecuteIn(BasCrnp basCrnp, CrnThread crnThread) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if(crnProtocol == null){
             return false;
@@ -269,7 +269,7 @@
         return false;
     }
 
-    private synchronized boolean crnExecuteOut(BasCrnp basCrnp, CrnThread crnThread) {
+    private boolean crnExecuteOut(BasCrnp basCrnp, CrnThread crnThread) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if(crnProtocol == null){
             return false;
@@ -377,7 +377,7 @@
         return false;
     }
 
-    private synchronized boolean crnExecuteInPlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
+    private boolean crnExecuteInPlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if (crnProtocol == null) {
             return false;
@@ -470,7 +470,7 @@
         return false;
     }
 
-    private synchronized boolean crnExecuteOutPlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
+    private boolean crnExecuteOutPlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if (crnProtocol == null) {
             return false;
@@ -555,7 +555,7 @@
         return false;
     }
 
-    private synchronized boolean crnExecuteLocTransfer(BasCrnp basCrnp, CrnThread crnThread) {
+    private boolean crnExecuteLocTransfer(BasCrnp basCrnp, CrnThread crnThread) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if(crnProtocol == null){
             return false;
@@ -610,7 +610,7 @@
     }
 
     //鍫嗗灈鏈轰换鍔℃墽琛屽畬鎴�
-    public synchronized void crnIoExecuteFinish() {
+    public void crnIoExecuteFinish() {
         List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
         for (BasCrnp basCrnp : basCrnps) {
             crnIoExecuteFinish(basCrnp);
@@ -691,7 +691,7 @@
         }
     }
 
-    public synchronized void plannerExecute() {
+    public void plannerExecute() {
         List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
         for (BasCrnp basCrnp : basCrnps) {
             plannerExecute(basCrnp);
@@ -796,7 +796,7 @@
         }
     }
 
-    private synchronized boolean crnExecuteMovePlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
+    private boolean crnExecuteMovePlanner(BasCrnp basCrnp, CrnThread crnThread, WrkMast wrkMast) {
         CrnProtocol crnProtocol = crnThread.getStatus();
         if (crnProtocol == null) {
             return false;
@@ -852,6 +852,15 @@
     }
 
     public void submitCrnIoTasks(MainProcessLane lane, long minIntervalMs) {
+        mainProcessTaskSubmitter.submitSerialTask(
+                MainProcessLane.CRN_SCAN,
+                "submitCrnIoTasks",
+                minIntervalMs,
+                () -> submitCrnIoTasksInternal(lane, minIntervalMs)
+        );
+    }
+
+    private void submitCrnIoTasksInternal(MainProcessLane lane, long minIntervalMs) {
         List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
         for (BasCrnp basCrnp : basCrnps) {
             if (basCrnp == null || basCrnp.getCrnNo() == null) {
@@ -873,6 +882,15 @@
     }
 
     public void submitCrnIoExecuteFinishTasks(MainProcessLane lane, long minIntervalMs) {
+        mainProcessTaskSubmitter.submitSerialTask(
+                MainProcessLane.CRN_SCAN,
+                "submitCrnIoExecuteFinishTasks",
+                minIntervalMs,
+                () -> submitCrnIoExecuteFinishTasksInternal(lane, minIntervalMs)
+        );
+    }
+
+    private void submitCrnIoExecuteFinishTasksInternal(MainProcessLane lane, long minIntervalMs) {
         List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
         for (BasCrnp basCrnp : basCrnps) {
             if (basCrnp == null || basCrnp.getCrnNo() == null) {
@@ -890,7 +908,7 @@
     }
 
     //妫�娴嬫祬搴撲綅鐘舵��
-    public synchronized boolean checkShallowLocStatus(String locNo, Integer taskNo) {
+    public boolean checkShallowLocStatus(String locNo, Integer taskNo) {
         String checkDeepLocOutTaskBlockReport = "Y";
         Object systemConfigMapObj = redisUtil.get(RedisKeyType.SYSTEM_CONFIG_MAP.key);
         if (systemConfigMapObj != null) {

--
Gitblit v1.9.1