From 4448779d76ff424e666d65f2f168a5890642c857 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 12 十一月 2025 14:04:22 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/controller/OrderPakoutController.java | 17 ++++++++++-------
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 15 ++++++++++-----
src/main/resources/application.yml | 12 ++++++++++++
3 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
index 2779d77..e226183 100644
--- a/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderPakoutController.java
@@ -9,19 +9,17 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
-import com.zy.asrs.entity.param.OrderDomainParam;
import com.zy.asrs.entity.param.QualityGroupListParam;
import com.zy.asrs.entity.result.OrderPakoutDetailVo;
import com.zy.asrs.entity.result.OrderPakoutMainVo;
import com.zy.asrs.entity.result.WrkTraceVo;
import com.zy.asrs.service.*;
-import com.zy.common.constant.MesConstant;
-import com.zy.common.model.DetlDto;
import com.zy.common.utils.HttpHandler;
import com.zy.common.web.BaseController;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
@@ -52,6 +50,11 @@
private WrkMastLogService wrkMastLogService;
@Autowired
private ApiLogService apiLogService;
+
+ @Value("${srXghyMes.actualShipmentMesUrl}")
+ private String actualShipmentMesUrl;
+ @Value("${srXghyMes.actualShipmentMes}")
+ private String actualShipmentMes;
@RequestMapping(value = "/order/nav/list/auth")
@ManagerAuth
@@ -401,8 +404,8 @@
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(actualShipmentMesUrl)
+ .setPath(actualShipmentMes)
.setJson(JSON.toJSONString(qualityGroupListParam))
.build()
.doPost();
@@ -422,7 +425,7 @@
// throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
log.error("缁勮揣鍗曟洿鏂扮姸鎬佸け璐�!!!缁勮揣鍗曞彿"+itemName+".updateItemName");
}
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(qualityGroupListParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", actualShipmentMesUrl+"/"+actualShipmentMes, JSON.toJSONString(qualityGroupListParam), response);
}
return R.error("涓婃姤mes绯荤粺澶辫触").add("涓婃姤mes绯荤粺澶辫触");
} catch (Exception e) {
@@ -436,7 +439,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"涓婃姤MES瀹為檯缁勮揣鍗�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ actualShipmentMesUrl+"/"+actualShipmentMes,
null,
"127.0.0.1",
JSON.toJSONString(qualityGroupListParam),
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 1f3d79a..dc1c627 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -22,6 +22,7 @@
import com.zy.common.utils.HttpHandler;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -50,6 +51,11 @@
private WrkDetlServiceImpl wrkDetlService;
@Autowired
private SnowflakeIdWorker snowflakeIdWorker;
+
+ @Value("${srXghyMes.productInventoryUrl}")
+ private String productInventoryUrl;
+ @Value("${srXghyMes.productInventory}")
+ private String productInventory;
@Transactional
public ReturnT<String> start(Order order) {
@@ -251,8 +257,8 @@
boolean success = false;
try {
response = new HttpHandler.Builder()
- .setUri(MesConstant.URL)
- .setPath(MesConstant.PAKIN_URL)
+ .setUri(productInventoryUrl)
+ .setPath(productInventory)
.setJson(JSON.toJSONString(orderMesXGHYParam))
.build()
.doPost();
@@ -260,7 +266,7 @@
if (jsonObject.getInteger("code").equals(200)) {
success = true;
} else {
- log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", MesConstant.URL+MesConstant.PAKIN_URL, JSON.toJSONString(orderMesXGHYParam), response);
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", productInventoryUrl+"/"+productInventory, JSON.toJSONString(orderMesXGHYParam), response);
}
} catch (Exception e) {
log.error("fail", e);
@@ -271,7 +277,7 @@
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
"鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ productInventoryUrl+"/"+productInventory,
null,
"127.0.0.1",
JSON.toJSONString(orderMesXGHYParam),
@@ -280,7 +286,6 @@
);
} catch (Exception e) { log.error("", e); }
}
-// System.out.println(orderMesXGHYParam.toString());
return SUCCESS;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 3cddd4a..b832946 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -81,6 +81,18 @@
inPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cprkwc
# 鍑哄簱涓婃姤
outPath: EosServer/PluginGateway.ashx?pluginid=DataIOHttp&func=senddata&userno=ASRS&sign=5DD885999945BA2F3DC9A61F1B857DB3&dataname=cpckwc
+
+srXghyMes:
+ # 涓婃姤MES瀹為檯缁勮揣鍗�
+ actualShipmentMesUrl: 172.22.152.3:8157
+ actualShipmentMes: qualityGroupList/v1/updateGroupList
+ # 涓婃姤MES鍑哄叆搴撴暟鎹�
+ productInventoryUrl: 172.22.152.3:8160
+ productInventory: productInventory/v1/saveDto
+ # 鏌ヨ鍗峰彿鏄惁鍚堟牸
+ qualityFinishedCheckoutUrl: 172.22.152.3:8157
+ qualityFinishedCheckout: qualityFinishedCheckout/v1/querybatchNoWMS
+
srHangJia:
url: 192.168.18.229:16126
# 鎷嗗灈淇℃伅涓婁紶
--
Gitblit v1.9.1