From 5074c51d978a490a1d0e9dc116a874d33ddeb16c Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 04 六月 2025 13:22:03 +0800
Subject: [PATCH] DO单excel导入功能 任务工作档优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 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 5fbaf0b..ca4d6b6 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
@@ -138,10 +138,8 @@
if (Objects.isNull(deviceSite)) {
throw new CoolException("褰撳墠绔欑偣涓嶆敮鎸佺洏鐐瑰嚭搴擄紒锛�");
}
-
task.setTaskType(TaskType.TASK_TYPE_CHECK_OUT.type).setWarehType(deviceSite.getDevice());
}
-
if (!taskService.save(task)) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
@@ -159,10 +157,6 @@
//浼樺厛鐢熸垚绉诲簱浠诲姟
if (one.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
moveTask = genMoveTask(map, loginUserId);
- task.setParentId(moveTask.getId());
- if (!taskService.updateById(task)) {
- throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
- }
}
} else {
workTask.setSort(task.getSort() + 1).setParentId(task.getId());
@@ -172,14 +166,16 @@
}
}
-
-
-// if (!Objects.isNull(moveTask.getId())) {
-// moveTask.setParentId(task.getId()).setSort(moveTask.getSort() - 1);
-// if (!taskService.saveOrUpdate(moveTask)) {
-// throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
-// }
-// }
+ if (!Objects.isNull(moveTask.getId())) {
+ moveTask.setParentId(task.getId()).setSort(moveTask.getSort() + 1);
+ if (!taskService.saveOrUpdate(moveTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ task.setParentId(moveTask.getId());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("涓讳换鍔″叧鑱斿け璐ワ紒锛�");
+ }
+ }
List<TaskItem> taskItems = new ArrayList<>();
listMap.get(key).forEach(item -> {
--
Gitblit v1.9.1