From f48878cdae5652be9e8f1145eda84d2ca9ca0544 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 07 一月 2025 13:52:05 +0800
Subject: [PATCH] 优化订单同步逻辑及环境配置
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index 404a5a6..cb648d6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -3,12 +3,10 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.zy.asrs.entity.AgvLocDetl;
+import com.zy.asrs.entity.DocType;
import com.zy.asrs.entity.Order;
import com.zy.asrs.entity.OrderDetl;
-import com.zy.asrs.service.AgvLocDetlService;
-import com.zy.asrs.service.ApiLogService;
-import com.zy.asrs.service.OrderDetlService;
-import com.zy.asrs.service.OrderService;
+import com.zy.asrs.service.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
@@ -38,6 +36,9 @@
@Autowired
private OrderDetlService orderDetlService;
+
+ @Autowired
+ private DocTypeService docTypeService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -85,7 +86,8 @@
@Scheduled(fixedDelay = 30000)
//@Async("orderThreadPool")
public synchronized void reportOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
+ DocType docType = docTypeService.selectOne(new EntityWrapper<DocType>().eq("docName", "閾跺骇閲囪喘鍏ュ簱鍗�"));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
});
@@ -98,11 +100,9 @@
//@Scheduled(cron = "0 */1 * * * ? ")
@Scheduled(fixedDelay = 60000)
public void completeOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2).isNotNull("plt_type"));
orderList.forEach(order -> {
- if (order.getPltType() != null) {
- orderService.checkComplete(order.getOrderNo(), order.getPltType());
- }
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
});
}
--
Gitblit v1.9.1