From a84386f98cc752516d492222684d5c850c9c7a1e Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 00:00:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdqzasrs' into mdqzasrs

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   94 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 84 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..a797915 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,13 +1,16 @@
 package com.zy.asrs.task;
 
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.core.common.Cools;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.OrderSyncHandler;
+import com.zy.asrs.utils.OrderInAndOutUtil;
+import com.zy.common.entity.Parameter;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
@@ -15,7 +18,7 @@
 import java.util.List;
 
 /**
- * Created by vincent on 2020/7/7
+ * updated by IX in 2024/12/17
  */
 @Slf4j
 @Component
@@ -28,8 +31,11 @@
     @Autowired
     private ApiLogService apiLogService;
 
+    @Value("${erp.switch.ErpReportOld}")
+    private boolean ErpReportOld;
+
     @Scheduled(cron = "0 0 1 * * ? ")
-    public void clearApiLog(){
+    public void clearApiLog() {
         try {
             apiLogService.clearWeekBefore();
         } catch (Exception e) {
@@ -37,16 +43,84 @@
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
+    @Scheduled(cron = "0 1 * * * ? ")
     @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());
+    public void completeAndReportOrderIssuedOnceMore() {
+        List<Order> orderList = orderService.selectComplete99();
+        for (Order order : orderList) {
+            try {
+                ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
+                if (!result.isSuccess()) {
+                    log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(),result.getMsg());
+                }
+            } catch (Exception e){
+                log.error(e.getMessage());
+                log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触", order.getOrderNo());
             }
         }
     }
 
+    @Scheduled(cron = "0/30 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrderIssued() {
+//        String erpReport = Parameter.get().getErpReport();
+//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orderList = orderService.selectComplete1();
+//            List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 1L).eq("status", 1).orderBy("create_time", true));
+            for (Order order : orderList) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e){
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]杞墽琛岃〃澶辫触", order.getOrderNo());
+                }
+            }
+//        }
+    }
+
+    @Scheduled(cron = "0/5 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrderInAndOutUtil() {
+//        String erpReport = Parameter.get().getErpReport();
+//        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = OrderInAndOutUtil.selectComplete(null);
+            for (Order order : orders) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderInAndOutUtil(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e){
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", order.getOrderNo());
+                }
+            }
+//        }
+    }
+
+    @Scheduled(cron = "0/30 * * * * ? ")
+    @Async("orderThreadPool")
+    public void completeAndReportOrderReport() {
+        if (!ErpReportOld){
+            return;
+        }
+        String erpReport = Parameter.get().getErpReport();
+        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<Order> orders = orderService.selectComplete();
+            for (Order order : orders) {
+                try {
+                    ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+                    if (!result.isSuccess()) {
+                        log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                    }
+                } catch (Exception e) {
+                    log.error(e.getMessage());
+                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+                }
+            }
+        }
+    }
 }

--
Gitblit v1.9.1