From 0d30daf9ee89603b97c6181c2949abbb89bd64c4 Mon Sep 17 00:00:00 2001
From: tzsk <Administrator@qq.com>
Date: 星期四, 11 四月 2024 13:37:10 +0800
Subject: [PATCH] Merge branch 'tzskasrs-2' of http://47.97.1.152:5880/r/zy-asrs into tzskasrs-2
---
src/main/java/com/zy/asrs/controller/AgvWorkController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 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..1b1417d 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("搴撳瓨璋冩暣鎴愬姛");
@@ -51,6 +51,9 @@
} else if (type == 2) {
workService.cancelWrkMast(workNo, getUserId());
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+ } else if (type == 3) {
+ workService.changeToOutWrkMast(workNo,getUserId());
+ return R.ok("宸ヤ綔妗ｅ凡杞垚鍑哄簱浠诲姟锛屽苟涓斿鍣ㄧ鍦烘垚鍔�");
}
return R.ok();
}
--
Gitblit v1.9.1