From c376b2ed79feec9612a1c35ad7d370ea15508bc8 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 22:52:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 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 dbd8100..b02d099 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,7 +35,10 @@
private LocMastService locMastService;
@Autowired
private WrkMastService wrkMastService;
+ @Autowired
+ private RgvOneSignService rgvOneSignService;
+ @Transactional
public ReturnT<String> start(WrkMast wrkMast,WrkMast wrkMastOther) {
try {
Date now = new Date();
@@ -73,7 +73,6 @@
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
- wrkMastCrnService.insert(wrkMastCrn);
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -87,7 +86,6 @@
throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
- wrkMastService.updateById(wrkMast);
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMastOther = locMastService.selectById(wrkMastOther.getLocNo());
@@ -100,7 +98,10 @@
} else {
throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ wrkMastService.updateById(wrkMast);
wrkMastService.updateById(wrkMastOther);
+
+ wrkMastCrnService.insert(wrkMastCrn);
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
@@ -119,8 +120,18 @@
if (Cools.isEmpty(deepLocOther)){
return FAIL;
}
- WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther));
+ WrkMast wrkMastOther = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("source_loc_no", deepLocOther).eq("wrk_sts", 11L));
if (!Cools.isEmpty(wrkMastOther)){
+ if ((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;
+ }
+ int wrkCount = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("sta_no", wrkMastOther.getStaNo()).eq("wrk_sts",12L));
+ if (wrkCount+rgvOneSign.getRgvOneSign()>=3){
+ return FAIL;
+ }
+ }
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
wrkMastCrnService.insert(wrkMastCrn);
}else {
--
Gitblit v1.9.1