From bf44ae2dd15b2b139ce56b1ba1294fdfd220c763 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 25 十二月 2024 17:13:34 +0800
Subject: [PATCH] #问题修复 1. 列表字段空间调整 2. 地址链接放至配置文件中 3. 定时任务执行完成后，状态修改补上 4. 修改状态时，需校验上一步状态是否对应 5. 下发任务完成后，查看是否修改状态为2 7. 任务状态列表，数据显示不全问题修复 8. 波次列表，表格合并问题导致多订单出库问题
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java | 70 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 30 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
index 42a0b9e..323f3ae 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/OrderDetlServiceImpl.java
@@ -1,30 +1,40 @@
-package com.zy.asrs.wms.asrs.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.zy.asrs.wms.asrs.entity.OrderDetlField;
-import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
-import com.zy.asrs.wms.asrs.entity.OrderDetl;
-import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
-import com.zy.asrs.wms.asrs.service.OrderDetlService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service("orderDetlService")
-public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
-
- @Autowired
- private OrderDetlFieldService orderDetlFieldService;
-
- @Override
- public List<OrderDetl> getOrderDetlByOrderId(Long orderId) {
- List<OrderDetl> orderDetls = this.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId));
- for (OrderDetl orderDetl : orderDetls) {
- List<OrderDetlField> list = orderDetlFieldService.list(new LambdaQueryWrapper<OrderDetlField>().eq(OrderDetlField::getDetlId, orderDetl.getId()));
- orderDetl.syncField(list);
- }
- return orderDetls;
- }
-}
+package com.zy.asrs.wms.asrs.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.zy.asrs.wms.asrs.entity.OrderDetlField;
+import com.zy.asrs.wms.asrs.mapper.OrderDetlMapper;
+import com.zy.asrs.wms.asrs.entity.OrderDetl;
+import com.zy.asrs.wms.asrs.service.OrderDetlFieldService;
+import com.zy.asrs.wms.asrs.service.OrderDetlService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service("orderDetlService")
+public class OrderDetlServiceImpl extends ServiceImpl<OrderDetlMapper, OrderDetl> implements OrderDetlService {
+
+ @Autowired
+ private OrderDetlFieldService orderDetlFieldService;
+
+ @Override
+ public List<OrderDetl> getOrderDetlByOrderId(Long orderId) {
+ List<OrderDetl> orderDetls = this.list(new LambdaQueryWrapper<OrderDetl>().eq(OrderDetl::getOrderId, orderId));
+ for (OrderDetl orderDetl : orderDetls) {
+ List<OrderDetlField> list = orderDetlFieldService.list(new LambdaQueryWrapper<OrderDetlField>().eq(OrderDetlField::getDetlId, orderDetl.getId()));
+ orderDetl.syncField(list);
+ }
+ return orderDetls;
+ }
+
+ @Override
+ public List<OrderDetl> parseDetl(List<OrderDetl> orderDetls) {
+ for (OrderDetl orderDetl : orderDetls) {
+ List<OrderDetlField> list = orderDetlFieldService.list(new LambdaQueryWrapper<OrderDetlField>().eq(OrderDetlField::getDetlId, orderDetl.getId()));
+ orderDetl.syncField(list);
+ }
+ return orderDetls;
+ }
+}
--
Gitblit v1.9.1