From 22bfc5e302e8896154d06642d36410ad0c557e25 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 10 八月 2021 08:32:14 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java |   31 +++++++++++++++++++++----------
 1 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
index ddedda6..f1ba192 100644
--- a/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
+++ b/src/main/java/zy/cloud/wms/common/service/erp/ErpScheduler.java
@@ -65,6 +65,8 @@
     private NodeService nodeService;
     @Autowired
     private DocLogService docLogService;
+    @Autowired
+    private RequestLogService requestLogService;
 
     /**
      * 鍟嗗搧涓嬭浇
@@ -606,6 +608,13 @@
                             docLogService.insert(docLog);
                         }
 
+                        RequestLog logInfo = new RequestLog();
+                        logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + 11);
+                        logInfo.setRequest(JSON.toJSONString(getOrderResult0)); // 鍏ュ弬
+                        logInfo.setResponse(response); // 鍑哄弬
+                        logInfo.setCreateTime(new Date());
+                        requestLogService.insert(logInfo);
+
                     } catch (Exception e) {
                         log.error(e.getMessage());
                     }
@@ -613,20 +622,13 @@
                     if (!Cools.isEmpty(response)) {
                         log.warn(response);
                         Result result = JSON.parseObject(response, Result.class);
-                        if (result.getCode() != 1) {
+                        if (result.getCode() != 1 && !result.getMsg().equals("鍗曟嵁宸茬粡瀹℃牳瀹屾垚鎴栧垹闄わ紝涓嶈兘瀹℃牳銆�")) {
                             continue;
                         }
                         if (!orderService.updateSettle(order.getOrderNo(), 6L)) {
                             throw new CoolException("淇敼璁㈠崟鐘舵�佸け璐�");
                         }
-//                        // 杞巻鍙叉。
-//                        int save = custOrderMapper.saveLog(getOrderResult0.getNumber());
-//                        if (save > 0) {
-//                            if (custOrderMapper.delete(new EntityWrapper<CustOrder>().eq("number", getOrderResult0.getNumber())) == 0) {
-//                                throw new CoolException("鍒犻櫎閿�鍞鍗曞け璐�");
-//                            }
-//                            log.info("{}閿�鍞鍗曟嫞璐х粨鏉�", getOrderResult0.getNumber());
-//                        }
+
                     }
 
                 }
@@ -705,7 +707,16 @@
                             .doPost();
 
                     try {
-                        docLogService.insertBatch(docLogs);
+                        for (DocLog docLog : docLogs) {
+                            docLogService.insert(docLog);
+                        }
+
+                        RequestLog logInfo = new RequestLog();
+                        logInfo.setName("鍗曟嵁涓婁紶锛屽崟鎹被鍨�" + 6);
+                        logInfo.setRequest(JSON.toJSONString(getOrderResult0)); // 鍏ュ弬
+                        logInfo.setResponse(response); // 鍑哄弬
+                        logInfo.setCreateTime(new Date());
+                        requestLogService.insert(logInfo);
                     } catch (Exception e) {
                         log.error(e.getMessage());
                     }

--
Gitblit v1.9.1