From b967d23ae6c1f7761feb3c5328e3b591df6a735d Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 26 八月 2026 10:51:41 +0800
Subject: [PATCH] feat:进行中合同导入
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 291 +++++++++++++++++++++++++++++----------------------------
1 files changed, 147 insertions(+), 144 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 a5b26da..b624244 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
@@ -108,20 +108,20 @@
//鍑哄簱
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)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
outBound.setBatchNumber(generateSMJContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
outBound.setBatchNumber(generateGYBContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
outBound.setBatchNumber(generateYMJContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
outBound.setBatchNumber(generateTFContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
outBound.setBatchNumber(generateJXCContractCKNo());
}
outBound.setBusGuestName(addDTO.getBusGuestName());
@@ -210,16 +210,16 @@
//鍚堝悓閲戦
Contract contract = contractMapper.selectById(contractId);
//鍑哄簱鏄惁瀹屾垚
- if (outPirce.compareTo(contract.getBillingAmout())>0) {
+ if (outPirce.compareTo(contract.getBillingAmout()) > 0) {
contract.setBillingStatus("2");
contractMapper.updateById(contract);
}
- if (outPirce.compareTo(contract.getBillingAmout())==0) {
+ if (outPirce.compareTo(contract.getBillingAmout()) == 0) {
contract.setBillingStatus("1");
contractMapper.updateById(contract);
}
- if (outPirce.compareTo(contract.getAmount()) == 0&&
- outPirce.compareTo(contract.getBillingAmout())==0) {
+ if (outPirce.compareTo(contract.getAmount()) == 0 &&
+ outPirce.compareTo(contract.getBillingAmout()) == 0) {
contract.setBillingStatus("3");
contractMapper.updateById(contract);
}
@@ -406,7 +406,7 @@
PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
- &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
+ && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
//鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
contract.setContractStatus(3);
contractMapper.updateById(contract);
@@ -427,7 +427,7 @@
contractOutBound.setBusGuestName(contract.getPartyA());
contractOutBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
contractOutBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
- contractOutBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime())?addDTO.getOutBoundTime():new Date());
+ contractOutBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
contractOutBound.setOutBoundNum(subjectMatter.getLastDeliveredQuantity());
contractOutBound.setOutBoundAttNames(addDTO.getOutBoundAttNames());
contractOutBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
@@ -436,7 +436,7 @@
contractOutBound.setInvoiceStatus("0");
contractOutBound.setInvoiceNum(new BigDecimal("0"));
contractOutBoundMapper.insert(contractOutBound);
- if (!StrUtil.equals(contract.getContractCategory(),"water_house")) {
+ if (!StrUtil.equals(contract.getContractCategory(), "water_house")) {
// 1. 纭畾鐢ㄤ簬姣旇緝鐨勫熀鍑嗘棩鏈燂紙浼樺厛绾э細璁″垝浜よ揣鏃ユ湡 > 鍚堝悓鍒版湡鏃ユ湡锛�
Date deadline = subjectMatter.getPlannedDeliveryDate();
if (ObjUtil.isNull(deadline)) {
@@ -495,44 +495,44 @@
if (ObjUtil.isNull(contract)) {
return R.failed("鍚堝悓淇℃伅鏌ヨ澶辫触");
}
- if (addDTO.getSubjectMatterList().stream().allMatch(item->item.getOutBoundNum().compareTo(new BigDecimal("0"))==0)){
+ if (addDTO.getSubjectMatterList().stream().allMatch(item -> item.getOutBoundNum().compareTo(new BigDecimal("0")) == 0)) {
return R.failed("鍑哄簱鏁伴噺涓嶈兘閮戒负涓�0");
}
- addDTO.setSubjectMatterList(addDTO.getSubjectMatterList().stream().filter(item->item.getOutBoundNum().compareTo(new BigDecimal("0"))>0).collect(Collectors.toList()));
+ addDTO.setSubjectMatterList(addDTO.getSubjectMatterList().stream().filter(item -> item.getOutBoundNum().compareTo(new BigDecimal("0")) > 0).collect(Collectors.toList()));
//鍑哄簱鏁伴噺鏍￠獙
- for (OutSubjectMatterAddDTO outSubjectMatterAddDTO: addDTO.getSubjectMatterList()) {
+ for (OutSubjectMatterAddDTO outSubjectMatterAddDTO : addDTO.getSubjectMatterList()) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,contract.getId())
- .eq(ContractSubjectMatter::getMaterialCode,outSubjectMatterAddDTO.getSubjectMatterCode())
- .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()),ContractSubjectMatter::getLineNo,outSubjectMatterAddDTO.getLineNo())
+ .eq(ContractSubjectMatter::getContractId, contract.getId())
+ .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
- if (ObjUtil.isNull(subjectMatter)){
+ if (ObjUtil.isNull(subjectMatter)) {
continue;
}
- if (subjectMatter.getDeliveryStatus()==0){
- if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getQuantity())>0){
- return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"鍑哄簱鏁颁笉鑳借秴杩囧悎鍚屼腑鏁伴噺");
+ if (subjectMatter.getDeliveryStatus() == 0) {
+ if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getQuantity()) > 0) {
+ return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "鍑哄簱鏁颁笉鑳借秴杩囧悎鍚屼腑鏁伴噺");
}
}
- if (subjectMatter.getDeliveryStatus()==1){
- if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getRemainingQuantity())>0){
- return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"鍑哄簱鏁颁笉鑳借秴杩囨湭鍑哄簱鏁伴噺");
+ if (subjectMatter.getDeliveryStatus() == 1) {
+ if (outSubjectMatterAddDTO.getOutBoundNum().compareTo(subjectMatter.getRemainingQuantity()) > 0) {
+ return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "鍑哄簱鏁颁笉鑳借秴杩囨湭鍑哄簱鏁伴噺");
}
}
- if (subjectMatter.getDeliveryStatus()==2){
- return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode()+"宸插嚭搴撳畬鎴愶紝涓嶈兘瓒呴鍑哄簱");
+ if (subjectMatter.getDeliveryStatus() == 2) {
+ return R.failed(outSubjectMatterAddDTO.getSubjectMatterCode() + "宸插嚭搴撳畬鎴愶紝涓嶈兘瓒呴鍑哄簱");
}
}
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
- ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,contract.getId())
- .eq(ContractSubjectMatter::getMaterialCode,outSubjectMatterAddDTO.getSubjectMatterCode())
- .ne(ContractSubjectMatter::getDeliveryStatus,2)
- .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()),ContractSubjectMatter::getLineNo,outSubjectMatterAddDTO.getLineNo())
+ ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, contract.getId())
+ .eq(ContractSubjectMatter::getMaterialCode, outSubjectMatterAddDTO.getSubjectMatterCode())
+ .ne(ContractSubjectMatter::getDeliveryStatus, 2)
+ .eq(StrUtil.isNotEmpty(outSubjectMatterAddDTO.getLineNo()), ContractSubjectMatter::getLineNo, outSubjectMatterAddDTO.getLineNo())
.last("limit 1"));
- if (ObjUtil.isNull(subjectMatter)){
+ if (ObjUtil.isNull(subjectMatter)) {
return;
}
subjectMatter.setLastDeliveredQuantity(outSubjectMatterAddDTO.getOutBoundNum());
@@ -553,20 +553,20 @@
contractSubjectMatterMapper.updateById(subjectMatter);
//
OutBound outBound = new OutBound();
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smj)||StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjsc)||
- StrUtil.equals(SecurityUtils.getUser().getCompId()+"",smjzt)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smj) || StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjsc) ||
+ StrUtil.equals(SecurityUtils.getUser().getCompId() + "", smjzt)) {
outBound.setBatchNumber(generateSMJContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",sgb)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", sgb)) {
outBound.setBatchNumber(generateGYBContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",ymj)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", ymj)) {
outBound.setBatchNumber(generateYMJContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",tfgs)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", tfgs)) {
outBound.setBatchNumber(generateTFContractCKNo());
}
- if (StrUtil.equals(SecurityUtils.getUser().getCompId()+"",jxc)){
+ if (StrUtil.equals(SecurityUtils.getUser().getCompId() + "", jxc)) {
outBound.setBatchNumber(generateJXCContractCKNo());
}
outBound.setOutBoundNum(outSubjectMatterAddDTO.getOutBoundNum());
@@ -574,11 +574,11 @@
outBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
outBound.setBusGuestName(contract.getPartyA());
outBound.setBusGuestId(contract.getPartyAId());
- outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime())?addDTO.getOutBoundTime():new Date());
+ outBound.setOutBoundTime(ObjUtil.isNotNull(addDTO.getOutBoundTime()) ? addDTO.getOutBoundTime() : new Date());
outBound.setSubjectMatterCode(outSubjectMatterAddDTO.getSubjectMatterCode());
outBound.setSubjectMatterName(outSubjectMatterAddDTO.getSubjectMatterName());
outBound.setOutBoundType("1");
- if (StrUtil.isEmpty(addDTO.getOutBoundType())){
+ if (StrUtil.isEmpty(addDTO.getOutBoundType())) {
outBound.setOutBoundType("0");
}
baseMapper.insert(outBound);
@@ -590,7 +590,7 @@
.eq(ContractSubjectMatter::getContractId, contract.getId()).ne(ContractSubjectMatter::getDeliveryStatus, 0));
//鏌ヨ鍚堝悓鏄惁鏈夊嚭搴撻樁娈�
ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contract.getId())
- .eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�"));
+ .eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�").gt(ContractPaymentSchedule::getPaymentRatio,0).last("limit 1"));
//瀛樺湪鍑哄簱闃舵
if (ObjUtil.isNotNull(schedule)) {
//褰撳墠鍑哄簱閲戦
@@ -598,104 +598,107 @@
.map(item -> (item.getDeliveryStatus() == 1 ? item.getDeliveredQuantity().multiply(item.getUnitPrice()) : item.getQuantity().multiply(item.getUnitPrice())))
.reduce(BigDecimal.ZERO, BigDecimal::add);
//鍑哄簱鏄惁瀹屾垚
- if (outPirce.compareTo(contract.getBillingAmout())>0) {
+ if (outPirce.compareTo(contract.getBillingAmout()) > 0) {
contract.setBillingStatus("2");
contractMapper.updateById(contract);
}
- if (outPirce.compareTo(contract.getBillingAmout())==0) {
+ if (outPirce.compareTo(contract.getBillingAmout()) == 0) {
contract.setBillingStatus("1");
contractMapper.updateById(contract);
}
- if (outPirce.compareTo(contract.getAmount()) == 0&&
- outPirce.compareTo(contract.getBillingAmout())==0) {
+ if (outPirce.compareTo(contract.getAmount()) == 0 &&
+ outPirce.compareTo(contract.getBillingAmout()) == 0) {
contract.setBillingStatus("3");
contractMapper.updateById(contract);
}
- //璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
- PaymentConfirm paymentConfirm = new PaymentConfirm();
- paymentConfirm.setBusinessType("鍙戣揣鍓嶅簲鏀�");
- paymentConfirm.setBusGuestId(contract.getPartyAId());
- paymentConfirm.setBusGuestName(contract.getPartyA());
- paymentConfirm.setContractId(contract.getId());
- paymentConfirm.setContractName(contract.getContractName());
- paymentConfirm.setContractNo(contract.getContractNo());
- paymentConfirm.setScheduleId(schedule.getId());
- paymentConfirm.setScheduleName(schedule.getStageName());
- paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
- //璁＄畻鍑哄簱閲戦
- BigDecimal outAmount = addDTO.getSubjectMatterList().stream().map(item->item.getUnitPrice().multiply(item.getOutBoundNum())).reduce(BigDecimal.ZERO, BigDecimal::add);
- paymentConfirm.setTransationAmount(outAmount.divide(new BigDecimal("100")).multiply(schedule.getPaymentRatio()));
- if (ObjUtil.isNotNull(contract.getOutBoundAmout())){
- contract.setOutBoundAmout(outAmount.add(contract.getOutBoundAmout()));
- }else {
- contract.setOutBoundAmout(outAmount);
- }
- contractMapper.updateById(contract);
- //鏈�杩戞槑缁�
- PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(lastConfirm)) {
+ //瀵煎叆鏁版嵁涓嶇敓鎴愬簲鏀�
+ if (targetContractNo.startsWith("ZB-")) {
+ //璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
+ PaymentConfirm paymentConfirm = new PaymentConfirm();
+ paymentConfirm.setBusinessType("鍙戣揣鍓嶅簲鏀�");
+ paymentConfirm.setBusGuestId(contract.getPartyAId());
+ paymentConfirm.setBusGuestName(contract.getPartyA());
+ paymentConfirm.setContractId(contract.getId());
+ paymentConfirm.setContractName(contract.getContractName());
+ paymentConfirm.setContractNo(contract.getContractNo());
+ paymentConfirm.setScheduleId(schedule.getId());
+ paymentConfirm.setScheduleName(schedule.getStageName());
+ paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
+ //璁＄畻鍑哄簱閲戦
+ BigDecimal outAmount = addDTO.getSubjectMatterList().stream().map(item -> item.getUnitPrice().multiply(item.getOutBoundNum())).reduce(BigDecimal.ZERO, BigDecimal::add);
+ paymentConfirm.setTransationAmount(outAmount.divide(new BigDecimal("100")).multiply(schedule.getPaymentRatio()));
+ if (ObjUtil.isNotNull(contract.getOutBoundAmout())) {
+ contract.setOutBoundAmout(outAmount.add(contract.getOutBoundAmout()));
+ } else {
+ contract.setOutBoundAmout(outAmount);
+ }
+ contractMapper.updateById(contract);
+ //鏈�杩戞槑缁�
+ PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ if (ObjUtil.isNotNull(lastConfirm)) {
//涓嶅瓨鍦ㄥ彂璐у簲鏀� 鍑哄簱鎬婚
paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
- if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>0){
+ if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
paymentConfirm.setAdvanceAmount(paymentConfirm.getTotalAmount());
}
- if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0"))<0){
+ if (paymentConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
paymentConfirm.setReceivableAmount(paymentConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
}
if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
paymentConfirmMapper.insert(paymentConfirm);
}
// }
- } else {
- //鏃犱箣鍓嶉樁娈靛簲鏀�
- paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
- if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
- paymentConfirmMapper.insert(paymentConfirm);
- //瀹㈡埛浠樻瀹屾垚鍚堝悓
- List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
- .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
- if (CollUtil.isNotEmpty(customerCompleteContractList)) {
- List<BigDecimal> outAmountList = new ArrayList<>();
- for (Contract completeContract : customerCompleteContractList
- ) {
- PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
- if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
- //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
- PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
+ } else {
+ //鏃犱箣鍓嶉樁娈靛簲鏀�
+ paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0")) > 0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = contractMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getPartyAId, contract.getPartyAId())
+ .eq(Contract::getPartyBId, SecurityUtils.getUser().getCompId()).apply(" amount = paid_amount"));
+ if (CollUtil.isNotEmpty(customerCompleteContractList)) {
+ List<BigDecimal> outAmountList = new ArrayList<>();
+ for (Contract completeContract : customerCompleteContractList
+ ) {
+ PaymentConfirm contractLastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, completeContract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ //鏌ヨ瀹㈡埛浠樻瀹屾垚鍚堝悓涓渶鍚庢槑缁嗛噾棰� 鏈夐鏀惰浆鍏ュ綋鍓嶅悎鍚�
+ if (contractLastConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
+ //鏂板瀹屾垚浠樻鍚堝悓 璧勯噾杞嚭
+ PaymentConfirm outConfirm = BeanUtil.copyProperties(contractLastConfirm, PaymentConfirm.class, "id", "transationAmount",
+ "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
+ outConfirm.setBusinessType("璧勯噾杞嚭");
+ outConfirm.setConfirmTime(new Date());
+ outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
+ outConfirm.setTotalAmount(new BigDecimal("0"));
+ paymentConfirmMapper.insert(outConfirm);
+ outAmountList.add(outConfirm.getTransationAmount());
+ }
+ }
+ if (CollUtil.isNotEmpty(outAmountList)) {
+ BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
"advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
- outConfirm.setBusinessType("璧勯噾杞嚭");
- outConfirm.setConfirmTime(new Date());
- outConfirm.setTransationAmount(contractLastConfirm.getTotalAmount());
- outConfirm.setTotalAmount(new BigDecimal("0"));
- paymentConfirmMapper.insert(outConfirm);
- outAmountList.add(outConfirm.getTransationAmount());
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentInSum);
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ schedule.setActualAmount(inConfirm.getTransationAmount());
+ schedule.setPaymentStatus(2);
+ if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
+ inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
+ } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
+ inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
+ schedule.setActualAmount(paymentConfirm.getTotalAmount().subtract(currentInSum));
+ schedule.setPaymentStatus(1);
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
+ scheduleMapper.updateById(schedule);
}
- }
- if (CollUtil.isNotEmpty(outAmountList)) {
- BigDecimal currentInSum = outAmountList.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
- PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm, PaymentConfirm.class, "id", "transationAmount",
- "advanceAmount", "receivableAmount", "overdueAmount", "totalAmount");
- inConfirm.setBusinessType("璧勯噾杞叆");
- inConfirm.setConfirmTime(new Date());
- inConfirm.setTransationAmount(currentInSum);
- inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentInSum));
- //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
- schedule.setActualAmount(inConfirm.getTransationAmount());
- schedule.setPaymentStatus(2);
- if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) > 0) {
- inConfirm.setAdvanceAmount(inConfirm.getTotalAmount());
- } else if (inConfirm.getTotalAmount().compareTo(new BigDecimal("0")) < 0) {
- inConfirm.setReceivableAmount(inConfirm.getTotalAmount().multiply(new BigDecimal("-1")));
- schedule.setActualAmount(paymentConfirm.getTotalAmount().subtract(currentInSum));
- schedule.setPaymentStatus(1);
- }
- paymentConfirmMapper.insert(inConfirm);
- //鏇存柊褰撳墠闃舵瀹為檯鏀舵 鍜� 鏀舵鐘舵��
- scheduleMapper.updateById(schedule);
}
}
}
@@ -723,7 +726,7 @@
.eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
.orderByAsc(ContractPaymentSchedule::getCreateTime));
- if (CollUtil.isNotEmpty(afterSchedule)&&contract.getOutBoundAmout().compareTo(contract.getAmount())==0) {
+ if (CollUtil.isNotEmpty(afterSchedule) && contract.getOutBoundAmout().compareTo(contract.getAmount()) == 0) {
contract.setNextScheduleName(afterSchedule.get(0).getStageName());
contractMapper.updateById(contract);
}
@@ -738,7 +741,7 @@
PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
if (lastNewConfirm.getTotalAmount().compareTo(new BigDecimal("0")) >= 0
- &&contract.getBillingAmout().compareTo(contract.getAmount())==0) {
+ && contract.getBillingAmout().compareTo(contract.getAmount()) == 0) {
//鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
contract.setContractStatus(3);
contractMapper.updateById(contract);
@@ -751,7 +754,7 @@
/**
* 鐢熸垚鏍煎紡涓�: yyyyMMdd + 4浣嶅簭鍒楀彿 (渚嬪: 20260629000001)
*/
- public String generateSMJContractCKNo() {
+ public String generateSMJContractCKNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -766,10 +769,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-SMJ-CK-"+dateStr + seqStr;
+ return "ZB-SMJ-CK-" + dateStr + seqStr;
}
- public String generateYMJContractCKNo() {
+ public String generateYMJContractCKNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -784,10 +787,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-YMJ-CK-"+dateStr + seqStr;
+ return "ZB-YMJ-CK-" + dateStr + seqStr;
}
- public String generateJXCContractCKNo() {
+ public String generateJXCContractCKNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -802,10 +805,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-JXC-CK-"+dateStr + seqStr;
+ return "ZB-JXC-CK-" + dateStr + seqStr;
}
- public String generateTFContractCKNo() {
+ public String generateTFContractCKNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -820,10 +823,10 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-TF-CK-"+dateStr + seqStr;
+ return "ZB-TF-CK-" + dateStr + seqStr;
}
- public String generateGYBContractCKNo() {
+ public String generateGYBContractCKNo() {
// 1. 鑾峰彇褰撳墠鏃ユ湡瀛楃涓�
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
@@ -838,42 +841,42 @@
String seqStr = String.format("%04d", sequence);
// 5. 鎷兼帴杩斿洖
- return "ZB-GYB-CK-"+dateStr + seqStr;
+ return "ZB-GYB-CK-" + dateStr + seqStr;
}
@Override
public R delOutBound(String batchNumber) {
- List<OutBound> outBoundList = baseMapper.selectList(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber,batchNumber));
- if (CollUtil.isEmpty(outBoundList)){
+ List<OutBound> outBoundList = baseMapper.selectList(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
+ if (CollUtil.isEmpty(outBoundList)) {
return R.failed("鍑哄簱淇℃伅寮傚父锛岃鑱旂郴钀ラ攢绯荤粺绠＄悊浜哄憳");
}
List<ContractOutBound> contractOutBoundList = contractOutBoundMapper.selectList(Wrappers.<ContractOutBound>lambdaQuery()
- .in(ContractOutBound::getOutBoundId,outBoundList.stream().map(OutBound::getId).collect(Collectors.toList())));
- if (CollUtil.isEmpty(contractOutBoundList)){
+ .in(ContractOutBound::getOutBoundId, outBoundList.stream().map(OutBound::getId).collect(Collectors.toList())));
+ if (CollUtil.isEmpty(contractOutBoundList)) {
return R.failed("鍑哄簱淇℃伅寮傚父锛岃鑱旂郴钀ラ攢绯荤粺绠＄悊浜哄憳");
}
boolean allZero = true;
for (ContractOutBound item : contractOutBoundList) {
// 鍋囪 invoiceNum 鏄� Integer 瀵硅薄
- if (item.getInvoiceNum() == null || item.getInvoiceNum().compareTo(new BigDecimal("0"))!=0) {
+ if (item.getInvoiceNum() == null || item.getInvoiceNum().compareTo(new BigDecimal("0")) != 0) {
allZero = false;
break; // 鍙戠幇涓�涓笉绗﹀悎鍗抽��鍑�
}
}
- if (!allZero){
+ if (!allZero) {
return R.failed("璇峰厛鍐插噺鎵�鏈夎摑鐗屽悗鍦ㄦ搷浣�");
}
for (ContractOutBound item : contractOutBoundList) {
ContractSubjectMatter subjectMatter = contractSubjectMatterMapper.selectOne(Wrappers.<ContractSubjectMatter>lambdaQuery()
- .eq(ContractSubjectMatter::getContractId,item.getContractId()).eq(ContractSubjectMatter::getMaterialCode,item.getSubjectMatterCode())
- .eq(ContractSubjectMatter::getLineNo,item.getLineNo()));
- if (ObjUtil.isNotNull(subjectMatter)){
+ .eq(ContractSubjectMatter::getContractId, item.getContractId()).eq(ContractSubjectMatter::getMaterialCode, item.getSubjectMatterCode())
+ .eq(ContractSubjectMatter::getLineNo, item.getLineNo()));
+ if (ObjUtil.isNotNull(subjectMatter)) {
subjectMatter.setDeliveredQuantity(subjectMatter.getDeliveredQuantity().subtract(item.getOutBoundNum()));
subjectMatter.setRemainingQuantity(subjectMatter.getRemainingQuantity().add(item.getOutBoundNum()));
- if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))==0){
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) == 0) {
subjectMatter.setDeliveryStatus(0);
}
- if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0"))>0){
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
subjectMatter.setDeliveryStatus(1);
}
//鏍囩殑鐗╂洿鏂�
@@ -898,7 +901,7 @@
//鍑哄簱璁板綍鍒犻櫎
contractOutBoundMapper.deleteById(item);
}
- baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber,batchNumber));
+ baseMapper.delete(Wrappers.<OutBound>lambdaQuery().eq(OutBound::getBatchNumber, batchNumber));
return R.ok();
}
}
\ No newline at end of file
--
Gitblit v1.9.1