From f3afce900e77ec46ed8b3b5b4484d72f796fcaef Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 31 七月 2024 15:55:46 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java | 28 ++++++++++++++++++++++++++++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java | 3 +++
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java | 15 ++++++++++++++-
3 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
index 2d1f503..d4c90b1 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/TaskController.java
@@ -109,12 +109,25 @@
}
@PreAuthorize("hasAuthority('asrs:task:update')")
+ @OperationLog("瀹屾垚浠诲姟")
+ @PostMapping("/task/complete")
+ public R complete(@RequestBody Task task) {
+ try {
+ boolean result = workService.completeTask(task.getId());
+ return R.ok("瀹屾垚鎴愬姛");
+ } catch (Exception e) {
+ e.printStackTrace();
+ return R.error(e.getMessage());
+ }
+ }
+
+ @PreAuthorize("hasAuthority('asrs:task:update')")
@OperationLog("鍙栨秷浠诲姟")
@PostMapping("/task/cancel")
public R cancel(@RequestBody Task task) {
try {
boolean result = workService.cancelTask(task.getId());
- return R.ok("淇敼鎴愬姛");
+ return R.ok("鍙栨秷鎴愬姛");
} catch (Exception e) {
e.printStackTrace();
return R.error(e.getMessage());
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java
index dbcd401..8c478bc 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/WorkService.java
@@ -17,6 +17,9 @@
//鐢熸垚鍏ュ簱浠诲姟
boolean generatePakIn(GeneratePakInParam param);
+ //瀹屾垚浠诲姟
+ boolean completeTask(Long taskId);
+
//鍙栨秷浠诲姟
boolean cancelTask(Long taskId);
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
index bdc9590..6c7c7ce 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/WorkServiceImpl.java
@@ -161,6 +161,34 @@
}
@Override
+ public boolean completeTask(Long taskId) {
+ Task task = taskService.getById(taskId);
+ if(task == null){
+ throw new CoolException("浠诲姟涓嶅瓨鍦�");
+ }
+
+ List<TaskDetl> taskDetls = taskDetlService.getTaskDetlByTaskId(taskId);
+ if (taskDetls.isEmpty()) {
+ throw new CoolException("浠诲姟鏄庣粏涓嶅瓨鍦�");
+ }
+
+ if (task.getTaskType() < 100) {
+ //鍏ュ簱
+ task.setTaskSts(99L);//99.鍏ュ簱瀹屾垚
+ }else {
+ //鍑哄簱
+ task.setTaskSts(199L);//199.鍑哄簱瀹屾垚
+ }
+
+ task.setUpdateTime(new Date());
+ if (!taskService.updateById(task)) {
+ throw new CoolException("浠诲姟鏇存柊澶辫触");
+ }
+
+ return true;
+ }
+
+ @Override
@Transactional
public boolean cancelTask(Long taskId) {
Task task = taskService.getById(taskId);
--
Gitblit v1.9.1