From fce34ab8e1453d7376de56eca7eff01576e62745 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 18 五月 2024 16:52:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 7 +++++--
1 files changed, 5 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..7afa56a 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,7 +49,10 @@
workService.completeWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");
} else if (type == 2) {
- workService.cancelWrkMast(workNo, getUserId());
+ workService.cancelWrkMast(workNo, getUserId(),2);
+ return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 5) {
+ workService.cancelWrkMast(workNo, getUserId(),5);
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
}
return R.ok();
--
Gitblit v1.9.1