From c5ec00c68631a250a692a689d733daee29276f23 Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 15 四月 2026 08:58:42 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index 049081f..c0e913a 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -702,19 +702,19 @@
// 妯℃嫙璋冪敤浠撳簱1鎺ュ彛
private String syncToWarehouse1(ErpMat mat) {
log.info("Calling Warehouse 1 API for mat: {}", mat.getMatNr());
- return callMatSyncApi(mat, "http://localhost:8888");
+ return callMatSyncApi(mat, "http://localhost:8080");
}
// 妯℃嫙璋冪敤浠撳簱2鎺ュ彛
private String syncToWarehouse2(ErpMat mat) {
log.info("Calling Warehouse 2 API for mat: {}", mat.getMatNr());
- return callMatSyncApi(mat, "http://localhost:8080");
+ return callMatSyncApi(mat, "http://192.168.0.17:8080");
}
// 妯℃嫙璋冪敤浠撳簱3鎺ュ彛
private String syncToWarehouse3(ErpMat mat) {
log.info("Calling Warehouse 3 API for mat: {}", mat.getMatNr());
- return callMatSyncApi(mat, "http://localhost:8080");
+ return callMatSyncApi(mat, "http://192.168.0.17:8080");
}
private String callMatSyncApi(ErpMat mat, String baseUrl) {
@@ -1015,6 +1015,7 @@
} else {
throw new CoolException("涓嶆敮鎸佺殑wkType锛�" + param.getWkType());
}
+ payload.put("warehouseId", "WH01");
try {
Map<String, Object> res = callMesWkApi(baseUrl, path, headers, payload, bizDesc);
@@ -1045,13 +1046,13 @@
}
String wh = wareHouseId.trim();
if ("WH01".equalsIgnoreCase(wh) || "WH1".equalsIgnoreCase(wh)) {
- return "http://localhost:8888";
+ return "http://localhost:8080";
}
if ("WH02".equalsIgnoreCase(wh) || "WH2".equalsIgnoreCase(wh)) {
- return "http://localhost:8080";
+ return "http://192.168.0.17:8080";
}
if ("WH03".equalsIgnoreCase(wh) || "WH3".equalsIgnoreCase(wh)) {
- return "http://localhost:8080";
+ return "http://192.168.0.17:8080";
}
return null;
}
@@ -1361,19 +1362,19 @@
// 妯℃嫙璋冪敤浠撳簱1鎺ュ彛
private String syncOrderToWarehouse1(ErpOrder order, List<ErpOrderDetl> details, Integer orderType) {
log.info("Calling Warehouse 1 API for order: {}", order.getOrderNo());
- return callOrderSyncApi(order, details, orderType, "http://localhost:8888");
+ return callOrderSyncApi(order, details, orderType, "http://localhost:8080");
}
// 妯℃嫙璋冪敤浠撳簱2鎺ュ彛
private String syncOrderToWarehouse2(ErpOrder order, List<ErpOrderDetl> details, Integer orderType) {
log.info("Calling Warehouse 2 API for order: {}", order.getOrderNo());
- return callOrderSyncApi(order, details, orderType, "http://localhost:8080");
+ return callOrderSyncApi(order, details, orderType, "http://192.168.0.17:8080");
}
// 妯℃嫙璋冪敤浠撳簱3鎺ュ彛
private String syncOrderToWarehouse3(ErpOrder order, List<ErpOrderDetl> details, Integer orderType) {
log.info("Calling Warehouse 3 API for order: {}", order.getOrderNo());
- return callOrderSyncApi(order, details, orderType, "http://localhost:8080");
+ return callOrderSyncApi(order, details, orderType, "http://192.168.0.17:8080");
}
private String callOrderSyncApi(ErpOrder order, List<ErpOrderDetl> details, Integer orderType, String baseUrl) {
@@ -1392,6 +1393,7 @@
param.setOrderNo(order.getOrderNo());
param.setOrderType(order.getWkType());
param.setOrderTime(DateUtils.convert(new Date(order.getBusinessTime())));
+ param.setWareHouseId(order.getWarehouseId());
List<DetlDto> detlDtos = new ArrayList<>();
for (ErpOrderDetl d : details) {
--
Gitblit v1.9.1