From fe0c2392123c13a50a773e503cfce6528374271d Mon Sep 17 00:00:00 2001
From: zc <zyzc>
Date: 星期四, 20 十一月 2025 16:00:44 +0800
Subject: [PATCH] 入庫功能優化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java |   24 ++++++++++++++++--------
 1 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
index 77e9b17..b6526ed 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/AutoRunSchedules.java
@@ -58,7 +58,7 @@
      * 鑷姩鐢熸垚搴撲綅鏄庣粏
      */
     @Transactional(rollbackFor = Exception.class)
-    @Scheduled(cron = "0/25 * * * * ?")
+//    @Scheduled(cron = "0/25 * * * * ?")
     public void insertRandomMats() {
         List<Loc> list = locService.list(new LambdaQueryWrapper<Loc>().eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type));
         for (Loc loc : list) {
@@ -101,7 +101,7 @@
      * @description: 鑷姩瀹屾垚鐩樼偣鍔熻兘
      * @version 1.0
      */
-    @Scheduled(cron = "0/25 * * * * ?")
+//    @Scheduled(cron = "0/25 * * * * ?")
     @Transactional(rollbackFor = Exception.class)
     public void autoCheckComplete() {
         //鑾峰彇浠诲姟鍒楄〃涓紝涓虹洏鐐瑰嚭搴撶殑浠诲姟
@@ -298,29 +298,37 @@
         if (Cools.isEmpty(autoRunArea)) {
             return;
         }
+        List<Integer> array = new ArrayList<>();
+        List<String> list = new ArrayList<>();
         for (char c : autoRunArea.toCharArray()) {
             switch (c) {
                 case '1':
-                    xx(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+                    array.addAll(LocGroupConstant.FAR_RIGHT_LOC_ROW_LIST);
+                    list.addAll(StaGroupConstant.FAR_RIGHT_STA_ROW_LIST);
                     break;
                 case '2':
-                    xx(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+                    array.addAll(LocGroupConstant.RIGHT_LOC_ROW_LIST);
+                    list.addAll(StaGroupConstant.RIGHT_STA_ROW_LIST);
                     break;
                 case '3':
-                    xx(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+                    array.addAll(LocGroupConstant.MIDDLE_LOC_ROW_LIST);
+                    list.addAll(StaGroupConstant.MIDDLE_STA_ROW_LIST);
                     break;
                 case '4':
-                    xx(LocGroupConstant.LEFT_LOC_ROW_LIST);
+                    array.addAll(LocGroupConstant.LEFT_LOC_ROW_LIST);
+                    list.addAll(StaGroupConstant.LEFT_STA_ROW_LIST);
                     break;
                 case '5':
-                    xx(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+                    array.addAll(LocGroupConstant.FAR_LEFT_LOC_ROW_LIST);
+                    list.addAll(StaGroupConstant.FAR_LEFT_STA_ROW_LIST);
                     break;
                 default:
                     break;
             }
         }
-    }
+        xx(array);
 
+    }
 
     private void xx(List<Integer> locGroupList) {
         Integer startRow = Collections.min(locGroupList);

--
Gitblit v1.9.1