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/SubmitOrderSyncScheduler.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
index 64118e7..8fbbe6f 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -27,14 +27,14 @@
public class SubmitOrderSyncScheduler {
@Autowired
- private SaveOrderSyncHandler saveOrderSyncHandler;
+ private SubmitOrderSyncHandler submitOrderSyncHandler;
@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(!ReviewOrderSwitch){
@@ -42,10 +42,11 @@
}
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- // List<Order> orders = orderService.selectComplete8();
- List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
+// List<Order> orders = OrderInAndOutUtil.selectComplete10(null); //鏌ヨ10鏂板涓婃姤瀹屾垚
+ List<Order> orders = orderService.selectComplete10();
+
for (Order order : orders) {
- ReturnT<String> result = saveOrderSyncHandler.start(order);
+ ReturnT<String> result = submitOrderSyncHandler.start(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
}
--
Gitblit v1.9.1