From 8f7e1bf264a5beaca1cf563452bc9ef72dea848f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 21 五月 2025 08:16:22 +0800
Subject: [PATCH] 修复取消组托，收货数量修改错误问题
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TaskController.java | 99 +++++++------------------------------------------
1 files changed, 14 insertions(+), 85 deletions(-)
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 114e815..1456ea1 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
@@ -31,17 +31,13 @@
@Autowired
private TaskService taskService;
-
@Autowired
private TaskItemService taskItemService;
-
@Autowired
private WaitPakinService waitPakinService;
-
@Autowired
private LocService locService;
- @Autowired
- private BasStationService basStationService;
+
@PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/task/page")
@@ -103,75 +99,8 @@
if (Objects.isNull(ids) || ids.length < 1) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- List<Short> longs = Arrays.asList(TaskStsType.GENERATE_IN.id, TaskStsType.GENERATE_OUT.id);
- List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>().in(Task::getId, ids).in(Task::getTaskStatus, longs));
- if (tasks.isEmpty()) {
- throw new CoolException("浠诲姟宸插鎵ц鐘舵�佷笉鍙彇娑堬紒锛�");
- }
- for (Task task : tasks) {
- //鎭㈠缁勬墭鐘舵��
- WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>()
- .eq(WaitPakin::getBarcode, task.getBarcode())
- );
- if (null != waitPakin) {
- waitPakin.setIoStatus(Short.valueOf(PakinIOStatus.PAKIN_IO_STATUS_DONE.val));
- if (!waitPakinService.updateById(waitPakin)) {
- throw new CoolException("鏇存柊缁勬墭鐘舵�佸け璐ワ紒锛�");
-
- }
- }
- Loc loc = locService.getOne(new LambdaQueryWrapper<Loc>()
- .eq(Loc::getCode, task.getTaskType() < 100 ? task.getTargLoc() : task.getOrgLoc())
- );
- if (null != loc
- && (loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_S.type)
- || loc.getUseStatus().equals(LocStsType.LOC_STS_TYPE_R.type))) {
-
- loc.setUseStatus(LocStsType.LOC_STS_TYPE_O.type);
- if (!locService.updateById(loc)) {
- throw new CoolException("鏇存柊搴撲綅鐘舵�佸け璐ワ紒锛�");
- }
- }
- if (task.getWarehType().equals(WarehType.WAREHOUSE_TYPE_AGV.id)){
- BasStation basStation = null;
- if (task.getTaskType().equals(TaskType.TASK_TYPE_IN.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_EMPITY_IN.type)
- ){
- basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName, task.getOrgSite())
- .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
- );
-
-
- } else if (task.getTaskType().equals(TaskType.TASK_TYPE_OUT.type)
- || task.getTaskType().equals(TaskType.TASK_TYPE_PICK_AGAIN_IN.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)
- ) {
- basStation = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
- .eq(BasStation::getStationName, task.getTargLoc())
- .eq(BasStation::getUseStatus, StaUseStatusType.TYPE_R.type)
- );
- }
- if (null == basStation) {
- throw new CoolException("绔欑偣鐘舵�侀敊璇紒锛�");
- }
- basStation.setUseStatus(StaUseStatusType.TYPE_F.type);
- if (!basStationService.updateById(basStation)){
- throw new CoolException("鏇存柊绔欑偣鐘舵�佸け璐ワ紒锛�");
- }
- }
-
-
- }
- if (!taskService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
- }
- if (!taskItemService.remove(new LambdaQueryWrapper<TaskItem>().in(TaskItem::getTaskId, ids))) {
- return R.error("Details delete Failed");
- }
- return R.ok("Delete Success").add(ids);
+ return taskService.removeTask(ids);
+// return R.ok("Delete Success").add(ids);
}
@PreAuthorize("hasAuthority('manager:task:list')")
@@ -208,24 +137,24 @@
// }
// taskService.completeTask(tasks);
for (Task task : tasks) {
- task.setTaskStatus(task.getTaskType() < (short)100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
+ task.setTaskStatus(task.getTaskType() < (short) 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id);
}
- if (!taskService.updateBatchById(tasks)){
+ if (!taskService.updateBatchById(tasks)) {
return R.error("瀹屾垚浠诲姟澶辫触");
}
return R.ok("瀹屾垚浠诲姟鎴愬姛");
}
- @PreAuthorize("hasAuthority('manager:task:update')")
- @ApiOperation("鍙栨秷浠诲姟")
- @PostMapping("/task/cancel/{id}")
- public R cancelTask(@PathVariable String id) {
- if (Objects.isNull(id)) {
- throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
- }
- return R.ok();
- }
+// @PreAuthorize("hasAuthority('manager:task:update')")
+// @ApiOperation("鍙栨秷浠诲姟")
+// @PostMapping("/task/cancel/{id}")
+// public R cancelTask(@PathVariable String id) {
+// if (Objects.isNull(id)) {
+// throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+// }
+// return R.ok();
+// }
@PreAuthorize("hasAuthority('manager:task:update')")
@ApiOperation("浠诲姟鍑哄簱缃《")
--
Gitblit v1.9.1