From 5efdcf99dcbb0f2539c6d94c117a3eff21c98fa2 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 11 Apr 2026 16:03:16 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=B7=BB=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=89=A9=E6=B5=81=E8=BF=90=E5=8D=95=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在CrmContractOrderFinanceVo中新增wmsDeliveryWaybills字段用于存储物流运单信息 - 添加WmsDeliveryWaybillVo依赖引入 - 在CrmOrderItemServiceImpl的两个查询方法中增加物流运单数据查询逻辑 - 使用LambdaQueryWrapper按订单ID批量查询关联的物流运单信息 - 将查询到的物流运单列表设置到返回结果中 --- .../crm/domain/vo/CrmContractOrderFinanceVo.java | 4 ++++ .../crm/service/impl/CrmOrderItemServiceImpl.java | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractOrderFinanceVo.java b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractOrderFinanceVo.java index 72413627..91124ca8 100644 --- a/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractOrderFinanceVo.java +++ b/klp-crm/src/main/java/com/klp/crm/domain/vo/CrmContractOrderFinanceVo.java @@ -1,5 +1,6 @@ package com.klp.crm.domain.vo; +import com.klp.domain.vo.WmsDeliveryWaybillVo; import com.klp.domain.vo.WmsReceivableVo; import lombok.Data; @@ -11,4 +12,7 @@ public class CrmContractOrderFinanceVo { private List objectionList; private List receivableList; + + // setWmsDeliveryWaybills + private List wmsDeliveryWaybills; } diff --git a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java index af8f5440..24121b16 100644 --- a/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java +++ b/klp-crm/src/main/java/com/klp/crm/service/impl/CrmOrderItemServiceImpl.java @@ -8,7 +8,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; import com.klp.crm.domain.CrmSalesObjection; +import com.klp.domain.WmsMaterialCoil; import com.klp.domain.WmsReceivable; +import com.klp.domain.vo.WmsDeliveryWaybillVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.crm.domain.bo.CrmOrderItemBo; @@ -171,6 +173,12 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { List receivableList = wmsReceivableMapper.selectVoList(receivableWrapper); result.setReceivableList(receivableList); + LambdaQueryWrapper waybillWrapper = new LambdaQueryWrapper<>(); + waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds); + List wmsDeliveryWaybills = wmsDeliveryWaybillMapper.selectVoList(waybillWrapper); + result.setWmsDeliveryWaybills(wmsDeliveryWaybills); + + return result; } @@ -276,6 +284,11 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService { List receivableList = wmsReceivableMapper.selectVoList(receivableWrapper); result.setReceivableList(receivableList); + LambdaQueryWrapper waybillWrapper = new LambdaQueryWrapper<>(); + waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds); + List wmsDeliveryWaybills = wmsDeliveryWaybillMapper.selectVoList(waybillWrapper); + result.setWmsDeliveryWaybills(wmsDeliveryWaybills); + return result; }