From 6bd83b22415203acac4bac60c798615e807690fd Mon Sep 17 00:00:00 2001
From: yy <yy123>
Date: 星期四, 27 十一月 2025 09:39:42 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   39 +++++++++++++++++++++------------------
 1 files changed, 21 insertions(+), 18 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..e37b30d 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)) {
@@ -1016,7 +1019,7 @@
 
         tempLocs.forEach(working -> {
             taskItems.forEach(taskItem -> {
-                if (taskItem.getMatnrId().equals(working.getMatnrId())) {
+                if (taskItem.getFieldsIndex().equals(working.getFieldsIndex())) {
                     Double minQty = taskItem.getAnfme();
                     if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
                         minQty = Math.round((working.getAnfme() - taskItem.getAnfme()) * 100) / 100.0;
@@ -1047,6 +1050,7 @@
                     .setMatnrCode(working.getMatnrCode())
                     .setSpec(working.getSpec())
                     .setAnfme(working.getAnfme())
+                    .setQty(0.0)
                     .setBatch(working.getBatch())
                     .setFieldsIndex(working.getFieldsIndex())
                     .setUnit(working.getUnit())
@@ -1064,22 +1068,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);
 
@@ -1212,7 +1216,6 @@
                 .set(Task::getTaskStatus, TaskStsType.WAVE_SEED.id))) {
             throw new CoolException("搴撳瓨鐘舵�佹洿鏂板け璐ワ紒锛�");
         }
-
 
 //        if (task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type) || task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
 //            if (!this.update(new LambdaUpdateWrapper<Task>()

--
Gitblit v1.9.1