Browse Source

fix:修复待签收列表导出所有仓库的数据bug-5 修改导出模板名称,修改装车时间

pull/2/head
pref_mail@163.com 10 months ago
parent
commit
3c6f2e7823
  1. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java
  2. 2
      blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionSignforExcel.java

@ -100,7 +100,7 @@ public class DistributionSignforExcel implements Serializable {
* 服务类型 * 服务类型
*/ */
@ColumnWidth(20) @ColumnWidth(20)
@ExcelProperty("配送服务类型") @ExcelProperty("增值服务类型")
private String deliveryWayName; private String deliveryWayName;
/** /**
* 服务类型 * 服务类型

2
blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@ -1828,7 +1828,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
DistributionSignforExcel signforExcel = new DistributionSignforExcel(); DistributionSignforExcel signforExcel = new DistributionSignforExcel();
BeanUtils.copyProperties(d, signforExcel); BeanUtils.copyProperties(d, signforExcel);
signforExcel.setOrderCode(d.getStockArticleId()); signforExcel.setOrderCode(d.getStockArticleId());
signforExcel.setDeliveryTime(d.getLoadingTime()); signforExcel.setDeliveryTime(d.getSignLoadingDate());
// signforExcel.setConsignee(); // signforExcel.setConsignee();
String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType()); String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, d.getDeliveryType());

Loading…
Cancel
Save