angelo
/
java-base-app
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

## 发货时，根据发货单号进行发货；

This commit is contained in:
cabbage 2025-05-13 16:13:36 +08:00
parent f7dd0a1f9c
commit d257a8b196
3 changed files with 43 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverController.java
View File

@ -291,17 +291,10 @@ public class SaDeliverController extends BaseController {
List<SaDeliver> saDeliverList = iSaDeliverService.listByIds(idList); List<SaDeliver> saDeliverList = iSaDeliverService.listByIds(idList);
for (SaDeliver saDeliver : saDeliverList) { for (SaDeliver saDeliver : saDeliverList) {
// 处理地址
// String address = StringUtils.isNotEmpty(saDeliver.getRecAddress()) ? saDeliver.getRecAddress() : "";
// 遍历导入数据，匹配发货单发货数据，如果相同则封装返回发货信息 // 遍历导入数据，匹配发货单发货数据，如果相同则封装返回发货信息
for (DeliverTemplateParam deliverTemplate : deliverTemplateParamList) { for (DeliverTemplateParam deliverTemplate : deliverTemplateParamList) {
if (saDeliver.getRecName().equals(deliverTemplate.getRecName()) if (saDeliver.getDeliverCode().equals(deliverTemplate.getDeliverCode())) {
&& saDeliver.getRecPhone().equals(deliverTemplate.getRecPhone()) // 物流单号相同，进行返回
// 2023.09.26 与供应链确认需求，只匹配收货人和联系方式
// && (deliverTemplate.getRecAddress().contains(address))
) {
// 收货人相同、收货电话相同、收货地址相同，则进行返回
resultList.add(DeliverTemplateVO.builder() resultList.add(DeliverTemplateVO.builder()
.pkId(saDeliver.getPkId()) .pkId(saDeliver.getPkId())
.logisticsCompany(deliverTemplate.getLogisticsCompany().trim()) .logisticsCompany(deliverTemplate.getLogisticsCompany().trim())

35
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/param/DeliverTemplateParam.java
View File

@ -13,23 +13,30 @@ import lombok.Data;
@Data @Data
public class DeliverTemplateParam { public class DeliverTemplateParam {
/** // /**
* 收货姓名 // * 收货姓名
*/ // */
@Excel(name = "收货姓名") // @Excel(name = "收货姓名")
private String recName; // private String recName;
//
// /**
// * 收货电话
// */
// @Excel(name = "收货电话")
// private String recPhone;
//
// /**
// * 收货地址
// */
// @Excel(name = "收货地址")
// private String recAddress;
/** /**
* 收货电话 * 发货单号
*/ */
@Excel(name = "收货电话") @Excel(name = "发货单号")
private String recPhone; private String deliverCode;
/**
* 收货地址
*/
@Excel(name = "收货地址")
private String recAddress;
/** /**
* 物流公司 * 物流公司

34
bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/vo/DeliverTemplateVO.java
View File

@ -24,23 +24,29 @@ public class DeliverTemplateVO {
*/ */
private Long pkId; private Long pkId;
/** // /**
* 收货姓名 // * 收货姓名
*/ // */
@Excel(name = "收货姓名") // @Excel(name = "收货姓名")
private String recName; // private String recName;
//
// /**
// * 收货电话
// */
// @Excel(name = "收货电话")
// private String recPhone;
//
// /**
// * 收货地址
// */
// @Excel(name = "收货地址")
// private String recAddress;
/** /**
* 收货电话 * 发货单号
*/ */
@Excel(name = "收货电话") @Excel(name = "发货单号")
private String recPhone; private String deliverCode;
/**
* 收货地址
*/
@Excel(name = "收货地址")
private String recAddress;
/** /**
* 物流公司 * 物流公司