From d07154d92334ba2ec312bf738a2a02a60350d5d9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 29 九月 2025 13:34:21 +0800
Subject: [PATCH] 2. pda 组托加减号 应该是整数加减(完成) 3. 站点状态,显示清楚	(完成) 4. 站点保存报错,	修改人,创建人员显示 错误(完成) 5. agv入库不显示 历史库位记录	(完成) 6. 任务类型,应该为入库	(完成)

---
 src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
index 99c2b31..a983123 100644
--- a/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/TaskServiceImpl.java
@@ -14,6 +14,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
@@ -31,12 +32,11 @@
     private TaskDetlService taskDetlService;
     @Autowired
     private TaskService taskService;
-
     @Autowired
     private TaskDetlLogService taskDetlLogService;
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     public void completeWrkMast(String workNo, Long userId) {
         Task wrkMast = this.selectOne(new EntityWrapper<Task>().eq("wrk_no", workNo));
         if (Cools.isEmpty(wrkMast)) {
@@ -121,6 +121,10 @@
         }
     }
 
+    @Override
+    public List<Task> selectToBeCompleteData() {
+        return this.baseMapper.selectToBeCompleteData();
+    }
 
 
     @Override

--
Gitblit v1.9.1