From c1702cc51a4d94ed37d5083494c87fe0f2cbe5b3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 18 六月 2021 10:20:13 +0800
Subject: [PATCH] # 销售单取消后回滚立库出库至A99

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpService.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

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 1f1e729..4404926 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
@@ -11,8 +11,10 @@
 import zy.cloud.wms.common.service.erp.entity.UploadBillDetail;
 import zy.cloud.wms.manager.entity.DocType;
 import zy.cloud.wms.manager.entity.Mat;
+import zy.cloud.wms.manager.entity.RequestLog;
 import zy.cloud.wms.manager.service.DocTypeService;
 import zy.cloud.wms.manager.service.MatService;
+import zy.cloud.wms.manager.service.RequestLogService;
 import zy.cloud.wms.manager.utils.HttpHandler;
 
 import java.util.ArrayList;
@@ -30,13 +32,12 @@
     private DocTypeService docTypeService;
     @Autowired
     private MatService matService;
+    @Autowired
+    private RequestLogService requestLogService;
     /**
      * 鍗曟嵁涓婃姤
      */
     public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
-        if (true) {
-//            return true;
-        }
         try {
             if (Cools.isEmpty(dtos)) {
                 return false;
@@ -52,6 +53,11 @@
             uploadBill.setBTypeID("SHHT");
             uploadBill.setKTypeID("瀹忔尯浠撳簱");
             uploadBill.setVchType(docId);
+            if (docId == 9) {
+                uploadBill.setDifAtype(22);
+            } else if (docId == 14) {
+                uploadBill.setDifAtype(23);
+            }
             uploadBill.setSummary(docType.getDocName() + " - " + DateUtils.convert(new Date(), "yyyy-MM-dd HH:mm"));
             List<UploadBillDetail> detail = new ArrayList<>();
             uploadBill.setDetail(detail);
@@ -64,7 +70,7 @@
                 detl.setUnit(mat==null?"鏆傛棤":mat.getUnit());
                 detail.add(detl);
             }
-            System.out.println(JSON.toJSONString(uploadBill));
+            log.warn(JSON.toJSONString(uploadBill));
             String response = new HttpHandler.Builder()
                     .setUri(ErpScheduler.URI)
                     .setPath(ErpScheduler.UPLOAD_BILL)
@@ -72,6 +78,19 @@
                     .build()
                     .doPost();
 
+            try {
+                // 鏃ュ織璁板綍
+                RequestLog logInfo = new RequestLog();
+                logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId.toString());
+                logInfo.setRequest(JSON.toJSONString(uploadBill)); // 鍏ュ弬
+                logInfo.setResponse(response); // 鍑哄弬
+                logInfo.setCreateTime(new Date());
+                requestLogService.insert(logInfo);
+            } catch (Exception e) {
+                log.error(e.getMessage());
+            }
+
+
             if (!Cools.isEmpty(response)) {
                 log.warn(response);
                 Result result = JSON.parseObject(response, Result.class);

--
Gitblit v1.9.1