From 0ff927605ae5df1cb63fbe6cb838c35da43be8ac Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期一, 11 十一月 2024 10:58:14 +0800
Subject: [PATCH] Merge branch 'phyzwms2' into phyzasrs-erp
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 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 2248302..630d1dd 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -43,6 +43,9 @@
@Autowired
private DocTypeService docTypeService;
+ @Value("${spring.profiles.active}")
+ private String active;
+
@Value("${u8.url}")
private String url;
@@ -92,7 +95,7 @@
@Transactional
public void timelyStart(Order order) {
- List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�"));
+ List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
DocType docType = docTypeService.selectById(order.getDocType());
if (docNames.contains(docType.getDocName())) {
@@ -125,8 +128,13 @@
}
public void mappingParam(Order order, ReportErpParam param) {
- //param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
- param.set鎿嶄綔绯荤粺鍙�("998");
+ if (active.equals("prod")) {
+ param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ } else if (active.equals("dev") || active.equals("loc")) {
+ param.set鎿嶄綔绯荤粺鍙�("998");
+ } else {
+ param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ }
param.set鎿嶄綔鍗曟嵁(order.getDocType$());
param.set鎿嶄綔绫诲瀷("add");
param.setDdate(order.getInTime());
@@ -146,10 +154,22 @@
childInfo.setIrowno(orderDetl.getItemNum());
childInfo.setCInvCode(orderDetl.getMatnr());
childInfo.setIQuantity(orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()) + "");
- childInfo.setCBatch(orderDetl.getBatch());
+ String batch = orderDetl.getBatch();
+ if (Cools.isEmpty(batch)) {
+ childInfo.setCBatch("");
+ childInfo.setBFree1("");
+ } else {
+ String[] s = batch.split("__");
+ if (s.length > 1) {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1(s[1]);
+ } else {
+ childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ }
+ }
childInfo.setINum(orderDetl.getLength() + "");
childInfo.setIinvexchrate("");
- childInfo.setBFree1(orderDetl.getDeadTime());
childInfo.setIPOsID(orderDetl.getSku());
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
@@ -159,6 +179,7 @@
}
}
+
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
@@ -181,7 +202,7 @@
success = true;
return code;
} catch (Exception e) {
- log.error(e.getMessage());
+ log.error("鎶ラ敊淇℃伅:{},{}", e.getMessage(), JSON.toJSONString(requestParam));
throw new CoolException("璋冪敤鎺ュ彛鍝嶅簲閿欒");
} finally {
apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
--
Gitblit v1.9.1