From e44239cb6516389b4dd4a63747df7bc82681660b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期四, 11 一月 2024 13:18:05 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 26c8166..c66a103 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,6 +46,9 @@
             BasDevp basDevp = basDevpService.selectById(staNo);
             if (basDevp.getWrkNo()!=0){
                 WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+                if(Cools.isEmpty(wrkMast)){
+                    continue;
+                }
                 if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                     continue;
                 }
@@ -84,15 +87,22 @@
                     continue;
                 }
                 boolean wrkTypeSign = fullKM(wrkMast);
-                if (wrkTypeSign){
-                    boolean equals = wrkMast.getIoType().equals(1);
-                }
+
                 if (!Cools.isEmpty(wrkMast)){
-                    ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
-                    if (result.getCode()==200) {
-                        continue;
-                    } else {
-                        System.out.println(staNo+"澶辫触锛�");
+                    if (wrkTypeSign){
+                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);
+                        if (result.getCode()==200) {
+                            continue;
+                        } else {
+                            System.out.println(staNo+"澶辫触锛�");
+                        }
+                    }else {
+                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);
+                        if (result.getCode()==200) {
+                            continue;
+                        } else {
+                            System.out.println(staNo+"澶辫触锛�");
+                        }
                     }
                 }
             }

--
Gitblit v1.9.1