From 46793d6a0e430a290ffc02ff0460342361cd7f32 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 05 一月 2024 16:18:15 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 49 +++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 41 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 dd36e7f..26c8166 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,12 +46,31 @@
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
+ continue;
+ }
+ boolean wrkTypeSign = fullKM(wrkMast);
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
- if (result.getCode()==200){
- continue;
- }else {
- System.out.println(staNo+"澶辫触锛�");
+ if (wrkTypeSign) {
+// ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,11);//1:鍙栵紙鍙犵洏锛�
+// if (result.getCode()==200){
+// continue;
+// }else {
+// System.out.println(staNo+"澶辫触锛�");
+// }
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
+ } else {
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,13);//3锛氬彇鏀�
+ if (result.getCode()==200){
+ continue;
+ }else {
+ System.out.println(staNo+"澶辫触锛�");
+ }
}
}
}
@@ -61,11 +80,18 @@
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){
+ continue;
+ }
+ boolean wrkTypeSign = fullKM(wrkMast);
+ if (wrkTypeSign){
+ boolean equals = wrkMast.getIoType().equals(1);
+ }
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
- if (result.getCode()==200){
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
+ if (result.getCode()==200) {
continue;
- }else {
+ } else {
System.out.println(staNo+"澶辫触锛�");
}
}
@@ -73,4 +99,11 @@
}
}
+ public boolean fullKM(WrkMast wrkMast){
+ if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1