From 96f92ed5f6c0e3ac57214828e09b5aa4fa33270a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期三, 12 十一月 2025 14:58:35 +0800
Subject: [PATCH] erp对接接口开发

---
 src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
index b40c44d..bf71b92 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakinSyncHandler.java
@@ -5,10 +5,7 @@
 import com.core.common.Cools;
 import com.core.common.DateUtils;
 import com.core.exception.CoolException;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.entity.OrderDetlPakin;
-import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.*;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.DocTypeService;
 import com.zy.asrs.service.OrderDetlPakinService;
@@ -23,6 +20,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -51,12 +49,14 @@
             return FAIL.setMsg("鏈壘鍒板搴旂殑鍗曟嵁绫诲瀷锛�" + order.getOrderNo());
         }
 
-        MesPakinParam pakinParam = new MesPakinParam();
+        ErpReportDto param = new ErpReportDto();
+        param.setOrderDetails(new ArrayList<>());
         List<OrderDetlPakin> orderDetls = orderDetlPakinService.selectByOrderId(order.getId());
         for (OrderDetlPakin orderDetl : orderDetls) {
-            String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
-            pakinParam.getList().add(new MesPakinParam.Detl(orderDetl.getMatnr() + (Cools.isEmpty(serial) ? "" : "-" + serial), orderDetl.getAnfme()));
+            param.getOrderDetails().add(new ErpReportDto.DetlDto(orderDetl.getMatnr(),orderDetl.getQty()));
         }
+        param.setOrderNo(order.getOrderNo());
+
         String response = "";
         boolean success = false;
         ReturnT<String> result = SUCCESS;
@@ -64,7 +64,7 @@
             response = new HttpHandler.Builder()
                     .setUri(MesConstant.URI)
                     .setPath(MesConstant.PAKIN_PATH)
-                    .setJson(JSON.toJSONString(pakinParam))
+                    .setJson(JSON.toJSONString(param))
                     .build()
                     .doPost();
             JSONObject jsonObject = JSON.parseObject(response);
@@ -73,7 +73,7 @@
                 orderPakinService.updateSettle(order.getId(), 6L, null);
                 success = true;
             } else {
-                log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(pakinParam), response);
+                log.error("鍏ュ簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKIN_PATH, JSON.toJSONString(param), response);
                 throw new CoolException("鍏ュ簱瀹屾垚涓婃姤erp澶辫触");
             }
         } catch (Exception e) {
@@ -87,7 +87,7 @@
                         MesConstant.URI + MesConstant.PAKIN_PATH,
                         null,
                         "127.0.0.1",
-                        JSON.toJSONString(pakinParam),
+                        JSON.toJSONString(param),
                         response,
                         success
                 );

--
Gitblit v1.9.1