From 8257d89c461f6553d66fad1e5e3df3d172a00924 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 29 十一月 2025 18:10:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 35e2c3a..8626282 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -58,15 +58,15 @@
         put(1005, 1007);put(1008, 1010);put(1019, 1021);put(1022, 1024);put(1029, 1031);
         put(2001, 2003);put(2007, 2009);put(2013, 2015);put(2019, 2021);put(2025, 2027);
         put(2003, 2003);put(2009, 2009);put(2015, 2015);put(2021, 2021);put(2027, 2027);
+        put(1105,1105);put(1104,1105);put(1043,1042);put(1042,1042);
     }};
     public static final Map<Integer, Integer> siteInMap = new HashMap<Integer, Integer>() {{
-        put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);
-
+        put(1043, 1042);put(1042, 1042);put(1105, 1105);put(1104, 1105);put(1036, 1036);put(1038, 1038);put(2037,2037);
     }};
 
     // 寮傚父鍑哄簱鍙�
     public static final List<Integer> STA_WORK_Exception = new ArrayList<Integer>() {{
-        add(1042);add(1105);
+        add(1042);add(1105);add(1104);add(1043);
     }};
 
 //    public static final List<Integer> STA_WORK_CU_CAR_TWO = new ArrayList<Integer>() {{
@@ -134,7 +134,7 @@
         for(Integer staNo: STA_WORK_Exception){
             BasDevp basDevp = basDevpService.selectById(staNo);
             basDevp.setDevNo(siteOutMap.get(basDevp.getDevNo()));
-            if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+            if (basDevp.getWrkNo() > 10000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                 ReturnT<String> result = wrkMastStaInItHandler.start(null,basDevp,23);//寮傚父閫�鍑�
                 if (result.getCode()==200) {
                     continue;

--
Gitblit v1.9.1