From cd7057f38613e7dd56f830a7519e5d0ae93c8628 Mon Sep 17 00:00:00 2001
From: pjb <123456>
Date: 星期五, 10 四月 2026 12:51:29 +0800
Subject: [PATCH] U8单据对接
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 77 +++++++++++++++++++-------------------
1 files changed, 39 insertions(+), 38 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 750920d..c6b0474 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -30,6 +30,7 @@
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
/**
@@ -50,12 +51,12 @@
@Autowired
private DocTypeService docTypeService;
- private static final String baseUrl = "127.0.0.1:8081/jsjwms/open/asrs";
+ private static final String baseUrl = "192.168.4.189:10006/api/U8Server";
private static final Map<String, String> pathMap = new HashMap<String, String>() {{
- put("閲囪喘鍏ュ簱", "/purchasein_import");
- put("閿�鍞嚭搴�", "/saleout_import");
- put("浜ф垚鍝佸叆搴撳崟", "/productin_import");
- put("鏉愭枡鍑哄簱鍗�", "/materialout_import");
+ put("閲囪喘鍒拌揣鍗�", "/purchasein_import");
+ put("閿�鍞彂璐у崟", "/saleout_import");
+ put("鐢熶骇璁㈠崟", "/productin_import");
+ put("棰嗘枡鐢宠鍗�", "/materialout_import");
put("鍏朵粬鍏ュ簱鍗�", "/otherin_import");
put("鍏朵粬鍑哄簱鍗�", "/otherout_import");
}};
@@ -196,6 +197,7 @@
.setUri(baseUrl)
.setPath(path)
.setJson(requestJson)
+ .setTimeout(60, TimeUnit.SECONDS)
.build()
.doPost();
List<U8ResultVo> list = JSON.parseArray(response, U8ResultVo.class);
@@ -203,9 +205,9 @@
List<String> successReceiptNos = list.stream().filter(u8ResultVo -> "T".equals(u8ResultVo.getResult())).map(U8ResultVo::getReceiptNo).collect(Collectors.toList());
if (!successReceiptNos.isEmpty()) {
orderMapper.batchUpdateSettleByOrderNos(successReceiptNos);
+ success = true;
}
log.info("鍗曟嵁涓婃姤鎴愬姛锛屽崟鎹紪鍙凤細{}", successReceiptNos);
- success = true;
} else {
errorMsg = response;
log.error(nameSpaces + "璋冪敤澶栭儴鎺ュ彛澶辫触锛寀rl锛歿}锛宺equest锛歿}锛宺esponse锛歿}", url, requestJson, response);
@@ -235,16 +237,16 @@
List<ReportU8Vo> list = new ArrayList<>();
String now = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
switch (docName) {
- case "閲囪喘鍏ュ簱":
+ case "閲囪喘鍒拌揣鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
+ reportU8Vo.setCgltype(docName);
reportU8Vo.setCwhcode("103");
reportU8Vo.setCrdcode("101");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -263,26 +265,26 @@
list.add(reportU8Vo);
}
break;
- case "閿�鍞嚭搴�":
+ case "閿�鍞彂璐у崟":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("101");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("203");
reportU8Vo.setCrdcode("201");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- String docType$ = order.getDocType$();
+// String docType$ = order.getDocType$();
for (OrderDetl orderDetl : orderDetlList) {
ReportU8Vo.Item item = new ReportU8Vo.Item();
item.setCinvcode(orderDetl.getMatnr());
item.setIquantity(orderDetl.getQty());
item.setAutoidSo(orderDetl.getSku());
- item.setSoautoidcol(docType$.equals("鍙戣揣鍗�") ? "IDLSID" : "");
+ item.setSoautoidcol("IDLSID");
item.setCbatch(orderDetl.getBatch());
itemList.add(item);
}
@@ -290,16 +292,16 @@
list.add(reportU8Vo);
}
break;
- case "浜ф垚鍝佸叆搴撳崟":
+ case "鐢熶骇璁㈠崟":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
+ reportU8Vo.setCgltype(docName);
reportU8Vo.setCwhcode("101");
- reportU8Vo.setCrdcode("201");
- reportU8Vo.setCmaker(order.getCreateBy$());
+ reportU8Vo.setCrdcode("102");
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -316,27 +318,26 @@
list.add(reportU8Vo);
}
break;
- case "鏉愭枡鍑哄簱鍗�":
+ case "棰嗘枡鐢宠鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("5");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("203");
reportU8Vo.setCrdcode("202");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
- String docType$ = order.getDocType$();
+// String docType$ = order.getDocType$();
for (OrderDetl orderDetl : orderDetlList) {
ReportU8Vo.Item item = new ReportU8Vo.Item();
item.setCinvcode(orderDetl.getMatnr());
item.setIquantity(orderDetl.getQty());
item.setAutoidAll(orderDetl.getSku());
- item.setAllcautoidcol(docType$.equals("鐢熶骇璁㈠崟") ? "AllocateId" : docType$.equals("濮斿璁㈠崟") ? "MOMaterialsID" :
- docType$.equals("棰嗘枡鐢宠鍗�") ? "AutoID" : "");
+ item.setAllcautoidcol("AutoID");
item.setCbatch(orderDetl.getBatch());
itemList.add(item);
}
@@ -347,13 +348,13 @@
case "鍏朵粬鍏ュ簱鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("109");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("201");
reportU8Vo.setCrdcode("199");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
@@ -371,13 +372,13 @@
case "鍏朵粬鍑哄簱鍗�":
for (Order order : value) {
ReportU8Vo reportU8Vo = new ReportU8Vo();
- reportU8Vo.setCaccid("001");
+// reportU8Vo.setCaccid("001");
reportU8Vo.setCvouchcode(order.getOrderNo());
reportU8Vo.setDdate(now);
- reportU8Vo.setCgltype(order.getDocType$());
- reportU8Vo.setCwhcode("109");
+ reportU8Vo.setCgltype(docName);
+ reportU8Vo.setCwhcode("201");
reportU8Vo.setCrdcode("299");
- reportU8Vo.setCmaker(order.getCreateBy$());
+// reportU8Vo.setCmaker(order.getCreateBy$());
reportU8Vo.setChandler(order.getUpdateBy$());
List<ReportU8Vo.Item> itemList = new ArrayList<>();
List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
--
Gitblit v1.9.1