From 7e8c672d13a4d5c9ef6d8b62f6fc1ce092a6c123 Mon Sep 17 00:00:00 2001
From: ytfl <ytfl@qq.com>
Date: 星期一, 11 八月 2025 08:23:14 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 8b6a223..66e78e6 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -37,19 +37,19 @@
 
     @RequestMapping("/available/put/site")
     @ManagerAuth()
-    public R availablePutSite(){
+    public R availablePutSite() {
         return R.ok().add(basDevpService.getAvailableInSite());
     }
 
     @RequestMapping("/available/empty/put/site")
     @ManagerAuth()
-    public R availableEmptyPutSite(){
+    public R availableEmptyPutSite() {
         return R.ok().add(basDevpService.getAvailableEmptyInSite());
     }
 
     @RequestMapping("/available/take/site")
     @ManagerAuth()
-    public R availableTakeSite(){
+    public R availableTakeSite() {
         List<Map<String, Object>> result = new ArrayList<>();
         List<Integer> outSite = basDevpService.getAvailableOutSite(101);
         for (Integer siteId : outSite) {
@@ -68,27 +68,52 @@
         return R.ok().add(result);
     }
 
+    @RequestMapping("/turn/over/out/start")
+    @ManagerAuth(memo = "瀹㈡埛杞崲")
+    public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
+        workService.turnOverOut(param, getUserId());
+        return R.ok("瀹㈡埛杞崲鎴愬姛");
+    }
+
     @RequestMapping("/available/take/check/site")
     @ManagerAuth()
-    public R availableTakeCheckSite(){
+    public R availableTakeCheckSite() {
         return R.ok().add(basDevpService.getAvailableOutSite(107));
     }
 
     @RequestMapping("/available/empty/take/site")
     @ManagerAuth()
-    public R availableEmptyTakeSite(){
+    public R availableEmptyTakeSite() {
         return R.ok().add(basDevpService.getAvailableEmptyOutSite());
     }
 
     @RequestMapping("/full/store/put/start")
     @ManagerAuth(memo = "鍏ㄦ澘鍏ュ簱")
     public R fullStorePutStart(@RequestBody FullStoreParam fullStoreParam) {
-        return R.ok("鍏ュ簱鍚姩鎴愬姛").add(workService.startupFullPutStore(fullStoreParam,getUserId()));
+        try {
+            String locNo = workService.startupFullPutStore(fullStoreParam, getUserId());
+            return R.ok("鍏ュ簱鍚姩鎴愬姛").add(locNo);
+        } catch (Exception e) {
+            return R.error("鍏ュ簱鍚姩澶辫触==>" + e.getMessage());
+        }
     }
 
     @RequestMapping("/plate/out/start")
     @ManagerAuth(memo = "鍑哄簱浣滀笟")
     public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+        /*if (getUser().getRoleId()!=2 && getUser().getRoleId()!=14){
+            return R.error("鏃犳潈闄� 璇疯仈绯荤鐞嗗憳");
+        }*/
+        workService.startupFullTakeStore(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/plate/out/start/v2")
+    @ManagerAuth(memo = "鍑哄簱浣滀笟2")
+    public R fullStoreTakeStartV2(@RequestBody StockOutParam param) {
+        if (Cools.isEmpty(param.getItemId())) {
+            return R.error("杞叆浠撳簱涓嶈兘涓虹┖");
+        }
         workService.startupFullTakeStore(param, getUserId());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
@@ -124,10 +149,10 @@
     @RequestMapping("/mat/turn/over/out/start")
     @ManagerAuth(memo = "鍝佸彿绉讳氦")
     public R turnMatLocDetl(@RequestBody EmptyPlateOutParam param) {
-        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(),param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())){
+        if (Cools.isEmpty(param) || Cools.isEmpty(param.getLocDetls(), param.getMatId()) || Cools.isEmpty(param.getLocDetls().get(0)) || Cools.isEmpty(param.getLocDetls().get(0).getMatnr())) {
             return R.error("鍙傛暟涓虹┖");
         }
-        if (param.getLocDetls().size()>1){
+        if (param.getLocDetls().size() > 1) {
             return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
         }
         workService.turnMatLocDetl(param, getUserId());
@@ -144,7 +169,7 @@
     @RequestMapping("/hand/control/wrkMast")
     @ManagerAuth(memo = "鎵嬪姩澶勭悊宸ヤ綔妗�")
     public R handControlWrkMast(@RequestParam String workNo,
-                                @RequestParam Integer type){
+                                @RequestParam Integer type) {
         if (type == 1) {
             workService.completeWrkMast(workNo, getUserId());
             return R.ok("宸ヤ綔妗ｅ凡瀹屾垚");

--
Gitblit v1.9.1