From 42f887929f3003026f33ba6822703b1a89a13489 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 17:12:40 +0800
Subject: [PATCH] 盘点单据取消任务功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 34 ++++++++++++++++++++++++++++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java | 10 ++++++++++
2 files changed, 40 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
index e2893b3..2f7e1f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/CheckOrderServiceImpl.java
@@ -280,6 +280,10 @@
if (Objects.isNull(loc)) {
throw new CoolException("褰撳墠搴撲綅涓嶅瓨鍦紒锛�");
}
+ Task task1 = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getBarcode, key));
+ if (!Objects.isNull(task1)) {
+ throw new CoolException("鎵樼洏浠诲姟宸插瓨鍦紒锛�");
+ }
List<CheckOrderItemParams> itemParams = listMap.get(key);
CheckOrderItemParams checkItem = itemParams.stream().findFirst().get();
Task task = new Task();
@@ -294,6 +298,8 @@
.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type)
.setTaskStatus(TaskStsType.GENERATE_OUT.id)
.setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
.setCreateBy(loginUserId)
.setBarcode(key);
@@ -319,6 +325,10 @@
.setMatnrId(checkParam.getMatnrId())
.setCreateBy(loginUserId)
.setCreateTime(new Date())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date())
+ .setOrderItemId(checkItem.getId())
+ .setOrderId(checkParam.getOrderId())
.setPlatItemId(checkParam.getPlatItemId());
items.add(taskItem);
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 2e66a96..dfe9fbb 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
@@ -84,6 +84,11 @@
@Autowired
private OutStockItemService outStockItemService;
+ @Autowired
+ private CheckOrderItemService checkOrderItemService;
+ @Autowired
+ private CheckOrderService checkOrderService;
+
@Override
@Transactional(rollbackFor = Exception.class)
public synchronized R generateAGVTasks(WaitPakin pakins, String locCode, String orgSta, Long loginUserId) {
@@ -742,7 +747,9 @@
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
throw new CoolException("婧愬簱浣嶇姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
- if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()).set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type))) {
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getCode, task.getTargLoc())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type))) {
throw new CoolException("绉诲簱鐩爣搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
}
@@ -762,7 +769,22 @@
}
}
} 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())
+ .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("鐩樼偣鍗曟墽琛屾暟閲忎慨鏀瑰け璐ワ紒锛�");
+ }
+ });
+ }
}
if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {
@@ -797,7 +819,10 @@
if (Objects.isNull(loc)) {
throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
}
- loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date());
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type)
+ .setBarcode(task.getBarcode())
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
if (!locService.updateById(loc)) {
throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
}
@@ -868,7 +893,8 @@
}
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getTaskType() < TaskStsType.UPDATED_IN.id ? task.getTargLoc() : task.getOrgLoc()));
- if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type) || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
+ if (null != loc && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
+ || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
if (!locService.updateById(loc)) {
throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
--
Gitblit v1.9.1