From aa2d520a06c371e76ef26c78d426a01fca76a2fc Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 07 二月 2025 14:56:35 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/controller/AgvWorkController.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvWorkController.java b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
index f7aca3d..3d54034 100644
--- a/src/main/java/com/zy/asrs/controller/AgvWorkController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvWorkController.java
@@ -35,7 +35,7 @@
     }
 
     @RequestMapping("/locDdetl/adjust/start")
-    @ManagerAuth(memo = "搴撳瓨璋冩暣")
+    @ManagerAuth(memo = "")
     public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
         workService.adjustLocDetl(param, getUserId());
         return R.ok("搴撳瓨璋冩暣鎴愬姛");
@@ -49,9 +49,19 @@
             workService.completeWrkMast(workNo, getUserId());
             return R.ok("宸ヤ綔妗e凡瀹屾垚");
         } else if (type == 2) {
-            workService.cancelWrkMast(workNo, getUserId());
+            workService.cancelWrkMast(workNo, getUserId(),2);
+            return R.ok("宸ヤ綔妗e凡鍙栨秷");
+        } else if (type == 5) {
+            workService.cancelWrkMast(workNo, getUserId(),5);
             return R.ok("宸ヤ綔妗e凡鍙栨秷");
         }
         return R.ok();
     }
+
+    @RequestMapping("/hand/control/wrkMast/changeType")
+    @ManagerAuth(memo = "鍒囨崲璋冩嫧鏂瑰紡")
+    public R handControlWrkMastChangeType(@RequestParam String workNo){
+        workService.changeType(workNo, getUserId());
+        return R.ok();
+    }
 }

--
Gitblit v1.9.1