From ed72baa5f60f2d86cc58799ce96c658321a54d79 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期五, 30 四月 2021 13:53:54 +0800
Subject: [PATCH] 1.erp立库出库对接 2.erp平仓出库对接

---
 src/main/java/com/zy/asrs/controller/OutStockController.java |   79 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 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..362dcf0 100644
--- a/src/main/java/com/zy/asrs/controller/OutStockController.java
+++ b/src/main/java/com/zy/asrs/controller/OutStockController.java
@@ -4,22 +4,47 @@
 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.LocNormal;
+import com.zy.asrs.entity.param.LocNormalStockOutParam;
+import com.zy.asrs.entity.param.StockOutParam;
+import com.zy.asrs.service.LocNormalService;
 import com.zy.asrs.service.OutStockService;
+import com.zy.asrs.service.WorkService;
+import com.zy.common.service.erp.ErpService;
 import com.zy.common.service.erp.entity.OutStockBillEntry;
 import com.zy.common.web.BaseController;
+import lombok.extern.slf4j.Slf4j;
 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.Date;
+import java.util.List;
 import java.util.Map;
 
+@Slf4j
 @RestController
 public class OutStockController extends BaseController {
 
     @Autowired
     private OutStockService outStockService;
+    @Autowired
+    private WorkService workService;
+    @Autowired
+    private LocNormalService locNormalService;
+    @Autowired
+    private ErpService erpService;
 
+    /**
+     *
+     * @param curr
+     * @param limit
+     * @param param
+     * @return
+     */
     @RequestMapping(value = "/outStock/query/list")
     @ManagerAuth
     public R outStockQueryList(@RequestParam(defaultValue = "1")Integer curr,
@@ -27,4 +52,58 @@
                           @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("鍑哄簱鍚姩鎴愬姛");
+    }
+
+    /**
+     * 妫�绱㈢鍚堥�氱煡鍗曠殑骞充粨搴撳瓨鐗╂枡
+     * @param fbillNo
+     * @return
+     */
+    @RequestMapping(value = "/outStock/query/locNormalList")
+    @ManagerAuth
+    public R queryMatWithLocNormal(String fbillNo) {
+        List<LocNormal> list = locNormalService.queryLocNorlMatnr(fbillNo);
+        return R.ok(list);
+    }
+
+
+    /**
+     * 骞充粨瀵规帴erp鍑哄簱
+     * @param
+     * @return
+     */
+    @RequestMapping(value = "/outStock/locNormal")
+    @ManagerAuth
+    public R outStockLocNormal(@RequestBody LocNormalStockOutParam param) {
+        Long modiUser = getUserId();
+        Date modiTime = new Date();
+        for (LocNormal locNormals:param.getList()) {
+            // erp涓棿琛ㄦ洿鏂版暟鎹�
+            Integer FInterI = outStockService.queryOutStockFInterID(param.getSupplier()); // 鑾峰彇鍑哄簱鍗曚富琛ㄤ富閿�
+            if (!erpService.incrementCPakOut(FInterI, locNormals.getMatnr(), locNormals.getAnfme().doubleValue(), param.getSupplier())) {
+                log.info("鏇存柊ERP鎴愬搧鍑哄簱鏁版嵁[matnr={0}]澶辫触", locNormals.getMatnr());
+            }
+            // 鎶婂搴旂墿鏂欏钩浠撳簱瀛樺嚭搴�
+            locNormalService.outLocNormal(locNormals.getMatnr(), modiUser, modiTime, locNormals.getId());
+        }
+        return R.ok("骞充粨鍑哄簱鎴愬姛");
+    }
 }

--
Gitblit v1.9.1