From 5ae41979b5a6190ab6989942c1ba062071bfc40c Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 09 四月 2025 20:23:37 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   59 +++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 363bd55..fad8d68 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,20 +1,21 @@
 package com.zy.asrs.task;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.core.common.Cools;
-import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.DocType;
-import com.zy.asrs.entity.Order;
-import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.*;
+import com.zy.asrs.mapper.OrderDetlMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.OrderSyncHandler;
 import com.zy.common.entity.Parameter;
+import com.zy.common.utils.Synchro;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -28,6 +29,15 @@
     private OrderSyncHandler orderSyncHandler;
     @Autowired
     private OrderService orderService;
+
+
+    @Autowired
+    private OrderLogService orderLogService;
+
+    @Autowired
+    private OrderDetlLogService orderDetlLogService;
+
+
     @Autowired
     private ApiLogService apiLogService;
 
@@ -38,7 +48,14 @@
     private OrderDetlService orderDetlService;
 
     @Autowired
+    private OrderDetlMapper orderDetlMapper;
+
+    @Autowired
     private DocTypeService docTypeService;
+
+    private Integer page = 1;
+
+    private Integer size = 200;
 
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog() {
@@ -87,10 +104,12 @@
     //@Async("orderThreadPool")
     public synchronized void reportOrder() {
         DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
-        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
-        orderList.forEach(order -> {
-            orderSyncHandler.timelyStart(order);
-        });
+        if (docType != null) {
+            List<String> reportDetl = orderDetlMapper.getReportDetl(docType.getDocId());
+            reportDetl.forEach(orderNo -> {
+                orderSyncHandler.timelyStart(orderService.selectByNo(orderNo));
+            });
+        }
     }
 
 
@@ -98,14 +117,26 @@
     瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
      */
     //@Scheduled(cron = "0 */1 * * * ? ")
-    @Scheduled(fixedDelay = 60000)
+    @Scheduled(fixedDelay = 120000)
     public void completeOrder() {
-        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
-        orderList.forEach(order -> {
-            if (order.getPltType() != null) {
-                orderService.checkComplete(order.getOrderNo(), order.getPltType());
+        try {
+            Page<Order> settle = orderService.selectPage(new Page<Order>(page, size), new EntityWrapper<Order>().eq("settle", 2));
+            if (settle != null) {
+                List<Order> orderList = settle.getRecords();
+                if (orderList == null || orderList.isEmpty()) {
+                    log.info("杞瀹屾瘯锛寋},{}", page, settle.getTotal());
+                    page = 1;
+                    return;
+                }
+                orderList.forEach(order -> {
+                    orderService.checkComplete2(order.getOrderNo());
+                });
             }
-        });
+        } finally {
+            page++;
+        }
     }
 
+
+
 }

--
Gitblit v1.9.1