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

功能优化

This commit is contained in:
mashuai 2025-09-15 19:55:53 +08:00
parent 3b5c725f1c
commit b1fe3526c4
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-material/src/main/java/com/bonus/material/clz/domain/vo/MaterialRetainedEquipmentInfo.java
View File

@ -5,12 +5,12 @@ import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.apache.poi.ss.usermodel.HorizontalAlignment;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Set;
/** /**
* @description 综合查询--保有设备总量查询 * @description 综合查询--保有设备总量查询
@ -43,15 +43,15 @@ public class MaterialRetainedEquipmentInfo {
private String impUnitName; private String impUnitName;
@ApiModelProperty(value = "项目部") @ApiModelProperty(value = "项目部")
@Excel(name = "项目部") @Excel(name = "项目部", width = 25)
private String departName; private String departName;
@ApiModelProperty(value = "工程名称") @ApiModelProperty(value = "工程名称")
@Excel(name = "工程名称") @Excel(name = "工程名称", width = 40)
private String proName; private String proName;
@ApiModelProperty(value = "分包单位") @ApiModelProperty(value = "分包单位")
@Excel(name = "分包单位") @Excel(name = "分包单位", width = 25)
private String subUnitName; private String subUnitName;
@ApiModelProperty(value = "班组名称") @ApiModelProperty(value = "班组名称")
@ -80,7 +80,7 @@ public class MaterialRetainedEquipmentInfo {
private BigDecimal usNum; private BigDecimal usNum;
@ApiModelProperty(value = "数量") @ApiModelProperty(value = "数量")
@Excel(name = "数量") @Excel(name = "数量",align = HorizontalAlignment.RIGHT)
private BigDecimal allNum; private BigDecimal allNum;
@ApiModelProperty(value = "购置单价") @ApiModelProperty(value = "购置单价")

4
bonus-modules/bonus-material/src/main/resources/mapper/material/clz/MaterialMachineMapper.xml
View File

@ -1295,7 +1295,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
'编码' '编码'
ELSE ELSE
'数量' '数量'
END manageType END manageType,
'站内库存' AS teamName,
'/' AS subUnitName
FROM ma_type mt FROM ma_type mt
LEFT JOIN ( LEFT JOIN (
SELECT SELECT