From 115d649a6e941a69f57d61b384ade968a5d6e473 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Sat, 26 Apr 2025 13:04:21 +0800 Subject: [PATCH] =?UTF-8?q?YT-2543:=E5=8F=91=E8=BF=90=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86--=E5=88=9B=E5=BB=BA=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/release_202405/intex_wms_202410.sql | 14 ++++++++++++++ .../vo/CustomerSaleInvoiceMainBaseVO.java | 9 +++++++++ .../vo/CustomerSaleInvoiceMainExcelVO.java | 13 +++++++++++-- .../CustomerStatementDetailController.java | 19 ++++++++++++------- .../vo/CustomerStatementDetailRespVO.java | 9 +++++++++ .../CustomerSaleInvoiceRecordMainBaseVO.java | 9 +++++++++ .../CustomerSaleInvoiceRecordMainExcelVO.java | 9 +++++++++ .../CustomerSaleInvoiceMainDO.java | 16 ++++++++++++++++ .../CustomerSaleInvoiceRecordMainDO.java | 16 ++++++++++++++++ .../CustomerSaleInvoiceDetailServiceImpl.java | 15 +++++++++++---- 10 files changed, 116 insertions(+), 13 deletions(-) diff --git a/sql/release_202405/intex_wms_202410.sql b/sql/release_202405/intex_wms_202410.sql index 1e883a3a5e..b23a5a3c43 100644 --- a/sql/release_202405/intex_wms_202410.sql +++ b/sql/release_202405/intex_wms_202410.sql @@ -2026,3 +2026,17 @@ ALTER TABLE infra_outer_api_his DROP INDEX number_available; CREATE INDEX number ON infra_outer_api_his(number); -- 配置文件添加导入对账单明细分摊物料类型 INSERT INTO `infra_config` (`id`, `category`, `type`, `name`, `config_key`, `value`, `visible`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `item_type`, `area_type`, `inventory_status`, `location_code`) VALUES (null, '业务取值', 2, '客户对账单物料分摊类型', 'CustomerStatementItemCodeStatus', 'A', b'1', '可以分摊的物料类型多个类型用逗号分隔', '1', '2025-04-23 17:39:08', '1', '2025-04-23 17:39:08', b'0', NULL, NULL, NULL, NULL); + +-- wms模具分摊销售开票申请主数据已分摊模具未税金额 +ALTER TABLE request_customer_sale_invoice_main ADD `already_mold_untaxed_amount` decimal(18,6) DEFAULT NULL COMMENT '数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总' AFTER `ad_tax_amount`; +-- wms模具分摊销售开票申请主增加主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 +ALTER TABLE request_customer_sale_invoice_main ADD `already_mold_tax_amount` decimal(18,6) DEFAULT NULL COMMENT '主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和' AFTER `ad_tax_amount`; +-- wms模具分摊销售开票申请主增加主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 +ALTER TABLE request_customer_sale_invoice_main ADD `mold_tax_amount_diff` decimal(18,6) DEFAULT NULL COMMENT '主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额' AFTER `ad_tax_amount`; + +-- wms模具分摊销售开票记录主数据已分摊模具未税金额 +ALTER TABLE record_customer_sale_invoice_main ADD `already_mold_untaxed_amount` decimal(18,6) DEFAULT NULL COMMENT '数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总' AFTER `ad_tax_amount`; +-- wms模具分摊销售开票记录主增加主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 +ALTER TABLE record_customer_sale_invoice_main ADD `already_mold_tax_amount` decimal(18,6) DEFAULT NULL COMMENT '主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和' AFTER `ad_tax_amount`; +-- wms模具分摊销售开票记录主增加主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 +ALTER TABLE record_customer_sale_invoice_main ADD `mold_tax_amount_diff` decimal(18,6) DEFAULT NULL COMMENT '主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额' AFTER `ad_tax_amount`; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainBaseVO.java index 413bd519bb..9ff304a535 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainBaseVO.java @@ -77,6 +77,15 @@ public class CustomerSaleInvoiceMainBaseVO { @Schema(description = "主数据材料含税金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal materialsTaxTotal; + @Schema(description = "主数据已分摊模具未税金额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldUntaxedAmount; + + @Schema(description = "主数据已分摊模具税额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldTaxAmount; + + @Schema(description = "主数据模具模具税额差异", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal moldTaxAmountDiff; + @Schema(description = "金税票号") private String goldenTaxInvoiceNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainExcelVO.java index 7080a9e822..cd7a9ca13b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerSaleinvoice/vo/CustomerSaleInvoiceMainExcelVO.java @@ -64,8 +64,17 @@ public class CustomerSaleInvoiceMainExcelVO { @ExcelProperty("材料含税金额") private BigDecimal materialsTaxTotal; - @ExcelProperty("模具未税尾差") - private BigDecimal allocationDifferenceBeforeTax; +// @ExcelProperty("模具未税尾差") +// private BigDecimal allocationDifferenceBeforeTax; + + @ExcelProperty("已分摊模具未税金额") + private BigDecimal alreadyMoldUntaxedAmount; + + @ExcelProperty("已分摊模具税额") + private BigDecimal alreadyMoldTaxAmount; + + @ExcelProperty("模具税额差异") + private BigDecimal moldTaxAmountDiff; @ExcelProperty("金税票号") private String goldenTaxInvoiceNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/CustomerStatementDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/CustomerStatementDetailController.java index 70804b4671..995be74623 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/CustomerStatementDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/CustomerStatementDetailController.java @@ -212,12 +212,14 @@ public class CustomerStatementDetailController { BigDecimal mainBeforeTaxAmount = BigDecimal.ZERO;//主数据未税金额 所有明细行未税金额相加的和 BigDecimal mainTaxAmount = BigDecimal.ZERO;//主数据税额 BigDecimal mainAdTaxAmount = BigDecimal.ZERO;//主数据价税合计金额 - BigDecimal moldZs = BigDecimal.ZERO;//每一行模具单价*数量保留两位小数 BigDecimal moldTaxAmount = BigDecimal.ZERO;//主数据模具税额 BigDecimal moldTaxTotal = BigDecimal.ZERO;//主数据模具含税金额 BigDecimal materialsUntaxedAmount = BigDecimal.ZERO;//主数据材料未税金额 BigDecimal materialsTaxAmount = BigDecimal.ZERO;//主数据材料税额 BigDecimal materialsTaxTotal = BigDecimal.ZERO;//主数据材料含税金额 + BigDecimal alreadyMoldUntaxedAmount = BigDecimal.ZERO;//主数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总 + BigDecimal alreadyMoldTaxAmount = BigDecimal.ZERO;//主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + BigDecimal moldTaxAmountDiff = BigDecimal.ZERO;//主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 for(CustomerStatementDetailRespVO en:result.getList()){ String number = en.getNumber(); String articleNumber = en.getArticleNumber(); @@ -228,9 +230,10 @@ public class CustomerStatementDetailController { allocationPrice = allocationPriceMap.get(key);//模具分摊单价 } en.setAllocationPrice(allocationPrice);//模具分摊金额从客户模具分摊对账单查出 - //计算每一行明细模具分摊单价*数量保留两位小数 - moldZs = moldZs.add(allocationPrice.multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP));//明细行模具未税金额 - + //主数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总 + alreadyMoldUntaxedAmount = alreadyMoldUntaxedAmount.add(allocationPrice.multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP));//明细行模具未税金额 + //主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + alreadyMoldTaxAmount = alreadyMoldTaxAmount.add(allocationPrice.multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP).multiply(new BigDecimal(13)).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP)); //计算明细合计单价 销售单价+模具分摊单价 BigDecimal price1 = en.getPrice();//销售单价 //材料未税金额 各明细行的（销售单价 *数量）保留两位小数累加 @@ -261,8 +264,8 @@ public class CustomerStatementDetailController { moldTaxAmount = moldUntaxedAmount.multiply(new BigDecimal(13)).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); //模具含税金额 = 模具未税金额+模具税额 moldTaxTotal = moldUntaxedAmount.add(moldTaxAmount); - //模具未税尾差模具未税尾差：客户导入模具对账单未税金额保留两位小数的总和 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额 - BigDecimal allocationDifferenceBeforeTax = moldUntaxedAmount.subtract(moldZs); + //模具未税差异=已分摊模具未税金额-模具分摊未税金额 + moldTaxAmountDiff = moldUntaxedAmount.subtract(alreadyMoldUntaxedAmount); //各明细行的（销售单价 *数量）之和 * 税率 materialsTaxAmount = materialsUntaxedAmount.multiply(new BigDecimal(13)).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); @@ -284,7 +287,9 @@ public class CustomerStatementDetailController { if(userNicknameMap.containsKey(Long.valueOf(en.getUpdater()))){ en.setUpdater(userNicknameMap.get(Long.valueOf(en.getUpdater()))); } - en.setAllocationDifferenceBeforeTax(allocationDifferenceBeforeTax); + en.setMoldTaxAmountDiff(moldTaxAmountDiff); + en.setAlreadyMoldUntaxedAmount(alreadyMoldUntaxedAmount); + en.setAlreadyMoldTaxAmount(alreadyMoldTaxAmount); en.setMoldUntaxedAmount(moldUntaxedAmount); en.setMoldTaxAmount(moldTaxTotal); en.setMoldTaxTotal(moldTaxTotal); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/vo/CustomerStatementDetailRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/vo/CustomerStatementDetailRespVO.java index 61b633e1a8..969b485b64 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/vo/CustomerStatementDetailRespVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerStatement/vo/CustomerStatementDetailRespVO.java @@ -66,5 +66,14 @@ public class CustomerStatementDetailRespVO extends CustomerStatementDetailBaseVO @Schema(description = "主数据材料含税金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal materialsTaxTotal; + @Schema(description = "主数据已分摊模具未税金额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldUntaxedAmount; + + @Schema(description = "主数据已分摊模具税额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldTaxAmount; + + @Schema(description = "主数据模具模具税额差异", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal moldTaxAmountDiff; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainBaseVO.java index bdaa58fb30..1a88320c08 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainBaseVO.java @@ -82,6 +82,15 @@ public class CustomerSaleInvoiceRecordMainBaseVO { @Schema(description = "主数据材料含税金额", requiredMode = Schema.RequiredMode.REQUIRED) private BigDecimal materialsTaxTotal; + @Schema(description = "主数据已分摊模具未税金额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldUntaxedAmount; + + @Schema(description = "主数据已分摊模具税额", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal alreadyMoldTaxAmount; + + @Schema(description = "主数据模具模具税额差异", requiredMode = Schema.RequiredMode.REQUIRED) + private BigDecimal moldTaxAmountDiff; + @Schema(description = "金税票号") private String goldenTaxInvoiceNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainExcelVO.java index e7d8c50f89..34b91ffb82 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersaleinvoiceRecord/vo/CustomerSaleInvoiceRecordMainExcelVO.java @@ -68,6 +68,15 @@ public class CustomerSaleInvoiceRecordMainExcelVO { @ExcelProperty("模具未税尾差") private BigDecimal allocationDifferenceBeforeTax; + @ExcelProperty("已分摊模具未税金额") + private BigDecimal alreadyMoldUntaxedAmount; + + @ExcelProperty("已分摊模具税额") + private BigDecimal alreadyMoldTaxAmount; + + @ExcelProperty("模具税额差异") + private BigDecimal moldTaxAmountDiff; + @ExcelProperty("金税票号") private String goldenTaxInvoiceNumber; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerSaleinvoice/CustomerSaleInvoiceMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerSaleinvoice/CustomerSaleInvoiceMainDO.java index d86726b2e7..d165487300 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerSaleinvoice/CustomerSaleInvoiceMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerSaleinvoice/CustomerSaleInvoiceMainDO.java @@ -102,6 +102,22 @@ public class CustomerSaleInvoiceMainDO extends BaseDO { */ private BigDecimal materialsTaxTotal; + + /** + * 主数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总 + */ + private BigDecimal alreadyMoldUntaxedAmount; + + /** + * 主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + */ + private BigDecimal alreadyMoldTaxAmount; + + /** + * 主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 + */ + private BigDecimal moldTaxAmountDiff; + /** * 金税票号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersaleinvoiceRecord/CustomerSaleInvoiceRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersaleinvoiceRecord/CustomerSaleInvoiceRecordMainDO.java index 23ac1d2cb4..0a80b4bb48 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersaleinvoiceRecord/CustomerSaleInvoiceRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersaleinvoiceRecord/CustomerSaleInvoiceRecordMainDO.java @@ -66,6 +66,22 @@ public class CustomerSaleInvoiceRecordMainDO extends BaseDO { * 税额 */ private BigDecimal taxAmount; + + /** + * 主数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总 + */ + private BigDecimal alreadyMoldUntaxedAmount; + + /** + * 主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + */ + private BigDecimal alreadyMoldTaxAmount; + + /** + * 主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 + */ + private BigDecimal moldTaxAmountDiff; + /** * 价税合计金额 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerSaleinvoice/CustomerSaleInvoiceDetailServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerSaleinvoice/CustomerSaleInvoiceDetailServiceImpl.java index 292105cd96..e3fb03581e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerSaleinvoice/CustomerSaleInvoiceDetailServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerSaleinvoice/CustomerSaleInvoiceDetailServiceImpl.java @@ -92,12 +92,17 @@ public class CustomerSaleInvoiceDetailServiceImpl implements CustomerSaleInvoice BigDecimal materialsUntaxedAmount = BigDecimal.ZERO;//主数据材料未税金额 BigDecimal materialsTaxAmount = BigDecimal.ZERO;//主数据材料税额 BigDecimal materialsTaxTotal = BigDecimal.ZERO;//主数据材料含税金额 + BigDecimal alreadyMoldUntaxedAmount = BigDecimal.ZERO;//主数据已分摊模具未税金额=（已分摊品番数量*分摊单价）保留两位小数 后汇总 + BigDecimal alreadyMoldTaxAmount = BigDecimal.ZERO;//主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + BigDecimal moldTaxAmountDiff = BigDecimal.ZERO;//主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 for(CustomerSaleInvoiceDetailDO en:detailDOS){ mainBeforeTaxAmount = mainBeforeTaxAmount.add(en.getBeforeTaxAmount()); sumAmount = sumAmount.add(en.getAllocationPrice().multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP)); //计算每一行明细模具分摊单价*数量保留两位小数 - moldZs = moldZs.add(en.getAllocationPrice().multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP));//明细行模具未税金额 + alreadyMoldUntaxedAmount = alreadyMoldUntaxedAmount.add(en.getAllocationPrice().multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP));//明细行模具未税金额 + //主数据已分摊模具税额=（（已分摊品番数量*分摊单价）保留两位小数*税率）保留两位小数后汇总求和 + alreadyMoldTaxAmount = alreadyMoldTaxAmount.add(allocationPrice.multiply(en.getQty()).setScale(2, RoundingMode.HALF_UP).multiply(new BigDecimal(13)).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP)); //计算明细合计单价 销售单价+模具分摊单价 BigDecimal price1 = en.getPrice();//销售单价 @@ -114,8 +119,8 @@ public class CustomerSaleInvoiceDetailServiceImpl implements CustomerSaleInvoice moldTaxAmount = moldUntaxedAmount.multiply(mainDO.getTaxRate()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); //模具含税金额 = 模具未税金额+模具税额 moldTaxTotal = moldUntaxedAmount.add(moldTaxAmount); - //模具未税尾差：客户导入模具对账单未税金额保留两位小数的总和 减去 系统明细中品番数量*模具单价 保留两位小数后汇总金额 - BigDecimal allocationDifferenceBeforeTax = moldUntaxedAmount.subtract(moldZs); + //主数据模具未税差异=已分摊模具未税金额-模具分摊未税金额 + moldTaxAmountDiff = moldUntaxedAmount.subtract(alreadyMoldUntaxedAmount); //各明细行的（销售单价 *数量）之和 * 税率 materialsTaxAmount = materialsUntaxedAmount.multiply(mainDO.getTaxRate()).divide(new BigDecimal(100)).setScale(2, RoundingMode.HALF_UP); @@ -128,7 +133,9 @@ public class CustomerSaleInvoiceDetailServiceImpl implements CustomerSaleInvoice mainDO.setAdTaxAmount(mainAdTaxAmount); mainDO.setBeforeTaxAmount(mainBeforeTaxAmount); - mainDO.setAllocationDifferenceBeforeTax(allocationDifferenceBeforeTax); + mainDO.setMoldTaxAmountDiff(moldTaxAmountDiff); + mainDO.setAlreadyMoldUntaxedAmount(alreadyMoldUntaxedAmount); + mainDO.setAlreadyMoldTaxAmount(alreadyMoldTaxAmount); mainDO.setMoldUntaxedAmount(moldUntaxedAmount); mainDO.setMoldTaxAmount(moldTaxTotal); mainDO.setMaterialsUntaxedAmount(materialsUntaxedAmount);