From 2b78f39309bf25641d8a050ab82fedd7cfb5b300 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 十一月 2025 11:09:27 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 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 77f29c6..a639b63 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,12 +172,11 @@
@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;
}
- String packageGroupNo; //鍖呰缁勫彿锛堝緪宸ユ病鏈夛紝鍙湁绠卞彿鍗峰彿涓�瀵逛竴锛� //null
String outOrIn; //out 鍑猴紱in鍏ワ紱
/*
* 鎺ュ彛1=銆嬩笉鍚堟牸鍝佸嚭搴撲簩妤硷細 涓嶅悎鏍煎搧鍑哄簱
@@ -204,6 +209,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("涓嶅悎鏍煎搧鍑哄簱")){
@@ -215,14 +221,14 @@
// packageGroupNo = order.getItemName();
wrkDetl.setDeadTime(order.getItemName());
}
- wrkDetl.setManu(docType.getDocName$());
+ wrkDetl.setManu(docType.getDocName$(outOrIn));
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
} else {
wrkDetl.setManu("鎴愬搧鍑哄簱");
}
- } else if (wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
+ } else if (!Cools.isEmpty(wrkDetl.getOrderNo()) && wrkDetl.getOrderNo().equals("涓嶅悎鏍煎搧鍑哄簱")){
wrkDetl.setManu("涓嶅悎鏍煎搧鍑哄簱");
}
} else {
@@ -245,7 +251,41 @@
orderMesXGHYParam.setBarcode(String.valueOf(snowflakeIdWorker.nextId()));
orderMesXGHYParam.setPalletizingNo(1);
- System.out.println(orderMesXGHYParam.toString());
+
+
+ String response = "";
+ boolean success = false;
+ try {
+ response = new HttpHandler.Builder()
+ .setUri(productInventoryUrl)
+ .setPath(productInventory)
+ .setJson(JSON.toJSONString(orderMesXGHYParam))
+ .build()
+ .doPost();
+ JSONObject jsonObject = JSON.parseObject(response);
+ if (jsonObject.getInteger("code").equals(200)) {
+ success = true;
+ } else {
+ log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", productInventoryUrl+"/"+productInventory, JSON.toJSONString(orderMesXGHYParam), response);
+ }
+ } catch (Exception e) {
+ log.error("fail", e);
+// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return FAIL.setMsg(e.getMessage());
+ } finally {
+ try {
+ // 淇濆瓨鎺ュ彛鏃ュ織
+ apiLogService.save(
+ "鎴愬搧搴撳叆鍑哄簱涓婃姤MES",
+ productInventoryUrl+"/"+productInventory,
+ null,
+ "127.0.0.1",
+ JSON.toJSONString(orderMesXGHYParam),
+ response,
+ success
+ );
+ } catch (Exception e) { log.error("", e); }
+ }
return SUCCESS;
}
--
Gitblit v1.9.1