yinq
/
hwbm-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.0.96 合同变更申请上方承办部门、行业/大区去掉，添加业务方向。合同变更后的合同申请流程需要提示，合同激活关联项目排查测试问题。合同变更页面添加按钮能查看原合同信息。

Browse Source
dev
yinq 2 months ago
parent e8bf7e231a
commit e772d53695
16 changed files with 129 additions and 113 deletions
Show Stats Download Patch File Download Diff File

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractChange.java
Unescape Escape View File

@ -110,6 +110,11 @@ public class ErpContractChange extends TenantEntity {
*/
private String industryRegion;
/**
* 业务方向（字典，与所选原合同 business_direction 一致）
*/
private String businessDirection;
/**
* 印章法人单位（1公章 2法人章 3合同章 4销售合同章）
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/ErpContractInfo.java
Unescape Escape View File

@ -112,6 +112,11 @@ public class ErpContractInfo extends TenantEntity {
*/
private Date twoDate;
/**
* 最终客户（关联客户ID，crm_customer_info.customer_id）
*/
private Long finalCustomerId;
/**
* 合同状态(1暂存 2审批中 3可用)
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeBo.java
Unescape Escape View File

@ -110,6 +110,11 @@ public class ErpContractChangeBo extends BaseEntity {
*/
private String industryRegion;
/**
* 业务方向（字典，取自原合同）
*/
private String businessDirection;
/**
* 印章法人单位（1公章 2法人章 3合同章 4销售合同章）
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractChangeSaveBo.java
Unescape Escape View File

@ -69,6 +69,11 @@ public class ErpContractChangeSaveBo {
*/
private String industryRegion;
/**
* 业务方向（字典，取自原合同）
*/
private String businessDirection;
/**
* 印章法人单位
*/

5
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpContractInfoBo.java
Unescape Escape View File

@ -115,6 +115,11 @@ public class ErpContractInfoBo extends BaseEntity {
*/
private Date twoDate;
/**
* 最终客户（关联客户ID）
*/
private Long finalCustomerId;
/**
* 合同状态(1暂存 2审批中 3可用)
*/

10
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/bo/ErpProjectInfoBo.java
Unescape Escape View File

@ -164,6 +164,16 @@ public class ErpProjectInfoBo extends BaseEntity {
*/
private String contractName;
/**
* 客户合同编号（合同订单激活时写入 erp_contract_info.customer_contract_code）
*/
private String customerContractCode;
/**
* 最终客户ID（合同订单激活时写入 erp_contract_info.final_customer_id）
*/
private Long finalCustomerId;
/**
* 备注
*/

7
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractChangeVo.java
Unescape Escape View File

@ -144,6 +144,13 @@ public class ErpContractChangeVo implements Serializable {
@ExcelProperty(value = "行业/大区")
private String industryRegion;
/**
* 业务方向（字典）
*/
@ExcelProperty(value = "业务方向", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "business_direction")
private String businessDirection;
/**
* 印章法人单位（1公章 2法人章 3合同章 4销售合同章）
*/

12
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpContractInfoVo.java
Unescape Escape View File

@ -140,6 +140,18 @@ public class ErpContractInfoVo implements Serializable {
@ExcelProperty(value = "乙方签字日期")
private Date twoDate;
/**
* 最终客户（关联客户ID）
*/
@ExcelProperty(value = "最终客户ID")
private Long finalCustomerId;
/**
* 最终客户名称（关联查询）
*/
@ExcelProperty(value = "最终客户")
private String finalCustomerName;
/**
* 合同状态(1暂存 2审批中 3可用)
*/

10
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/domain/vo/ErpProjectInfoVo.java
Unescape Escape View File

@ -256,6 +256,16 @@ public class ErpProjectInfoVo implements Serializable {
@ExcelProperty(value = "合同名称")
private String contractName;
/**
* 客户合同编号（关联 erp_contract_info）
*/
private String customerContractCode;
/**
* 最终客户ID（关联 erp_contract_info.final_customer_id）
*/
private Long finalCustomerId;
/**
* 合同跟进人名称
*/

4
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/IErpContractChangeService.java
Unescape Escape View File

@ -109,8 +109,8 @@ public interface IErpContractChangeService {
ErpContractChangeVo submitContentChange(ErpContractChangeSaveBo bo);
/**
* 新合同激活时回调：若当前合同为由内容变更产生的新合同，则继承原合同关联项目、作废原合同并解除原合同与项目关联。
* 在合同订单保存/激活流程中调用，幂等（原合同已作废则跳过）。
* 新合同激活时回调：若当前合同为由内容变更产生的新合同，则继承原合同关联项目、将原合同 active_flag 置为 0（不逻辑删除原合同主表）并解除原合同与项目关联。
* 在合同订单保存/激活流程中调用。
*
* @param newContractId 当前（新）合同 ID
*/

89
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractChangeServiceImpl.java
Unescape Escape View File

@ -168,6 +168,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
.eq(bo.getUndertakeDeptId() != null, ErpContractChange::getUndertakeDeptId, bo.getUndertakeDeptId())
.eq(bo.getUndertakeBy() != null, ErpContractChange::getUndertakeBy, bo.getUndertakeBy())
.eq(StringUtils.isNotBlank(bo.getIndustryRegion()), ErpContractChange::getIndustryRegion, bo.getIndustryRegion())
.eq(StringUtils.isNotBlank(bo.getBusinessDirection()), ErpContractChange::getBusinessDirection, bo.getBusinessDirection())
.eq(StringUtils.isNotBlank(bo.getSealLegalEntity()), ErpContractChange::getSealLegalEntity, bo.getSealLegalEntity())
.eq(StringUtils.isNotBlank(bo.getChangeStatus()), ErpContractChange::getChangeStatus, bo.getChangeStatus())
.eq(StringUtils.isNotBlank(bo.getFlowStatus()), ErpContractChange::getFlowStatus, bo.getFlowStatus())
@ -438,6 +439,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
e.setUndertakeDeptId(bo.getUndertakeDeptId());
e.setUndertakeBy(bo.getUndertakeBy());
e.setIndustryRegion(bo.getIndustryRegion());
e.setBusinessDirection(bo.getBusinessDirection());
e.setSealLegalEntity(bo.getSealLegalEntity());
e.setChangeStatus(StringUtils.isNotBlank(bo.getChangeStatus()) ? bo.getChangeStatus() : "1");
e.setFlowStatus(bo.getFlowStatus());
@ -531,7 +533,7 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
}
/**
* 新合同激活时：若该合同为由内容变更产生的新合同，则继承原合同关联项目、删除原合同、解除原合同与项目关联并删除原合同订单信息。
* 新合同激活时：若该合同为由内容变更产生的新合同，则继承原合同关联项目、将原合同激活标识置为 0（不逻辑删除原合同主表）、解除原合同与项目关联并删除原合同订单信息。
*/
@Override
@Transactional(rollbackFor = Exception.class)
@ -568,8 +570,12 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
newLink.setProjectSource(oldLink.getProjectSource());
projectContractsMapper.insert(newLink);
}
//原合同更新并逻辑删除
contractInfoMapper.deleteById(originalContractId);
// 原合同：仅将激活标识置为 0，保留主表数据（不再逻辑删除）
ErpContractInfo originalInactive = new ErpContractInfo();
originalInactive.setContractId(originalContractId);
originalInactive.setContractStatus(OAStatusEnum.INVALID.getStatus());
originalInactive.setActiveFlag("0");
contractInfoMapper.updateById(originalInactive);
for (ErpProjectContracts oldLink : oldLinks) {
projectContractsMapper.deleteById(oldLink.getProjectContractsId());
}
@ -581,39 +587,6 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
);
}
/**
* 内容变更回写：用变更信息快照更新原合同主表；原合同物料/付款方式先逻辑删除后按变更快照插入（逻辑删除，实体带 @TableLogic）。
*/
private void doWriteBackContent(Long contractChangeId, Long contractId) {
List<ErpContractChangeInfoVo> infoList = changeInfoMapper.selectVoList(
new LambdaQueryWrapper<ErpContractChangeInfo>().eq(ErpContractChangeInfo::getContractChangeId, contractChangeId));
if (!infoList.isEmpty()) {
ErpContractInfo contractInfo = contractInfoMapper.selectById(contractId);
if (contractInfo != null) {
copyChangeInfoToContract(infoList.get(0), contractInfo);
contractInfoMapper.updateById(contractInfo);
}
}
// 逻辑删除原合同下物料（@TableLogic）
LambdaQueryWrapper<ErpContractMaterial> materialDel = new LambdaQueryWrapper<ErpContractMaterial>().eq(ErpContractMaterial::getContractId, contractId);
contractMaterialMapper.delete(materialDel);
List<ErpContractChangeMaterial> materials = changeMaterialMapper.selectList(
new LambdaQueryWrapper<ErpContractChangeMaterial>().eq(ErpContractChangeMaterial::getContractChangeId, contractChangeId));
for (ErpContractChangeMaterial m : materials) {
contractMaterialMapper.insert(copyChangeMaterialToContract(m, contractId));
}
// 逻辑删除原合同下付款方式（@TableLogic）
LambdaQueryWrapper<ErpContractPaymentMethod> paymentDel = new LambdaQueryWrapper<ErpContractPaymentMethod>().eq(ErpContractPaymentMethod::getContractId, contractId);
contractPaymentMethodMapper.delete(paymentDel);
List<ErpContractChangePaymentMethod> payments = changePaymentMethodMapper.selectList(
new LambdaQueryWrapper<ErpContractChangePaymentMethod>().eq(ErpContractChangePaymentMethod::getContractChangeId, contractChangeId));
for (ErpContractChangePaymentMethod p : payments) {
contractPaymentMethodMapper.insert(copyChangePaymentToContract(p, contractId));
}
}
// ======================= 流程监听 =======================
/**
* 合同变更流程事件监听（flowCode=HTBG）：根据流程状态同步变更单 flowStatus/changeStatus，审批完成时触发回写。
* <ul>
@ -650,50 +623,6 @@ public class ErpContractChangeServiceImpl implements IErpContractChangeService {
});
}
// ======================= 回写时的数据拷贝 =======================
/**
* 将变更信息快照字段拷贝到原合同主表（回写内容变更时用）
*/
private void copyChangeInfoToContract(ErpContractChangeInfoVo snap, ErpContractInfo contract) {
contract.setContractFlag(snap.getContractFlag());
contract.setCustomerContractCode(snap.getCustomerContractCode());
contract.setContractCode(snap.getContractCode());
contract.setContractName(snap.getContractName());
contract.setContractCategory(snap.getContractCategory());
contract.setContractType(snap.getContractType());
contract.setBusinessDirection(snap.getBusinessDirection());
contract.setContractDeptId(snap.getContractDeptId());
contract.setContractDate(snap.getContractDate());
contract.setTotalPrice(snap.getTotalPrice());
contract.setOneCustomerId(snap.getOneCustomerId());
contract.setOneRepresent(snap.getOneRepresent());
contract.setOneDate(snap.getOneDate());
contract.setTwoCustomerId(snap.getTwoCustomerId());
contract.setTwoRepresent(snap.getTwoRepresent());
contract.setTwoDate(snap.getTwoDate());
contract.setContractManagerId(snap.getContractManagerId());
contract.setTemplateId(snap.getTemplateId());
contract.setOssId(snap.getOssId());
contract.setPaymentAccountId(snap.getPaymentAccountId());
contract.setPaymentMethod(snap.getPaymentMethod());
contract.setSignatureAppendix(snap.getSignatureAppendix());
contract.setWarrantyPeriod(snap.getWarrantyPeriod());
contract.setInternalContractCode(snap.getInternalContractCode());
contract.setExternalContractCode(snap.getExternalContractCode());
contract.setOrderContractCode(snap.getOrderContractCode());
contract.setProjectContractCode(snap.getProjectContractCode());
contract.setDeliveryStart(snap.getDeliveryStart() != null ? snap.getDeliveryStart().intValue() : null);
contract.setWarrantyPeriodDescription(snap.getWarrantyPeriodDescription());
contract.setDeliveryLocation(snap.getDeliveryLocation());
contract.setShipMethod(snap.getShipMethod());
contract.setTaxRate(snap.getTaxRate());
contract.setSigningPlace(snap.getSigningPlace());
contract.setMaterialRemark(snap.getMaterialRemark());
contract.setContractTemplateFlag(snap.getContractTemplateFlag());
contract.setCapitalizedAmount(snap.getCapitalizedAmount());
contract.setRemark(snap.getRemark());
}
/**
* 将单条变更物料快照转为原合同下的合同物料实体（回写时插入 erp_contract_material）

22
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractInfoServiceImpl.java
Unescape Escape View File

@ -26,9 +26,7 @@ import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.oa.base.domain.bo.BaseRelationMaterialBo;
import org.dromara.oa.base.domain.vo.BaseRelationMaterialVo;
import org.dromara.oa.base.service.IBaseRelationMaterialService;
import org.dromara.oa.crm.domain.vo.CrmCustomerInfoVo;
import org.dromara.oa.crm.domain.vo.CrmPaymentAccountVo;
import org.dromara.oa.crm.service.ICrmCustomerInfoService;
import org.dromara.oa.crm.service.ICrmPaymentAccountService;
import org.dromara.oa.erp.domain.ErpContractInfo;
import org.dromara.oa.erp.domain.ErpContractMaterial;
@ -83,8 +81,6 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
private final ICrmPaymentAccountService crmPaymentAccountService;
private final ICrmCustomerInfoService crmCustomerInfoService;
private final RemoteUserService remoteUserService;
@DubboReference(timeout = 30000)
@ -227,6 +223,7 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
.eq(StringUtils.isNotBlank(bo.getContractTemplateFlag()), ErpContractInfo::getContractTemplateFlag,
bo.getContractTemplateFlag())
.eq("t.del_flag", "0")
.eq("t.active_flag", "1")
.orderByDesc(ErpContractInfo::getCreateTime);
return lqw;
}
@ -402,23 +399,6 @@ public class ErpContractInfoServiceImpl implements IErpContractInfoService {
}
}
// 校验客户基础信息是否已完善（附件、税号、开户银行、银行账号不能为空）
Long oneCustomerId = entity.getOneCustomerId();
if (oneCustomerId != null) {
CrmCustomerInfoVo customerInfo = crmCustomerInfoService.queryById(oneCustomerId);
if (customerInfo == null) {
throw new ServiceException("合同甲方客户信息不存在，请先在客户管理中维护客户信息");
}
if (StringUtils.isBlank(customerInfo.getOssId())
|| StringUtils.isBlank(customerInfo.getTaxNumber())
|| StringUtils.isBlank(customerInfo.getBankAccountOpening())
|| StringUtils.isBlank(customerInfo.getBankNumber())) {
String customerName = StringUtils.isNotBlank(customerInfo.getCustomerName())
? customerInfo.getCustomerName()
: String.valueOf(oneCustomerId);
throw new ServiceException("客户【" + customerName + "】的附件、税号、开户银行、银行账号不能为空，请先在客户管理中完善！");
}
}
// 物料列表的强制校验
// if (entity.getContractMaterialList() == null ||
// entity.getContractMaterialList().isEmpty()) {

53
ruoyi-modules/ruoyi-oa/src/main/java/org/dromara/oa/erp/service/impl/ErpContractOrderServiceImpl.java
Unescape Escape View File

@ -26,6 +26,8 @@ import org.dromara.oa.erp.mapper.ErpProjectInfoMapper;
import org.dromara.oa.erp.mapper.ErpProjectContractsMapper;
import org.dromara.oa.erp.mapper.ErpProjectPlanMapper;
import org.dromara.oa.erp.mapper.ErpProjectPlanStageMapper;
import org.dromara.oa.crm.domain.vo.CrmCustomerInfoVo;
import org.dromara.oa.crm.service.ICrmCustomerInfoService;
import org.dromara.oa.erp.service.IErpContractChangeService;
import org.dromara.oa.erp.service.IErpContractOrderService;
import org.dromara.oa.erp.service.IErpProjectInfoService;
@ -74,6 +76,7 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
private final IErpContractChangeService erpContractChangeService;
private final IErpProjectInfoService projectInfoService;
private final IErpProjectTypeService projectTypeService;
private final ICrmCustomerInfoService crmCustomerInfoService;
/** 项目申请流程编码（新增项目提交时使用） */
private static final String FLOW_CODE_PROJECT = "xmsq";
@ -177,14 +180,24 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
ErpProjectInfo projectInfo = MapstructUtils.convert(bo, ErpProjectInfo.class);
validEntityBeforeSave(projectInfo);
if (StringUtils.isNotNull(bo.getOssId()) && StringUtils.isNotNull(bo.getContractId())) {
ErpContractInfoVo contractInfoVo = contractInfoMapper.selectVoById(bo.getContractId());
ErpContractInfo contractInfo = new ErpContractInfo();
contractInfo.setContractId(contractInfoVo.getContractId());
contractInfo.setSignatureAppendix(Long.valueOf(bo.getOssId()));
contractInfo.setContractDeptId(bo.getDeptId());
contractInfo.setContractStatus(OAStatusEnum.ACTIVATE.getStatus());
contractInfoMapper.updateById(contractInfo);
// 合同订单保存：将客户合同编号、最终客户
if (bo.getContractId() != null) {
ErpContractInfo contractPatch = new ErpContractInfo();
contractPatch.setContractId(bo.getContractId());
contractPatch.setCustomerContractCode(bo.getCustomerContractCode());
contractPatch.setFinalCustomerId(bo.getFinalCustomerId());
// 上传终版合同时：激活合同并校验甲方客户资料
if (StringUtils.isNotBlank(bo.getOssId())) {
ErpContractInfoVo contractInfoVo = contractInfoMapper.selectVoById(bo.getContractId());
if (contractInfoVo == null) {
throw new ServiceException("合同信息不存在，无法激活订单");
}
validPartyACustomerForOrderActivate(contractInfoVo.getOneCustomerId());
contractPatch.setSignatureAppendix(Convert.toLong(bo.getOssId().trim()));
contractPatch.setContractDeptId(bo.getDeptId());
contractPatch.setContractStatus(OAStatusEnum.ACTIVATE.getStatus());
}
contractInfoMapper.updateById(contractPatch);
}
if (StringUtils.isNull(bo.getProjectId())) {
@ -474,6 +487,30 @@ public class ErpContractOrderServiceImpl implements IErpContractOrderService {
//TODO 做一些数据校验,如唯一约束
}
/**
* 订单激活时校验甲方客户基础信息（附件、税号、开户银行、银行账号不能为空）
*
* @param oneCustomerId 甲方客户ID
*/
private void validPartyACustomerForOrderActivate(Long oneCustomerId) {
if (oneCustomerId == null) {
return;
}
CrmCustomerInfoVo customerInfo = crmCustomerInfoService.queryById(oneCustomerId);
if (customerInfo == null) {
throw new ServiceException("合同甲方客户信息不存在，请先在客户管理中维护客户信息");
}
if (StringUtils.isBlank(customerInfo.getOssId())
|| StringUtils.isBlank(customerInfo.getTaxNumber())
|| StringUtils.isBlank(customerInfo.getBankAccountOpening())
|| StringUtils.isBlank(customerInfo.getBankNumber())) {
String customerName = StringUtils.isNotBlank(customerInfo.getCustomerName())
? customerInfo.getCustomerName()
: String.valueOf(oneCustomerId);
throw new ServiceException("客户【" + customerName + "】的附件、税号、开户银行、银行账号不能为空，请先在客户管理中完善！");
}
}
/**
* 总体流程监听(例如: 草稿，撤销，退回，作废，终止，已完成等)
*

1
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractChangeMapper.xml
Unescape Escape View File

@ -25,6 +25,7 @@
t.undertake_dept_id,
t.undertake_by,
t.industry_region,
t.business_direction,
t.seal_legal_entity,
t.change_status,
t.flow_status,

5
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpContractInfoMapper.xml
Unescape Escape View File

@ -25,6 +25,7 @@
t.two_customer_id,
t.two_represent,
t.two_date,
t.final_customer_id,
t.contract_status,
t.flow_status,
t.template_id,
@ -69,10 +70,12 @@
c2.business_contact twoBusinessContact,
c2.business_contact_phone twoBusinessContactPhone,
c2.technical_contact twoTechnicalContact,
c2.technical_contact_phone twoTechnicalContactPhone
c2.technical_contact_phone twoTechnicalContactPhone,
c3.customer_name finalCustomerName
from erp_contract_info t
left join crm_customer_info c1 on t.one_customer_id = c1.customer_id
left join crm_customer_info c2 on t.two_customer_id = c2.customer_id
left join crm_customer_info c3 on t.final_customer_id = c3.customer_id
left join sys_dept d on d.dept_id = t.contract_dept_id
left join sys_user u on u.user_id = t.contract_manager_id
${ew.getCustomSqlSegment}

4
ruoyi-modules/ruoyi-oa/src/main/resources/mapper/oa/erp/ErpProjectInfoMapper.xml
Unescape Escape View File

@ -49,7 +49,9 @@
u3.nick_name deputyName,
u4.nick_name contractUserName,
c.contract_code contractCode,
c.contract_name contractName
c.contract_name contractName,
c.customer_contract_code customerContractCode,
c.final_customer_id finalCustomerId
from erp_project_info t
left join erp_project_type t1 on t1.project_type_id = t.project_type_id
left join erp_project_type t2 on t1.parent_id = t2.project_type_id

Write Preview
Loading…
Cancel
Save