From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
index 932bca7..f7184f8 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -1,9 +1,13 @@
package com.zy.asrs.task.kingdee;
+import com.core.common.Cools;
import com.zy.asrs.entity.Order;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
+import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler;
import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+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;
@@ -21,25 +25,29 @@
public class SaveOrderSyncScheduler {
@Autowired
- private SubmitOrderSyncHandler submitOrderSyncHandler;
+ private SaveOrderSyncHandler saveOrderSyncHandler;
@Autowired
private OrderService orderService;
@Value("${erp.switch.ReviewOrderSwitch}")
private boolean ReviewOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
- if (1==1) return;
if(!ReviewOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete8();
- for (Order order : orders) {
- ReturnT<String> result = submitOrderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+// List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+ List<Order> orders = orderService.selectComplete();
+
+ for (Order order : orders) {
+ ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ }
}
}
}
--
Gitblit v1.9.1