From 2fbf3adb37334f90c29b1f119f0652f37a2608dc Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 19 十一月 2024 10:03:17 +0800
Subject: [PATCH] #优化
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 76 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 34 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 fb9bfd8..1e47661 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,5 +1,7 @@
package com.zy.asrs.task.handler;
+import cn.hutool.core.util.NumberUtil;
+import com.alibaba.excel.util.NumberUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.core.common.Cools;
@@ -22,6 +24,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
@@ -43,6 +46,9 @@
@Autowired
private DocTypeService docTypeService;
+ @Value("${spring.profiles.active}")
+ private String active;
+
@Value("${u8.url}")
private String url;
@@ -51,48 +57,35 @@
@Transactional
public ReturnT<String> start(Order order) {
- //List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇濮斿鍏ュ簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
- 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())) {
order.setSettle(8L);
orderService.updateById(order);
return SUCCESS;
- }
-// if("鎵嬪姩鍑哄簱鍗�".equals(docType.getDocName())
-// || "鎵嬪姩鍏ュ簱鍗�".equals(docType.getDocName())
-// || "鑷姩琛ヨ揣鍗�".equals(docType.getDocName())
-// || "浜哄伐琛ヨ揣鍗�".equals(docType.getDocName())){
-// order.setSettle(8L);
-// orderService.updateById(order);
-// return SUCCESS;
-// }
-
- List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
-
- ReportErpParam param = new ReportErpParam();
- mappingParam(order, param);
- mappingParamChildren(orderDetlList, param);
- if (Cools.isEmpty(order.getPltType())) {
+ } else {
+ boolean flag = true;
+ List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+ List<OrderDetl> report = new ArrayList<>();
+ for (OrderDetl orderDetl : orderDetlList) {
+ if (orderDetl.getReportQty() == null || orderDetl.getQty() > orderDetl.getReportQty() || orderDetl.getQty() < orderDetl.getAnfme()) {
+ flag = false;
+ }
+ }
+ if (flag) {
+ log.info("鍗曟嵁瀹岀粨,{}", order);
+ order.setSettle(6L);
+ orderService.updateById(order);
+ }
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);
- }
-
- return SUCCESS;
}
-
@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 +118,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());
@@ -155,8 +153,11 @@
if (s.length > 1) {
childInfo.setCBatch(s[0]);
childInfo.setBFree1(s[1]);
- } else {
+ } else if (s.length == 1) {
childInfo.setCBatch(s[0]);
+ childInfo.setBFree1("");
+ } else {
+ childInfo.setCBatch("");
childInfo.setBFree1("");
}
}
@@ -166,14 +167,21 @@
childInfo.setCOrderCode(orderDetl.getOrderNo());
childInfo.setIvouchrowno(orderDetl.getItemNum());
childInfo.setDefine22(orderDetl.getThreeCode());
-
+ if (!Cools.isEmpty(orderDetl.getWeight()) && !Cools.isEmpty(orderDetl.getVolume())) {
+ BigDecimal mul = NumberUtil.div(childInfo.getIQuantity(), orderDetl.getVolume() + "");
+ childInfo.setINum(mul.toString());
+ } else {
+ childInfo.setINum("1");
+ }
+ childInfo.setIinvexchrate(Cools.isEmpty(orderDetl.getVolume()) ? "" : orderDetl.getVolume() + "");
paramChild.add(childInfo);
}
}
- private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String
+ ip) {
String response = "";
boolean success = false;
--
Gitblit v1.9.1