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/ContractServiceImpl.java | 267 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 208 insertions(+), 59 deletions(-)
diff --git a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
index c21a77e..921a9dc 100644
--- a/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
+++ b/platformx-business-finance-biz/src/main/java/com/by4cloud/platformx/business/service/impl/ContractServiceImpl.java
@@ -1,12 +1,16 @@
package com.by4cloud.platformx.business.service.impl;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.by4cloud.platformx.admin.api.entity.SysDept;
+import com.by4cloud.platformx.admin.api.feign.RemoteDeptService;
import com.by4cloud.platformx.business.api.feign.RemoteFlowProcessService;
import com.by4cloud.platformx.business.constant.FlowNameEnum;
import com.by4cloud.platformx.business.dto.ContractAddDTO;
@@ -18,17 +22,23 @@
import com.by4cloud.platformx.business.vo.ContractDetailVo;
import com.by4cloud.platformx.common.core.util.R;
import com.by4cloud.platformx.common.security.util.SecurityUtils;
-import com.by4cloud.platformx.flow.task.api.feign.RemoteBusinessService;
import com.by4cloud.platformx.flow.task.dto.ProcessInstanceParamDto;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.deepoove.poi.data.RowRenderData;
+import com.deepoove.poi.plugin.table.LoopRowTableRenderPolicy;
+import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.core.io.ClassPathResource;
import org.springframework.stereotype.Service;
-import java.io.Serializable;
+import java.io.IOException;
+import java.io.OutputStream;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicReference;
/**
* @author cd
@@ -44,7 +54,13 @@
private final ContractPaymentScheduleProcessMapper contractPaymentScheduleProcessMapper;
private final PaymentConfirmMapper paymentConfirmMapper;
private final CurrentOverdueMapper currentOverdueMapper;
+ private final BusinessCustomerMapper businessCustomerMapper;
private final RemoteFlowProcessService remoteFlowProcessService;
+ private final ContractTemplateMapper contractTemplateMapper;
+ private final RemoteDeptService remoteDeptService;
+
+ @Value("${file.local.base-path}")
+ private String basePath;
@Override
public R add(ContractAddDTO addDTO) {
@@ -208,29 +224,8 @@
.orderByAsc(ContractPaymentSchedule::getCreateTime).last("limit 1"));
if (fitstSchedule.getStageName().equals("鍚堝悓绛捐")){
//鏂板搴旀敹
- 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(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- 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();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
- paymentConfirmMapper.insert(paymentConfirm);
- }
+ savePaymentConfirm(contract,fitstSchedule);
+
//鏂板鍚堝悓灞ョ害璁板綍
ContractPaymentScheduleProcess process = new ContractPaymentScheduleProcess();
process.setContractId(contract.getId());
@@ -239,14 +234,14 @@
process.setScheduleName(fitstSchedule.getStageName());
process.setProcessDate(contract.getSignDate());
contractPaymentScheduleProcessMapper.insert(process);
- //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
- PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
- .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
- if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
- //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
- contract.setContractStatus(3);
- baseMapper.updateById(contract);
- }
+// //褰撳墠涓哄悎鍚屾渶鍚庨樁娈�
+// PaymentConfirm newConfirm = paymentConfirmMapper.selectOne(Wrappers.<PaymentConfirm>lambdaQuery().eq(PaymentConfirm::getContractId,contract.getId())
+// .orderByDesc(PaymentConfirm::getCreateTime).last("limit 1"));
+// if (ObjUtil.isNotNull(newConfirm)&&newConfirm.getTotalAmount().compareTo(new BigDecimal("0"))>=0){
+// //鏈夐浠樹笖瓒呰繃搴旀敹 鍏抽棴鍚堝悓鐘舵��
+// contract.setContractStatus(3);
+// baseMapper.updateById(contract);
+// }
}else if (fitstSchedule.getStageName().equals("鍙戣揣鍓�")) {
//鏇存柊鍚堝悓涓嬩釜闃舵
contract.setNextScheduleName("鏃�");
@@ -261,29 +256,7 @@
baseMapper.updateById(contract);
}else {
//鏂板搴旀敹
- 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(fitstSchedule.getId());
- paymentConfirm.setScheduleName(fitstSchedule.getStageName());
- paymentConfirm.setConfirmTime(new Date());
- paymentConfirm.setTransationAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setReceivableAmount(fitstSchedule.getPlannedAmount());
- paymentConfirm.setTotalAmount(fitstSchedule.getPlannedAmount().multiply(new BigDecimal("-1")));
- 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();
- }
- paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
- if (fitstSchedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0) {
- paymentConfirmMapper.insert(paymentConfirm);
- }
+ savePaymentConfirm(contract,fitstSchedule);
}
//鏌ヨ鏄惁鏈夊悗缁樁娈�
List<ContractPaymentSchedule> afterSchedule = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery()
@@ -343,6 +316,76 @@
fitstSchedule.setEffectiveDate(DateUtil.offsetDay(contract.getSignDate(),fitstSchedule.getAgreedDays()));
fitstSchedule.setEffectiveEndDate(contract.getExpirationDate());
contractPaymentScheduleMapper.updateById(fitstSchedule);
+ }
+ }
+
+ private void savePaymentConfirm(Contract contract, ContractPaymentSchedule schedule) {
+ PaymentConfirm paymentConfirm = new PaymentConfirm();
+ paymentConfirm.setBusinessType(schedule.getStageName()+"搴旀敹");
+ 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(new Date());
+ paymentConfirm.setTransationAmount(schedule.getPlannedAmount());
+ paymentConfirm.setReceivableAmount(schedule.getPlannedAmount());
+ paymentConfirm.setTotalAmount(schedule.getPlannedAmount().multiply(new BigDecimal("-1")));
+ 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();
+ }
+ paymentConfirm.setTotalAmount(lastNewTotal.subtract(paymentConfirm.getReceivableAmount()));
+ if (schedule.getPaymentRatio().compareTo(new BigDecimal("0"))>0){
+ paymentConfirmMapper.insert(paymentConfirm);
+ }
+ //瀹㈡埛浠樻瀹屾垚鍚堝悓
+ List<Contract> customerCompleteContractList = baseMapper.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);
+ }
+ }
+
}
}
@@ -426,6 +469,7 @@
newContract.setPaidAmount(new BigDecimal("0"));
newContract.setBillingStatus("0");
newContract.setErpPushFlag("0");
+ newContract.setContractStatus(0);
List<Contract> contracts;
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
while (ArrayUtil.isNotEmpty(contracts.toArray())){
@@ -433,6 +477,111 @@
contracts = baseMapper.selectList(Wrappers.<Contract>lambdaQuery().eq(Contract::getContractNo,newContract.getContractNo()));
}
baseMapper.insert(newContract);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery().eq(ContractSubjectMatter::getContractId,id));
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ ContractSubjectMatter subjectMatter = BeanUtil.copyProperties(contractSubjectMatter,ContractSubjectMatter.class,"id","createTime");
+ subjectMatter.setContractId(newContract.getId());
+ subjectMatter.setDeliveryStatus(0);
+ subjectMatter.setDeliveredQuantity(new BigDecimal("0"));
+ subjectMatter.setRemainingQuantity(new BigDecimal("0"));
+ contractSubjectMatterMapper.insert(subjectMatter);
+ });
+ List<ContractPaymentSchedule> scheduleList = contractPaymentScheduleMapper.selectList(Wrappers.<ContractPaymentSchedule>lambdaQuery().eq(ContractPaymentSchedule::getContractId,id));
+ scheduleList.stream().forEach(contractPaymentSchedule -> {
+ ContractPaymentSchedule schedule = BeanUtil.copyProperties(contractPaymentSchedule,ContractPaymentSchedule.class,"id","createTime");
+ schedule.setContractId(newContract.getId());
+ schedule.setPaymentStatus(0);
+ schedule.setActualAmount(new BigDecimal("0"));
+ schedule.setEffectiveDate(null);
+ schedule.setEffectiveEndDate(null);
+ contractPaymentScheduleMapper.insert(schedule);
+ });
return R.ok();
}
+
+ @Override
+ public void exportContractYMJJGCLWord(Long id, HttpServletResponse response) {
+ Contract contract = baseMapper.selectById(id);
+ List<ContractSubjectMatter> subjectMatterList = contractSubjectMatterMapper.selectList(Wrappers.<ContractSubjectMatter>lambdaQuery()
+ .eq(ContractSubjectMatter::getContractId,id).orderByAsc(ContractSubjectMatter::getCreateTime));
+ Map<String,Object> map = new HashMap<>();
+ //鍚堝悓鍩烘湰淇℃伅
+ map.put("partyA",contract.getPartyA());
+ map.put("partyB",contract.getPartyB());
+ map.put("contractNo",contract.getContractNo());
+ map.put("signPlace",contract.getSignPlace());
+ map.put("signDate",DateUtil.formatDate(contract.getSignDate()));
+ map.put("signDateYMD",DateUtil.format(contract.getSignDate(), DatePattern.CHINESE_DATE_PATTERN));
+ map.put("total", contract.getAmount());
+ map.put("amountWords", Convert.digitToChinese(contract.getAmount()));
+ //鏍囩殑鐗�
+ List<Map<String,Object>> items = new ArrayList<>();
+ List<RowRenderData> dataList = new ArrayList<>();
+ AtomicReference<Integer> no = new AtomicReference<>(0);
+ subjectMatterList.stream().forEach(contractSubjectMatter -> {
+ Map<String,Object> item = new HashMap<>();
+ item.put("no",no);
+ item.put("materialName",contractSubjectMatter.getMaterialName());
+ item.put("guige","");
+ item.put("unit","");
+ item.put("quantity",contractSubjectMatter.getQuantity());
+ item.put("danzhong","");
+ item.put("zongzhong","");
+ item.put("unitPrice",contractSubjectMatter.getUnitPrice());
+ item.put("price",contractSubjectMatter.getTotalAmount());
+ items.add(item);
+ no.updateAndGet(v -> v + 1);
+ });
+ map.put("items",items);
+ //瀹氬埗鏂�
+ BusinessCustomer customer = businessCustomerMapper.selectById(contract.getPartyAId());
+ map.put("companyName",customer.getCompanyName());
+ map.put("legalPerson",customer.getLegalPerson());
+ map.put("contactPhone",customer.getContactPhone());
+ map.put("bankName",customer.getBankName());
+ map.put("bankAccount",customer.getBankAccount());
+
+ //鎵挎徑鏂�
+ R<SysDept> r = remoteDeptService.getById(contract.getPartyBId());
+ SysDept dept = r.getData();
+ map.put("companyName",dept.getOrgName());
+ map.put("legalPerson1",StrUtil.isNotEmpty(dept.getLegalPerson())?dept.getLegalPerson():"");
+ map.put("entrustedAgent",StrUtil.isNotEmpty(dept.getLegalPerson())?"":dept.getEntrustedAgent());
+ map.put("orgContact",dept.getOrgContact());
+ map.put("orgBank",dept.getOrgBank());
+ map.put("orgBankAccount",dept.getOrgBankAccount());
+
+ //鐢熸垚鏂囦欢鍚�
+ Long time = new Date().getTime();
+ // 鐢熸垚鐨剋ord鏍煎紡
+ String formatSuffix = ".docx";
+ // 鎷兼帴鍚庣殑鏂囦欢鍚�
+ String fileName = time + formatSuffix;//鏂囦欢鍚� 甯﹀悗缂�
+ //瀵煎嚭word
+ try {
+ // 1. 鍔犺浇妯＄増
+ // 鍋囪妯＄増鍦� resources/templates/template.docx
+ ClassPathResource resource = new ClassPathResource("template/ymjjgclht.docx");
+ // 閰嶇疆鍒楄〃绛栫暐
+ Configure config = Configure.builder()
+ .bind("items", new LoopRowTableRenderPolicy()) // 灏� items 缁戝畾鍒拌寰幆绛栫暐
+ .build();
+ // 2. 缂栬瘧骞舵覆鏌撴暟鎹�
+ XWPFTemplate xwpfTemplate = XWPFTemplate.compile(resource.getInputStream(),config).render(map);
+
+ // 3. 璁剧疆鍝嶅簲澶�
+ response.setContentType("application/vnd.openxmlformats-officedocument.wordprocessingml.document");
+ response.setCharacterEncoding("utf-8");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".docx");
+
+ // 4. 鍐欏叆杈撳嚭娴�
+ OutputStream out = response.getOutputStream();
+ xwpfTemplate.write(out);
+ out.flush();
+ out.close();
+ xwpfTemplate.close(); // 閲嶈锛氬叧闂ā鐗堥噴鏀捐祫婧�
+ }catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
--
Gitblit v1.9.1