From 6c3cc6842009f3897c3fb18bef8a6634fe653818 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 04 三月 2026 19:59:11 +0800
Subject: [PATCH] lsh#

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
index 4c8035e..de73c01 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java
@@ -494,12 +494,12 @@
             throw new CoolException("绔欑偣鐘舵�佷笉涓虹┖闂�");
         }
 
-        List<String> areaList = JSONObject.parseArray(basStation.getCrossZoneArea(), String.class);
-        if (!areaList.contains(area)) {
+        List<Integer> areaList = basStation.getCrossZoneArea();
+        if (!areaList.contains(Integer.parseInt(area))) {
             throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洰鏍囧簱鍖�");
         }
         if (!Cools.isEmpty(basStation.getContainerType())) {
-            List<Long> longs1 = JSONObject.parseArray(basStation.getContainerType(), Long.class);
+            List<Integer> longs1 = basStation.getContainerType();
             List<BasContainer> containers = basContainerService.list(
                     new LambdaQueryWrapper<BasContainer>()
                             .in(BasContainer::getContainerType, longs1)
@@ -988,7 +988,7 @@
                     //110.绌烘澘鍑哄簱
                     complateOutStockEmpty(task, loginUserId);
                 } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CROSS_DOCKING_OUT.type)) {
-                    //109.瓒婂簱
+                    //109.澶囪揣
                     complateOutStockDocking(task, loginUserId);
                 } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
                     //107.鐩�
@@ -1099,11 +1099,24 @@
             throw new CoolException("搴撲綅淇℃伅鏇存柊澶辫触锛侊紒");
         }
 
+
+
         List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
         if (taskItems.isEmpty()) {
             throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦紒锛�");
         }
 
+        List<LocItem> list = locItemService.list(new LambdaQueryWrapper<LocItem>().eq(LocItem::getLocId, loc.getId()));
+        list.forEach(item -> {
+            item.setOrderId(taskItems.get(0).getSourceId());
+            item.setType(taskItems.get(0).getOrderType());
+            item.setOrderItemId(taskItems.get(0).getSource());
+            item.setPlatOrderCode(taskItems.get(0).getSourceCode());
+            item.setWkType(taskItems.get(0).getWkType());
+        });
+
+        locItemService.updateBatchById(list);
+
         TaskItem taskItem = taskItems.stream().findFirst().get();
         //淇濆瓨鍏ュ嚭搴撴祦姘�
         saveStockItems(taskItems, task, null, null, taskItem.getWkType(), OrderType.ORDER_IN.type, loginUserId);

--
Gitblit v1.9.1