bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化

This commit is contained in:
mashuai 2025-11-13 13:32:56 +08:00
parent 8b3ffc8957
commit 32e338bad2
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material/src/main/java/com/bonus/material/back/service/impl/BackApplyInfoServiceImpl.java
View File

@ -2726,6 +2726,9 @@ public class BackApplyInfoServiceImpl implements IBackApplyInfoService {
exitPermit.setCode("/"); exitPermit.setCode("/");
exitPermit.setCodeList(Collections.singletonList("/")); exitPermit.setCodeList(Collections.singletonList("/"));
} }
if (StringUtils.isBlank(exitPermit.getRemark())) {
exitPermit.setRemark("/");
}
} }
} }
return exitPermitList; return exitPermitList;

13
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/back/MaterialBackExportVO.java
View File

@ -45,19 +45,18 @@ public class MaterialBackExportVO {
@ApiModelProperty(value = "退料单号") @ApiModelProperty(value = "退料单号")
private String code; private String code;
@ApiModelProperty(value = "工器具名称") @ApiModelProperty(value = "类型名称")
@Excel(name = "工器具名称") @Excel(name = "类型名称")
private String typeCode;
@ApiModelProperty(value = "物资名称")
@Excel(name = "物资名称")
private String materialName; private String materialName;
@Excel(name = "规格型号") @Excel(name = "规格型号")
@ApiModelProperty(value = "规格型号") @ApiModelProperty(value = "规格型号")
private String typeModelName; private String typeModelName;
@ApiModelProperty(value = "类型名称")
@Excel(name = "类型名称")
private String typeCode;
/** 退料数量 */ /** 退料数量 */
@ApiModelProperty(value = "预退数量") @ApiModelProperty(value = "预退数量")
@Excel(name = "预退数量", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "预退数量", cellType = Excel.ColumnType.NUMERIC)

11
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/lease/MaterialLeaseApplyDetailExport.java
View File

@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
@ -61,20 +62,20 @@ public class MaterialLeaseApplyDetailExport extends BaseEntity{
@Excel(name = "物资名称") @Excel(name = "物资名称")
private String typeModelName; private String typeModelName;
@ApiModelProperty(value = "物资型号") @ApiModelProperty(value = "规格型号")
@Excel(name = "物资型号") @Excel(name = "规格型号")
private String typeName; private String typeName;
@ApiModelProperty(value = "单位") @ApiModelProperty(value = "单位")
@Excel(name = "单位") @Excel(name = "单位")
private String unitName; private String unitName;
@ApiModelProperty(value = "领料数量") @ApiModelProperty(value = "预领数量")
@Excel(name = "领料数量", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "预领数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal alNum; private BigDecimal alNum;
@ApiModelProperty(value = "出库数量") @ApiModelProperty(value = "出库数量")
@Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC) @Excel(name = "出库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal outNum; private BigDecimal outNum;
@ApiModelProperty(value = "出库时间") @ApiModelProperty(value = "出库时间")