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/OutBoundServiceImpl.java | 69 +++++++++++++++++++++++++++++-----
1 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
index 57f2256..131e904 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java
@@ -43,7 +43,7 @@
private final ContractSubjectMatterMapper contractSubjectMatterMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
private final ContractMapper contractMapper;
- private final ContractPaymentScheduleProcessMapper scheduleProcessMapper;
+ private final ProductMapper productMapper;
private final ContractOutBoundMapper contractOutBoundMapper;
private final DeliveryOverdueMapper deliveryOverdueMapper;
private final StringRedisTemplate redisTemplate;
@@ -57,6 +57,9 @@
@Value("${dept.smjzt}")
private String smjzt;
+
+ @Value("${dept.smjhw}")
+ private String smjhw;
@Value("${dept.sgb}")
private String sgb;
@@ -111,7 +114,8 @@
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
outBound.setBatchNumber(generateSMJContractCKNo());
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -465,8 +469,9 @@
return r;
}
Contract contract = r.getData();
+ String batchNumber = genBatchNumber();
//鍑哄簱
- handleOutBound(contract, addDTO);
+ handleOutBound(batchNumber,contract, addDTO);
//淇濆瓨璧勯噾鏄庣粏
BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
@@ -474,7 +479,7 @@
contract.setOutBoundAmout(outBoundAmount);
updateContractSchedule(contract);
- return R.ok();
+ return R.ok(batchNumber);
}
private void updateContractSchedule(Contract contract) {
@@ -505,7 +510,8 @@
for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, contract.getId())
- .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
.eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
outAmount = outAmount.add(outSubjectMatterAddDTO.getOutBoundNum().multiply(subjectMatter.getUnitPrice()));
@@ -543,11 +549,12 @@
return outAmount;
}
- private void handleOutBound(Contract contract, OutBoundAddDTO addDTO) {
+ private void handleOutBound(String batchNumber,Contract contract, OutBoundAddDTO addDTO) {
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, contract.getId())
- .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
.ne(ContractSubjectMatter::getDeliveryStatus, 2)
.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
@@ -571,7 +578,6 @@
subjectMatter.setActualDeliveryDate(addDTO.getOutBoundTime());
contractSubjectMatterMapper.updateById(subjectMatter);
//淇濆瓨erp鍑哄簱
- String batchNumber = genBatchNumber();
Long outBoundId = saveErpOutBound(contract, addDTO, outSubjectMatterAddDTO, batchNumber);
//淇濆瓨鍚堝悓鍑哄簱璁板綍
saveContractOutBound(contract, addDTO, subjectMatter, outBoundId);
@@ -580,7 +586,8 @@
private String genBatchNumber() {
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
- StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjhw)) {
return generateSMJContractCKNo();
}
if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
@@ -609,6 +616,22 @@
outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
outBound.setSubjectMatterCode(outSubjectMatterAddDTO.getSubjectMatterCode());
outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+ List<String> smjList = new ArrayList<>();
+ smjList.add(smj);
+ smjList.add(smjhw);
+ if (("" + SecurityUtils.getUser().getCompId()).equals(smj)||("" + SecurityUtils.getUser().getCompId()).equals(smjhw)) {
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .in(Product::getCompId, smjList).last("limit 1"));
+ if (ObjUtil.isNotNull(product) ) {
+ outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+ }
+ } else {
+ Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery().eq(Product::getErpCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .eq(Product::getCompId, SecurityUtils.getUser().getCompId()).last("limit 1"));
+ if (ObjUtil.isNotNull(product) ) {
+ outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
+ }
+ }
outBound.setOutBoundType("1");
if (StrUtil.isEmpty(addDTO.getOutBoundType())) {
outBound.setOutBoundType("0");
@@ -620,6 +643,10 @@
private R<Contract> vailParam(OutBoundAddDTO addDTO) {
if (CollUtil.isEmpty(addDTO.getSubjectMatterList())) {
return R.failed("鍑哄簱鏍囩殑鐗╀笉鑳戒负绌�");
+ }
+ if (addDTO.getSubjectMatterList().stream().anyMatch(contractSubjectMatterAddDTO -> StrUtil.isBlank(contractSubjectMatterAddDTO.getDataId())&&
+ StrUtil.isBlank(contractSubjectMatterAddDTO.getSubjectMatterCode()))){
+ return R.failed("鏍囩殑鐗╃殑dataId鍜宮aterialCode涓嶈兘鍚屾椂涓虹┖");
}
// 1. 纭畾鏌ヨ鐢ㄧ殑鍚堝悓缂栧彿瀛楁鍊�
String targetContractNo = addDTO.getContractNo();
@@ -652,7 +679,8 @@
for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
.eq(ContractSubjectMatter::getContractId, contract.getId())
- .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getDataId()),ContractSubjectMatter::getDataId, outSubjectMatterAddDTO.getDataId())
+ .eq(StrUtil.isNotBlank(outSubjectMatterAddDTO.getSubjectMatterCode()),ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
.eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
if (ObjUtil.isNull(subjectMatter)) {
@@ -828,4 +856,25 @@
baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
return R.ok();
}
+
+ @Override
+ public R addContractOutSgb(OutBoundAddDTO addDTO) {
+ //鏍¢獙鍙傛暟
+ R<Contract> r = vailParam(addDTO);
+ if (!r.isOk()) {
+ return r;
+ }
+ Contract contract = r.getData();
+ String batchNumber = genBatchNumber();
+ //鍑哄簱
+ handleOutBound(batchNumber,contract, addDTO);
+
+ //淇濆瓨璧勯噾鏄庣粏
+ BigDecimal outBoundAmount = savePaymentConfirm(contract, addDTO);
+ //鏇存柊鍚堝悓鐘舵�佸強闃舵
+ contract.setOutBoundAmout(outBoundAmount);
+ updateContractSchedule(contract);
+
+ return R.ok(batchNumber);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1