From cc2b7c021293f25748711617ef182b2d15192dbd Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 29 六月 2021 14:47:40 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java        |   12 ++++++------
 src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java |    2 +-
 src/main/java/zy/cloud/wms/common/service/erp/ErpR.java              |   22 ++++++++++++++++++++++
 src/main/java/zy/cloud/wms/manager/controller/WorkController.java    |    6 ++++--
 src/main/java/zy/cloud/wms/manager/controller/OpenController.java    |    2 +-
 src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java |   16 ++++++++++------
 6 files changed, 44 insertions(+), 16 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpR.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpR.java
new file mode 100644
index 0000000..7fb9c2d
--- /dev/null
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpR.java
@@ -0,0 +1,22 @@
+package zy.cloud.wms.common.service.erp;
+
+import lombok.Data;
+
+/**
+ * Created by vincent on 2021/6/29
+ */
+@Data
+public class ErpR {
+
+    private Boolean success;
+
+    private String msg;
+
+    public ErpR() {
+    }
+
+    public ErpR(Boolean success, String msg) {
+        this.success = success;
+        this.msg = msg;
+    }
+}
diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
index 4404926..df02ccb 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpService.java
@@ -37,14 +37,14 @@
     /**
      * 鍗曟嵁涓婃姤
      */
-    public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
+    public ErpR uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
         try {
             if (Cools.isEmpty(dtos)) {
-                return false;
+                return new ErpR(false, null);
             }
             DocType docType = docTypeService.selectById(docId);
             if (Cools.isEmpty(docType)) {
-                return false;
+                return new ErpR(false, null);
             }
 
             UploadBill uploadBill = new UploadBill();
@@ -95,14 +95,14 @@
                 log.warn(response);
                 Result result = JSON.parseObject(response, Result.class);
                 if (result.getCode() != 1) {
-                    return false;
+                    return new ErpR(false, result.getMsg());
                 }
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return false;
+            return new ErpR(false, e.getMessage());
         }
-        return Boolean.TRUE;
+        return new ErpR(true, null);
     }
 
 
diff --git a/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java b/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
index 3481873..4ac04c9 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/LocSyncController.java
@@ -118,7 +118,7 @@
                 res.setMatnr(executeData.getMatnr());
                 res.setQty(executeData.getQty());
                 dtos.add(res);
-                if (erpService.uploadBill(dtos, docId, docNum)) {
+                if (erpService.uploadBill(dtos, docId, docNum).getSuccess()) {
                     // 鎴愬姛鍚庡垹闄や换鍔�
                     if (!wrkLocSyncService.delete(new EntityWrapper<WrkLocSync>().eq("matnr", executeData.getMatnr()))) {
                         log.info("搴撳瓨鍚屾鍒犻櫎浠诲姟澶辫触,浠诲姟matnr=" + executeData.getMatnr() + "鏃堕棿=" + new Date());
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 5eb24d4..d676f78 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/OpenController.java
@@ -50,7 +50,7 @@
 
     @PostMapping("/erp/upload")
     public R erpUpload(@RequestBody ErpUpload erpUpload){
-        Boolean result = erpService.uploadBill(erpUpload.getDtos(), erpUpload.getDocId(), erpUpload.getDocNumber());
+        Boolean result = erpService.uploadBill(erpUpload.getDtos(), erpUpload.getDocId(), erpUpload.getDocNumber()).getSuccess();
         return result ? R.ok() : R.error();
     }
 
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index 5d79466..fd7b482 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -15,6 +15,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import zy.cloud.wms.common.model.BillDto;
+import zy.cloud.wms.common.service.erp.ErpR;
 import zy.cloud.wms.common.service.erp.ErpService;
 import zy.cloud.wms.common.web.BaseController;
 import zy.cloud.wms.manager.entity.*;
@@ -220,8 +221,9 @@
             throw new CoolException("鏁版嵁寮傚父");
         }
         // erp涓婁紶鐩樼泩鐩樹簭
-        if (!erpService.uploadBill(dtos, docId, docNum)) {
-            throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+        ErpR erpR = erpService.uploadBill(dtos, docId, docNum);
+        if (!erpR.getSuccess()) {
+            throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg());
         }
         String dotsStr = JSON.toJSONString(dtos);
         log.info("鐩樼偣涓婁紶锛岀被鍨嬶細" + (docId == 14 ? "鐩樼泩" : "鐩樹簭") + "锛屽崟鍙凤細" + docNum + "锛屼笂浼犵墿鏂欐竻鍗�:" + dotsStr);
diff --git a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
index 57cf3e2..ee3054b 100644
--- a/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
+++ b/src/main/java/zy/cloud/wms/manager/service/impl/WorkServiceImpl.java
@@ -17,6 +17,7 @@
 import zy.cloud.wms.common.service.MainService;
 import zy.cloud.wms.common.service.asrs.AsrsService;
 import zy.cloud.wms.common.service.asrs.entity.Result1;
+import zy.cloud.wms.common.service.erp.ErpR;
 import zy.cloud.wms.common.service.erp.ErpService;
 import zy.cloud.wms.common.utils.VersionUtils;
 import zy.cloud.wms.manager.entity.*;
@@ -132,8 +133,9 @@
             billDto.setQty(dto.getCount());
             dtos.add(billDto);
         }
-        if (!erpService.uploadBill(dtos, docId, docNum)) {
-            throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+        ErpR erpR = erpService.uploadBill(dtos, docId, docNum);
+        if (!erpR.getSuccess()) {
+            throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg());
         }
 
         return R.ok("鍏ュ簱鎴愬姛");
@@ -264,8 +266,9 @@
             billDto.setQty(comb.getAnfme());
             dtos.add(billDto);
         }
-        if (!erpService.uploadBill(dtos, param.getDocType(), docNum)) {
-            throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+        ErpR erpR = erpService.uploadBill(dtos, param.getDocType(), docNum);
+        if (!erpR.getSuccess()) {
+            throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg());
         }
         return R.ok();
     }
@@ -877,8 +880,9 @@
         billDto.setMatnr(check.getMatnr());
         billDto.setQty(Math.abs(check.getDiffQty()));
         dtos.add(billDto);
-        if (!erpService.uploadBill(dtos, docId.intValue(), docNum)) {
-            throw new CoolException("鏃犳硶涓婃姤鑷砮rp");
+        ErpR erpR = erpService.uploadBill(dtos, docId.intValue(), docNum);
+        if (!erpR.getSuccess()) {
+            throw new CoolException("鏃犳硶涓婃姤鑷砮rp锛�"+erpR.getMsg());
         }
         return R.ok();
     }

--
Gitblit v1.9.1