From 67cede569371cb963eb64295f3f3e69a0505c380 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 21 十一月 2025 10:53:25 +0800
Subject: [PATCH] 1

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   35 +++++++++++++++++++----------------
 1 files changed, 19 insertions(+), 16 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 2ea7580..36f4f97 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
@@ -309,6 +309,9 @@
         waitPakins.forEach(pakin -> {
             BasContainer container = basContainerService.getOne(new LambdaUpdateWrapper<BasContainer>()
                     .eq(BasContainer::getCode, pakin.getBarcode()));
+            if (Objects.isNull(container)) {
+                throw new CoolException("瀹瑰櫒鏈淮鎶ゅ叆搴擄紝璇风淮鎶ゅ悗鍐嶆搷浣滐紒锛�");
+            }
             /**鑾峰彇搴撲綅*/
             String targetLoc = LocManageUtil.getTargetLoc(warehouseArea.getId(), container.getContainerType());
             if (Cools.isEmpty(targetLoc)) {
@@ -1064,22 +1067,22 @@
             throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
         }
 
-//        List<LocItemWorking> workings = new ArrayList<>();
-//        List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
-//        items.forEach(taskItem -> {
-//            if (taskItem.getAnfme() > 0) {
-//                LocItemWorking itemWorking = new LocItemWorking();
-//                BeanUtils.copyProperties(taskItem, itemWorking);
-//                itemWorking.setTaskId(task.getId())
-//                        .setLocId(loc1.getId())
-//                        .setLocCode(loc1.getCode());
-//                workings.add(itemWorking);
-//            }
-//        });
-//
-//        if (!locItemWorkingService.saveBatch(workings)) {
-//            throw new CoolException("涓存椂搴撳瓨鏇存柊澶辫触锛侊紒");
-//        }
+        List<LocItemWorking> workings = new ArrayList<>();
+        List<TaskItem> items = taskItemService.list(new LambdaQueryWrapper<TaskItem>().eq(TaskItem::getTaskId, task.getId()));
+        items.forEach(taskItem -> {
+            if (taskItem.getAnfme() > 0) {
+                LocItemWorking itemWorking = new LocItemWorking();
+                BeanUtils.copyProperties(taskItem, itemWorking);
+                itemWorking.setTaskId(task.getId())
+                        .setLocId(loc1.getId())
+                        .setLocCode(loc1.getCode());
+                workings.add(itemWorking);
+            }
+        });
+
+        if (!locItemWorkingService.saveBatch(workings)) {
+            throw new CoolException("涓存椂搴撳瓨鏇存柊澶辫触锛侊紒");
+        }
 
         loc1.setUseStatus(LocStsType.LOC_STS_TYPE_S.type);
 

--
Gitblit v1.9.1