From f6e955d57bf5e885afde54a8c6eefe80bc1bec26 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 30 十一月 2023 17:00:06 +0800
Subject: [PATCH] #出入库任务下发
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index 080f9f4..f82660e 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -67,10 +67,28 @@
@RequestMapping(value = "/taskWrk/update/auth")
@ManagerAuth
public R update(TaskWrk taskWrk){
- if (Cools.isEmpty(taskWrk) || null==taskWrk.getTaskNo()){
+ if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
return R.error();
}
taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/taskWrk/updatePoint/auth")
+ @ManagerAuth
+ public R updatePoint(TaskWrk taskWrk){
+ if (Cools.isEmpty(taskWrk) || null == taskWrk.getTaskNo()) {
+ return R.error();
+ }
+ TaskWrk taskWrk1 = taskWrkService.selectByTaskNo(taskWrk.getTaskNo());
+ if (taskWrk1 == null) {
+ return R.error();
+ }
+ taskWrk1.setStartPoint(taskWrk.getStartPoint());
+ taskWrk1.setTargetPoint(taskWrk.getTargetPoint());
+ taskWrk1.setModiTime(new Date());
+ taskWrk1.setModiUser(getUserId());
+ taskWrkService.updateById(taskWrk1);
return R.ok();
}
@@ -140,7 +158,11 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.COMPLETE.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ try{
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ }catch (Exception e){
+ taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
@@ -159,7 +181,11 @@
Date now = new Date();
taskWrk.setStatus(TaskStatusType.CANCEL.id);
taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ try{
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ }catch (Exception e){
+ taskWrk.setModiUser(9999L);//鎿嶄綔鍛�
+ }
taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
taskWrkService.updateById(taskWrk);
return R.ok();
--
Gitblit v1.9.1