From 3eb25a0bb9b4bd0b914cf2cba60ecb8cc404fac9 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 16:01:56 +0800
Subject: [PATCH] 任务取消功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 33 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 2b3e618..aaa683a 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
@@ -79,6 +79,10 @@
private LocItemWorkingService locItemWorkingService;
@Autowired
private WcsService wcsService;
+ @Autowired
+ private OutStockService outStockService;
+ @Autowired
+ private OutStockItemService outStockItemService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -455,10 +459,12 @@
}
modiftyTaskSort(task, loginUserId);
-
//
-
+// if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) {
+// task.setTaskStatus(TaskStsType.COMPLETE_OUT.id);
+// } else {
task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+// }
if (!this.updateById(task)) {
throw new CoolException("瀹屾垚浠诲姟澶辫触");
}
@@ -511,26 +517,35 @@
//
// return moveTask;
// }
- } 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);
- }
}
-
return task;
+ }
+
+ /**
+ * 浠诲姟瀹屾垚鍚庯紝鍒ゆ柇娣卞簱浣嶆槸鍚︿负绌猴紝濡傛灉涓虹┖鐢熸垚绉诲簱浠诲姟
+ *
+ * @param loginUserId
+ * @param curLoc
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void moveToDeep(Long loginUserId, String curLoc) throws Exception {
+ //娴呭簱浣嶏紝鍒ゆ柇娣卞搴旀繁搴撲綅鏄惁涓虹┖锛屽鏋滀负绌虹敓鎴愪竴涓Щ搴撲换鍔★紝灏嗘墭鐩橀�佸叆娣卞簱浣�
+ 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);
+ }
}
@Transactional(rollbackFor = Exception.class)
@@ -708,8 +723,8 @@
@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_PICK_AGAIN_OUT.type,
- TaskType.TASK_TYPE_CHECK_OUT.type, TaskType.TASK_TYPE_EMPITY_IN.type, TaskType.TASK_TYPE_LOC_MOVE.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)
@@ -719,7 +734,7 @@
}
for (Task task : tasks) {
//鍙栨秷绉诲簱浠诲姟
- if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_OUT.id)) {
+ if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type) && task.getTaskStatus().equals(TaskStsType.GENERATE_IN.id)) {
if (!locService.update(new LambdaUpdateWrapper<Loc>()
.eq(Loc::getCode, task.getOrgLoc())
.set(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_F.type))) {
@@ -742,11 +757,7 @@
outTask.setParentId(moveTask.getId());
if (!this.updateById(outTask)) {
throw new CoolException("浠诲姟淇℃伅淇敼澶辫触锛侊紒");
-
}
-
- } else {
- throw new CoolException("鏃犳硶鐢熸垚鏂扮殑绉诲簱浠诲姟锛屽彇娑堝け璐ワ紒锛�");
}
}
@@ -779,17 +790,47 @@
if (!taskItems.isEmpty()) {
for (TaskItem item : taskItems) {
if (item.getOrderType().equals(OrderType.ORDER_OUT.type)) {
+ Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getCode, task.getOrgLoc()));
+ if (Objects.isNull(loc)) {
+ throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ }
+
+ loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date());
+ if (!locService.updateById(loc)) {
+ throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
+ }
+
//鍑哄簱
if (item.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_STOCK_OUT.type))) {
//搴撳瓨鍑哄簱
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>().eq(Loc::getId, item.getSourceId()));
- if (Objects.isNull(loc)) {
- throw new CoolException("鏁版嵁閿欒锛氬簱浣嶄俊鎭笉瀛樺湪锛侊紒");
+ } else if (item.getWkType().equals(Short.parseShort(OrderWorkType.ORDER_WORK_TYPE_OTHER.type))) {
+ //鍏跺畠鍑哄簱
+ } else {
+ //鍑哄簱鍗曞嚭搴�
+ AsnOrder asnOrder = outStockService.getById(item.getSourceId());
+ if (Objects.isNull(asnOrder)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹凡涓嶅瓨鍦紒锛�");
+ }
+ Double workQty = Math.round((asnOrder.getWorkQty() - item.getAnfme()) * 10000) / 10000.0;
+
+ asnOrder.setExceStatus(AsnExceStatus.OUT_STOCK_STATUS_TASK_INIT.val)
+ .setWorkQty(workQty.compareTo(0.00) > 0 ? workQty : 0.00 )
+ .setUpdateBy(loginUserId)
+ .setUpdateTime(new Date());
+ if (!outStockService.updateById(asnOrder)) {
+ throw new CoolException("鍘熷崟鎹姸鎬佷慨鏀瑰け璐ワ紒锛�");
}
- loc.setUseStatus(LocStsType.LOC_STS_TYPE_F.type).setBarcode(task.getBarcode()).setUpdateBy(loginUserId).setUpdateTime(new Date());
- if (!locService.updateById(loc)) {
- throw new CoolException("搴撲綅淇℃伅淇敼澶辫触锛侊紒");
+ AsnOrderItem orderItem = outStockItemService.getById(item.getSource());
+ if (Objects.isNull(orderItem)) {
+ throw new CoolException("鏁版嵁閿欒锛氬崟鎹槑缁嗗凡涓嶅瓨鍦紒锛�");
+ }
+
+ Double workItmQty = Math.round((orderItem.getWorkQty() - item.getAnfme()) * 10000) / 10000.0;
+ orderItem.setWorkQty(workItmQty);
+
+ if (!outStockItemService.updateById(orderItem)) {
+ throw new CoolException("鍘熷崟鎹槑缁嗕慨鏀瑰け璐ワ紒锛�");
}
}
} else {
--
Gitblit v1.9.1