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; }