Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

- 在CrmContractOrderFinanceVo中新增wmsDeliveryWaybills字段用于存储物流运单信息
- 添加WmsDeliveryWaybillVo依赖引入
- 在CrmOrderItemServiceImpl的两个查询方法中增加物流运单数据查询逻辑
- 使用LambdaQueryWrapper按订单ID批量查询关联的物流运单信息
- 将查询到的物流运单列表设置到返回结果中

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<CrmSalesObjectionVo> objectionList;
 
     private List<WmsReceivableVo> receivableList;
+
+    // setWmsDeliveryWaybills
+    private List<WmsDeliveryWaybillVo> wmsDeliveryWaybills;
 }

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<WmsReceivableVo> receivableList = wmsReceivableMapper.selectVoList(receivableWrapper);
         result.setReceivableList(receivableList);
 
+        LambdaQueryWrapper<WmsDeliveryWaybill> waybillWrapper = new LambdaQueryWrapper<>();
+        waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds);
+        List<WmsDeliveryWaybillVo> wmsDeliveryWaybills = wmsDeliveryWaybillMapper.selectVoList(waybillWrapper);
+        result.setWmsDeliveryWaybills(wmsDeliveryWaybills);
+
+
         return result;
     }
 
@@ -276,6 +284,11 @@ public class CrmOrderItemServiceImpl implements ICrmOrderItemService {
         List<WmsReceivableVo> receivableList = wmsReceivableMapper.selectVoList(receivableWrapper);
         result.setReceivableList(receivableList);
 
+        LambdaQueryWrapper<WmsDeliveryWaybill> waybillWrapper = new LambdaQueryWrapper<>();
+        waybillWrapper.in(WmsDeliveryWaybill::getOrderId, orderIds);
+        List<WmsDeliveryWaybillVo> wmsDeliveryWaybills = wmsDeliveryWaybillMapper.selectVoList(waybillWrapper);
+        result.setWmsDeliveryWaybills(wmsDeliveryWaybills);
+
         return result;
     }