From e8031f041ad3c5d77986b025a79db0d4e2059496 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常信息及版本更新
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..363bd55 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;
@@ -39,6 +37,9 @@
@Autowired
private OrderDetlService orderDetlService;
+ @Autowired
+ private DocTypeService docTypeService;
+
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
try {
@@ -49,7 +50,7 @@
}
//@Scheduled(cron = "0/5 * * * * ? ")
- @Scheduled(fixedDelay = 5000)
+ @Scheduled(fixedDelay = 600000)
//@Async("orderThreadPool")
public void completeAndReport() {
String erpReport = Parameter.get().getErpReport();
@@ -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("doc_name", "閾跺骇閲囪喘鍏ュ簱鍗�"));
+ List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("doc_type", docType.getDocId()).in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
});
@@ -98,7 +100,7 @@
//@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());
--
Gitblit v1.9.1