From 3ff07f0bcdd4b17cb0ddac0941f571af70a69598 Mon Sep 17 00:00:00 2001 From: mashuai Date: Fri, 30 Jan 2026 17:38:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/domain/report/PurChaseReportDetails.java | 8 ++++---- .../material/basic/domain/report/PurChaseReportInfo.java | 8 ++++---- .../resources/mapper/material/basic/BmReportMapper.xml | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java index 1c9bd9eb..bd32de18 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportDetails.java @@ -27,12 +27,12 @@ public class PurChaseReportDetails { @Excel(name = "设备编码") private String maCode; - @ApiModelProperty(value = "采购价格不含税") - @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) - private BigDecimal purchasePriceNoTax; - @ApiModelProperty(value = "采购价格含税") @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal purchasePrice; + @ApiModelProperty(value = "采购价格不含税") + @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) + private BigDecimal purchasePriceNoTax; + } diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java index fc5f1c30..c4085d17 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/domain/report/PurChaseReportInfo.java @@ -58,14 +58,14 @@ public class PurChaseReportInfo { @Excel(name = "待入库数量", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal pendingInputNum; - @ApiModelProperty(value = "采购价格不含税") - @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) - private BigDecimal purchasePriceNoTax; - @ApiModelProperty(value = "采购价格含税") @Excel(name = "采购价格（含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) private BigDecimal purchasePrice; + @ApiModelProperty(value = "采购价格不含税") + @Excel(name = "采购价格（不含税）", cellType = Excel.ColumnType.NUMERIC, align = HorizontalAlignment.RIGHT) + private BigDecimal purchasePriceNoTax; + @ApiModelProperty(value = "物资厂家") @Excel(name = "物资厂家", width = 30) private String supplierName; diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml index 221a4b65..f6a0f43c 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmReportMapper.xml @@ -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 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.purchase_price, 0) as purchasePrice, - IFNULL(pcd.purchase_tax_price, 0) as purchasePriceNoTax, + IFNULL(pcd.purchase_tax_price, 0) as purchasePrice, + IFNULL(pcd.purchase_price, 0) as purchasePriceNoTax, msi.supplier as supplierName, pci.create_time as purchaseTime, pcd.check_time as passTime,