From 19b6a20abbe677e7e09ce0dffe7b6fa7a10afc70 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 26 三月 2026 19:54:40 +0800
Subject: [PATCH] #等入库完成5秒

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    7 ++++---
 1 files changed, 4 insertions(+), 3 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 2dd7107..622dcb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -571,19 +571,20 @@
         // 瀛樺湪杩涜涓�/鍦ㄩ�斾换鍔�(2,3,12,13,14)鍒欎笉涓嬪彂鍑哄簱锛岄伩鍏嶅啿绐侊紙鎺掗櫎褰撳墠浠诲姟锛�
         // 2 寰呮墽琛岋紙鍏ュ簱锛�
         // 3 璁惧鎵ц涓紙鍏ュ簱锛�
+        // 4 鍏ュ簱瀹屾垚
         // 12 璁惧鎵ц涓紙鍑哄簱锛�
         // 13 鍑哄簱鍒扮珯鐐逛笂
         // 14 鍑哄簱绛夊緟纭
         int activeCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
-                .in("wrk_sts", 2, 3, 12, 13, 14)
+                .in("wrk_sts", 2, 3,4, 12, 13, 14)
                 .ne("wrk_no", wrkMast.getWrkNo()));
         if (activeCount > 0) {
             return;
         }
-        // 瀛樺湪5绉掑唴鐨�15鐘舵�佷笉涓嬪彂鍑哄簱
+        // 瀛樺湪5绉掑唴鐨� 5鐘舵�侊紝涓嶄笅鍙戞柊鐨勫嚭搴撲换鍔�
         Date modiTimeThreshold = new Date(System.currentTimeMillis() - 5000L);
         int recentStatus15Count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
-                .eq("wrk_sts", 15)
+                .in("wrk_sts", 5)
                 .gt("modi_time", modiTimeThreshold)
                 .ne("wrk_no", wrkMast.getWrkNo()));
         if (recentStatus15Count > 0) {

--
Gitblit v1.9.1