From 232d815eb48ca0a8e16b559d2ae3bf803036c05f Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期三, 24 十二月 2025 14:33:05 +0800
Subject: [PATCH] 单据下发传参修改
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 44 +++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 43 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 6887117..b239a2d 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,7 +1,9 @@
package com.zy.asrs.task;
import com.core.common.Cools;
+import com.zy.asrs.entity.CheckOrder;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.ApiLogService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
@@ -10,6 +12,7 @@
import com.zy.common.entity.Parameter;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
@@ -29,6 +32,9 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+
+ @Value("${erp.switch.ErpReportOld}")
+ private boolean ErpReportOld;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -97,9 +103,12 @@
// }
}
- @Scheduled(cron = "0/5 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
+ if (!ErpReportOld){
+ return;
+ }
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
@@ -116,4 +125,37 @@
}
}
}
+
+ /**鎹熸孩鍗曞畬缁撲笂鎶� */
+ @Scheduled(cron = "0/30 * * * * ?")
+ @Async("orderThreadPool")
+ public void completeCheckOrderReport() {
+ if (!ErpReportOld){
+ return;
+ }
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<CheckOrder> orders = orderService.selectCompleteCheck();
+ for (CheckOrder order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startCheckOrderReport(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+
+ try {
+ Thread.sleep(300);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ }
+ }
+
+
}
--
Gitblit v1.9.1