From 6aab8a960aa436d1e2e5304e837946df6d29c3c6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 10 十二月 2024 11:37:24 +0800
Subject: [PATCH] 启用出库和移库类型报告和参数生成逻辑
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 1e47661..71cc66c 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -1,7 +1,6 @@
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;
@@ -29,6 +28,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.concurrent.TimeUnit;
/**
* Created by vincent on 2020/7/7
@@ -48,6 +48,9 @@
@Value("${spring.profiles.active}")
private String active;
+
+ @Value("${u8.report}")
+ private Boolean report;
@Value("${u8.url}")
private String url;
@@ -83,7 +86,10 @@
}
@Transactional
- public void timelyStart(Order order) {
+ public synchronized void timelyStart(Order order) {
+ if (!report) {
+ return;
+ }
List<String> docNames = new ArrayList<>(Arrays.asList("閾跺骇閲囪喘鍏ュ簱鍗�", "閾跺骇濮斿鏉愭枡鍑哄簱鍗�", "閾跺骇鐢熶骇鏉愭枡鍑哄簱鍗�"));
@@ -99,6 +105,9 @@
if (Cools.isEmpty(order.getPltType())) {
return;
}
+ if (Cools.isEmpty(order.getInTime())) {
+ order.setInTime(DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmsssss_F));
+ }
if (!Cools.isEmpty(report)) {
ReportErpParam param = new ReportErpParam();
mappingParam(order, param);
@@ -106,9 +115,13 @@
log.info(JSON.toJSONString(param));
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
+ Date date = new Date();
+ order.setInTime(DateUtils.convert(date, DateUtils.yyyyMMddHHmmsssss_F));
+ orderService.updateById(order);
for (OrderDetl orderDetl : report) {
log.info("{}鍗曟嵁瀹℃牳涓婃姤浜嗭細{}", order.getOrderNo(), orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
orderDetl.setReportQty(orderDetl.getQty());
+ orderDetl.setUpdateTime(date);
orderDetlService.updateById(orderDetl);
}
}
@@ -127,13 +140,14 @@
}
param.set鎿嶄綔鍗曟嵁(order.getDocType$());
param.set鎿嶄綔绫诲瀷("add");
- param.setDdate(order.getInTime());
+ param.setDdate(DateUtils.convert(new Date(), DateUtils.yyyyMMdd_F));
param.setCWhCode(Cools.isEmpty(order.getPltType()) ? "" : order.getPltType() + "");
param.setCDepCode("YZ");
param.setCOrderCode(order.getOrderNo());
param.setCMaker("");
param.setCHandler("");
- param.setCDefine14(order.getOrderNo() + "_" + DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss + "_" + order.getPltType()));
+ param.setCDefine14(order.getOrderNo() + "_" + order.getInTime());
+ //param.setCDefine14(order.getOrderNo() + "_" + order.getInTime() + "_" + order.getPltType()));
}
public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
@@ -186,7 +200,7 @@
boolean success = false;
try {
- response = new HttpHandler.Builder().setUri(url).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
+ response = new HttpHandler.Builder().setUri(url).setTimeout(30, TimeUnit.SECONDS).setPath(path).setJson(JSONObject.toJSONString(requestParam)).build().doPost();
JSONObject jsonObject = JSON.parseObject(response);
if (Cools.isEmpty(jsonObject.get("succeed"))) {
--
Gitblit v1.9.1