From d16d3b70e94f798d7e5abd145f8566d81d0c66c9 Mon Sep 17 00:00:00 2001
From: 18516761980 <4761516tqsxp>
Date: 星期二, 14 六月 2022 18:07:45 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 366f668..f5b8749 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;
@@ -12,6 +14,11 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -40,7 +47,28 @@
     @RequestMapping("/available/take/site")
     @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
     public R availableTakeSite(){
-        return R.ok().add(basDevpService.getAvailableOutSite());
+        List<Map<String, Object>> result = new ArrayList<>();
+        List<Integer> outSite = basDevpService.getAvailableOutSite(101);
+        for (Integer siteId : outSite) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堝叏鏉垮嚭搴撳彛锛�");
+            result.add(map);
+        }
+        List<Integer> pickOutSite = basDevpService.getAvailableOutSite(103);
+        for (Integer siteId : pickOutSite) {
+            Map<String, Object> map = new HashMap<>();
+            map.put("siteId", siteId);
+            map.put("desc", siteId + "锛堟嫞鏂欏嚭搴撳彛锛�");
+            result.add(map);
+        }
+        return R.ok().add(result);
+    }
+
+    @RequestMapping("/available/take/check/site")
+    @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+    public R availableTakeCheckSite(){
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
     }
 
     @RequestMapping("/available/empty/take/site")
@@ -53,6 +81,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")
@@ -68,6 +103,13 @@
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
+    @RequestMapping("/locCheck/out/start")
+    @ManagerAuth(memo = "鐩樼偣鍑哄簱")
+    public R locCheckOutStart(@RequestBody StockOutParam param) {
+        workService.locCheckOut(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
     @RequestMapping("/loc/move/start")
     @ManagerAuth(memo = "搴撲綅绉昏浆")
     public R locMoveStart(@RequestParam String sourceLocNo,
@@ -76,14 +118,26 @@
         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("宸ヤ綔妗ｅ凡瀹屾垚");
         } else if (type == 2) {
             workService.cancelWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗ｅ凡鍙栨秷");
+        } else if (type == 3) {
+            workService.pickWrkMast(workNo, getUserId());
+            return R.ok("宸ヤ綔妗ｅ凡鎷ｆ枡");
         }
         return R.ok();
     }

--
Gitblit v1.9.1