From cdda258ac9b94edd11aff18da12aac7eb5c940a1 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期五, 25 十月 2024 11:26:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 2 +-
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index d74a0d9..8cc81d7 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -80,7 +80,7 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "* 0/5 * * * ? ")
@Async("orderThreadPool")
public void reportOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
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 99c5d29..60683dd 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;
/**
@@ -105,8 +107,8 @@
int code = doHttpRequest(param, "鍗曟嵁瀹℃牳", url, orderReportPath, null, "127.0.0.1");
if (code == 0) {
for (OrderDetl orderDetl : orderDetlList) {
- orderDetl.setReportQty(orderDetl.getQty() - orderDetl.getReportQty());
- log.info("涓婃姤浜嗭細{}", orderDetl.getQty() - orderDetl.getReportQty());
+ orderDetl.setReportQty(orderDetl.getQty());
+ log.info("{}鍗曞瓙涓婃姤浜嗭細{}", order.getOrderNo(),orderDetl.getQty() - (orderDetl.getReportQty() == null ? 0D : orderDetl.getReportQty()));
orderDetlService.updateById(orderDetl);
}
}
@@ -125,7 +127,7 @@
param.setCOrderCode(order.getOrderNo());
param.setCMaker("");
param.setCHandler("");
- param.setCDefine14(order.getOrderNo());
+ param.setCDefine14(order.getOrderNo()+"_"+DateUtils.convert(new Date(), DateUtils.yyyyMMddHHmmss));
}
public void mappingParamChildren(List<OrderDetl> orderDetlList, ReportErpParam param) {
--
Gitblit v1.9.1