From 03b5b8a480fb201e288486299eb385a00d2aac66 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 13 十月 2025 09:25:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/ycawdasrs-2' into ycawdasrs-2

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

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index e4ab767..5d86b36 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -2,18 +2,25 @@
 
 import com.core.annotations.ManagerAuth;
 import com.core.common.R;
+import com.zy.asrs.entity.WaitPakin;
 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.model.StartupDto;
 import com.zy.common.web.BaseController;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 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;
 
 /**
  * 宸ヤ綔娴佹帴鍙ｆ帶鍒跺櫒
@@ -28,25 +35,44 @@
     private BasDevpService basDevpService;
 
     @RequestMapping("/available/put/site")
-    @ManagerAuth(memo = "鑾峰彇鍏ュ簱绔欑偣")
+    @ManagerAuth()
     public R availablePutSite(){
         return R.ok().add(basDevpService.getAvailableInSite());
     }
 
     @RequestMapping("/available/empty/put/site")
-    @ManagerAuth(memo = "鑾峰彇绌烘澘鍏ュ簱绔欑偣")
+    @ManagerAuth()
     public R availableEmptyPutSite(){
         return R.ok().add(basDevpService.getAvailableEmptyInSite());
     }
 
     @RequestMapping("/available/take/site")
-    @ManagerAuth(memo = "鑾峰彇鍑哄簱绔欑偣")
+    @ManagerAuth()
     public R availableTakeSite(){
-        return R.ok().add(basDevpService.getAvailableOutSite());
+        List<Map<String, Object>> result = new ArrayList<>();
+        Map<String, Object> map = new HashMap<>();
+        map.put("siteId", "C1");
+        map.put("desc", "C1" + "锛堝嚭搴撳彛1锛�");
+        result.add(map);
+        Map<String, Object> map1 = new HashMap<>();
+        map1.put("siteId", "C2");
+        map1.put("desc", "C2" + "锛堝嚭搴撳彛2锛�");
+        result.add(map1);
+        Map<String, Object> map2 = new HashMap<>();
+        map2.put("siteId", "C3");
+        map2.put("desc", "C3" + "锛堝嚭搴撳彛3锛�");
+        result.add(map2);
+        return R.ok().add(result);
+    }
+
+    @RequestMapping("/available/take/check/site")
+    @ManagerAuth()
+    public R availableTakeCheckSite(){
+        return R.ok().add(basDevpService.getAvailableOutSite(107));
     }
 
     @RequestMapping("/available/empty/take/site")
-    @ManagerAuth(memo = "鑾峰彇绌烘澘鍑哄簱绔欑偣")
+    @ManagerAuth()
     public R availableEmptyTakeSite(){
         return R.ok().add(basDevpService.getAvailableEmptyOutSite());
     }
@@ -60,7 +86,7 @@
     @RequestMapping("/plate/out/start")
     @ManagerAuth(memo = "鍑哄簱浣滀笟")
     public R fullStoreTakeStart(@RequestBody StockOutParam param) {
-        workService.startupFullTakeStore(param, getUserId());
+        workService.startupFullTakeStore(param, getUser());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
@@ -80,7 +106,7 @@
     @RequestMapping("/locCheck/out/start")
     @ManagerAuth(memo = "鐩樼偣鍑哄簱")
     public R locCheckOutStart(@RequestBody StockOutParam param) {
-        workService.locCheckOut(param, getUserId());
+        workService.locCheckOut(param, getUser());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
@@ -109,8 +135,25 @@
         } 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();
     }
 
+    @RequestMapping("/create/waitPain/wrkMast/start")
+    @ManagerAuth(memo = "鐢熸垚浠诲姟")
+    public R createWaitPainWrkMastStart(@RequestBody List<WaitPakin> list) {
+        StartupDto startupDto = workService.createWaitPainWrkMastStart(list, getUserId());
+        return R.ok("浠诲姟鍙凤細" + startupDto.getWorkNo() + ";鐩爣搴撲綅锛�" + startupDto.getLocNo());
+    }
+
+    @RequestMapping("/deal/preHave/start")
+    @ManagerAuth(memo = "鍏堝叆鍝佸鐞�")
+    public R dealPreHave(@RequestParam Integer wrkNo) {
+        String locNo = workService.dealPreHaveStart(wrkNo, getUserId());
+        return R.ok("浠诲姟閲嶆柊鍏ュ簱锛岀洰鏍囧簱浣嶏細" + locNo);
+    }
+
 }

--
Gitblit v1.9.1