From 0368c0b26c52b032e3ef86b3fda548d34fbfa4f7 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期日, 27 四月 2025 14:28:21 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   73 ++++++++++++++++++++++++++----------
 1 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 9c764f4..89e0871 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,15 +1,11 @@
 package com.zy.asrs.task;
 
-import com.alibaba.fastjson.JSON;
 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.Order;
-import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+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;
@@ -19,7 +15,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 /**
  * Created by vincent on 2020/7/7
@@ -32,6 +27,15 @@
     private OrderSyncHandler orderSyncHandler;
     @Autowired
     private OrderService orderService;
+
+
+    @Autowired
+    private OrderLogService orderLogService;
+
+    @Autowired
+    private OrderDetlLogService orderDetlLogService;
+
+
     @Autowired
     private ApiLogService apiLogService;
 
@@ -40,6 +44,19 @@
 
     @Autowired
     private OrderDetlService orderDetlService;
+
+    @Autowired
+    private OrderDetlMapper orderDetlMapper;
+
+    @Autowired
+    private DocTypeService docTypeService;
+
+    @Autowired
+    private AgvWrkDetlService agvWrkDetlService;
+
+    private Integer page = 1;
+
+    private Integer size = 200;
 
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog() {
@@ -51,7 +68,7 @@
     }
 
     //@Scheduled(cron = "0/5 * * * * ? ")
-    @Scheduled(fixedDelay = 5000)
+    @Scheduled(fixedDelay = 600000)
     //@Async("orderThreadPool")
     public void completeAndReport() {
         String erpReport = Parameter.get().getErpReport();
@@ -65,7 +82,7 @@
                     Boolean flag = false;
                     for (OrderDetl orderDetl : orderDetlList) {
                         List<AgvLocDetl> agvLocDetls = agvLocDetlService.selectList(new EntityWrapper<AgvLocDetl>().eq("matnr", orderDetl.getMatnr()).eq("three_code", orderDetl.getThreeCode()));
-                        if (!Cools.isEmpty(agvLocDetls)) {
+                        if (!Cools.isEmpty(agvLocDetls) ) {
                             //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
                             flag = true;
                         }
@@ -87,10 +104,13 @@
     @Scheduled(fixedDelay = 30000)
     //@Async("orderThreadPool")
     public synchronized void reportOrder() {
-        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
-        orderList.forEach(order -> {
-            orderSyncHandler.timelyStart(order);
-        });
+        DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
+        if (docType != null) {
+            List<String> reportDetl = orderDetlMapper.getReportDetl(docType.getDocId());
+            reportDetl.forEach(orderNo -> {
+                orderSyncHandler.timelyStart(orderService.selectByNo(orderNo));
+            });
+        }
     }
 
 
@@ -98,12 +118,25 @@
     瀹氭椂鏌ヨ鐘舵�佷负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));
-        orderList.forEach(order -> {
-            orderService.checkComplete(order.getOrderNo(), null);
-        });
+        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