From cc4769108b9b98fabf48a91033c8df90a396e061 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 10:48:37 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
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..9c6225c 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) {
@@ -166,8 +172,8 @@
@Transactional
public ReturnT<String> startV1(WrkMast wrkMast) {
-// List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
- List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
+ List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
+// List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<>());
if (wrkDetls.isEmpty()) {
return SUCCESS;
}
@@ -204,6 +210,7 @@
}
for (WrkDetl wrkDetl : wrkDetls) {
if (outOrIn.equals("out")){
+ wrkDetl.setManu("鎴愬搧鍑哄簱");
if (!Cools.isEmpty(stockType) && stockType.equals("鐩樼偣鍑哄簱")){
wrkDetl.setManu("鐩樼偣鍑哄簱");
} else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && !wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
@@ -222,7 +229,7 @@
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
- } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
}
} else {
@@ -251,8 +258,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 +267,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);
@@ -270,8 +277,8 @@
try {
// 淇濆瓨鎺ュ彛鏃ュ織
apiLogService.save(
- "鎴愬搧搴撳叆搴撲笂鎶�",
- MesConstant.URL + MesConstant.PAKIN_URL,
+ "鎴愬搧搴撳叆搴撲笂鎶ES",
+ productInventoryUrl+"/"+productInventory,
null,
"127.0.0.1",
JSON.toJSONString(orderMesXGHYParam),
@@ -280,7 +287,6 @@
);
} catch (Exception e) { log.error("", e); }
}
-// System.out.println(orderMesXGHYParam.toString());
return SUCCESS;
}
--
Gitblit v1.9.1