From 4b6e6d95ae6fbbccc4351db366b99fa05288877f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 11 六月 2025 10:09:38 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java |   28 ++++++++++++++++++++--------
 1 files changed, 20 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 99911fa..678bc1b 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.task.kingdee;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
@@ -11,6 +12,7 @@
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -27,18 +29,28 @@
     @Value("${erp.switch.SaveOrderSwitch}")
     private boolean SaveOrderSwitch;
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    /**
+     * 2.淇濆瓨鎺ュ彛
+     */
+    @Scheduled(cron = "0/3 * * * * ? ")
     @Async("orderThreadPool")
-    public void completeAndReport(){
-        if (1==1) return;
-        if(!SaveOrderSwitch){
+    public synchronized void completeAndReport() {
+        if (!SaveOrderSwitch) {
             return;
         }
-        List<Order> orders = orderService.selectComplete();
+        List<Order> orders = orderService.selectCompletemEmo2();
         for (Order order : orders) {
-            ReturnT<String> result = saveOrderSyncHandler.start(order);
-            if (!result.isSuccess()) {
-                log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo());
+            try {
+
+                ReturnT<String> result = saveOrderSyncHandler.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