From f710ee17ec798c2b359a2f635af13269506d628e Mon Sep 17 00:00:00 2001
From: lty <124567>
Date: 星期一, 13 四月 2026 14:13:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 b615048..99144e7 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -75,10 +75,10 @@
@Autowired
private PlatformTransactionManager transactionManager;
- @Value("${mes-wk.base-url.test:http://192.168.0.41}")
+ @Value("${mes-wk.base-url.test:http://192.168.0.41:8080}")
private String mesWkBaseUrlTest;
- @Value("${mes-wk.base-url.prod:http://192.168.0.42}")
+ @Value("${mes-wk.base-url.prod:http://192.168.0.42:8080}")
private String mesWkBaseUrlProd;
@Value("${mes-wk.auth.ent-code:lfd}")
@@ -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);
@@ -1138,10 +1139,8 @@
return "http://" + v;
}
}
-
- String wkType = param != null ? param.getWkType() : null;
- String norm = wkType == null ? "" : wkType.trim().toLowerCase();
- if (norm.contains("test") || norm.contains("41") || norm.contains("娴嬭瘯")) {
+ boolean result = true;
+ if (result) {
return normalizeHttpBaseUrl(mesWkBaseUrlTest);
}
return normalizeHttpBaseUrl(mesWkBaseUrlProd);
@@ -1394,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) {
@@ -1522,7 +1522,7 @@
url,
request,
null,
- null,
+ request,
response,
success
);
--
Gitblit v1.9.1