From c5ea85558fea4d82b5368073c598a30f905c4bdc Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 23 十月 2026 17:11:49 +0800
Subject: [PATCH] feat:新增统计标注功能
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractInvoiceServiceImpl.java | 96 ++++++++++++++++++++++++++++-------------------
1 files changed, 57 insertions(+), 39 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 655f892..306072c 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
@@ -234,12 +234,8 @@
}
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + 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())) {
@@ -288,12 +284,8 @@
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + 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())) {
@@ -351,12 +343,8 @@
ContractOutBound contractOutBound = contractOutBoundMapper.selectById(contractOutBoundInvoiceVo.getContractOutBoundId());
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + 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())) {
@@ -414,12 +402,8 @@
Product product = new Product();
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -462,7 +446,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);
@@ -619,12 +603,8 @@
Product product = new Product();
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) || ("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -659,7 +639,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);
@@ -690,12 +670,8 @@
Product product = new Product();
List<String> smjList = new ArrayList<>();
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(smjhw)) {
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, contractOutBound.getSubjectMatterCode())
.in(Product::getCompId, smjList).last("limit 1"));
} else {
@@ -738,7 +714,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);
@@ -761,14 +737,24 @@
mergeVo.setMaterialInternalName(schedule.getSubjectMatterName());
mergeVo.setPriceAndTax(schedule.getPlannedAmount());
mergeVo.setQuantity(schedule.getInvoiceNum());
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
- .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ Product product = null;
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
+ .in(Product::getCompId, smjList).last("limit 1"));
+ } else {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, schedule.getSubjectMatterCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ }
if (ObjUtil.isNotNull(product)) {
mergeVo.setTaxClass(product.getTaxClass());
mergeVo.setSpecification(product.getProductType());
mergeVo.setTaxRate(new BigDecimal(product.getTaxRate()));
mergeVo.setTaxCode(product.getTaxCode());
}
+
ContractSubjectMatter subjectMatter = subjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getMaterialCode, schedule.getSubjectMatterCode())
.eq(ContractSubjectMatter::getContractId, contract.getId()).last("limit 1"));
@@ -802,7 +788,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));
@@ -846,8 +832,17 @@
mergeVo.setMaterialCode(subjectMatter.getMaterialCode());
mergeVo.setMaterialInternalName(subjectMatter.getMaterialName());
mergeVo.setQuantity(contractOutBoundInvoiceVo.getInvoiceNum());
- Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
- .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ Product product = null;
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj) ||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
+ .in(Product::getCompId, smjList).last("limit 1"));
+ } else {
+ product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, subjectMatter.getMaterialCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ }
if (ObjUtil.isNotNull(product)) {
mergeVo.setTaxClass(product.getTaxClass());
mergeVo.setSpecification(product.getProductType());
@@ -880,7 +875,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);
@@ -1202,6 +1197,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;
@@ -2379,6 +2375,28 @@
}
@Override
+ public R selectZbByKey(String dictKey) {
+ List<BipDict> bipDictList = bipDictMapper.selectList(Wrappers.<BipDict>lambdaQuery().eq(BipDict::getDictKey, dictKey)
+ .eq(BipDict::getCompId,SecurityUtils.getUser().getCompId()));
+ if (CollUtil.isNotEmpty(bipDictList)) {
+ // 鏉冮檺鍐呴儴闂�
+ List<TreeNode<Long>> collect = bipDictList.stream()
+ .map(dict -> {
+ TreeNode<Long> treeNode = new TreeNode<>();
+ treeNode.setId(dict.getId());
+ treeNode.setParentId(dict.getParentId());
+ treeNode.setName(dict.getDictName());
+ treeNode.setWeight(dict.getDictCode());
+ return treeNode;
+ })
+ .collect(Collectors.toList());
+
+ return R.ok(TreeUtil.build(collect, 0L));
+ }
+ return R.failed("瀛楀吀鑾峰彇澶辫触");
+ }
+
+ @Override
public R saveAndPush(ContractInvoiceUpateDTO upateDTO) {
ContractInvoice invoice = baseMapper.selectById(upateDTO.getId());
invoice.setInvoicePreview(upateDTO.getInvoicePreview());
--
Gitblit v1.9.1