From e4ea838c20e94dff4fdbb4f82b542a8b5790fa9d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 09:22:06 +0800
Subject: [PATCH] # 库存跳转上报erp

---
 src/main/java/zy/cloud/wms/manager/controller/OpenController.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
index ac5f42f..5eb24d4 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -12,8 +12,12 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import zy.cloud.wms.common.entity.Parameter;
+import zy.cloud.wms.common.model.ErpUpload;
+import zy.cloud.wms.common.model.param.ReplenishDto;
 import zy.cloud.wms.common.model.param.ReplenishParam;
+import zy.cloud.wms.common.service.erp.ErpService;
 import zy.cloud.wms.common.utils.VersionUtils;
+import zy.cloud.wms.common.web.BaseController;
 import zy.cloud.wms.manager.entity.LocDetl;
 import zy.cloud.wms.manager.entity.Mat;
 import zy.cloud.wms.manager.entity.Node;
@@ -22,7 +26,6 @@
 import zy.cloud.wms.manager.service.MatService;
 import zy.cloud.wms.manager.service.NodeService;
 import zy.cloud.wms.manager.service.PriorService;
-import zy.cloud.wms.system.service.ConfigService;
 
 import java.util.Date;
 import java.util.List;
@@ -32,7 +35,7 @@
  */
 @RestController
 @RequestMapping("/open/api")
-public class OpenController {
+public class OpenController extends BaseController {
 
     @Autowired
     private PriorService priorService;
@@ -43,16 +46,22 @@
     @Autowired
     private LocDetlService locDetlService;
     @Autowired
-    private ConfigService configService;
+    private ErpService erpService;
+
+    @PostMapping("/erp/upload")
+    public R erpUpload(@RequestBody ErpUpload erpUpload){
+        Boolean result = erpService.uploadBill(erpUpload.getDtos(), erpUpload.getDocId(), erpUpload.getDocNumber());
+        return result ? R.ok() : R.error();
+    }
 
     @PostMapping("/replenish")
     @Transactional
-    public R asrsReplenish(@RequestBody List<ReplenishParam> params){
-        if (Cools.isEmpty(params)) {
+    public R asrsReplenish(@RequestBody ReplenishParam params){
+        if (Cools.isEmpty(params.getList())) {
             return R.parse(BaseRes.PARAM);
         }
         Date now = new Date();
-        for (ReplenishParam param : params) {
+        for (ReplenishDto param : params.getList()) {
             Mat mat = matService.selectByMatnr(param.getMatnr());
             List<Prior> priors = priorService.selectList(new EntityWrapper<Prior>().eq("matnr", param.getMatnr()));
             // 鏈夋帹鑽愯揣浣�

--
Gitblit v1.9.1