From d51be0cdfd6fd3a146da1d4b5a808bc61c86b700 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 18 六月 2020 17:17:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/WorkController.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 78bfc8a..f653ef2 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -4,6 +4,8 @@
 import com.core.common.R;
 import com.zy.asrs.entity.param.EmptyPlateOutParam;
 import com.zy.asrs.entity.param.FullStoreParam;
+import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.service.BasDevpService;
 import com.zy.asrs.service.WorkService;
 import com.zy.common.web.BaseController;
@@ -37,6 +39,12 @@
         return R.ok().add(basDevpService.getAvailableEmptyInSite());
     }
 
+    @RequestMapping("/available/take/site")
+    @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
+    public R availableTakeSite(){
+        return R.ok().add(basDevpService.getAvailableOutSite());
+    }
+
     @RequestMapping("/available/empty/take/site")
     @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
     public R availableEmptyTakeSite(){
@@ -47,6 +55,13 @@
     @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
     public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
         return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+    }
+
+    @RequestMapping("/plate/out/start")
+    @ManagerAuth(memo = "鍏ㄦ澘鍑哄簱")
+    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+        workService.startupFullTakeStore(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
     @RequestMapping("/empty/plate/in/start")
@@ -70,14 +85,23 @@
         return R.ok("绉诲簱鍚姩鎴愬姛");
     }
 
+    @RequestMapping("/locDdetl/adjust/start")
+    @ManagerAuth(memo = "搴撳瓨璋冩暣")
+    public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
+        workService.adjustLocDetl(param, getUserId());
+        return R.ok("搴撳瓨璋冩暣鎴愬姛");
+    }
+
     @RequestMapping("/hand/control/wrkMast")
     @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
     public R handControlWrkMast(@RequestParam String workNo,
                                 @RequestParam Integer type){
         if (type == 1) {
             workService.completeWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗e凡瀹屾垚");
         } else if (type == 2) {
             workService.cancelWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗e凡鍙栨秷");
         }
         return R.ok();
     }

--
Gitblit v1.9.1