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

优化

This commit is contained in:
mashuai 2026-01-30 17:38:28 +08:00
parent fb297128dc
commit 3ff07f0bcd
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java
View File

@ -27,12 +27,12 @@ public class PurChaseReportDetails {
@Excel(name = "设备编码") @Excel(name = "设备编码")
private String maCode; private String maCode;
@ApiModelProperty(value = "采购价格不含税")
@Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePriceNoTax;
@ApiModelProperty(value = "采购价格含税") @ApiModelProperty(value = "采购价格含税")
@Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty(value = "采购价格不含税")
@Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePriceNoTax;
} }

8
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java
View File

@ -58,14 +58,14 @@ public class PurChaseReportInfo {
@Excel(name = "待入库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @Excel(name = "待入库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal pendingInputNum; private BigDecimal pendingInputNum;
@ApiModelProperty(value = "采购价格不含税")
@Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePriceNoTax;
@ApiModelProperty(value = "采购价格含税") @ApiModelProperty(value = "采购价格含税")
@Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePrice; private BigDecimal purchasePrice;
@ApiModelProperty(value = "采购价格不含税")
@Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT)
private BigDecimal purchasePriceNoTax;
@ApiModelProperty(value = "物资厂家") @ApiModelProperty(value = "物资厂家")
@Excel(name = "物资厂家", width = 30) @Excel(name = "物资厂家", width = 30)
private String supplierName; private String supplierName;

4
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml
View File

@ -15,8 +15,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
case when pcd.status in (12) then 0 else IFNULL(pcd.check_num, 0) end as passNum, case when pcd.status in (12) then 0 else IFNULL(pcd.check_num, 0) end as passNum,
case when pcd.status in (12) then IFNULL(pcd.purchase_num, 0) else IFNULL(pcd.purchase_num, 0) - IFNULL(pcd.check_num, 0) end as notPassNum, case when pcd.status in (12) then IFNULL(pcd.purchase_num, 0) else IFNULL(pcd.purchase_num, 0) - IFNULL(pcd.check_num, 0) end as notPassNum,
IFNULL(pcd.input_num, 0) as inputNum, IFNULL(pcd.input_num, 0) as inputNum,
IFNULL(pcd.purchase_price, 0) as purchasePrice, IFNULL(pcd.purchase_tax_price, 0) as purchasePrice,
IFNULL(pcd.purchase_tax_price, 0) as purchasePriceNoTax, IFNULL(pcd.purchase_price, 0) as purchasePriceNoTax,
msi.supplier as supplierName, msi.supplier as supplierName,
pci.create_time as purchaseTime, pci.create_time as purchaseTime,
pcd.check_time as passTime, pcd.check_time as passTime,