diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java index 10a00ef6..8df6fa33 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java @@ -2726,6 +2726,9 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService { exitPermit.setCode("/"); exitPermit.setCodeList(Collections.singletonList("/")); } + if (StringUtils.isBlank(exitPermit.getRemark())) { + exitPermit.setRemark("/"); + } } } return exitPermitList; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackExportVO.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackExportVO.java index aa70187c..d7ebd353 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackExportVO.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackExportVO.java @@ -45,19 +45,18 @@ public class MaterialBackExportVO { @ApiModelProperty(value = "退料单号") private String code; - @ApiModelProperty(value = "工器具名称") - @Excel(name = "工器具名称") + @ApiModelProperty(value = "类型名称") + @Excel(name = "类型名称") + private String typeCode; + + @ApiModelProperty(value = "物资名称") + @Excel(name = "物资名称") private String materialName; @Excel(name = "规格型号") @ApiModelProperty(value = "规格型号") private String typeModelName; - - @ApiModelProperty(value = "类型名称") - @Excel(name = "类型名称") - private String typeCode; - /** 退料数量 */ @ApiModelProperty(value = "预退数量") @Excel(name = "预退数量", cellType = Excel.ColumnType.NUMERIC) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetailExport.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetailExport.java index 33c25588..fe4ce2c9 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetailExport.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetailExport.java @@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; +import org.apache.poi.ss.usermodel.HorizontalAlignment; import java.math.BigDecimal; import java.util.Date; @@ -61,20 +62,20 @@ public class MaterialLeaseApplyDetailExport extends BaseEntity{ @Excel(name = "物资名称") private String typeModelName; - @ApiModelProperty(value = "物资型号") - @Excel(name = "物资型号") + @ApiModelProperty(value = "规格型号") + @Excel(name = "规格型号") private String typeName; @ApiModelProperty(value = "单位") @Excel(name = "单位") private String unitName; - @ApiModelProperty(value = "领料数量") - @Excel(name = "领料数量", cellType = Excel.ColumnType.NUMERIC) + @ApiModelProperty(value = "预领数量") + @Excel(name = "预领数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal alNum; @ApiModelProperty(value = "出库数量") - @Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC) + @Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal outNum; @ApiModelProperty(value = "出库时间")