From 2eb34bee06677dcff810b843b6c2a0979e844422 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:04:41 +0800
Subject: [PATCH] 移库任务取消优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocItemServiceImpl.java | 22 +++++++++++++++-------
2 files changed, 49 insertions(+), 9 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 03ba701..aeb5791 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
@@ -162,6 +162,14 @@
if (!taskService.save(task)) {
throw new CoolException("浠诲姟鍒涘缓澶辫触锛侊紒");
}
+
+ if (!Objects.isNull(moveTask.getId())) {
+ moveTask.setParentId(task.getId());
+ if (!taskService.saveOrUpdate(moveTask)) {
+ throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
+ }
+ }
+
List<TaskItem> taskItems = new ArrayList<>();
listMap.get(key).forEach(item -> {
TaskItem taskItem = new TaskItem();
@@ -230,11 +238,11 @@
throw new CoolException("婧愬簱浣嶄笉瀛樺湪锛侊紒");
}
- if (orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)
- || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
- || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_X.type ) ) {
- throw new CoolException("婧愬簱浣嶆湁浠诲姟姝ｅ湪鎵ц涓�...");
- }
+// if (orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type)
+// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
+// || orgLoc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_X.type ) ) {
+// throw new CoolException("婧愬簱浣嶆湁浠诲姟姝ｅ湪鎵ц涓�...");
+// }
orgLoc.setUseStatus(LocStsType.LOC_STS_TYPE_R.type);
@@ -309,8 +317,8 @@
.setSourceCode(item.getLocCode())
.setSource(item.getId())
.setUpdateTime(new Date())
- .setOrderType(OrderType.ORDER_IN.type)
- .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER_IN.type));
+ .setOrderType(OrderType.ORDER_OUT.type)
+ .setWkType(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type));
taskItems.add(taskItem);
}
if (!taskItemService.saveBatch(taskItems)) {
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 4e9f124..5dfcc6b 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
@@ -501,6 +501,16 @@
task.setSort(i);
}
}
+// else if (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_F.type)) {
+// //濡傛灉涓哄湪搴撶姸鎬侊紝鐢熸垚绉诲簱浠诲姟
+// LocToTaskParams params = new LocToTaskParams();
+// params.setOrgLoc(curLoc);
+// //鐢熸垚绉绘繁搴撲綅浠诲姟
+// Task moveTask = locItemService.genMoveTask(params, loginUserId);
+// moveTask.setTaskType(task.getSort() + 1);
+//
+// return moveTask;
+// }
} else {
//娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘墭鐩橀�佸叆娣卞簱浣�
String deepLoc = LocUtils.getDeepLoc(curLoc);
@@ -708,6 +718,29 @@
throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�");
}
for (Task task : tasks) {
+ //鍙栨秷绉诲簱浠诲姟
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_OUT.id)) {
+ if (!locService.update(new LambdaUpdateWrapper<Loc>()
+ .eq(Loc::getCode, task.getOrgLoc())
+ .set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
+ throw new CoolException("婧愬簱浣嶇姸鎬佷慨鏀瑰け璐ワ紒锛�");
+ }
+ if (!locService.update(new LambdaUpdateWrapper<Loc>().eq(Loc::getCode, task.getTargLoc()).set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type))) {
+ throw new CoolException("绉诲簱鐩爣搴撲綅鐘舵�佷慨鏀瑰け璐ワ紒锛�");
+ }
+
+ Task outTask = taskService.getById(task.getParentId());
+ if (!Objects.isNull(outTask)) {
+ LocToTaskParams params = new LocToTaskParams();
+ params.setOrgLoc(task.getOrgLoc());
+ //鐢熸垚绉绘繁搴撲綅浠诲姟
+ Task moveTask = locItemService.genMoveTask(params, loginUserId);
+ moveTask.setTaskType(task.getSort() + 1);
+ } else {
+ throw new CoolException("鏃犳硶鐢熸垚鏂扮殑绉诲簱浠诲姟锛屽彇娑堝け璐ワ紒锛�");
+ }
+ }
+
if (!Objects.isNull(task.getWarehType()) && task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.val)) {
BasStation basStation = null;
if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type) || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)) {
@@ -719,8 +752,7 @@
|| task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_MERGE_OUT.type)
|| task.getTaskType().equals(TaskType.TASK_TYPE_CHECK_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)
- ) {
+ || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_OUT.type)) {
basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
.eq(BasStation::getStationName, task.getTargLoc())
.eq(BasStation::getUseStatus, LocStsType.LOC_STS_TYPE_R.type));
--
Gitblit v1.9.1