From d07a7672eb185c4fb2bcb6589994d23e93d144f6 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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
index d69dedb..f579f89 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,20 +1,17 @@
package com.zy.asrs.task;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
-import com.core.exception.CoolException;
-import com.zy.asrs.entity.*;
-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.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.*;
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.handler.OrderSyncHandler;
import com.zy.common.entity.Parameter;
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;
@@ -39,6 +36,9 @@
@Autowired
private OrderDetlService orderDetlService;
+
+ @Autowired
+ private DocTypeService docTypeService;
@Scheduled(cron = "0 0 1 * * ? ")
public void clearApiLog() {
@@ -85,8 +85,9 @@
//@Scheduled(cron = "0/30 * * * * ? ")
@Scheduled(fixedDelay = 30000)
//@Async("orderThreadPool")
- public synchronized void reportOrder() {
- List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
+ public synchronized void reportOrder() {
+ 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);
});
@@ -99,9 +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 -> {
- orderService.checkComplete(order.getOrderNo(), null);
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
});
}
--
Gitblit v1.9.1