From ae2b0889d677be95535349c389bfb041b18a27ef Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 22 七月 2025 20:09:53 +0800
Subject: [PATCH] 盘点功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 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 b269e33..71a4afc 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
@@ -776,18 +776,6 @@
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())
- .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("鐩樼偣鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
- }
-
checkDiffItemService.remove(new LambdaQueryWrapper<CheckDiffItem>().eq(CheckDiffItem::getTaskItemId, taskItem.getId()));
checkDiffService.removeById(taskItem.getSourceId());
@@ -997,19 +985,23 @@
tempLocs.forEach(working -> {
taskItems.forEach(taskItem -> {
if (taskItem.getMatnrId().equals(working.getMatnrId())) {
- Double minQty = Math.round((working.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0;
+ Double minQty = taskItem.getAnfme();
+ if (!task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_IN.type)) {
+ minQty = Math.round((working.getAnfme() - taskItem.getAnfme()) * 10000) / 10000.0;
+ }
if (minQty.compareTo(0.0) > 0) {
taskItem.setAnfme(minQty);
if (!taskItemService.updateById(taskItem)) {
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触锛侊紒");
}
-
} else {
if (!taskItemService.removeById(taskItem)) {
throw new CoolException("浠诲姟鏄庣粏淇敼澶辫触锛侊紒");
}
}
}
+
+
});
});
List<Long> matnrIds = taskItems.stream().map(TaskItem::getMatnrId).collect(Collectors.toList());
@@ -1021,6 +1013,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())
@@ -1035,7 +1029,7 @@
});
locItemWorkingService.remove(new LambdaQueryWrapper<LocItemWorking>().eq(LocItemWorking::getTaskId, task.getId()));
- Loc loc1 = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ Loc loc1 = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()));
if (Objects.isNull(loc1)) {
throw new CoolException("鐩爣搴撲綅涓嶅瓨鍦紒锛�");
}
--
Gitblit v1.9.1