From 258fb5fa6e99490a9e667b4e7d49f48c29ce2c9a Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 15 四月 2024 10:24:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java | 42 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
index eb36dc9..7ab6d4e 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java
@@ -69,6 +69,11 @@
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
continue;
@@ -111,7 +116,7 @@
for(Integer staNo : STA_WORK_RU){
try{
BasDevp basDevp = basDevpService.selectById(staNo);
- if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getLoadingSuper().equals("Y") && basDevp.getAutoing().equals("Y")){
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if (Cools.isEmpty(wrkMast)){
continue;
@@ -145,6 +150,11 @@
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
continue;
@@ -170,6 +180,11 @@
if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
continue;
}
+ if (basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
+ if (basDevpEnd.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
@@ -178,7 +193,7 @@
}
if (wrkMast.getIoType()!=101){
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
+ if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
String origin = wrkDetls.get(0).getOrigin();
if (origin.equals("1")){
if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
@@ -216,6 +231,11 @@
try{
BasDevp basDevp = basDevpService.selectById(staNo);
if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
+ if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+ if (!basDevp.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
if(Cools.isEmpty(wrkMast)){
@@ -235,7 +255,7 @@
boolean sign = false;
if (wrkMast.getIoType()!=101){
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- if (wrkDetls.size()!=0){
+ if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
origin = wrkDetls.get(0).getOrigin();
if (origin.equals("1")){
if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
@@ -265,11 +285,22 @@
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
+ if (Cools.isEmpty(basDevpEnd)){
+ sign = true;
+ }
+ if (!sign && basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
+ if (basDevpEnd.getLoadingSuper().equals("Y")){
+ sign = true;
+ }
+ }
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;
if (sign){
+ if (Cools.isEmpty(origin)){
+ continue;
+ }
if (origin.equals("1")){
if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
continue;
@@ -289,6 +320,11 @@
if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
continue;
}
+ if (basDevpOther.getDevNo()>117 && basDevpOther.getDevNo()<124){
+ if (basDevpOther.getLoadingSuper().equals("Y")){
+ continue;
+ }
+ }
wrkMast.setStaNo(staNoOther);
wrkMastService.updateById(wrkMast);
log.info("宸ヤ綔鍙�"+wrkMast.getWrkNo()+"淇敼鐩爣绔欎负:"+staNoOther+";鍘熺洰鏍囩珯涓�:"+wrkMastStaNo);
--
Gitblit v1.9.1