DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.8.X' of http://49.232.154.205:10100/DeXun/klp-oa into 0.8.X

Browse Source
This commit is contained in:
砂糖
2026-03-21 10:40:17 +08:00
parent 1b22ec6173 09de6e4e62
commit 69c43a7edf
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
View File

@@ -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;
}

11
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -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);
}
}
}