From edbc6bb56eb8e03061b05e9194d6464eb3664700 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期五, 28 二月 2025 10:50:32 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java | 7 +++ src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java | 17 +++++--- src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java | 17 +++++--- src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 9 ++++ src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java | 17 +++++--- src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java | 7 +++ src/main/resources/application.yml | 2 + 7 files changed, 55 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java index 6887117..a797915 100644 --- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java @@ -10,6 +10,7 @@ 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; @@ -29,6 +30,9 @@ private OrderService orderService; @Autowired private ApiLogService apiLogService; + + @Value("${erp.switch.ErpReportOld}") + private boolean ErpReportOld; @Scheduled(cron = "0 0 1 * * ? ") public void clearApiLog() { @@ -97,9 +101,12 @@ // } } - @Scheduled(cron = "0/5 * * * * ? ") + @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(); diff --git a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java index 2955277..1c68d49 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/InboundOrderScheduler.java @@ -1,6 +1,8 @@ package com.zy.asrs.task.kingdee; +import com.core.common.Cools; import com.zy.asrs.task.kingdee.handler.InboundOrderHandler; +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; @@ -21,7 +23,10 @@ if(!InboundOrderSwitch){ return; } - inboundOrderHandler.start(); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + inboundOrderHandler.start(); + } } } diff --git a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java index 8b7be90..c6befac 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/LoginAuthenticationScheduler.java @@ -1,6 +1,8 @@ package com.zy.asrs.task.kingdee; +import com.core.common.Cools; import com.zy.asrs.task.kingdee.handler.LoginAuthenticationHandler; +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; @@ -20,6 +22,9 @@ if(!LoginAuthenticationSwitch){ return; } - loginAuthenticationHandler.start(); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + loginAuthenticationHandler.start(); + } } } diff --git a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java index 79647e8..a3c9e16 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/ReviewOrderSyncScheduler.java @@ -1,11 +1,13 @@ package com.zy.asrs.task.kingdee; +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.kingdee.handler.ReviewOrderSyncHandler; 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; @@ -36,12 +38,15 @@ if(!ReviewOrderSwitch){ return; } -// List<Order> orders = orderService.selectComplete(); - List<Order> orders = OrderInAndOutUtil.selectComplete(null); - for (Order order : orders) { - ReturnT<String> result = reviewOrderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo()); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + // List<Order> orders = orderService.selectComplete(); + List<Order> orders = OrderInAndOutUtil.selectComplete(null); + for (Order order : orders) { + ReturnT<String> result = reviewOrderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]鍚慹rp瀹℃牳澶辫触", order.getOrderNo()); + } } } } diff --git a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java index 46f5910..4fe4f26 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/SaveOrderSyncScheduler.java @@ -1,10 +1,12 @@ package com.zy.asrs.task.kingdee; +import com.core.common.Cools; import com.zy.asrs.entity.Order; import com.zy.asrs.service.OrderService; import com.zy.asrs.task.core.ReturnT; import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler; 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; @@ -36,12 +38,15 @@ if(!ReviewOrderSwitch){ return; } -// List<Order> orders = orderService.selectComplete8(); - List<Order> orders = OrderInAndOutUtil.selectComplete8(null); - for (Order order : orders) { - ReturnT<String> result = submitOrderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo()); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + // List<Order> orders = orderService.selectComplete8(); + List<Order> orders = OrderInAndOutUtil.selectComplete8(null); + for (Order order : orders) { + ReturnT<String> result = submitOrderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]鎻愪氦鑷砮rp澶辫触", order.getOrderNo()); + } } } } diff --git a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java index 785657e..e35710e 100644 --- a/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java +++ b/src/main/java/com/zy/asrs/task/kingdee/SubmitOrderSyncScheduler.java @@ -1,5 +1,6 @@ package com.zy.asrs.task.kingdee; +import com.core.common.Cools; import com.zy.asrs.entity.Order; import com.zy.asrs.service.ApiLogService; import com.zy.asrs.service.OrderService; @@ -8,6 +9,7 @@ import com.zy.asrs.task.kingdee.handler.SaveOrderSyncHandler; import com.zy.asrs.task.kingdee.handler.SubmitOrderSyncHandler; 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; @@ -38,12 +40,15 @@ if(!ReviewOrderSwitch){ return; } -// List<Order> orders = orderService.selectComplete8(); - List<Order> orders = OrderInAndOutUtil.selectComplete8(null); - for (Order order : orders) { - ReturnT<String> result = saveOrderSyncHandler.start(order); - if (!result.isSuccess()) { - log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo()); + String erpReport = Parameter.get().getErpReport(); + if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) { + // List<Order> orders = orderService.selectComplete8(); + List<Order> orders = OrderInAndOutUtil.selectComplete8(null); + for (Order order : orders) { + ReturnT<String> result = saveOrderSyncHandler.start(order); + if (!result.isSuccess()) { + log.error("鍗曟嵁[orderNo={}]淇濆瓨鑷砮rp澶辫触", order.getOrderNo()); + } } } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5d45666..f7428f3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -81,6 +81,8 @@ erp: # 寮�鍏� switch: + #璁℃椂鍣ㄤ笂鎶ュ紑鍏� + ErpReportOld: false #鑾峰彇鍗曟嵁寮�鍏� InboundOrderSwitch: false #鐧诲綍鎺ュ彛寮�鍏� -- Gitblit v1.9.1