From 839bd0176e7eb920e2135aaa6334750552c84a7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:28:05 +0800
Subject: [PATCH] 取消移库任务优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 13 +++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 1 -
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
index aeb5791..43a083b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java
@@ -125,7 +125,6 @@
Double useQty = Math.round((outQty + workQty) * 10000) / 10000.0;
if (orgQty.compareTo(useQty) > 0) {
//鎷ｆ枡鍑哄簱
-
DeviceSite deviceSite = deviceSiteService.getOne(new LambdaQueryWrapper<DeviceSite>()
.eq(DeviceSite::getSite, siteNo)
.eq(DeviceSite::getChannel, loc.getChannel())
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 5dfcc6b..2b3e618 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
@@ -732,10 +732,19 @@
Task outTask = taskService.getById(task.getParentId());
if (!Objects.isNull(outTask)) {
LocToTaskParams params = new LocToTaskParams();
- params.setOrgLoc(task.getOrgLoc());
+ params.setOrgLoc(task.getOrgLoc()).setSiteNo(task.getOrgSite());
//鐢熸垚绉绘繁搴撲綅浠诲姟
Task moveTask = locItemService.genMoveTask(params, loginUserId);
- moveTask.setTaskType(task.getSort() + 1);
+ moveTask.setSort(task.getSort() + 1).setParentId(outTask.getId());
+ if (!this.updateById(moveTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ outTask.setParentId(moveTask.getId());
+ if (!this.updateById(outTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+
+ }
+
} else {
throw new CoolException("鏃犳硶鐢熸垚鏂扮殑绉诲簱浠诲姟锛屽彇娑堝け璐ワ紒锛�");
}
--
Gitblit v1.9.1