From d3d155627aac7ed9529eabc3de4a2dab4bda504e Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 13 十一月 2025 13:19:51 +0800
Subject: [PATCH] ERP接口对接完善
---
src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java | 29 ++++++++++++++---------------
1 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
index 1b670a3..76ca839 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderPakoutSyncHandler.java
@@ -5,16 +5,14 @@
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.OrderDetlPakout;
-import com.zy.asrs.entity.OrderPakout;
+import com.zy.asrs.entity.*;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.DocTypeService;
import com.zy.asrs.service.OrderDetlPakoutService;
import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.common.constant.ApiInterfaceConstant;
import com.zy.common.constant.MesConstant;
import com.zy.common.model.MesPakoutParam;
import com.zy.common.utils.HttpHandler;
@@ -23,6 +21,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -51,22 +50,22 @@
return FAIL.setMsg("鏈壘鍒板搴旂殑鍗曟嵁绫诲瀷锛�" + order.getOrderNo());
}
- MesPakoutParam pakoutParam = new MesPakoutParam();
- pakoutParam.setTag(!order.getDocType$().equalsIgnoreCase("鎵嬪姩鍑哄簱鍗�"));
- pakoutParam.setOrderNo(order.getOrderNo());
+ ErpReportDto param = new ErpReportDto();
+ param.setOrderDetails(new ArrayList<>());
List<OrderDetlPakout> orderDetls = orderDetlPakoutService.selectByOrderId(order.getId());
for (OrderDetlPakout orderDetl : orderDetls) {
- String serial = Cools.isEmpty(orderDetl.getBatch()) ? "" : orderDetl.getBatch();
- pakoutParam.getList().add(new MesPakoutParam.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;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URI)
- .setPath(MesConstant.PAKOUT_PATH)
- .setJson(JSON.toJSONString(pakoutParam))
+ .setUri(ApiInterfaceConstant.ERP_IP)
+ .setPath(ApiInterfaceConstant.PAKOUT_PATH)
+ .setJson(JSON.toJSONString(param))
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
@@ -75,7 +74,7 @@
orderPakoutService.updateSettle(order.getId(), 6L, null);
success = true;
} else {
- log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URI + MesConstant.PAKOUT_PATH, JSON.toJSONString(pakoutParam), response);
+ log.error("鍑哄簱瀹屾垚涓婃姤erp澶辫触锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKOUT_PATH, JSON.toJSONString(param), response);
throw new CoolException("鍑哄簱瀹屾垚涓婃姤erp澶辫触");
}
} catch (Exception e) {
@@ -86,10 +85,10 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鍑哄簱瀹屾垚涓婃姤",
- MesConstant.URI + MesConstant.PAKOUT_PATH,
+ ApiInterfaceConstant.ERP_IP + ApiInterfaceConstant.PAKOUT_PATH,
null,
"127.0.0.1",
- JSON.toJSONString(pakoutParam),
+ JSON.toJSONString(param),
response,
success
);
--
Gitblit v1.9.1