From 5ee977f1dadab25a87661ff48b4a0844c669bc28 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 05 一月 2024 15:34:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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..4422c70 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -46,8 +46,11 @@
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;
+ }
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,1);
if (result.getCode()==200){
continue;
}else {
@@ -61,8 +64,15 @@
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 = fillKM(wrkMast);
+ if (wrkTypeSign){
+
+ }
if (!Cools.isEmpty(wrkMast)){
- ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp);
+ ReturnT<String> result = wrkMastStaInItHandler.start(wrkMast,basDevp,2);
if (result.getCode()==200){
continue;
}else {
@@ -73,4 +83,11 @@
}
}
+ public boolean fillKM(WrkMast wrkMast){
+ if (wrkMast.getIoType()!=10 && wrkMast.getIoType()!=110){
+ return true;
+ }
+ return false;
+ }
+
}
--
Gitblit v1.9.1