From 3961298882ff4b75c2412312e6d4dc9a77e968d6 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期六, 13 十二月 2025 17:45:42 +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 4fe4f26..ddb8925 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java
@@ -4,6 +4,7 @@
 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;
@@ -24,28 +25,34 @@
 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/20 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
-        if (1==1) return;
         if(!ReviewOrderSwitch){
             return;
         }
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            //        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());
+//            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+            List<Order> orders = orderService.selectComplete();
+            if(orders.size() > 0){
+                for (Order order : orders) {
+                    if(order.getDocType() == 3 || order.getDocType() == 16 || order.getDocType() == 18 || order.getDocType() == 19){
+                        ReturnT<String> result = saveOrderSyncHandler.start(order);//4宸插畬鎴�
+                        if (!result.isSuccess()) {
+                            log.error("鍗曟嵁[orderNo={}]鏂板淇濆瓨鑷砮rp澶辫触", order.getOrderNo());
+                        }
+                    }else{
+                        order.setSettle(9L);
+                        orderService.updateById(order);
+                    }
                 }
             }
         }

--
Gitblit v1.9.1