From 67cb49032b0efff478b2432713d62c305e4e53ce Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期三, 30 十月 2024 17:42:34 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 44 ++++++++++++++++++++++++++++++++++----------
1 files changed, 34 insertions(+), 10 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 28cc13e..77337d6 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
+import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
@@ -23,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
/**
@@ -72,9 +74,13 @@
ReportErpParam param = new ReportErpParam();
mappingParam(order, param);
mappingParamChildren(orderDetlList, param);
+ if (Cools.isEmpty(order.getPltType())) {
+ return SUCCESS;
+ }
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
+ log.info("鍗曟嵁瀹℃牳,{}", order);
order.setSettle(6L);
orderService.updateById(order);
}
@@ -86,7 +92,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())) {
@@ -97,15 +103,19 @@
report.add(orderDetl);
}
}
+ if (Cools.isEmpty(order.getPltType())) {
+ return;
+ }
if (!Cools.isEmpty(report)) {
ReportErpParam param = new ReportErpParam();
mappingParam(order, param);
mappingParamChildren(report, param);
-
+ log.info(JSON.toJSONString(param));
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
- for (OrderDetl orderDetl : orderDetlList) {
- orderDetl.setReportQty(orderDetl.getQty() - orderDetl.getReportQty());
+ for (OrderDetl orderDetl : report) {
+ log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
+ orderDetl.setReportQty(orderDetl.getQty());
orderDetlService.updateById(orderDetl);
}
}
@@ -115,16 +125,17 @@
}
public void mappingParam(Order order, ReportErpParam param) {
- param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ //param.set鎿嶄綔绯荤粺鍙�(order.getDefNumber());
+ param.set鎿嶄綔绯荤粺鍙�("998");
param.set鎿嶄綔鍗曟嵁(order.getDocType$());
param.set鎿嶄綔绫诲瀷("add");
- param.setDdate(order.getOrderTime());
+ param.setDdate(order.getInTime());
param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
param.setCDepCode("YZ");
param.setCOrderCode(order.getOrderNo());
param.setCMaker("");
param.setCHandler("");
- param.setCDefine14(order.getOrderNo());
+ param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
}
public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
@@ -135,10 +146,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());
@@ -148,6 +171,7 @@
}
}
+
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
String response = "";
@@ -170,7 +194,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