Browse Source

FWHL-445 已修复

master_hella
陈放 4 weeks ago
parent
commit
d4cd1e21e4
  1. 2
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java
  2. 7
      win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java

2
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/PurchasereturnRecordMainController.java

@ -421,6 +421,8 @@ public class PurchasereturnRecordMainController {
mapDropDown.put(43, purchaseReturnReason);
String[] uom = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.UOM);
mapDropDown.put(53, uom);
String[] reasonType = DictFrameworkUtils.dictTypeDictDataValue(DictTypeConstants.RETURN_REASON_TYPE);
mapDropDown.put(55, reasonType);
List<PurchasereturnRecordMainExcelVO> resultList = new ArrayList<>();
// 导出

7
win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRecord/vo/PurchasereturnRecordMainExcelVO.java

@ -82,6 +82,13 @@ public class PurchasereturnRecordMainExcelVO {
@ExcelProperty("Q2通知单编号")
private String q2Number;
@ExcelProperty(value = "退货原因", converter = DictConvert.class)
@DictFormat(DictTypeConstants.RETURN_REASON_TYPE)
private String reasonType;
@ExcelProperty("退货原因描述")
private String reason;
@ExcelProperty("创建时间")
@ColumnWidth(value = 16)
private LocalDateTime createTime;

Loading…
Cancel
Save