diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java index b7805c49..81a2c21b 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java @@ -291,17 +291,10 @@ public class SaDeliverController extends BaseController { List saDeliverList = iSaDeliverService.listByIds(idList); for (SaDeliver saDeliver : saDeliverList) { - // 处理地址 -// String address = StringUtils.isNotEmpty(saDeliver.getRecAddress()) ? saDeliver.getRecAddress() : ""; - // 遍历导入数据,匹配发货单发货数据,如果相同则封装返回发货信息 for (DeliverTemplateParam deliverTemplate : deliverTemplateParamList) { - if (saDeliver.getRecName().equals(deliverTemplate.getRecName()) - && saDeliver.getRecPhone().equals(deliverTemplate.getRecPhone()) - // 2023.09.26 与供应链确认需求,只匹配收货人和联系方式 -// && (deliverTemplate.getRecAddress().contains(address)) - ) { - // 收货人相同、收货电话相同、收货地址相同,则进行返回 + if (saDeliver.getDeliverCode().equals(deliverTemplate.getDeliverCode())) { + // 物流单号相同,进行返回 resultList.add(DeliverTemplateVO.builder() .pkId(saDeliver.getPkId()) .logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java index 24250609..42a1f534 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java @@ -13,23 +13,30 @@ import lombok.Data; @Data public class DeliverTemplateParam { - /** - * 收货姓名 - */ - @Excel(name = "收货姓名") - private String recName; +// /** +// * 收货姓名 +// */ +// @Excel(name = "收货姓名") +// private String recName; +// +// /** +// * 收货电话 +// */ +// @Excel(name = "收货电话") +// private String recPhone; +// +// /** +// * 收货地址 +// */ +// @Excel(name = "收货地址") +// private String recAddress; + /** - * 收货电话 + * 发货单号 */ - @Excel(name = "收货电话") - private String recPhone; - - /** - * 收货地址 - */ - @Excel(name = "收货地址") - private String recAddress; + @Excel(name = "发货单号") + private String deliverCode; /** * 物流公司 diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverTemplateVO.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverTemplateVO.java index 1e1c3f6b..12107e80 100644 --- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverTemplateVO.java +++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverTemplateVO.java @@ -24,23 +24,29 @@ public class DeliverTemplateVO { */ private Long pkId; - /** - * 收货姓名 - */ - @Excel(name = "收货姓名") - private String recName; +// /** +// * 收货姓名 +// */ +// @Excel(name = "收货姓名") +// private String recName; +// +// /** +// * 收货电话 +// */ +// @Excel(name = "收货电话") +// private String recPhone; +// +// /** +// * 收货地址 +// */ +// @Excel(name = "收货地址") +// private String recAddress; /** - * 收货电话 + * 发货单号 */ - @Excel(name = "收货电话") - private String recPhone; - - /** - * 收货地址 - */ - @Excel(name = "收货地址") - private String recAddress; + @Excel(name = "发货单号") + private String deliverCode; /** * 物流公司