From 5de76c8f2409c0d1a759c4ee33967f2fbd8295c8 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 22 十月 2025 17:25:24 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 61004e9..bf46a96 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -2,7 +2,9 @@
import com.core.common.Cools;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderDetl;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.OrderDetlService;
import com.zy.asrs.service.OrderService;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
@@ -28,6 +30,8 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Autowired
+ private OrderDetlService orderDetlService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog(){
@@ -38,16 +42,51 @@
}
}
-// @Scheduled(cron = "0/5 * * * * ? ")
+ /**
+ * 鍏ュ簱璁㈠崟銆佸嚭搴撹鍗曞畬鎴愪笂鎶�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReport(){
String erpReport = Parameter.get().getErpReport();
if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
List<Order> orders = orderService.selectComplete();
for (Order order : orders) {
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ if(order.getDocType()== 81){
+ continue;
+ }
+ try {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp鎶ラ敊", order.getOrderNo());
+ }
+ }
+ }
+ }
+
+ /**
+ * 閿�鍞嚭搴撹鍗曟槑缁嗗畬鎴愪笂鎶�
+ */
+ @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completeAndReport1(){
+ String erpReport = Parameter.get().getErpReport();
+ if (!Cools.isEmpty(erpReport) && erpReport.equals("true")) {
+ List<OrderDetl> orderDetls = orderDetlService.reportERPOrderDetl();
+ for (OrderDetl orderDetl : orderDetls) {
+ Order order = orderService.selectByNo(orderDetl.getOrderNo());
+ try {
+ ReturnT<String> result = orderSyncHandler.start1(order, orderDetl);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁鏄庣粏[orderNo={}],[matnr={}],[batch={}]涓婃姤erp澶辫触", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
+ }
+ }catch (Exception e){
+ e.printStackTrace();
+ log.error("鍗曟嵁鏄庣粏[orderNo={}],[matnr={}],[batch={}]涓婃姤erp澶辫触", orderDetl.getOrderNo(), orderDetl.getMatnr(), orderDetl.getBatch());
}
}
}
--
Gitblit v1.9.1