From 9126e6315288e1ea50e74c70b099974522d6b172 Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 08 十二月 2025 09:17:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs

---
 src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
index 4bf112b..4f64df0 100644
--- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java
@@ -32,7 +32,7 @@
     @Value("${erp.switch.ReviewOrderSwitch}")
     private boolean ReviewOrderSwitch;
 
-//    @Scheduled(cron = "0/3 * * * * ? ")
+    @Scheduled(cron = "0/3 * * * * ? ")
     @Async("orderThreadPool")
     public void completeAndReport(){
         if(!ReviewOrderSwitch){
@@ -40,8 +40,8 @@
         }
         String erpReport = Parameter.get().getErpReport();
         if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            //        List<Order> orders = orderService.selectComplete();
-            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+//            List<Order> orders = OrderInAndOutUtil.selectComplete9(null);//鏌ヨ9鎻愪氦瀹屾垚鐨�
+            List<Order> orders = orderService.selectComplete9();
             for (Order order : orders) {
                 ReturnT<String> result = reviewOrderSyncHandler.start(order);
                 if (!result.isSuccess()) {

--
Gitblit v1.9.1