From 734f0c5fa7c83c73e388e25c9863663b3559fe23 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 30 五月 2025 15:26:44 +0800
Subject: [PATCH] #移库找库位优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 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 3f31a35..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
@@ -7,6 +7,7 @@
import com.vincent.rsf.server.api.entity.dto.InTaskMsgDto;
import com.vincent.rsf.server.api.service.WcsService;
import com.vincent.rsf.server.common.constant.Constants;
+import com.vincent.rsf.server.manager.controller.params.LocToTaskParams;
import com.vincent.rsf.server.manager.enums.*;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
@@ -414,18 +415,19 @@
* 浠诲姟缃《
*
* @param id
+ * @param loginUserId
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Task taskToTop(Long id) throws Exception {
+ public Task taskToTop(Long id, Long loginUserId) throws Exception {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
Task tasks = taskService.getOne(new LambdaQueryWrapper<Task>().eq(Task::getId, id).in(Task::getTaskStatus, longs));
if (Objects.isNull(tasks)) {
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙竴閿疆椤讹紒锛�");
}
- //鍒ゆ柇瀛愪换鍔★紝淇敼浠诲姟浼樺厛绾�
- modiftyTaskSort(tasks);
+ //鍒ゆ柇娴呭簱浣嶄换鍔★紝淇敼浠诲姟浼樺厛绾�
+ modiftyTaskSort(tasks, loginUserId);
if (!taskService.updateById(tasks)) {
throw new CoolException("缃《澶辫触锛侊紒");
@@ -435,12 +437,14 @@
/**
* 鎵嬪姩瀹屾垚浠诲姟
+ *
* @param id
+ * @param loginUserId
* @return
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public Task operateComplete(Long id) {
+ public Task operateComplete(Long id, Long loginUserId) {
List<Integer> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
Task task = taskService.getOne(new LambdaQueryWrapper<Task>()
.eq(Task::getId, id)
@@ -450,7 +454,9 @@
throw new CoolException("褰撳墠浠诲姟姝ｅ湪鎵ц涓紝涓嶅彲鍙栨秷锛侊紒");
}
- modiftyTaskSort(task);
+ modiftyTaskSort(task, loginUserId);
+
+ //
task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
if (!this.updateById(task)) {
@@ -461,18 +467,22 @@
/**
* 淇敼浠诲姟浼樺厛绾�
+ *
* @param task
+ * @param loginUserId
*/
- private Task modiftyTaskSort(Task task) {
+ private Task modiftyTaskSort(Task task, Long loginUserId) {
String curLoc;
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)) {
curLoc = task.getTargLoc();
} else {
curLoc = task.getOrgLoc();
}
+ //娣卞簱浣嶅厛鍑烘儏鍐�
if (!LocUtils.isShallowLoc(curLoc)) {
+ //娣卞簱浣�
String shallowLoc = LocUtils.getShallowLoc(curLoc);
- if (StringUtils.isNotBlank(shallowLoc)) {
+ if (StringUtils.isBlank(shallowLoc)) {
throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
}
Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, shallowLoc));
@@ -485,11 +495,28 @@
.or()
.eq(Task::getTargLoc, loc.getCode()));
if (Objects.isNull(serviceOne)) {
- task.setSort(999);
+ task.setSort(Constants.TASK_SORT_MAX_VALUE);
} else {
int i = serviceOne.getSort() - 1;
task.setSort(i);
}
+ }
+ } else {
+ //娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘墭鐩橀�佸叆娣卞簱浣�
+ String deepLoc = LocUtils.getDeepLoc(curLoc);
+ if (StringUtils.isBlank(deepLoc)) {
+ throw new CoolException("鏁版嵁寮傚父锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, deepLoc));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛屽簱浣嶄笉瀛樺湪锛侊紒");
+ }
+ //鍒ゆ柇娣卞簱浣嶆槸鍚︿负绌�
+ if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_O.type)) {
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(curLoc).setTarLoc(deepLoc);
+ //鐢熸垚绉绘繁搴撲綅浠诲姟
+ locItemService.genMoveTask(params, loginUserId);
}
}
@@ -671,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