From 290e5fd2e74efe19326f56e38c3391aaae23ffc5 Mon Sep 17 00:00:00 2001
From: IZCD4L12RTSW0VZ\Administrator <skyouc>
Date: 星期三, 24 十二月 2025 17:14:09 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 013cf95..6d3d458 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.*;
+import com.zy.asrs.enums.TaskStatusType;
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
@@ -132,6 +133,7 @@
return SUCCESS;
}
+ @Transactional(rollbackFor = Exception.class)
public ReturnT<String> AgvStart(Task task) {
try {
List<TaskDetl> taskDetls = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
@@ -153,7 +155,7 @@
}
// 鍏ュ簱 --------------------------------------------------------------------------------
- if (task.getWrkSts() == 5) {
+ if (task.getWrkSts().equals(TaskStatusType.AGV_INVENTORY_UPDATED_IN.type)) {
// 鍏ㄦ澘鍏ュ簱
if (task.getIoType() == 1) {
// 鍏ュ簱閫氱煡鍗�
@@ -183,7 +185,7 @@
}
// 鍑哄簱 --------------------------------------------------------------------------------
- } else if (task.getWrkSts() == 15) {
+ } else if (task.getWrkSts().equals(TaskStatusType.AGV_INVENTORY_UPDATED_OUT.type)) {
// if (!Cools.isEmpty(wrkDetls)) {
// if (!orderService.saveHandlerOrder(Boolean.FALSE, wrkMast, wrkDetls)) {
// exceptionHandle("鐢熸垚鎵嬪姩鍑哄簱鍗曟嵁[workNo={0}]澶辫触", wrkMast.getWrkNo());
@@ -191,21 +193,6 @@
// }
}
-
-
- for (TaskDetl taskDetl :taskDetls){
- TaskDetlLog taskDetlLog = new TaskDetlLog();
- BeanUtils.copyProperties(taskDetl, taskDetlLog);
-
- // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
- if (!taskDetlLogService.insert(taskDetlLog)) {
- exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
- }
- // 鍒犻櫎宸ヤ綔鏄庣粏妗�
- if (!taskDetlService.deleteById(taskDetl)) {
- exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
- }
- }
TaskLog taskLog = new TaskLog();
BeanUtils.copyProperties(task, taskLog);
// 淇濆瓨宸ヤ綔涓绘。鍘嗗彶妗�
@@ -217,6 +204,22 @@
if (!taskService.deleteById(task)) {
exceptionHandle("鍒犻櫎宸ヤ綔涓绘。[workNo={0}]澶辫触", task.getWrkNo());
}
+ List<TaskDetl> taskDetls2 = taskDetlService.selectList(new EntityWrapper<TaskDetl>().eq("wrk_no", task.getWrkNo()));
+ for (TaskDetl taskDetl :taskDetls2){
+ TaskDetlLog taskDetlLog = new TaskDetlLog();
+ BeanUtils.copyProperties(taskDetl, taskDetlLog);
+ taskDetlLog.setLogId(taskLog.getId());
+ taskDetlLog.setId(null);
+ // 淇濆瓨宸ヤ綔鏄庣粏妗ｅ巻鍙叉。
+ if (!taskDetlLogService.insert(taskDetlLog)) {
+ exceptionHandle("淇濆瓨宸ヤ綔鏄庣粏鍘嗗彶妗workNo={0}]澶辫触", task.getWrkNo());
+ }
+ // 鍒犻櫎宸ヤ綔鏄庣粏妗�
+ if (!taskDetlService.deleteById(taskDetl)) {
+ exceptionHandle("鍒犻櫎宸ヤ綔鏄庣粏妗workNo={0}]澶辫触", task.getWrkNo());
+ }
+ }
+
} catch (Exception e) {
log.error("fail", e);
--
Gitblit v1.9.1