From ab14726215678ac69adfeafbd845ebc5b0776ea2 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:56:41 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/task/OrderSyncScheduler.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..404a5a6 100644
--- a/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
+++ b/src/main/java/com/zy/asrs/task/OrderSyncScheduler.java
@@ -1,10 +1,10 @@
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.entity.AgvLocDetl;
+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;
@@ -14,7 +14,6 @@
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;
@@ -85,7 +84,7 @@
//@Scheduled(cron = "0/30 * * * * ? ")
@Scheduled(fixedDelay = 30000)
//@Async("orderThreadPool")
- public synchronized void reportOrder() {
+ public synchronized void reportOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().in("settle", 2, 4));
orderList.forEach(order -> {
orderSyncHandler.timelyStart(order);
@@ -101,7 +100,9 @@
public void completeOrder() {
List<Order> orderList = orderService.selectList(new EntityWrapper<Order>().eq("settle", 2));
orderList.forEach(order -> {
- orderService.checkComplete(order.getOrderNo(), null);
+ if (order.getPltType() != null) {
+ orderService.checkComplete(order.getOrderNo(), order.getPltType());
+ }
});
}
--
Gitblit v1.9.1