From 3c7229b44c344094f5e81e5d077e1e249884bac0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期一, 17 八月 2020 16:07:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/WorkController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 5ac9cfc..70f9050 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -42,7 +42,13 @@
@RequestMapping("/available/take/site")
@ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
public R availableTakeSite(){
- return R.ok().add(basDevpService.getAvailableOutSite());
+ return R.ok().add(basDevpService.getAvailableOutSite(101));
+ }
+
+ @RequestMapping("/available/take/check/site")
+ @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+ public R availableTakeCheckSite(){
+ return R.ok().add(basDevpService.getAvailableOutSite(103));
}
@RequestMapping("/available/empty/take/site")
@@ -111,7 +117,7 @@
return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
} else if (type == 3) {
workService.pickWrkMast(workNo, getUserId());
- return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡鍏ュ簱");
+ return R.ok();
}
return R.ok();
}
--
Gitblit v1.9.1