From 42723be1452bfb3e132dff36fd46d2999c095f14 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 20:15:04 +0800
Subject: [PATCH] no message

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 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 35c5b22..1365f70 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
@@ -775,6 +775,7 @@
             } else if (task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)) {
                 List<TaskItem> taskItems = taskItemService.list(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, Arrays.asList(ids)));
                 if (!taskItems.isEmpty()) {
+
                     taskItems.forEach(taskItem -> {
                         if (!checkOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
                                 .eq(WkOrderItem::getId, taskItem.getOrderItemId())
@@ -788,9 +789,15 @@
                             throw new CoolException("鐩樼偣鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
                         }
 
-                        checkDiffItemService.remove(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
+                        CheckDiffItem serviceOne = checkDiffItemService.getOne(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
 
-                        checkDiffService.removeById(taskItem.getSourceId());
+                        checkDiffItemService.remove(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
+                        if (!Objects.isNull(serviceOne)) {
+                            CheckDiff checkDiff = checkDiffService.getById(serviceOne.getCheckId());
+                            if (!Objects.isNull(checkDiff)) {
+                                checkDiffService.removeById(checkDiff.getId());
+                            }
+                        }
                     });
                 }
 
@@ -999,7 +1006,7 @@
                 if (taskItem.getMatnrId().equals(working.getMatnrId())) {
                     Double minQty = taskItem.getAnfme();
                     if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
-                        minQty =  Math.round((working.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0;
+                        minQty = Math.round((working.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0;
                     }
                     if (minQty.compareTo(0.0) > 0) {
                         taskItem.setAnfme(minQty);
@@ -1025,6 +1032,8 @@
             TaskItem taskItem = taskItems.stream().findFirst().get();
             taskItem.setMatnrId(working.getMatnrId())
                     .setMaktx(working.getMaktx())
+                    .setMatnrId(working.getMatnrId())
+                    .setMatnrCode(working.getMatnrCode())
                     .setSpec(working.getSpec())
                     .setAnfme(working.getAnfme())
                     .setBatch(working.getBatch())

--
Gitblit v1.9.1