From 9c7e5bc10f242b71f3d94e2c700cb7de79feda17 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 25 二月 2025 08:45:14 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
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 ed36a71..667b84a 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -6,10 +6,7 @@
import com.core.common.Cools;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.service.LocMastService;
-import com.zy.asrs.service.WrkMastCrnService;
-import com.zy.asrs.service.WrkMastService;
-import com.zy.asrs.service.WrkMastStaService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.utils.Utils;
@@ -38,6 +35,8 @@
private LocMastService locMastService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
@Transactional
public ReturnT<String> start(WrkMast wrkMast,WrkMast wrkMastOther) {
@@ -111,7 +110,7 @@
return SUCCESS;
}
- public ReturnT<String> start(WrkMast wrkMast) {
+ public ReturnT<String> start(WrkMast wrkMast,boolean sign) {
try {
Date now = new Date();
LocTypeDto locTypeDto = new LocTypeDto();
@@ -123,6 +122,38 @@
}
WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
if (!Cools.isEmpty(wrkMastOther)){
+// if (!sign) {
+// RgvOneSign trunSma = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","TrunSma"+wrkMast.getStaNo()));
+// trunSma.setRgvOneSign(trunSma.getRgvOneSign()+1);
+// rgvOneSignService.updateById(trunSma);
+// }
+// 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);
+// }
+// }
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
wrkMastCrnService.insert(wrkMastCrn);
}else {
--
Gitblit v1.9.1