From ee2e593c5736c27dad7d93f9fca98290f578b5da Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 21 五月 2025 21:36:25 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/asrs/task/OrderSyncScheduler.java |   62 +++++++++++++++++++++----------
 1 files changed, 42 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 36e06ac..fee5c4c 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,8 +1,12 @@
 package com.zy.asrs.task;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
+import com.zy.asrs.entity.InventoryCheckOrder;
 import com.zy.asrs.entity.Order;
 import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.InventoryCheckOrderDetlService;
+import com.zy.asrs.service.InventoryCheckOrderService;
 import com.zy.asrs.service.OrderService;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -31,6 +35,13 @@
     @Autowired
     private ApiLogService apiLogService;
 
+
+    @Autowired
+    private InventoryCheckOrderDetlService inventoryCheckOrderDetlService;
+
+    @Autowired
+    private InventoryCheckOrderService inventoryCheckOrderService;
+
     @Value("${erp.switch.ErpReportOld}")
     private boolean ErpReportOld;
 
@@ -51,9 +62,9 @@
             try {
                 ReturnT<String> result = orderSyncHandler.startOrderIssuedOnceMore(order);
                 if (!result.isSuccess()) {
-                    log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(),result.getMsg());
+                    log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触:{}", order.getOrderNo(), result.getMsg());
                 }
-            } catch (Exception e){
+            } catch (Exception e) {
                 log.error(e.getMessage());
                 log.error("鍗曟嵁[orderNo={}]鍐嶆杞墽琛岃〃澶辫触", order.getOrderNo());
             }
@@ -65,19 +76,19 @@
     public void completeAndReportOrderIssued() {
 //        String erpReport = Parameter.get().getErpReport();
 //        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
-            List<Order> orderList = orderService.selectComplete1();
+        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());
+        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());
             }
+        }
 //        }
     }
 
@@ -86,18 +97,18 @@
     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());
+        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());
             }
+        }
 //        }
     }
 
@@ -123,4 +134,15 @@
             }
         }
     }
+
+    @Scheduled(cron = "0/30 * * * * ? ")
+    public void completeCheck() {
+        String erpReport = Parameter.get().getErpReport();
+        if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+            List<InventoryCheckOrder> inventoryCheckOrders = inventoryCheckOrderService.selectList(new EntityWrapper<InventoryCheckOrder>().eq("status", 2));
+            for (InventoryCheckOrder inventoryCheckOrder : inventoryCheckOrders) {
+
+            }
+        }
+    }
 }

--
Gitblit v1.9.1