From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   77 +++++++++++++++++++++++++++++++++-----
 1 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index c09acce..404a5a6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,14 +1,19 @@
 package com.zy.asrs.task;
 
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
+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.task.core.ReturnT;
 import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.common.entity.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
@@ -28,8 +33,14 @@
     @Autowired
     private ApiLogService apiLogService;
 
+    @Autowired
+    private AgvLocDetlService agvLocDetlService;
+
+    @Autowired
+    private OrderDetlService orderDetlService;
+
     @Scheduled(cron = "0 0 1 * * ? ")
-    public void clearApiLog(){
+    public void clearApiLog() {
         try {
             apiLogService.clearWeekBefore();
         } catch (Exception e) {
@@ -37,16 +48,62 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
-    @Async("orderThreadPool")
-    public void completeAndReport(){
-        List<Order> orders = orderService.selectList(new EntityWrapper<Order>().eq("settle", 4L).eq("status", 1));
-        for (Order order : orders) {
-            ReturnT<String> result = orderSyncHandler.start(order);
-            if (!result.isSuccess()) {
-                log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+    //@Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(fixedDelay = 5000)
+    //@Async("orderThreadPool")
+    public void completeAndReport() {
+        String erpReport = Parameter.get().getErpReport();
+        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = orderService.selectComplete();
+            for (Order order : orders) {
+                //濡傛灉鏄皟鎷ㄥ崟鍒欒繘琛屽垽鏂�
+                if (order.getDocType() == 33) {
+                    //鏌ヨ搴撳瓨涓槸鍚﹀瓨鍦ㄨ璁㈠崟鐨勭墿鏂欎俊鎭紝瀛樺湪鍒欎笉澶勭悊璇ヨ鍗�
+                    List<OrderDetl> orderDetlList = orderDetlService.selectByOrderId(order.getId());
+                    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)) {
+                            //鍙鏈変竴椤硅鍗曟槑缁嗗瓨鍦紝鍒欐爣璇嗕负true锛岃烦杩囪璁㈠崟
+                            flag = true;
+                        }
+                    }
+                    if (flag) {
+                        continue;
+                    }
+                }
+                ReturnT<String> result = orderSyncHandler.start(order);
+                if (!result.isSuccess()) {
+                    //log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                }
             }
         }
     }
 
+    //@Scheduled(cron = "* 0/5 * * * ? ")
+    //@Scheduled(cron = "0/30 * * * * ? ")
+    @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);
+        });
+    }
+
+
+    /*
+    瀹氭椂鏌ヨ鐘舵�佷负2.浣滀笟涓殑鍗曟嵁锛屾鏌ユ槸鍚﹀畬鎴�
+     */
+    //@Scheduled(cron = "0 */1 * * * ? ")
+    @Scheduled(fixedDelay = 60000)
+    public void completeOrder() {
+        List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
+        orderList.forEach(order -> {
+            if (order.getPltType() != null) {
+                orderService.checkComplete(order.getOrderNo(), order.getPltType());
+            }
+        });
+    }
+
 }

--
Gitblit v1.9.1