From ef19ce2bc384c00b590ebdbd4e8c14ebfa9f0188 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 24 十月 2024 14:49:14 +0800
Subject: [PATCH] 去掉日志打印

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

diff --git a/src/main/java/com/zy/asrs/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index f5b8749..0fb0d13 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -1,13 +1,16 @@
 package com.zy.asrs.controller;
 
 import com.core.annotations.ManagerAuth;
+import com.core.common.Cools;
 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;
@@ -33,19 +36,19 @@
     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(){
         List<Map<String, Object>> result = new ArrayList<>();
         List<Integer> outSite = basDevpService.getAvailableOutSite(101);
@@ -66,13 +69,13 @@
     }
 
     @RequestMapping("/available/take/check/site")
-    @ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
+    @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());
     }
@@ -87,6 +90,13 @@
     @ManagerAuth(memo = "鍑哄簱浣滀笟")
     public R fullStoreTakeStart(@RequestBody StockOutParam param) {
         workService.startupFullTakeStore(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    @RequestMapping("/plate/order/out/start")
+    @ManagerAuth(memo = "鎵嬪姩璁㈠崟鍑哄簱浣滀笟")
+    public R fullStoreTakeStartOrder(@RequestBody StockOutParam param) {
+        workService.startupFullTakeStoreOrder(param, getUserId());
         return R.ok("鍑哄簱鍚姩鎴愬姛");
     }
 
@@ -118,6 +128,19 @@
         return R.ok("绉诲簱鍚姩鎴愬姛");
     }
 
+    @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())){
+            return R.error("鍙傛暟涓虹┖");
+        }
+        if (param.getLocDetls().size()>1){
+            return R.error("璇峰崟鏉℃暟鎹慨鏀癸紝璋ㄦ厧鎿嶄綔锛�");
+        }
+        workService.turnMatLocDetl(param, getUserId());
+        return R.ok("鍝佸彿绉讳氦鎴愬姛");
+    }
+
     @RequestMapping("/locDdetl/adjust/start")
     @ManagerAuth(memo = "搴撳瓨璋冩暣")
     public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
@@ -142,4 +165,18 @@
         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