From af1b0101f2f19fb562ba81eb2bbe3a7976e3d716 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 24 十一月 2023 15:50:50 +0800
Subject: [PATCH] #堆垛机出入库
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/TaskWrkController.java b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
index c9c8b73..009f02c 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -24,10 +24,10 @@
@Autowired
private TaskWrkService taskWrkService;
- @RequestMapping(value = "/taskWrk/{id}/auth")
+ @RequestMapping(value = "/taskWrk/{wrkNo}/auth")
@ManagerAuth
- public R get(@PathVariable("id") String id) {
- return R.ok(taskWrkService.selectById(String.valueOf(id)));
+ public R get(@PathVariable("wrkNo") Integer wrkNo) {
+ return R.ok(taskWrkService.selectByWrkNo(wrkNo));
}
@RequestMapping(value = "/taskWrk/list/auth")
@@ -134,13 +134,17 @@
if (taskWrk == null) {
return R.error();
}
- if (taskWrk.getStatus() == TaskStatusType.COMPLETE.id) {
+ if (taskWrk.getStatus().equals(TaskStatusType.COMPLETE.id)) {
return R.error(taskWrk.getTaskNo() + "宸插畬缁�");
}
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();
@@ -153,16 +157,35 @@
if (taskWrk == null) {
return R.error();
}
- if (taskWrk.getStatus() == TaskStatusType.CANCEL.id) {
+ if (taskWrk.getStatus().equals(TaskStatusType.CANCEL.id)) {
return R.error(taskWrk.getTaskNo() + "宸茶鍙栨秷");
}
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();
}
+ @PostMapping(value = "/taskWrk/updateCommandStep")
+ @ManagerAuth(memo = "鏇存柊姝ュ簭")
+ public R updateCommandStep(@RequestParam Integer wrkNo, @RequestParam Integer commandStep) {
+ TaskWrk taskWrk = taskWrkService.selectByWrkNo(wrkNo);
+ if (taskWrk == null) {
+ return R.error();
+ }
+ Date now = new Date();
+ taskWrk.setCommandStep(commandStep);
+ taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
+ taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
+ taskWrkService.updateById(taskWrk);
+ return R.ok();
+ }
+
}
--
Gitblit v1.9.1