From fe0b22ed3a56a53f0d9ccd95e09d009634d34b65 Mon Sep 17 00:00:00 2001
From: L <L@123>
Date: 星期日, 13 七月 2025 16:05:01 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java | 93 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
index 18521d3..0d28065 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastStaInIt2Scheduler.java
@@ -60,11 +60,11 @@
}};
public static final List<Integer> STA_WORK_RU = new ArrayList<Integer>() {{
- add(120);add(121);add(122);add(123);
+ add(120);add(121);add(122);add(123);add(171);
}};
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute(){
for(Integer staNo : STA_WORK_CU){
try{
@@ -139,7 +139,7 @@
}
}
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
private void execute2(){
try{
for(Integer staNo : STA_WORK_CU){
@@ -168,9 +168,94 @@
continue;
}
BasDevp basDevpEnd = basDevpService.selectById(wrkMast.getStaNo());
- if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
+ if (!basDevpEnd.getAutoing().equals("Y")){
continue;
}
+ if (basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
+ if (basDevpEnd.getWrkNo()!=0 && basDevpEnd.getLoading().equals("Y") && basDevpEnd.getReportSign()!=0){
+ WrkMast wrkMastEnd = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
+ if (Cools.isEmpty(wrkMastEnd) || wrkMastEnd.getIoType()!=101 || Cools.isEmpty(wrkMastEnd.getSheetNo()) || wrkMastEnd.getSheetNo().equals("0")){
+ continue;
+ }
+ if (wrkMast.getStaNo()==121){
+ BasDevp basDevpEnd120 = basDevpService.selectById(120);
+ if (Cools.isEmpty(basDevpEnd120)){
+ continue;
+ }
+ if (basDevpEnd120.getAutoing().equals("Y")){
+ if (basDevpEnd120.getLoading().equals("N")){
+ boolean signQQ = false;
+ for (Integer staNoQQ : STA_WORK_CU){
+ BasDevp basDevpEndQQ = basDevpService.selectById(staNoQQ);
+ if (!Cools.isEmpty(basDevpEndQQ) && basDevpEndQQ.getWrkNo()!=0){
+ WrkMast wrkMastEndQQ = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpEndQQ.getWrkNo()));
+ if (!Cools.isEmpty(wrkMastEndQQ) && wrkMastEndQQ.getIoType()==101){
+ signQQ = true;
+ break;
+ }
+ if (!Cools.isEmpty(wrkMastEndQQ) && wrkMastEndQQ.getIoType()==103){
+ List<WrkDetl> wrkDetlsQQ = wrkDetlService.selectByWrkNo(wrkMastEndQQ.getWrkNo());
+ for (WrkDetl wrkDetlQQ: wrkDetlsQQ){
+ String originQQ = wrkDetlQQ.getOrigin();
+ if (originQQ.equals("1")){
+ signQQ = true;
+ break;
+ }
+ }
+ if (signQQ){
+ break;
+ }
+ }
+ }
+ }
+ if (signQQ){
+ continue;
+ }
+ }
+ }
+ }
+
+ if (wrkMast.getStaNo()==120){
+ BasDevp basDevpEnd121 = basDevpService.selectById(121);
+ if (Cools.isEmpty(basDevpEnd121)){
+ continue;
+ }
+ if (basDevpEnd121.getAutoing().equals("Y")){
+ if (basDevpEnd121.getLoading().equals("N")){
+ boolean signQQ = false;
+ for (Integer staNoQQ : STA_WORK_CU){
+ BasDevp basDevpEndQQ = basDevpService.selectById(staNoQQ);
+ if (!Cools.isEmpty(basDevpEndQQ) && basDevpEndQQ.getWrkNo()!=0){
+ WrkMast wrkMastEndQQ = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevpEndQQ.getWrkNo()));
+ if (!Cools.isEmpty(wrkMastEndQQ) && wrkMastEndQQ.getIoType()==101){
+ signQQ = true;
+ break;
+ }
+ if (!Cools.isEmpty(wrkMastEndQQ) && wrkMastEndQQ.getIoType()==103){
+ List<WrkDetl> wrkDetlsQQ = wrkDetlService.selectByWrkNo(wrkMastEndQQ.getWrkNo());
+ for (WrkDetl wrkDetlQQ: wrkDetlsQQ){
+ String originQQ = wrkDetlQQ.getOrigin();
+ if (originQQ.equals("2")){
+ signQQ = true;
+ break;
+ }
+ }
+ if (signQQ){
+ break;
+ }
+ }
+ }
+ }
+ if (signQQ){
+ continue;
+ }
+ }
+ }
+ }
+ } else {
+ continue;
+ }
+ }
if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
if (rgvOneSign.getRgvOneSign()==1){
--
Gitblit v1.9.1