From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 75 +++++++++++++++----------------------
1 files changed, 31 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index d223b49..382c7fb 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,13 +1,14 @@
package com.zy.asrs.task;
-import com.core.common.Cools;
-import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderPakin;
+import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.OrderPakinService;
+import com.zy.asrs.service.OrderPakoutService;
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 com.zy.asrs.task.handler.OrderPakinSyncHandler;
+import com.zy.asrs.task.handler.OrderPakoutSyncHandler;
+import com.zy.system.timer.LoadingConfigTimer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -24,11 +25,18 @@
public class OrderSyncScheduler {
@Autowired
- private OrderSyncHandler orderSyncHandler;
+ private OrderPakinSyncHandler orderPakinSyncHandler;
@Autowired
- private OrderService orderService;
+ private OrderPakoutSyncHandler orderPakoutSyncHandler;
+ @Autowired
+ private OrderPakinService orderPakinService;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private LoadingConfigTimer loadingConfigTimer;
+
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -39,56 +47,35 @@
}
}
- @Scheduled(cron = "0/5 * * * * ? ")
+
+ @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) {
+ public void completeOrderPakin() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakin> orders = orderPakinService.selectComplete();
+ for (OrderPakin order : orders) {
try {
- ReturnT<String> result = orderSyncHandler.startOrderIssued(order);
+ ReturnT<String> result = orderPakinSyncHandler.startOrderReport(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
- } catch (Exception e){
+ } catch (Exception e) {
log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", 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/5 * * * * ? ")
+ @Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
- public void completeAndReportOrderReport() {
- String erpReport = Parameter.get().getErpReport();
- if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
- List<Order> orders = orderService.selectComplete();
- for (Order order : orders) {
+ public void completeOrderPakout() {
+ if (loadingConfigTimer.getErpReport()) {
+ List<OrderPakout> orders = orderPakoutService.selectComplete();
+ for (OrderPakout order : orders) {
try {
- ReturnT<String> result = orderSyncHandler.startOrderReport(order);
+ ReturnT<String> result = orderPakoutSyncHandler.startOrderReport(order);
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
--
Gitblit v1.9.1