From a4bbc17545f06018fcee7d55380084d069fbc863 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 14 四月 2021 09:10:16 +0800
Subject: [PATCH] 4.13小太阳需求改动

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

diff --git a/src/main/java/com/zy/asrs/controller/OutStockController.java b/src/main/java/com/zy/asrs/controller/OutStockController.java
index 147213a..7d982c9 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -4,14 +4,19 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.common.R;
+import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.param.StockOutParam;
 import com.zy.asrs.service.OutStockService;
+import com.zy.asrs.service.WorkService;
 import com.zy.common.service.erp.entity.OutStockBillEntry;
 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.List;
 import java.util.Map;
 
 @RestController
@@ -19,7 +24,16 @@
 
     @Autowired
     private OutStockService outStockService;
+    @Autowired
+    private WorkService workService;
 
+    /**
+     *
+     * @param curr
+     * @param limit
+     * @param param
+     * @return
+     */
     @RequestMapping(value = "/outStock/query/list")
     @ManagerAuth
     public R outStockQueryList(@RequestParam(defaultValue = "1")Integer curr,
@@ -27,4 +41,23 @@
                           @RequestParam Map<String, Object> param){
         return R.ok(outStockService.queryOutStock(toPage(curr, limit, param, OutStockBillEntry.class)));
     }
+
+    /**
+     * 妫�绱㈢鍚堥�氱煡鍗曠殑搴撳瓨鐗╂枡
+     * @param fbillNo
+     * @return
+     */
+    @RequestMapping(value = "/outStock/query/locList")
+    @ManagerAuth
+    public R queryMatWithLoc(String fbillNo) {
+        List<LocDetl> list = outStockService.queryMatWithLoc(fbillNo);
+        return R.ok(list);
+    }
+
+    @RequestMapping(value = "/plate/outStock/start")
+    @ManagerAuth(memo = "鍑哄簱浣滀笟")
+    public R fullStoreTakeStart(@RequestBody StockOutParam param) {
+        outStockService.startupFullTakeStore(param, getUserId());
+        return R.ok("鍑哄簱鍚姩鎴愬姛");
+    }
 }

--
Gitblit v1.9.1