From 106669c0b850f1467fed8eda92a12343bb9d88d1 Mon Sep 17 00:00:00 2001
From: mrzhssss <pro6@qq.com>
Date: 星期五, 25 十一月 2022 10:32:17 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java       |    6 ++++++
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   23 +++++++++++------------
 src/main/resources/application.yml                           |    6 +++++-
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..c9027d1 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -9,6 +9,7 @@
 import com.zy.common.entity.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -29,6 +30,10 @@
     @Autowired
     private ApiLogService apiLogService;
 
+
+    @Value("${erp.enable}")
+    private Boolean erpEnable;
+
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog(){
         try {
@@ -41,6 +46,7 @@
 //    @Scheduled(cron = "0/5 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
+        if (!erpEnable) return;
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
             List<Order> orders = orderService.selectComplete();
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index 43b50b1..88fbc9f 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -20,6 +20,7 @@
 import com.zy.common.utils.HttpHandler;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,30 +45,28 @@
     @Autowired
     private DocTypeService docTypeService;
 
+    @Value("${erp.erpUrl}")
+    private String url;
+
     @Transactional
     public ReturnT<String> start(Order order) {
         DocType docType = docTypeService.selectById(order.getDocType());
         if (null == docType) {
+            log.info("涓婃姤鍑洪敊锛屼笉瀛樺湪璇ュ崟鎹被鍨嬶細 " + order);
             return SUCCESS;
         }
         List<OrderDetl> orderDetls = orderDetlService.selectByOrderId(order.getId());
         // 鍏ュ簱瀹屾垚涓婃姤
         if (docType.getPakin() == 1) {
-            MesPakinParam pakinParam = new MesPakinParam();
-            pakinParam.setPakinTime(DateUtils.convert(order.getUpdateTime()));
-            pakinParam.setLgortFrom("5008");
-            pakinParam.setLgortTo("5006");
-            for (OrderDetl orderDetl : orderDetls) {
-                String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
-                pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
-            }
+            JSONObject orderJson = new JSONObject();
+            orderJson.put("orderNo",order.getOrderNo());
             String response = "";
             boolean success = false;
             try {
                 response = new HttpHandler.Builder()
                         .setUri(MesConstant.URL)
                         .setPath(MesConstant.PAKIN_URL)
-                        .setJson(JSON.toJSONString(pakinParam))
+                        .setJson(orderJson.toJSONString())
                         .build()
                         .doPost();
                 JSONObject jsonObject = JSON.parseObject(response);
@@ -78,7 +77,7 @@
                         throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
                     }
                 } else {
-                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(pakinParam), response);
+                    log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(orderJson), response);
                     throw new CoolException("涓婃姤mes绯荤粺澶辫触");
                 }
             } catch (Exception e) {
@@ -89,11 +88,11 @@
                 try {
                     // 淇濆瓨鎺ュ彛鏃ュ織
                     apiLogService.save(
-                            "鎴愬搧搴撳叆搴撲笂鎶�",
+                            "鍏ュ簱涓婃姤",
                             MesConstant.URL + MesConstant.PAKIN_URL,
                             null,
                             "127.0.0.1",
-                            JSON.toJSONString(pakinParam),
+                            JSON.toJSONString(orderJson),
                             response,
                             success
                     );
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 5ff8241..7a095bd 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -48,4 +48,8 @@
   # 鍙屾繁搴撲綅鎺掑彿
   doubleLocs: 1,4,5,8,9,12,13,16
   # 涓�涓爢鍨涙満璐熻矗鐨勮揣鏋舵帓鏁�
-  groupCount: 4
\ No newline at end of file
+  groupCount: 4
+
+#erp
+erp:
+  enable: false
\ No newline at end of file

--
Gitblit v1.9.1