From a422a984cfa2a5a2bbe89c6fa6947363e559bb4f Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期五, 22 五月 2026 09:29:14 +0800
Subject: [PATCH] feat:faet:出库加批次号，合同履约加销方购方履约，到货单据必填校验，验收单据必填校验，单位新增法人、委托代理人字段 、合同出库新增erp出库ID
---
platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/OutBoundServiceImpl.java | 403 +++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 262 insertions(+), 141 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 ab084f0..ba953e1 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
@@ -1,6 +1,7 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
@@ -13,16 +14,14 @@
import com.by4cloud.platformx.business.mapper.*;
import com.by4cloud.platformx.business.service.OutBoundService;
import com.by4cloud.platformx.common.core.util.R;
+import com.by4cloud.platformx.common.security.util.SecurityUtils;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -40,6 +39,7 @@
private final PaymentConfirmMapper paymentConfirmMapper;
private final ContractMapper contractMapper;
private final ContractPaymentScheduleProcessMapper scheduleProcessMapper;
+ private final ContractOutBoundMapper contractOutBoundMapper;
@Override
public R add(OutBoundAddDTO addDTO) {
@@ -49,6 +49,7 @@
MPJLambdaWrapper<ContractSubjectMatter> wrapper = new MPJLambdaWrapper<ContractSubjectMatter>()
.selectAll(ContractSubjectMatter.class)
.ne(ContractSubjectMatter::getDeliveryStatus, 2)
+ .in(ContractSubjectMatter::getMaterialCode, addDTO.getSubjectMatterList().stream().map(item -> item.getSubjectMatterCode()).collect(Collectors.toList()))
.exists(Contract.class, contractQuery ->
contractQuery.select(ContractSubjectMatter::getId)
.eq(Contract::getId, ContractSubjectMatter::getContractId)
@@ -60,110 +61,121 @@
if (ArrayUtil.isEmpty(subjectMatterList.toArray())) {
return R.failed("娌℃湁鏌ヨ鍒扮浉鍏冲悎鍚岃鍗�");
}
- Double outTotal = subjectMatterList.stream().mapToDouble(item -> {
- // 浼樺厛鍒ゆ柇 remainNum
- if (item.getRemainingQuantity() != null && item.getRemainingQuantity().compareTo(new BigDecimal("0")) > 0) {
- return item.getRemainingQuantity().doubleValue();
- } else {
- // remainNum 涓� null 鎴� 0 鏃讹紝浣跨敤 quantity
- return item.getQuantity() == null ? 0.0 : item.getQuantity().doubleValue();
- }
- }).sum();
- BigDecimal orderNum = addDTO.getSubjectMatterList().stream().map(OutSubjectMatterAddDTO::getOutBoundNum)
+ List<String> erpCodeList = subjectMatterList.stream().map(ContractSubjectMatter::getMaterialCode).collect(Collectors.toList());
+ BigDecimal orderNum = subjectMatterList.stream().filter(item ->item.getDeliveryStatus()!=2)
+ .map(item ->item.getDeliveryStatus()==0?item.getQuantity():item.getRemainingQuantity())
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal outTotal = addDTO.getSubjectMatterList().stream()
+ .filter(item->erpCodeList.contains(item.getSubjectMatterCode()))
+ .map(OutSubjectMatterAddDTO::getOutBoundNum)
.filter(num -> num != null) // 杩囨护鎺� null 鍊硷紝闃叉 NullPointerException
.reduce(BigDecimal.ZERO, BigDecimal::add);
- if (new BigDecimal(outTotal).compareTo(orderNum) < 0) {
+ if (outTotal.compareTo(orderNum) > 0) {
return R.failed("鍑哄簱鏁伴噺瓒呭嚭鍚堝悓璁㈠崟鏁伴噺");
}
//褰撳墠鍏ュ簱鏍囩殑鐗�
- List<ContractSubjectMatter> currentOutList = new ArrayList<>();
+ Map<Long, Object> currentOutMap = new HashMap<>();
+ //鍑哄簱鎵规
+ String batchNumber = DateUtil.format(new Date(), DatePattern.PURE_DATETIME_MS_PATTERN);
+ //鍑哄簱
addDTO.getSubjectMatterList().stream().forEach(outSubjectMatterAddDTO -> {
- BigDecimal remainNum = outSubjectMatterAddDTO.getOutBoundNum();
- for (ContractSubjectMatter subjectMatter : subjectMatterList) {
-
- if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
- remainNum = remainNum.subtract(subjectMatter.getRemainingQuantity());
- //閮ㄥ垎浜や粯鐘舵�佷笅 鍏ㄩ儴鍑哄簱
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
- BigDecimal currentOut = subjectMatter.getRemainingQuantity();
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
- subjectMatter.setRemainingQuantity(new BigDecimal("0"));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(2);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- } else {
- BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
- subjectMatter.setRemainingQuantity(remainNum.multiply(new BigDecimal("-1")));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(1);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- break;
- }
-
- } else {
- //鏈氦浠樼姸鎬佷笅
- remainNum = remainNum.subtract(subjectMatter.getQuantity());
- if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
- subjectMatter.setRemainingQuantity(new BigDecimal("0"));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(2);
- contractSubjectMatterMapper.updateById(subjectMatter);
- subjectMatter.setLastDeliveredQuantity(subjectMatter.getQuantity());
- currentOutList.add(subjectMatter);
- } else {
- BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
- subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
- subjectMatter.setRemainingQuantity(remainNum.multiply(new BigDecimal("-1")));
- subjectMatter.setActualDeliveryDate(DateUtil.today());
- subjectMatter.setDeliveryStatus(1);
- subjectMatter.setLastDeliveredQuantity(currentOut);
- contractSubjectMatterMapper.updateById(subjectMatter);
- currentOutList.add(subjectMatter);
- break;
- }
- }
- }
OutBound outBound = BeanUtil.copyProperties(outSubjectMatterAddDTO, OutBound.class);
+ outBound.setBatchNumber(batchNumber);
outBound.setBusGuestName(addDTO.getBusGuestName());
outBound.setBusGuestId(addDTO.getBusGuestId());
outBound.setOutBoundTime(addDTO.getOutBoundTime());
baseMapper.insert(outBound);
+ BigDecimal remainNum = outSubjectMatterAddDTO.getOutBoundNum();
+ for (ContractSubjectMatter subjectMatter : subjectMatterList) {
+ if (outSubjectMatterAddDTO.getSubjectMatterCode().equals(subjectMatter.getMaterialCode())) {
+ Contract contract = contractMapper.selectById(subjectMatter.getContractId());
+ if (subjectMatter.getDeliveredQuantity().compareTo(new BigDecimal("0")) > 0) {
+ remainNum = remainNum.subtract(subjectMatter.getRemainingQuantity());
+ //閮ㄥ垎浜や粯鐘舵�佷笅 鍏ㄩ儴鍑哄簱
+ if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ BigDecimal currentOut = subjectMatter.getRemainingQuantity();
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(2);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ } else {
+ BigDecimal currentOut = remainNum.add(subjectMatter.getRemainingQuantity());
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
+ subjectMatter.setRemainingQuantity(subjectMatter.getRemainingQuantity().subtract(currentOut));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(1);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ break;
+ }
+
+ } else {
+ //鏈氦浠樼姸鎬佷笅
+ remainNum = remainNum.subtract(subjectMatter.getQuantity());
+ if (remainNum.compareTo(new BigDecimal("0")) >= 0) {
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity());
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(2);
+ subjectMatter.setLastDeliveredQuantity(subjectMatter.getQuantity());
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ } else {
+ BigDecimal currentOut = remainNum.add(subjectMatter.getQuantity());
+ subjectMatter.setDeliveredQuantity(subjectMatter.getQuantity().add(remainNum));
+ subjectMatter.setRemainingQuantity(remainNum.multiply(new BigDecimal("-1")));
+ subjectMatter.setActualDeliveryDate(DateUtil.today());
+ subjectMatter.setDeliveryStatus(1);
+ subjectMatter.setLastDeliveredQuantity(currentOut);
+ contractSubjectMatterMapper.updateById(subjectMatter);
+ currentOutMap.put(subjectMatter.getContractId(), subjectMatter);
+ //鏂板鍚堝悓鍑哄簱鍘嗗彶
+ saveContractOutBound(contract, addDTO, subjectMatter,outBound.getId());
+ break;
+ }
+ }
+ }
+ }
+
});
//鍑哄簱搴旀敹娆炬槑缁�
- if (ArrayUtil.isNotEmpty(currentOutList.toArray())) {
- //鏍规嵁鍚堝悓id鎷嗗垎搴旀敹鏄庣粏
- Map<Long, List<ContractSubjectMatter>> conSubMatMap = currentOutList.stream().collect(Collectors.groupingBy(ContractSubjectMatter::getContractId));
-
- conSubMatMap.forEach((key, value) -> {
+ if (ArrayUtil.isNotEmpty(currentOutMap.keySet())) {
+ for (Long contractId : currentOutMap.keySet()) {
+ //褰撳墠鍑哄簱鍚堝悓鍑哄簱鏍囩殑鐗�
+ List<ContractSubjectMatter> contractSubjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId, contractId).ne(ContractSubjectMatter::getDeliveryStatus, 0));
//鏌ヨ鍚堝悓鏄惁鏈夊嚭搴撻樁娈�
- ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, key)
+ ContractPaymentSchedule schedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractId)
.eq(ContractPaymentSchedule::getStageName, "鍙戣揣鍓�"));
- //褰撳墠鍑哄簱閲戦
- BigDecimal outPirce = value.stream()
- .filter(item -> item.getLastDeliveredQuantity() != null && item.getUnitPrice() != null)
- .map(item -> item.getLastDeliveredQuantity().multiply(item.getUnitPrice()))
- .reduce(BigDecimal.ZERO, BigDecimal::add);
- //鍚堝悓閲戦
- Contract contract = contractMapper.selectById(key);
- //鍑哄簱鏄惁瀹屾垚
- if (outPirce.compareTo(contract.getAmount())<0){
- contract.setBillingStatus("1");
- contractMapper.updateById(contract);
- }
- if (outPirce.compareTo(contract.getAmount())==0){
- contract.setBillingStatus("2");
- contractMapper.updateById(contract);
- }
+ //瀛樺湪鍑哄簱闃舵
if (ObjUtil.isNotNull(schedule)) {
-
- //鎸夊嚭搴撹祫閲戞瘮渚� 璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
+ //褰撳墠鍑哄簱閲戦
+ BigDecimal outPirce = contractSubjectMatterList.stream()
+ .map(item -> (item.getDeliveryStatus() == 1 ? item.getDeliveredQuantity().multiply(item.getUnitPrice()) : item.getQuantity().multiply(item.getUnitPrice())))
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+ //鍚堝悓閲戦
+ Contract contract = contractMapper.selectById(contractId);
+ //鍑哄簱鏄惁瀹屾垚
+ if (outPirce.compareTo(contract.getAmount()) < 0) {
+ contract.setBillingStatus("1");
+ contractMapper.updateById(contract);
+ }
+ if (outPirce.compareTo(contract.getAmount()) == 0) {
+ contract.setBillingStatus("2");
+ contractMapper.updateById(contract);
+ }
+ //璁＄畻鍙戣揣鍓嶅簲鏀舵洿鏂拌祫閲戞槑缁�
PaymentConfirm paymentConfirm = new PaymentConfirm();
paymentConfirm.setBusinessType("鍙戣揣鍓嶅簲鏀�");
paymentConfirm.setBusGuestId(contract.getPartyAId());
@@ -174,89 +186,198 @@
paymentConfirm.setScheduleId(schedule.getId());
paymentConfirm.setScheduleName(schedule.getStageName());
paymentConfirm.setConfirmTime(addDTO.getOutBoundTime());
+ //鎸夊嚭搴撹祫閲戞瘮渚� 璁＄畻鍙戣揣鍓嶅簲鏀�
paymentConfirm.setTransationAmount(outPirce.divide(contract.getAmount(), 10, RoundingMode.HALF_UP).multiply(schedule.getPlannedAmount()));
paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
- paymentConfirm.setTotalAmount(paymentConfirm.getTransationAmount().multiply(new BigDecimal("-1")));
+
//鏈�杩戝簲鏀�
PaymentConfirm lastConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
.orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+
if (ObjUtil.isNotNull(lastConfirm)) {
- paymentConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(lastConfirm.getTotalAmount()));
- paymentConfirmMapper.insert(paymentConfirm);
+ //宸插瓨鍦ㄥ彂璐у簲鏀�
+ if (StrUtil.equals(lastConfirm.getBusinessType(), paymentConfirm.getBusinessType())) {
+
+ //鏌ヨ涔嬪墠鎵�鏈夊彂璐у墠搴旀敹
+ List<PaymentConfirm> fhConfirmList = paymentConfirmMapper.selectList(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .eq(PaymentConfirm::getScheduleId,schedule.getId()).orderByDesc(PaymentConfirm::getCreateTime));
+ BigDecimal fhTotalAmount = fhConfirmList.stream().map(item->item.getTransationAmount()).reduce(BigDecimal.ZERO,BigDecimal::add);
+ //鏈鍙戣揣鍓嶅簲鏀� 鍑哄簱鎬婚 - 鎵�鏈夊彂璐у墠搴旀敹
+ paymentConfirm.setTransationAmount(paymentConfirm.getTransationAmount().subtract(fhTotalAmount));
+ paymentConfirm.setReceivableAmount(paymentConfirm.getTransationAmount());
+ paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
+ if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
+ } else {
+ //涓嶅瓨鍦ㄥ彂璐у簲鏀� 鍑哄簱鎬婚
+ paymentConfirm.setTotalAmount(lastConfirm.getTotalAmount().subtract(paymentConfirm.getTransationAmount()));
+ if(schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
+ }
} else {
- paymentConfirmMapper.insert(paymentConfirm);
+ //鏃犱箣鍓嶉樁娈靛簲鏀�
+ 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 (ArrayUtil.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 (ArrayUtil.isNotEmpty(outAmountList.toArray())){
+ BigDecimal currentSum = new BigDecimal("0");
+ for (BigDecimal currentAmount:outAmountList
+ ) {
+ currentSum=currentSum.add(currentAmount);
+ //鏂板褰撳墠鍚堝悓 璧勯噾杞叆
+ PaymentConfirm inConfirm = BeanUtil.copyProperties(paymentConfirm,PaymentConfirm.class,"id","transationAmount",
+ "advanceAmount","receivableAmount","overdueAmount","totalAmount");
+ inConfirm.setBusinessType("璧勯噾杞叆");
+ inConfirm.setConfirmTime(new Date());
+ inConfirm.setTransationAmount(currentSum.subtract(currentAmount));
+ inConfirm.setTotalAmount(paymentConfirm.getTotalAmount().add(currentSum));
+ 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")));
+ }
+ paymentConfirmMapper.insert(inConfirm);
+ }
+ }
+ }
+ }
}
+
//鏇存柊鍙戣揣鍓嶆敹娆剧敓鏁堟椂闂�
- if (ObjUtil.isNull(schedule.getEffectiveDate())){
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),schedule.getAgreedDays()));
+ if (ObjUtil.isNull(schedule.getEffectiveDate())) {
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), schedule.getAgreedDays()));
//鏌ヨ鏄惁鏈夊悗缁樁娈�
- List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, key)
+ List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, contractId)
.gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isEmpty(afterSchedule.toArray())){
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
schedule.setEffectiveEndDate(contract.getExpirationDate());
}
scheduleMapper.updateById(schedule);
//鏌ヨ鏄惁鏈変箣鍓嶉樁娈�
ContractPaymentSchedule beforeSchedule = scheduleMapper.selectOne(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
.lt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()).orderByDesc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(beforeSchedule)){
- beforeSchedule.setEffectiveEndDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),beforeSchedule.getAgreedDays()));
+ if (ObjUtil.isNotNull(beforeSchedule)) {
+ beforeSchedule.setEffectiveEndDate(schedule.getEffectiveDate());
scheduleMapper.updateById(beforeSchedule);
}
+ //鏇存柊灞ョ害
+ ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
+ contractPaymentScheduleProcess.setContractId(schedule.getContractId());
+ contractPaymentScheduleProcess.setContractName(schedule.getContractName());
+ contractPaymentScheduleProcess.setScheduleId(schedule.getId());
+ contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
+ contractPaymentScheduleProcess.setProcessDate(addDTO.getOutBoundTime());
+ scheduleProcessMapper.insert(contractPaymentScheduleProcess);
}
- //鏇存柊灞ョ害
- ContractPaymentScheduleProcess contractPaymentScheduleProcess = new ContractPaymentScheduleProcess();
- contractPaymentScheduleProcess.setContractId(schedule.getContractId());
- contractPaymentScheduleProcess.setContractName(schedule.getContractName());
- contractPaymentScheduleProcess.setScheduleId(schedule.getId());
- contractPaymentScheduleProcess.setScheduleName(schedule.getStageName());
- contractPaymentScheduleProcess.setProcessDate(addDTO.getOutBoundTime());
- scheduleProcessMapper.insert(contractPaymentScheduleProcess);
+
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = scheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
.eq(ContractPaymentSchedule::getContractId, schedule.getContractId())
- .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder()));
- if (ArrayUtil.isNotEmpty(afterSchedule.toArray())&&afterSchedule.size()==1){
-
+ .gt(ContractPaymentSchedule::getStageOrder, schedule.getStageOrder())
+ .orderByAsc(ContractPaymentSchedule::getCreateTime));
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() == 1) {
//鏈�鍚庨樁娈电敓鏁堟椂闂�
ContractPaymentSchedule endSchedule = afterSchedule.get(0);
- endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),endSchedule.getAgreedDays()));
- endSchedule.setEffectiveEndDate(contract.getExpirationDate());
- scheduleMapper.updateById(endSchedule);
- //褰撳墠闃舵鐢熸晥鏃堕棿
- schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(),schedule.getAgreedDays()));
- schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
- scheduleMapper.updateById(schedule);
- //鏈�鍚庨樁娈靛簲鏀�
- PaymentConfirm newConfim = new PaymentConfirm();
- newConfim.setBusinessType(endSchedule.getStageName()+"搴旀敹");
- newConfim.setBusGuestId(contract.getPartyAId());
- newConfim.setBusGuestName(contract.getPartyA());
- newConfim.setContractId(contract.getId());
- newConfim.setContractName(contract.getContractName());
- newConfim.setContractNo(contract.getContractNo());
- newConfim.setScheduleId(endSchedule.getId());
- newConfim.setScheduleName(schedule.getStageName());
- newConfim.setConfirmTime(addDTO.getOutBoundTime());
- newConfim.setTransationAmount(endSchedule.getPlannedAmount());
- newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
- PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- BigDecimal lastNewTotal = new BigDecimal("0");
- if(ObjUtil.isNotNull(lastNewConfirm)){
- lastNewTotal = lastNewConfirm.getTotalAmount();
+ if (StrUtil.equals(endSchedule.getStageName(), "璐ㄤ繚閲�")) {
+ endSchedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), endSchedule.getAgreedDays()));
+ endSchedule.setEffectiveEndDate(contract.getExpirationDate());
+ scheduleMapper.updateById(endSchedule);
+ //褰撳墠闃舵鐢熸晥鏃堕棿
+ schedule.setEffectiveDate(DateUtil.offsetDay(addDTO.getOutBoundTime(), schedule.getAgreedDays()));
+ schedule.setEffectiveEndDate(endSchedule.getEffectiveDate());
+ scheduleMapper.updateById(schedule);
+ //鏈�鍚庨樁娈靛簲鏀�
+ PaymentConfirm newConfim = new PaymentConfirm();
+ newConfim.setBusinessType(endSchedule.getStageName() + "搴旀敹");
+ newConfim.setBusGuestId(contract.getPartyAId());
+ newConfim.setBusGuestName(contract.getPartyA());
+ newConfim.setContractId(contract.getId());
+ newConfim.setContractName(contract.getContractName());
+ newConfim.setContractNo(contract.getContractNo());
+ newConfim.setScheduleId(endSchedule.getId());
+ newConfim.setScheduleName(schedule.getStageName());
+ newConfim.setConfirmTime(addDTO.getOutBoundTime());
+ newConfim.setTransationAmount(endSchedule.getPlannedAmount());
+ newConfim.setReceivableAmount(endSchedule.getPlannedAmount());
+ PaymentConfirm lastNewConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId, contract.getId())
+ .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+ BigDecimal lastNewTotal = new BigDecimal("0");
+ if (ObjUtil.isNotNull(lastNewConfirm)) {
+ lastNewTotal = lastNewConfirm.getTotalAmount();
+ }
+ newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
+ if(endSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
+ paymentConfirmMapper.insert(newConfim);
+ }
}
- newConfim.setTotalAmount(lastNewTotal.subtract(newConfim.getReceivableAmount()));
- paymentConfirmMapper.insert(newConfim);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(endSchedule.getStageName());
+ contractMapper.updateById(contract);
}
- if(ArrayUtil.isEmpty(afterSchedule.toArray())){
+ if (ArrayUtil.isNotEmpty(afterSchedule.toArray()) && afterSchedule.size() > 1) {
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName(afterSchedule.get(0).getStageName());
+ contractMapper.updateById(contract);
+ }
+ if (ArrayUtil.isEmpty(afterSchedule.toArray())) {
schedule.setEffectiveEndDate(contract.getExpirationDate());
scheduleMapper.updateById(schedule);
+ //鏇存柊鍚堝悓涓嬩釜闃舵
+ contract.setNextScheduleName("鏃�");
+ contractMapper.updateById(contract);
+ //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+ 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.setContractStatus(3);
+ contractMapper.updateById(contract);
+ }
}
}
- });
+ }
}
return R.ok();
}
+
+ private void saveContractOutBound(Contract contract, OutBoundAddDTO addDTO, ContractSubjectMatter subjectMatter,Long outBoundId) {
+ ContractOutBound contractOutBound = new ContractOutBound();
+ contractOutBound.setContractId(contract.getId());
+ contractOutBound.setContractName(contract.getContractName());
+ contractOutBound.setBusGuestId(contract.getPartyAId());
+ contractOutBound.setBusGuestName(contract.getPartyA());
+ contractOutBound.setSubjectMatterCode(subjectMatter.getMaterialCode());
+ contractOutBound.setSubjectMatterName(subjectMatter.getMaterialInternalName());
+ contractOutBound.setOutBoundTime(addDTO.getOutBoundTime());
+ contractOutBound.setOutBoundNum(subjectMatter.getLastDeliveredQuantity());
+ contractOutBound.setOutBoundAttNames(addDTO.getOutBoundAttNames());
+ contractOutBound.setOutBoundAttPaths(addDTO.getOutBoundAttPaths());
+ contractOutBound.setOutBoundId(outBoundId);
+ contractOutBoundMapper.insert(contractOutBound);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1