From 6867f6de91378cc8e9e1fe291131d7db0d2993a0 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 17 十月 2025 23:23:29 +0800
Subject: [PATCH] 对接

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   73 ++++++++++++++++++++++++++++--------
 1 files changed, 56 insertions(+), 17 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..18dce3d 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,20 +1,23 @@
 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.core.common.DateUtils;
+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 lombok.Data;
 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.Calendar;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -28,6 +31,15 @@
     private OrderSyncHandler orderSyncHandler;
     @Autowired
     private OrderService orderService;
+
+
+    @Autowired
+    private OrderLogService orderLogService;
+
+    @Autowired
+    private OrderDetlLogService orderDetlLogService;
+
+
     @Autowired
     private ApiLogService apiLogService;
 
@@ -38,7 +50,17 @@
     private OrderDetlService orderDetlService;
 
     @Autowired
+    private OrderDetlMapper orderDetlMapper;
+
+    @Autowired
     private DocTypeService docTypeService;
+
+    @Autowired
+    private AgvWrkDetlService agvWrkDetlService;
+
+    private Integer page = 1;
+
+    private Integer size = 500;
 
     @Scheduled(cron = "0 0 1 * * ? ")
     public void clearApiLog() {
@@ -50,7 +72,7 @@
     }
 
     //@Scheduled(cron = "0/5 * * * * ? ")
-    @Scheduled(fixedDelay = 600000)
+    //@Scheduled(fixedDelay = 600000)
     //@Async("orderThreadPool")
     public void completeAndReport() {
         String erpReport = Parameter.get().getErpReport();
@@ -64,7 +86,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;
                         }
@@ -83,14 +105,16 @@
 
     //@Scheduled(cron = "* 0/5 * * * ? ")
     //@Scheduled(cron = "0/30 * * * * ? ")
-    @Scheduled(fixedDelay = 30000)
+    //@Scheduled(fixedDelay = 30000)
     //@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 +122,29 @@
     瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
      */
     //@Scheduled(cron = "0 */1 * * * ? ")
-    @Scheduled(fixedDelay = 60000)
+    @Scheduled(fixedDelay = 300000)
     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());
+        Calendar calendar = Calendar.getInstance();
+        int i = calendar.get(Calendar.HOUR);
+        if (i >= 23 || i < 7){
+            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