From 41074b338be9cff71a43d910deab3ba6a7bfb69f Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期五, 12 一月 2024 21:10:33 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index ef75d37..3c4f475 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -49,6 +49,9 @@
                 if(Cools.isEmpty(wrkMast)){
                     continue;
                 }
+                if (wrkMast.getIoType()<100 || wrkMast.getIoType()==110){
+                    continue;
+                }
                 if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
                     continue;
                 }
@@ -83,27 +86,27 @@
             BasDevp basDevp = basDevpService.selectById(staNo);
             if (basDevp.getWrkNo()!=0){
                 WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
-                if (wrkMast.getWrkSts()!=2){
+                if (wrkMast.getWrkSts()!=2 || wrkMast.getIoType()==10){
                     continue;
                 }
-                boolean wrkTypeSign = fullKM(wrkMast);
+//                boolean wrkTypeSign = fullKM(wrkMast);
 
                 if (!Cools.isEmpty(wrkMast)){
-                    if (wrkTypeSign){
+//                    if (wrkTypeSign){
                         ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);
                         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+"澶辫触锛�");
-                        }
-                    }
+//                    }else {
+//                        ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,23);
+//                        if (result.getCode()==200) {
+//                            continue;
+//                        } else {
+//                            System.out.println(staNo+"澶辫触锛�");
+//                        }
+//                    }
                 }
             }
         }

--
Gitblit v1.9.1