From ccfa512653d817f5a53cb1a4b74a2221d3e65c38 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 29 十一月 2024 16:27:07 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java | 40 +++++++++++++++++++++++++---------------
src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java | 4 ++++
src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java | 6 +++++-
3 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
index 1dae031..3b38656 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastCrnScheduler.java
@@ -134,7 +134,11 @@
}
int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).eq("wrk_sts",12L));
int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMast.getStaNo()));
- if (wrkCountCrn+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
+ if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
+ continue;
+ }
+ int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+ if (wrkCountGt > 1){
continue;
}
sign = false;
diff --git a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
index 914e512..c56f182 100644
--- a/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
+++ b/src/main/java/com/zy/asrs/task/WrkMastSplitTwinInItScheduler.java
@@ -126,6 +126,10 @@
if (wrkCount+rgvOneSign.getRgvOneSign()>2){
continue;
}
+ int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMast.getStaNo()).gt("wrk_sts",11L));
+ if (wrkCountGt > 2){
+ continue;
+ }
// int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 110).gt("sta_no", 309).lt("sta_no", 314).gt("wrk_sts",11L));
// if (wrkCount>=12){
// continue;
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
index 740f193..57359ec 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -127,22 +127,32 @@
trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
rgvOneSignService.updateById(trunSma);
}
- if (sign && (wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
- RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
- if (Cools.isEmpty(rgvOneSign)){
- return FAIL;
+ if ((wrkMastOther.getIoType()==101 || wrkMastOther.getIoType() == 110) && wrkMastOther.booleanStaNoSign() && wrkMastOther.booleanStaNoSignOther()){
+ if (sign){
+ RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","LineUp"+wrkMastOther.getStaNo()));
+ if (Cools.isEmpty(rgvOneSign)){
+ return FAIL;
+ }
+ RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
+ if (Cools.isEmpty(trunSma)){
+ return FAIL;
+ }
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
+ int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
+ if (wrkCountCrn*2+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
+ return FAIL;
+ }
+ int wrkCountGt = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).gt("wrk_sts",11L));
+ if (wrkCountGt > 1){
+ return FAIL;
+ }
+ trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
+ rgvOneSignService.updateById(trunSma);
+ } else {
+ RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
+ trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
+ rgvOneSignService.updateById(trunSma);
}
- RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMastOther.getStaNo()));
- if (Cools.isEmpty(trunSma)){
- return FAIL;
- }
- int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
- int wrkCountCrn = wrkMastCrnService.selectCount(new EntityWrapper<WrkMastCrn>().eq("sta_no", wrkMastOther.getStaNo()));
- if (wrkCountCrn+wrkCount+rgvOneSign.getRgvOneSign()+trunSma.getRgvOneSign()>1){
- return FAIL;
- }
- trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
- rgvOneSignService.updateById(trunSma);
}
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
wrkMastCrnService.insert(wrkMastCrn);
--
Gitblit v1.9.1