From ca9531cfb203f2250e9f08c9e861c4624f179eb9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期六, 19 七月 2025 09:26:23 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 3410978..db15a1a 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -876,6 +876,10 @@
                             }
                             continue;
                         }
+
+                        if(waitWrkMast.getWrkSts() < 5 && waitWrkMast.getIoType() < 100) {
+                            continue;//鏈変换鍔$姝㈡惉杩愶紝鏈夊彲鑳芥祬搴撲綅鐘舵�佽繕鏈彉鏇村畬鎴�
+                        }
                     }
 
                 } else if (shallowLoc.getLocSts().equals("F") || shallowLoc.getLocSts().equals("D")) {
@@ -956,6 +960,19 @@
      */
     public synchronized void locToCrnStn(CrnSlave slave, CrnProtocol crnProtocol,Integer mark) {
         News.warnNoLog(""+mark+" - 2"+" - 0"+" - 鍫嗗灈鏈哄叆鍑哄簱浣滀笟涓嬪彂锛氭墽琛屽嚭搴�");
+
+        int devpTaskStackOver = 20;
+        Config config = configService.selectOne(new EntityWrapper<Config>()
+                .eq("code", "devpTaskStackOver"));
+        if(config != null) {
+            devpTaskStackOver = Integer.parseInt(config.getValue());
+        }
+
+        if (commonService.queryDevpWorkingCount() > devpTaskStackOver) {
+            News.warn(""+mark+" - 2"+" - 0"+" - 杈撻�佺嚎浠诲姟杩囪浇");
+            return;
+        }
+
         for (CrnSlave.CrnStn crnStn : slave.getCrnOutStn()) {
             // 鑾峰彇宸ヤ綔鐘舵�佷负11锛堢敓鎴愬嚭搴揑D锛夌殑鍑哄簱宸ヤ綔妗�
 //            WrkMast wrkMast = wrkMastMapper.selectPakOutStep1(slave.getId(), crnStn.getStaNo());

--
Gitblit v1.9.1