From e0300cb5c16e9487d118361141e59f1d7a284b7a Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 09 十二月 2025 14:39:59 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 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 46f5910..f2072e2 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -1,10 +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;
@@ -22,26 +25,30 @@
 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();
-        List<Order> orders = OrderInAndOutUtil.selectComplete8(null);
-        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();
+            if(orders.size() > 0){
+                for (Order order : orders) {
+                    ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+                    }
+                }
             }
         }
     }

--
Gitblit v1.9.1