From cc9dcfec975f6a10121be67eac6d029d159b9460 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期二, 20 十月 2026 14:19:42 +0800
Subject: [PATCH] feat:长期协议,不定期新增单位,标的物 历史导入标的物,根据接口查询 石煤机乙方总公司选总公司 和 分公司 银行流水加 时间拉取 流水数据 产品加拉取按钮 盖章件关闭控制
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
index 18650c8..eb81cc1 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java
@@ -93,6 +93,9 @@
@Value("${dept.smjsc}")
private String smjsc;
+ @Value("${dept.smjhw}")
+ private String smjhw;
+
@Value("${dept.tfgs}")
private String tfgs;
@@ -233,8 +236,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt) ||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
.in(Product::getCompId, smjList).last("limit 1"));
if (ObjUtil.isNull(product) || StrUtil.isBlank(product.getTaxClass()) || StrUtil.isBlank(product.getTaxCode())) {
@@ -285,8 +290,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
if (ObjUtil.isNull(product) || StrUtil.isBlank(product.getTaxClass()) || StrUtil.isBlank(product.getTaxCode())) {
@@ -346,8 +353,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt) ||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
if (ObjUtil.isNull(product) || StrUtil.isBlank(product.getTaxClass()) || StrUtil.isBlank(product.getTaxCode())) {
@@ -407,8 +416,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt) ||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -451,7 +462,7 @@
.forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
- BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("1").add(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))), 10, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))).setScale(2,RoundingMode.HALF_UP);
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
invoiceItemVo.setPriceAndTax(itemPrice);
@@ -567,8 +578,8 @@
GenInvoiceInfoVo vo = new GenInvoiceInfoVo();
BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
vo.setContractId(contract.getId());
- vo.setPartyA(a.getCompanyName());
- vo.setPartyAOrgCode(a.getCreditCode());
+ vo.setPartyA(genInvoiceInfoDTO.getPartyA());
+ vo.setPartyAOrgCode(genInvoiceInfoDTO.getPartyAOrgCode());
vo.setPartyAOpenBank(a.getBankName());
vo.setPartyABankAccount(a.getBankAccount());
vo.setPartyB(b.getOrgName());
@@ -610,8 +621,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -646,7 +659,7 @@
.forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
- BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("1").add(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))), 10, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))).setScale(2,RoundingMode.HALF_UP);
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
invoiceItemVo.setPriceAndTax(itemPrice);
@@ -679,8 +692,10 @@
smjList.add(smj);
smjList.add(smjsc);
smjList.add(smjzt);
+ smjList.add(smjhw);
if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjsc) ||
- ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)) {
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjzt)||
+ ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -723,7 +738,7 @@
.forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
- BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("1").add(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))), 10, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))).setScale(2,RoundingMode.HALF_UP);
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
invoiceItemVo.setPriceAndTax(itemPrice);
@@ -787,7 +802,7 @@
.forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getPriceAndTax();
- BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("1").add(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))), 10, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))).setScale(2,RoundingMode.HALF_UP);
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
@@ -807,8 +822,8 @@
BusinessCustomer a = businessCustomerMapper.selectById(contract.getPartyAId());
vo.setContractId(contract.getId());
vo.setAdvanceInvoice("111");
- vo.setPartyA(a.getCompanyName());
- vo.setPartyAOrgCode(a.getCreditCode());
+ vo.setPartyA(genInvoiceInfoDTO.getPartyA());
+ vo.setPartyAOrgCode(genInvoiceInfoDTO.getPartyAOrgCode());
vo.setPartyAOpenBank(a.getBankName());
vo.setPartyABankAccount(a.getBankAccount());
vo.setPartyB(b.getOrgName());
@@ -865,7 +880,7 @@
invoiceItemVoList.stream().filter(invoiceItem -> invoiceItem.getUnitPrice().compareTo(new BigDecimal("0")) > 0).forEach(invoiceItemVo -> {
// for (InvoiceItemVo invoiceItemVo:invoiceItemVoList) {
BigDecimal itemPrice = invoiceItemVo.getUnitPrice().multiply(invoiceItemVo.getQuantity());
- BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("100").add(invoiceItemVo.getTaxRate()), 2, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate());
+ BigDecimal itemPriceTax = itemPrice.divide(new BigDecimal("1").add(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))), 10, RoundingMode.HALF_UP).multiply(invoiceItemVo.getTaxRate().divide(new BigDecimal("100"))).setScale(2,RoundingMode.HALF_UP);
invoiceItemVo.setPriceTax(itemPriceTax);
invoiceItemVo.setPriceNoTax(itemPrice.subtract(itemPriceTax));
invoiceItemVo.setPriceAndTax(itemPrice);
@@ -1187,6 +1202,7 @@
jsonObject.put("redInvoiceLabel", "01");
jsonObject.put("invoiceSource", "2");
jsonObject.put("originalInvoiceNo", blueInvoice.getInvoiceNo());
+ jsonObject.put("autoIssueSwitch", "Y");
GenInvoiceInfoVo vo = BeanUtil.copyProperties(JSONObject.parseObject(redInvoice.getInvoicePreview()), GenInvoiceInfoVo.class);
JSONArray invoiceDetailsList = new JSONArray();
Integer lineNo = 1;
--
Gitblit v1.9.1