From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 79 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 25 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index e666b22..87e9e24 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,11 +1,15 @@
package com.zy.asrs.task;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.CheckOrder;
import com.zy.asrs.entity.Order;
+import com.zy.asrs.entity.OrderPakout;
import com.zy.asrs.enums.OrderTypeEnum;
import com.zy.asrs.service.ApiLogService;
+import com.zy.asrs.service.OrderPakoutService;
import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.impl.OrderPakoutServiceImpl;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.asrs.utils.OrderInAndOutUtil;
@@ -17,6 +21,7 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.util.Arrays;
import java.util.List;
/**
@@ -35,6 +40,8 @@
@Value("${erp.switch.ErpReportOld}")
private boolean ErpReportOld;
+ @Autowired
+ private OrderPakoutService orderPakoutService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -53,9 +60,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());
}
@@ -67,19 +74,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());
}
+ }
// }
}
@@ -88,25 +95,46 @@
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());
}
+ }
// }
+ }
+
+// @Scheduled(cron = "0/5 * * * * ? ")
+ @Async("orderThreadPool")
+ public void completePakoutOrder() {
+ List<OrderPakout> orderPakouts = orderPakoutService.selectList(new EntityWrapper<OrderPakout>()
+ .in("doc_type", Arrays.asList(2))
+ .eq("settle", 4));
+ if (orderPakouts != null && orderPakouts.size() > 0) {
+ for (OrderPakout orderPakout : orderPakouts) {
+ try {
+ ReturnT<String> result = orderSyncHandler.startConvertOrders(orderPakout);
+ if (!result.isSuccess()) {
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", orderPakout.getOrderNo());
+ }
+ } catch (Exception e) {
+ log.error(e.getMessage());
+ log.error("鍗曟嵁[orderNo={}]杞笂鎶ヨ〃澶辫触", orderPakout.getOrderNo());
+ }
+ }
+ }
}
@Scheduled(cron = "0/30 * * * * ? ")
@Async("orderThreadPool")
public void completeAndReportOrderReport() {
- if (!ErpReportOld){
+ if (!ErpReportOld) {
return;
}
String erpReport = Parameter.get().getErpReport();
@@ -118,7 +146,6 @@
if (!result.isSuccess()) {
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
}
-
} catch (Exception e) {
log.error(e.getMessage());
log.error("鍗曟嵁[orderNo={}]涓婃姤erp澶辫触", order.getOrderNo());
@@ -127,11 +154,13 @@
}
}
- /**鎹熸孩鍗曞畬缁撲笂鎶� */
-// @Scheduled(cron = "0/15 * * * * ?")
+ /**
+ * 鎹熸孩鍗曞畬缁撲笂鎶�
+ */
+ @Scheduled(cron = "0/15 * * * * ?")
@Async("orderThreadPool")
public void completeCheckOrderReport() {
- if (!ErpReportOld){
+ if (!ErpReportOld) {
return;
}
String erpReport = Parameter.get().getErpReport();
--
Gitblit v1.9.1