From a5990a214ba13119d617b4532e2b9eef2fe70cda Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 12 九月 2024 14:09:01 +0800
Subject: [PATCH] mes接口对接
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 34 ++++++++++++++++++++--------------
1 files changed, 20 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 8a24643..a461c16 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,18 +1,19 @@
package com.zy.asrs.task;
-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.handler.OrderSyncHandler;
-import com.zy.common.entity.Parameter;
+import com.zy.system.entity.Config;
+import com.zy.system.mapper.ConfigMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
import java.util.List;
/**
@@ -28,6 +29,8 @@
private OrderService orderService;
@Autowired
private ApiLogService apiLogService;
+ @Resource
+ private ConfigMapper configMapper;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog(){
@@ -40,22 +43,25 @@
@Scheduled(cron = "0/9 * * * * ? ")
@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) {
- try{
- ReturnT<String> result = orderSyncHandler.start(order);
- if (!result.isSuccess()) {
- log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- }
- }catch (Exception e){
+ public void completeAndReport() {
+ Config config = configMapper.selectConfigByCode("erpReport");
+ if (config == null || config.getStatus() == 0) {
+ return;
+ }
+
+ List<Order> orders = orderService.selectComplete();
+ for (Order order : orders) {
+ try {
+ ReturnT<String> result = orderSyncHandler.start(order);
+ if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
- log.error("璁㈠崟"+order+"澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
}
+ } catch (Exception e) {
+ log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
+ log.error("璁㈠崟" + order + "澶勭悊澶辫触锛屽紓甯镐俊鎭細" + e);
}
}
+
}
}
--
Gitblit v1.9.1