From a0d2beeb144c46d344dc5995653750947196efbe Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 24 七月 2025 09:23:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java |   33 ++++++++++++++++++++++-----------
 1 files changed, 22 insertions(+), 11 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 1f23ca4..0f45db0 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java
@@ -3,7 +3,8 @@
 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 lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -11,6 +12,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -21,24 +23,33 @@
 public class SubmitOrderSyncScheduler {
 
     @Autowired
-    private SaveOrderSyncHandler saveOrderSyncHandler;
+    private SubmitOrderSyncHandler submitOrderSyncHandler;
     @Autowired
     private OrderService orderService;
 
-    @Value("${erp.switch.ReviewOrderSwitch}")
-    private boolean ReviewOrderSwitch;
+    @Value("${erp.switch.SubmitOrderSwitch}")
+    private boolean SubmitOrderSwitch;
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    /**
+     * 3.鎻愪氦鎺ュ彛
+     */
+    @Scheduled(cron = "0/3 * * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReport(){
-        if(!ReviewOrderSwitch){
+    public synchronized void completeAndReport(){
+        if(!SubmitOrderSwitch){
             return;
         }
-        List<Order> orders = orderService.selectComplete();
+        List<Order> orders = orderService.selectCompletemEmo3();
         for (Order order : orders) {
-            ReturnT<String> result = saveOrderSyncHandler.start(order);
-            if (!result.isSuccess()) {
-                log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+            try{
+                ReturnT<String> result = submitOrderSyncHandler.start(order);
+                if (!result.isSuccess()) {
+                    log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+                }
+            }catch (Exception e){
+                Order order1 = orderService.selectById(order.getId());
+                order1.setUpdateTime(new Date());
+                orderService.updateById(order1);
             }
         }
     }

--
Gitblit v1.9.1