From cf074430480e44eba1e6ddce09ccce9f28067120 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期三, 17 九月 2025 08:56:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
index 3a4b3f0..4f012a3 100644
--- a/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WrkMastExecuteHandler.java
@@ -2,7 +2,14 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
+import com.zy.asrs.entity.BasJarMast;
+import com.zy.asrs.entity.BasJarMastLog;
import com.zy.asrs.entity.WrkMastExecute;
+import com.zy.asrs.entity.WrkMastExecuteLog;
+import com.zy.asrs.service.BasJarMastLogService;
+import com.zy.asrs.service.BasJarMastService;
+import com.zy.asrs.service.WrkMastExecuteLogService;
import com.zy.asrs.service.WrkMastExecuteService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -22,16 +29,45 @@
public class WrkMastExecuteHandler extends AbstractHandler<String> {
@Autowired
private WrkMastExecuteService wrkMastExecuteService;
+ @Autowired
+ private WrkMastExecuteLogService wrkMastExecuteLogService;
+ @Autowired
+ private BasJarMastService basJarMastService;
+ @Autowired
+ private BasJarMastLogService basJarMastLogService;
public ReturnT<String> start(int[] excute) {
try {
- //淇濆瓨鍘嗗彶妗ｆ
- if (!wrkMastExecuteService.save(excute)){
- log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
+ WrkMastExecute wrkMastExecute = wrkMastExecuteService.selectIoTypeAndWekSts(excute);
+ if (!Cools.isEmpty(wrkMastExecute)){
+ WrkMastExecuteLog wrkMastExecuteLog = new WrkMastExecuteLog(wrkMastExecute);
+ //淇濆瓨鍘嗗彶妗ｆ
+ if (!wrkMastExecuteLogService.insert(wrkMastExecuteLog)){
+ log.error("淇濆瓨纭寲缃愬尯鍩熸墽琛屼换鍔″巻鍙叉。[workNo={"+ JSON.toJSONString(excute) +"}]澶辫触");
+ }
+ //鍒犻櫎宸ヤ綔妗ｆ
+ if (!wrkMastExecuteService.deleteById(wrkMastExecute)){
+ log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+ }
}
- //鍒犻櫎宸ヤ綔妗ｆ
- if (!wrkMastExecuteService.delete(new EntityWrapper<WrkMastExecute>().eq("io_type",excute[0]).eq("wrk_sts",excute[1]).eq("wrk_type",2))){
- log.error("鍒犻櫎纭寲缃愬尯鍩熸墽琛屼换鍔workNo={"+JSON.toJSONString(excute)+"}]澶辫触");
+ }catch (Exception e){
+ log.error("寮傚父锛侊紒锛�"+e);
+ return FAIL;
+ }
+ return SUCCESS;
+ }
+ public ReturnT<String> start2(BasJarMast basJarMast) {
+ try {
+ if (!Cools.isEmpty(basJarMast)){
+ BasJarMastLog basJarMastLog = new BasJarMastLog(basJarMast);
+ //淇濆瓨鍘嗗彶妗ｆ
+ if (!basJarMastLogService.insert(basJarMastLog)){
+ log.error("淇濆瓨纭寲缃愬尯鍩熶换鍔asJarMast鍘嗗彶妗workNo={"+ JSON.toJSONString(basJarMast) +"}]澶辫触");
+ }
+ //鍒犻櫎宸ヤ綔妗ｆ
+ if (!basJarMastService.deleteById(basJarMast)){
+ log.error("鍒犻櫎纭寲缃愬尯鍩焍asJarMast浠诲姟[workNo={"+JSON.toJSONString(basJarMast)+"}]澶辫触");
+ }
}
}catch (Exception e){
log.error("寮傚父锛侊紒锛�"+e);
--
Gitblit v1.9.1