diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java index b8a715d8..21ecdc4f 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java @@ -174,10 +174,11 @@ public class WmsMaterialCoilAllExportVo { private Date updateTime; // 数据类型 - @ExcelProperty(value = "数据类型") - @ExcelDictFormat(readConverterExp = "0=历史,1=现存") private Integer dataType; + @ExcelProperty(value = "数据类型") + private String dataTypeText; + // 调制度 @ExcelProperty(value = "调制度") private String temperGrade; @@ -190,7 +191,8 @@ public class WmsMaterialCoilAllExportVo { private String businessPurpose; // 是否与订单相关 readConverterExp - @ExcelProperty(value = "是否与订单相关") - @ExcelDictFormat(readConverterExp = "0=否,1=是") private Integer isRelatedToOrder; + + @ExcelProperty(value = "是否与订单相关") + private String isRelatedToOrderText; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index a588f67a..5602c8bf 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -2498,6 +2498,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (Objects.equals(vo.getDataType(), 0)) { vo.setActualWarehouseName(null); } + // 转换数据类型:0=历史,1=现存 + if (vo.getDataType() != null) { + String dataTypeText = vo.getDataType() == 0 ? "历史" : "现存"; + vo.setDataTypeText(dataTypeText); + } + + // 转换是否与订单相关:0=否,1=是 + if (vo.getIsRelatedToOrder() != null) { + String isRelatedText = vo.getIsRelatedToOrder() == 0 ? "否" : "是"; + vo.setIsRelatedToOrderText(isRelatedText); + } } }