From 04b1ba2cf7f144079f1ae65d5d24fdcda330d1f9 Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期日, 21 一月 2024 16:09:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index fcda87d..efe3064 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,6 +46,14 @@
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.getIoType()<100 || wrkMast.getIoType()==110){
+ if (!wrkMast.getStaNo().equals(122)){
+ continue;
+ }
+ }
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
continue;
}
@@ -80,27 +88,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){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,21);
+// 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