diff --git a/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java b/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java index 34fb291ab..f833c59e8 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/application/server/businessDocument/BusinessDocumentApplicationService.java @@ -312,6 +312,9 @@ public class BusinessDocumentApplicationService { billDetail.setInvoiceItem(billingStatement.getFirstSubjectCode()); billDetail.setInvoiceItemName(billingStatement.getFirstSubjectName()); billDetail.setSettlementCurrency(billingStatement.getSettlementCurrency()); + billDetail.setTaxAmount(billingStatement.getTaxAmount()); + billDetail.setTaxFreeFee(billingStatement.getTaxFreeFee()); + billDetail.setTaxRate(billingStatement.getTaxRate()); billDetailService.save(billDetail); BigDecimal billAmount = billManage.getBillAmount(); BigDecimal amount = billAmount.add(billDetail.getBillingAmount()); diff --git a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java index 0adec6d8a..6e326dc95 100644 --- a/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java +++ b/mhd_bms/src/main/java/com/mhd/bms/domain/billingStatement/service/BillingStatementDomainService.java @@ -675,8 +675,8 @@ public class BillingStatementDomainService { billingStatementDO.setSettlementCustomersCode(billManagePO.getSettlementCustomersCode()); billingStatementDO.setBelongModuleCode(billManagePO.getBelongModuleCode()); billingStatementDO.setAccountExpenseType(billManagePO.getBillType()); - billingStatementDO.setCycleBeginTime(billManagePO.getCycleBeginTime()); - billingStatementDO.setCycleEndTime(billManagePO.getCycleEndTime()); +// billingStatementDO.setCycleBeginTime(billManagePO.getCycleBeginTime()); +// billingStatementDO.setCycleEndTime(billManagePO.getCycleEndTime()); billingStatementDO.setBillingState(2); startPage(); return billingStatementService.queryList(billingStatementDO);