From aecc30be4f72119829bf7f607aa6031e15fc3c0c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 七月 2025 08:01:28 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 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 41323b5..5d9fb64 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,10 +775,29 @@
} 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 -> {
- checkDiffItemService.remove(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
- checkDiffService.removeById(taskItem.getSourceId());
+ taskItems.forEach(taskItem -> {
+ if (!checkOrderItemService.update(new LambdaUpdateWrapper<WkOrderItem>()
+ .eq(WkOrderItem::getId, taskItem.getOrderItemId())
+ .setSql("work_qty = work_qty - " + taskItem.getAnfme()))) {
+ throw new CoolException("鏄庣粏鏁伴噺淇敼澶辫触锛侊紒");
+ }
+
+ if (!checkOrderService.update(new LambdaUpdateWrapper<WkOrder>()
+ .eq(WkOrder::getId, taskItem.getOrderId())
+ .setSql("work_qty = work_qty - " + taskItem.getAnfme()))) {
+ throw new CoolException("鐩樼偣鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+
+ CheckDiffItem serviceOne = checkDiffItemService.getOne(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
+
+ 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());
+ }
+ }
});
}
@@ -1000,8 +1019,6 @@
}
}
}
-
-
});
});
List<Long> matnrIds = taskItems.stream().map(TaskItem::getMatnrId).collect(Collectors.toList());
@@ -1133,7 +1150,8 @@
} catch (Exception e) {
throw new CoolException(e.getMessage());
}
- } else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val) || task.getResource().equals(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)) {
+ } else if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_ORDER_TYPE.val)
+ || task.getResource().equals(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)) {
WkOrderItem orderItem = new WkOrderItem();
if (task.getResource().equals(TaskResouceType.TASK_RESOUCE_CHECK_TYPE.val)) {
CheckDiffItem diffItem = checkDiffItemService.getById(key);
@@ -1262,7 +1280,6 @@
if (!stockItemService.saveBatch(stockItems)) {
throw new CoolException("搴撳瓨淇敼鏋跺け璐ワ紒锛�");
}
-
}
/**
--
Gitblit v1.9.1