From dbc2514aad6b2b70b08e81f33d45f64aae175ccf Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 16:31:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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..ed36a71 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastCrnHandler.java
@@ -39,6 +39,7 @@
@Autowired
private WrkMastService wrkMastService;
+ @Transactional
public ReturnT<String> start(WrkMast wrkMast,WrkMast wrkMastOther) {
try {
Date now = new Date();
@@ -73,7 +74,6 @@
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
- wrkMastCrnService.insert(wrkMastCrn);
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
@@ -87,7 +87,6 @@
throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
- wrkMastService.updateById(wrkMast);
// 鏇存柊鐩爣搴撲綅鐘舵��
LocMast locMastOther = locMastService.selectById(wrkMastOther.getLocNo());
@@ -100,7 +99,10 @@
} else {
throw new CoolException(locMast1.getLocNo()+"鐩爣搴撲綅宸茶鍗犵敤");
}
+ wrkMastService.updateById(wrkMast);
wrkMastService.updateById(wrkMastOther);
+
+ wrkMastCrnService.insert(wrkMastCrn);
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
@@ -119,7 +121,7 @@
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)){
WrkMastCrn wrkMastCrn = new WrkMastCrn(wrkMast,wrkMastOther,now);
wrkMastCrnService.insert(wrkMastCrn);
--
Gitblit v1.9.1