From 67a8f1f413b198a69363f56ad7f7106bf1aff590 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 14:57:00 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 f5305e4..4e9f124 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
@@ -480,6 +480,7 @@
}
//娣卞簱浣嶅厛鍑烘儏鍐�
if (!LocUtils.isShallowLoc(curLoc)) {
+ //娣卞簱浣�
String shallowLoc = LocUtils.getShallowLoc(curLoc);
if (StringUtils.isBlank(shallowLoc)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
@@ -513,9 +514,9 @@
//鍒ゆ柇娣卞簱浣嶆槸鍚︿负绌�
if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
LocToTaskParams params = new LocToTaskParams();
- params.setOrgLoc(loc.getCode()).setTarLoc(deepLoc);
-
- Task task1 = locItemService.genMoveTask(params, loginUserId);
+ params.setOrgLoc(curLoc).setTarLoc(deepLoc);
+ //鐢熸垚绉绘繁搴撲綅浠诲姟
+ locItemService.genMoveTask(params, loginUserId);
}
}
@@ -697,7 +698,9 @@
@Transactional(rollbackFor = Exception.class)
public R removeTask(Long[] ids, Long loginUserId) {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
+ List<Integer> list = Arrays.asList(TaskType.TASK_TYPE_IN.type, TaskType.TASK_TYPE_OUT.type,TaskType.TASK_TYPE_PICK_AGAIN_OUT.type,
+ TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.type,
+ TaskType.TASK_TYPE_EMPITY_OUT.type, TaskType.TASK_TYPE_MERGE_OUT.type);
List<Task> tasks = this.list(new LambdaQueryWrapper<Task>()
.in(Task::getTaskType, list)
.in(Task::getId, ids).in(Task::getTaskStatus, longs));
--
Gitblit v1.9.1