From ced2fc10af63b23402352f675f8b1e3c241c42ab Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期一, 10 十一月 2025 11:16:27 +0800
Subject: [PATCH] *

---
 src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java |   75 ++++++++++++++++++++++++-------------
 1 files changed, 49 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
index f6447b9..d1728ce 100644
--- a/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
+++ b/src/main/java/com/zy/asrs/task/GroupOrderFormScheduler.java
@@ -28,38 +28,61 @@
 
     @Scheduled(cron = "0/5 * * * * ? ")
     public void abandonedGroupOrderForm(){
-        String erpReport = Parameter.get().getErpReport();
-        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            List<OrderPakout> orders = orderPakoutService.selectSettle(99L);
-            for (OrderPakout order : orders) {
-                try{
-                    ReturnT<String> result = groupOrderFormHandler.abandoned(order);
-                    if (!result.isSuccess()) {
-                        log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
-                    }
-                }catch (Exception e){
-                    log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
-                    log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+        List<OrderPakout> orders = orderPakoutService.selectSettle(99L);//搴熷純
+        if (orders.isEmpty()){
+            return;
+        }
+        for (OrderPakout order : orders) {
+            try{
+                ReturnT<String> result = groupOrderFormHandler.abandoned(order);
+                if (!result.isSuccess()) {
+                    log.error("璁″垝缁勮揣鍗昜orderNo={}]搴熷純娓呴櫎澶辫触", order.getOrderNo());
                 }
+            }catch (Exception e){
+                log.error("璁″垝缁勮揣鍗昜orderNo={}]搴熷純娓呴櫎澶辫触", order.getOrderNo());
+                log.error("璁″垝缁勮揣鍗�"+order+"搴熷純娓呴櫎澶辫触锛屽紓甯镐俊鎭細"+e);
             }
         }
     }
 
-    @Scheduled(cron = "0/5 * * * * ? ")
-    public void outGroupOrderForm(){
-        String erpReport = Parameter.get().getErpReport();
-        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            List<OrderPakout> orders = orderPakoutService.selectSettle(11L);
-            for (OrderPakout order : orders) {
-                try{
-                    ReturnT<String> result = groupOrderFormHandler.start(order);
-                    if (!result.isSuccess()) {
-                        log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
-                    }
-                }catch (Exception e){
-                    log.error("璁″垝缁勮揣鍗昜orderNo={}]鍑哄簱澶辫触", order.getOrderNo());
-                    log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
+    @Scheduled(cron = "0/30 * * * * ? ")
+    public void inspectionGroupOrderForm(){
+        List<OrderPakout> orders = orderPakoutService.selectSettle(11L);//妫�楠�
+        if (orders.isEmpty()){
+            return;
+        }
+        for (OrderPakout order : orders) {
+            try{
+                ReturnT<String> result = groupOrderFormHandler.inspection(order);
+                if (!result.isSuccess()) {
+                    log.error("璁″垝缁勮揣鍗昜orderNo={}]鏌ヨ鍗峰彿瀛樺湪涓嶅悎鏍�", order.getOrderNo());
+                } else {
+                    orderPakoutService.updateSettle(order.getId(),12L,0L);//妫�楠屽悎鏍�
                 }
+            }catch (Exception e){
+                log.error("璁″垝缁勮揣鍗昜orderNo={}]鏌ヨ鍗峰彿澶辫触", order.getOrderNo());
+                log.error("璁″垝缁勮揣鍗�"+order+"鏌ヨ鍗峰彿澶辫触锛屽紓甯镐俊鎭細"+e);
+            }
+        }
+    }
+
+    @Scheduled(cron = "0/10 * * * * ? ")
+    public void outGroupOrderForm(){
+        List<OrderPakout> orders = orderPakoutService.selectSettle(12L);//鍑哄簱
+        if (orders.isEmpty()){
+            return;
+        }
+        for (OrderPakout order : orders) {
+            try{
+                ReturnT<String> result = groupOrderFormHandler.start(order);
+                if (!result.isSuccess()) {
+                    log.error("璁″垝缁勮揣鍗昜orderNo={}]妫�楠屽嚭搴撳け璐�", order.getOrderNo());
+                } else {
+                    orderPakoutService.updateSettle(order.getId(),15L,0L);//妫�楠屽悎鏍�
+                }
+            }catch (Exception e){
+                log.error("璁″垝缁勮揣鍗昜orderNo={}]妫�楠屽嚭搴撳け璐�", order.getOrderNo());
+                log.error("璁″垝缁勮揣鍗�"+order+"妫�楠屽嚭搴撳け璐ワ紝寮傚父淇℃伅锛�"+e);
             }
         }
     }

--
Gitblit v1.9.1