From 2d9665253e34da384fde299e2bc152a99f0c8ece Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 30 三月 2022 10:59:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/ErpService.java |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/ErpService.java b/src/main/java/com/zy/common/service/ErpService.java
index 322db8a..55f0995 100644
--- a/src/main/java/com/zy/common/service/ErpService.java
+++ b/src/main/java/com/zy/common/service/ErpService.java
@@ -3,8 +3,12 @@
 import com.alibaba.fastjson.JSON;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.zy.asrs.entity.DocLog;
 import com.zy.asrs.entity.MatCode;
+import com.zy.asrs.entity.RequestLog;
+import com.zy.asrs.service.DocLogService;
 import com.zy.asrs.service.MatCodeService;
+import com.zy.asrs.service.RequestLogService;
 import com.zy.common.model.BillDto;
 import com.zy.common.model.UploadBill;
 import com.zy.common.model.UploadBillDetail;
@@ -27,19 +31,28 @@
 
     @Value("${erp.url}")
     private String url;
-    
+
     public static final String UPLOAD_BILL = "cM/basis/uploadBill";
 
     @Autowired
     private MatCodeService matCodeService;
+    @Autowired
+    private RequestLogService requestLogService;
+    @Autowired
+    private DocLogService docLogService;
+
     /**
      * 鍗曟嵁涓婃姤
      */
     public Boolean uploadBill(List<BillDto> dtos, Integer docId, String docNumber){
         try {
+            Date now = new Date();
             if (Cools.isEmpty(dtos)) {
                 return false;
             }
+
+            // 鏃ュ織
+            List<DocLog> docLogs = new ArrayList<>();
 
             UploadBill uploadBill = new UploadBill();
             uploadBill.setNumber(docNumber);
@@ -63,14 +76,43 @@
                 detl.setPrice(0);
                 detl.setUnit(mat==null?"鏆傛棤":"绠�");
                 detail.add(detl);
+
+
+                // 鏃ュ織
+                docLogs.add(new DocLog(
+                        docNumber,    // 鍗曟嵁缂栧彿
+                        docId.longValue(),    // 鍗曟嵁绫诲瀷
+                        null,    // 鍗曟嵁鍚嶇О
+                        dto.getMatnr(),    // 鍟嗗搧缂栧彿
+                        dto.getQty(),    // 涓婃姤鏁伴噺
+                        1,    // 缁撴灉
+                        now,    // 涓婃姤鏃堕棿
+                        null    // 澶囨敞
+                ));
             }
-            System.out.println(JSON.toJSONString(uploadBill));
+            log.warn(JSON.toJSONString(uploadBill));
             String response = new HttpHandler.Builder()
                     .setUri(url)
                     .setPath(UPLOAD_BILL)
                     .setJson(JSON.toJSONString(uploadBill))
                     .build()
                     .doPost();
+            try {
+
+                for (DocLog docLog : docLogs) {
+                    docLogService.insert(docLog);
+                }
+
+                // 鏃ュ織璁板綍
+                RequestLog logInfo = new RequestLog();
+                logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + docId);
+                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);

--
Gitblit v1.9.1