From aebc7203d975c6520f507abfd91d90948092baac Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 10:26:25 +0800
Subject: [PATCH] 浅库位优化出库，生成移库任务
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 42 +++++++++++++++++----
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 4 +-
rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java | 17 ++++++++
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java | 4 +-
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 4 +-
5 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
index 5906032..4441c62 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/constant/Constants.java
@@ -1,5 +1,7 @@
package com.vincent.rsf.server.common.constant;
+import io.swagger.models.auth.In;
+
/**
* 绯荤粺甯搁噺
* Created by vincent on 2019-10-29 15:55
@@ -105,4 +107,19 @@
*/
public static final String TASK_TYPE_OUT_PICK = "pick";
+ /**
+ * 鎺掑簭榛樿鍊�
+ */
+ public static final Integer TASK_SORT_DEFAULT_VALUE = 49;
+
+ /**
+ * 鎺掑簭鏈�澶у��
+ */
+ public static final Integer TASK_SORT_MAX_VALUE = 999;
+
+ /**
+ * 鎺掑簭鏈�灏忓��
+ */
+ public static final Integer TASK_SORT_MIN_VALUE = 0;
+
}
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
index 24658cf..aa3c856 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java
@@ -139,7 +139,7 @@
if (Cools.isEmpty(id)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id));
+ return R.ok("瀹屾垚浠诲姟鎴愬姛").add(taskService.operateComplete(id, getLoginUserId()));
}
@@ -198,7 +198,7 @@
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
try {
- taskService.taskToTop(id);
+ taskService.taskToTop(id, getLoginUserId());
} catch (Exception e) {
logger.error("UNK", e);
throw new CoolException(e.getMessage());
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
index a39de4e..1d20247 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/TaskService.java
@@ -25,7 +25,7 @@
void complateInTask(List<Task> tasks) throws Exception;
- Task taskToTop(Long id) throws Exception;
+ Task taskToTop(Long id, Long loginUserId) throws Exception;
- Task operateComplete(Long id);
+ Task operateComplete(Long id, Long loginUserId);
}
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 8c7bc86..1d9be27 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
@@ -98,7 +98,7 @@
.setTaskCode(ruleCode)
.setParentId(moveTask.getId())
.setTargSite(siteNo)
- .setSort(Short.valueOf("49"))
+ .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateBy(loginUserId)
.setCreateBy(loginUserId)
.setCreateTime(new Date())
@@ -284,7 +284,7 @@
.setTaskType(TaskType.TASK_TYPE_LOC_MOVE.type)
.setTargLoc(targetLoc.getCode())
.setUpdateBy(loginUserId)
- .setSort(Short.valueOf("49"))
+ .setSort(Constants.TASK_SORT_DEFAULT_VALUE)
.setUpdateTime(new Date())
.setTaskStatus(TaskStsType.GENERATE_IN.id)
.setBarcode(orgLoc.getBarcode());
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..f5305e4 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,21 @@
/**
* 淇敼浠诲姟浼樺厛绾�
+ *
* @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,12 +494,29 @@
.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(loc.getCode()).setTarLoc(deepLoc);
+
+ Task task1 = locItemService.genMoveTask(params, loginUserId);
+ }
}
return task;
--
Gitblit v1.9.1