From 053bd1cc2693589840bfad523c954960db654f54 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期日, 01 二月 2026 17:24:19 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 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 4277ac2..fbf9405 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;
@@ -47,7 +48,7 @@
@Autowired
private TaskDetlLogService taskDetlLogService;
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public ReturnT<String> start(WrkMast wrkMast) {
try {
List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
@@ -71,7 +72,7 @@
// 鍏ュ簱 --------------------------------------------------------------------------------
if (wrkMast.getWrkSts() == 5) {
// 鍏ㄦ澘鍏ュ簱
- if (wrkMast.getIoType() == 1) {
+ if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10) {
// 鍏ュ簱閫氱煡鍗�
if (!Cools.isEmpty(wrkMast.getBarcode())) {
// 淇濆瓨鍏ュ簱閫氱煡妗ｅ巻鍙叉。
@@ -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());
--
Gitblit v1.9.1