From 97c6071eaf01a3ce1a706cb0114dcb27d255aa3d Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 25 十二月 2024 13:03:26 +0800
Subject: [PATCH] 优化订单同步逻辑及库位查找
---
src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
index d66fbfc..44d8f61 100644
--- a/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/OrderSyncHandler.java
@@ -46,7 +46,7 @@
private AgvWrkDetlLogService agvWrkDetlLogService;
@Autowired
- private AgvWrkMastService agvWrkMastService;
+ private AgvWrkMastLogService agvWrkMastLogService;
@Autowired
private AgvLocMastService agvLocMastService;
@@ -109,12 +109,14 @@
}
}
if (Cools.isEmpty(order.getPltType())) {
- List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).eq("io_type", 1));
+ List<AgvWrkDetlLog> agvWrkDetlLogs = agvWrkDetlLogService.selectList(new EntityWrapper<AgvWrkDetlLog>().eq("order_no", order.getOrderNo()).orderBy("appe_time", false));
if (!Cools.isEmpty(agvWrkDetlLogs)) {
- AgvWrkMast agvWrkMast = agvWrkMastService.selectById(agvWrkDetlLogs.get(0).getWrkNo());
- if (agvWrkMast != null) {
- AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
+ AgvWrkDetlLog agvWrkDetlLog = agvWrkDetlLogs.get(0);
+ List<AgvWrkMastLog> agvWrkMastLogs = agvWrkMastLogService.selectList(new EntityWrapper<AgvWrkMastLog>().eq("wrk_no", agvWrkDetlLog.getWrkNo()).eq("io_type", 1).orderBy("appe_time", false));
+ if (!Cools.isEmpty(agvWrkMastLogs)) {
+ AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMastLogs.get(0).getLocNo());
if (agvLocMast != null) {
+ log.info("琛ュ厖閫昏緫鐢熸晥锛歿}", order.getOrderNo());
order.setPltType(agvLocMast.getPltType());
}
}
--
Gitblit v1.9.1