From a6bee744b39fe44423624f0d268706c4257e4bba Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 16 七月 2025 08:57:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion
---
src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 1c4e3c6..0f45db0 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -30,18 +30,21 @@
@Value("${erp.switch.SubmitOrderSwitch}")
private boolean SubmitOrderSwitch;
-// @Scheduled(cron = "0/3 * * * * ? ")
+ /**
+ * 3.鎻愪氦鎺ュ彛
+ */
+ @Scheduled(cron = "0/3 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReport(){
+ public synchronized void completeAndReport(){
if(!SubmitOrderSwitch){
return;
}
- List<Order> orders = orderService.selectComplete();
+ List<Order> orders = orderService.selectCompletemEmo3();
for (Order order : orders) {
try{
ReturnT<String> result = submitOrderSyncHandler.start(order);
if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+ log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
}
}catch (Exception e){
Order order1 = orderService.selectById(order.getId());
--
Gitblit v1.9.1