From aefcad6d44077e465b995bb25322247b51a4d332 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 19 三月 2024 16:15:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index 8775600..c6b22d5 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -140,7 +140,7 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
- if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
+ if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
@@ -158,7 +158,7 @@
continue;
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
- if (!basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
+ if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
continue;
}
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
@@ -208,7 +208,7 @@
if(Cools.isEmpty(wrkMast)){
continue;
}
- if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=104){
+ if (wrkMast.getIoType()!=101 && wrkMast.getIoType()!=103){
continue;
}
if (wrkMast.getWrkSts()!=14 && wrkMast.getWrkSts()!=15){
@@ -252,7 +252,7 @@
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
- if (sign || !basDevpEnd.getLoading().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
+ if (sign || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
if (staNoOther.equals(wrkMastStaNo)) continue;
@@ -273,7 +273,7 @@
continue;
}
BasDevp basDevpOther = basDevpService.selectById(staNoOther);
- if (!basDevpOther.getLoading().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
+ if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
continue;
}
wrkMast.setStaNo(staNoOther);
--
Gitblit v1.9.1