From 118d83c4768b58a42bc54ab73967f53b930b63d7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 23 四月 2022 13:12:18 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java |   25 +++++++++++++++++++++----
 1 files changed, 21 insertions(+), 4 deletions(-)

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 8dd523a..9008f74 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -6,6 +6,7 @@
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderDetlService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.AbstractHandler;
@@ -35,6 +36,8 @@
     private OrderService orderService;
     @Autowired
     private OrderDetlService orderDetlService;
+    @Autowired
+    private ApiLogService apiLogService;
 
     @Transactional
     public ReturnT<String> start(Order order) {
@@ -45,11 +48,12 @@
         pakinParam.setLgortFrom("5008");
         pakinParam.setLgortTo("5006");
         for (OrderDetl orderDetl : orderDetls) {
-            pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr(), orderDetl.getAnfme()));
+            pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + "-" + orderDetl.getBatch(), orderDetl.getAnfme()));
         }
-
+        String response = "";
+        boolean success = false;
         try {
-            String response = new HttpHandler.Builder()
+            response = new HttpHandler.Builder()
                         .setUri(MesConstant.URL)
                         .setPath(MesConstant.PAKIN_URL)
                         .setJson(JSON.toJSONString(pakinParam))
@@ -57,6 +61,7 @@
                         .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
             if (jsonObject.getInteger("code").equals(200)) {
+                success = true;
                 // 淇敼璁㈠崟鐘舵�� 4.瀹屾垚 ===>> 6.宸蹭笂鎶�
                 if (!orderService.updateSettle(order.getId(), 6L, null)) {
                     throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
@@ -67,9 +72,21 @@
             }
         } catch (Exception e) {
             log.error("fail", e);
-            e.printStackTrace();
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             return FAIL.setMsg(e.getMessage());
+        } finally {
+            try {
+                // 淇濆瓨鎺ュ彛鏃ュ織
+                apiLogService.save(
+                        "鎴愬搧搴撳叆搴撲笂鎶�",
+                        MesConstant.URL + MesConstant.PAKIN_URL,
+                        null,
+                        "127.0.0.1",
+                        JSON.toJSONString(pakinParam),
+                        response,
+                        success
+                );
+            } catch (Exception e) { log.error("", e); }
         }
         return SUCCESS;
     }

--
Gitblit v1.9.1