From a572f1428af7a5d6eeaf973363c33785ea182bd3 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 17:19:31 +0800
Subject: [PATCH] 换绑功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
index c1a3926..8966305 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/schedules/TaskSchedules.java
@@ -24,6 +24,7 @@
 import com.vincent.rsf.server.manager.enums.*;
 import com.vincent.rsf.server.manager.entity.*;
 import com.vincent.rsf.server.manager.service.*;
+import com.vincent.rsf.server.manager.service.impl.LocItemWorkingServiceImpl;
 import com.vincent.rsf.server.manager.service.impl.LocServiceImpl;
 import com.vincent.rsf.server.manager.service.impl.WaveOrderRelaServiceImpl;
 import com.vincent.rsf.server.system.constant.GlobalConfigCode;
@@ -99,6 +100,9 @@
     private ReportMsgService reportMsgService;
     @Autowired
     private WaveOrderRelaService waveOrderRelaService;
+    @Autowired
+    private LocItemWorkingService locItemWorkingService;
+
 
     /**
      * @param
@@ -598,7 +602,8 @@
                     /**鍏ュ簱鍗曟槑缁嗕笂鎶�*/
                     reportMsgService.reportOrderItem(wkOrderItem);
                 }
-            } else if (task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type) {
+            } else if ((task.getTaskType() >= TaskType.TASK_TYPE_OUT.type && task.getTaskType() <= TaskType.TASK_TYPE_EMPITY_OUT.type)
+                    || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_IN.type)) {
                 /**鍒ゆ柇鍗曟嵁鏄惁瀹屾垚**/
                 Set<Long> longSet = taskItems.stream().map(TaskItem::getSourceId).collect(Collectors.toSet());
                 List<WaveOrderRela> waveOrderRelas = waveOrderRelaService.list(new LambdaQueryWrapper<WaveOrderRela>()
@@ -644,6 +649,9 @@
                 itemLogs.add(itemLog);
             }
 
+            locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
+
+
             if (!taskService.removeById(task.getId())) {
                 throw new CoolException("鍘熷浠诲姟鍒犻櫎澶辫触锛侊紒");
             }
@@ -656,6 +664,8 @@
                     throw new CoolException("鍘熷浠诲姟鏄庣粏鍒犻櫎澶辫触锛侊紒");
                 }
             }
+
+
         });
     }
 

--
Gitblit v1.9.1