From 64f4079a20eb4499845182a5b91abbbbcf1b44fc Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 27 四月 2025 15:17:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/TaskWrkController.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 96 insertions(+), 22 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..252b1a3 100644
--- a/src/main/java/com/zy/asrs/controller/TaskWrkController.java
+++ b/src/main/java/com/zy/asrs/controller/TaskWrkController.java
@@ -6,28 +6,34 @@
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.zy.asrs.domain.enums.TaskStatusType;
+import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.TaskWrk;
+import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.TaskWrkService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.R;
import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@RestController
+@Slf4j
public class TaskWrkController extends BaseController {
@Autowired
private TaskWrkService taskWrkService;
+ @Autowired
+ private LocMastService locMastService;
- @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")
@@ -67,10 +73,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();
}
@@ -120,30 +144,47 @@
return R.ok();
}
- @PostMapping(value = "/taskWrk/distribute/auth")
- @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
- public R distribute(@RequestParam String taskNo) {
- taskWrkService.distribute(taskNo, getUserId());
- return R.ok();
- }
+// @PostMapping(value = "/taskWrk/distribute/auth")
+// @ManagerAuth(memo = "鎵嬪姩娲惧彂浠诲姟")
+// public R distribute(@RequestParam String taskNo) {
+// taskWrkService.distribute(taskNo, getUserId());
+// return R.ok();
+// }
@PostMapping(value = "/taskWrk/complete/auth")
@ManagerAuth(memo = "鎵嬪姩瀹屾垚浠诲姟")
public R complete(@RequestParam String taskNo) {
TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
- if (taskWrk == null) {
- return R.error();
+ if (Cools.isEmpty(taskWrk) || taskWrk.getStatus() >= 3) {
+ return R.error("宸插畬缁撴垨宸插彇娑�");
}
- if (taskWrk.getStatus() == TaskStatusType.COMPLETE.id) {
- return R.error(taskWrk.getTaskNo() + "宸插畬缁�");
- }
- Date now = new Date();
- taskWrk.setStatus(TaskStatusType.COMPLETE.id);
- taskWrk.setModiTime(now);//鎿嶄綔鏃堕棿
- taskWrk.setModiUser(getUserId());//鎿嶄綔鍛�
- taskWrk.setCompleteTime(now);//瀹岀粨鏃堕棿
+ taskWrk.setStatus(TaskStatusType.MANUAL_OVER.id);//鎵嬪姩瀹屾垚浠诲姟
+ taskWrk.setModiTime(new Date());
taskWrkService.updateById(taskWrk);
return R.ok();
+ }
+
+ @PostMapping(value = "/taskWrk/returnWorkingCondition/auth")
+ @ManagerAuth(memo = "閲嶆柊缁欏爢鍨涙満涓嬪彂浠诲姟")
+ public R returnWorkingCondition(@RequestParam String taskNo) {
+ TaskWrk taskWrk = taskWrkService.selectByTaskNo(taskNo);
+ if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==12){
+ taskWrk.setWrkSts(11);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ } else if (!Cools.isEmpty(taskWrk) && taskWrk.getWrkSts()==3) {
+ taskWrk.setWrkSts(2);
+ taskWrkService.updateById(taskWrk);
+ if(!taskWrkService.updateById(taskWrk)){
+ return R.error("鏇存柊浠诲姟鐘舵�佸け璐�");
+ }
+ return R.ok();
+ }else{
+ return R.error("浠诲姟鐘舵�佷笉瀵规棤娉曢噸鏂扮粰鍫嗗灈鏈轰笅鍙戜换鍔�");
+ }
+
}
@PostMapping(value = "/taskWrk/cancel/auth")
@@ -153,16 +194,49 @@
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();
+ }
+
+ public static String getTaskType(Integer paramIoType){
+ switch (paramIoType){
+ case 1:
+ return "RK";
+ case 2:
+ return "CK";
+ case 3:
+ return "YK";
+ default:
+ return "鏈煡";
+ }
+ }
+
}
--
Gitblit v1.9.1