feat: 项目立项推送合规新增申请单位金蝶编码并停送创建单位
This commit is contained in:
+9
-6
@@ -43,7 +43,6 @@ import org.springblade.hcs.dto.HcsProjectLegalResultDTO;
|
|||||||
import org.springblade.hcs.dto.HcsProjectPropsDTO;
|
import org.springblade.hcs.dto.HcsProjectPropsDTO;
|
||||||
import org.springblade.hcs.dto.HcsProjectUpdateDTO;
|
import org.springblade.hcs.dto.HcsProjectUpdateDTO;
|
||||||
import org.springblade.hcs.dto.HcsProjectVO;
|
import org.springblade.hcs.dto.HcsProjectVO;
|
||||||
import org.springblade.hcs.dto.HcsRefVO;
|
|
||||||
import org.springblade.hcs.dto.HcsResult;
|
import org.springblade.hcs.dto.HcsResult;
|
||||||
import org.springblade.hcs.dto.HcsSaveOptionDTO;
|
import org.springblade.hcs.dto.HcsSaveOptionDTO;
|
||||||
import org.springblade.hcs.dto.HcsUserRefVO;
|
import org.springblade.hcs.dto.HcsUserRefVO;
|
||||||
@@ -55,6 +54,8 @@ import org.springblade.transport.mapper.HcsContractCheckLogMapper;
|
|||||||
import org.springblade.transport.mapper.ProjectApplyMapper;
|
import org.springblade.transport.mapper.ProjectApplyMapper;
|
||||||
import org.springblade.transport.pojo.entity.HcsContractCheckLog;
|
import org.springblade.transport.pojo.entity.HcsContractCheckLog;
|
||||||
import org.springblade.transport.pojo.entity.ProjectApply;
|
import org.springblade.transport.pojo.entity.ProjectApply;
|
||||||
|
import org.springblade.transport.service.KingdeeSyncContext;
|
||||||
|
import org.springblade.transport.support.KingdeeApBillSyncSupport;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
|
|
||||||
import java.math.BigDecimal;
|
import java.math.BigDecimal;
|
||||||
@@ -91,6 +92,7 @@ public class HcsProjectSyncSupport {
|
|||||||
private final HcsProperties hcsProperties;
|
private final HcsProperties hcsProperties;
|
||||||
private final ProjectApplyMapper projectApplyMapper;
|
private final ProjectApplyMapper projectApplyMapper;
|
||||||
private final HcsContractCheckLogMapper hcsContractCheckLogMapper;
|
private final HcsContractCheckLogMapper hcsContractCheckLogMapper;
|
||||||
|
private final KingdeeApBillSyncSupport kingdeeApBillSyncSupport;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 推送项目立项到 HCS:判重 → 新建(C102-1)/ 更新(C102-2)→ 回填合规 fdId 置 synced
|
* 推送项目立项到 HCS:判重 → 新建(C102-1)/ 更新(C102-2)→ 回填合规 fdId 置 synced
|
||||||
@@ -189,13 +191,11 @@ public class HcsProjectSyncSupport {
|
|||||||
props.setFdProSimpleName(projectApply.getProjectShortName());
|
props.setFdProSimpleName(projectApply.getProjectShortName());
|
||||||
// 【必填】项目编号:ProjectApply.projectCode(判重候选键)
|
// 【必填】项目编号:ProjectApply.projectCode(判重候选键)
|
||||||
props.setFdNum(projectApply.getProjectCode());
|
props.setFdNum(projectApply.getProjectCode());
|
||||||
// 创建单位:固定取配置 thirdParty.hcs.creator-unit-id/name(HCS 组织主数据,§9-U2;任一未配置回退开题部门名称仅传 fdName,其他合同接口同用此配置)
|
// 创建单位 fd_creator_unit 按合规要求停送(字段保留,值不传)
|
||||||
HcsRefVO creatorUnit = hcsProperties.resolveCreatorUnit(projectApply.getBusinessDeptName());
|
// 承接部门:取配置 thirdParty.hcs.creator-unit-id/name(原与创建单位同源,测试线联调固定广西物产城矿发展有限公司)
|
||||||
props.setFdCreatorUnit(creatorUnit);
|
props.setFdTakerDept(hcsProperties.resolveCreatorUnit(projectApply.getBusinessDeptName()));
|
||||||
// 项目负责人:负责人登录名 {fdLoginName}(§9-U2)
|
// 项目负责人:负责人登录名 {fdLoginName}(§9-U2)
|
||||||
props.setFdHead(resolveUserRef(projectApply.getPrincipalUserId()));
|
props.setFdHead(resolveUserRef(projectApply.getPrincipalUserId()));
|
||||||
// todo 承接部门:与创建单位一致,取配置 thirdParty.hcs.creator-unit-id/name(测试线联调固定广西物产城矿发展有限公司)
|
|
||||||
props.setFdTakerDept(creatorUnit);
|
|
||||||
// 承接人:项目经办人登录名 {fdLoginName}
|
// 承接人:项目经办人登录名 {fdLoginName}
|
||||||
props.setFdTaker(resolveUserRef(projectApply.getHandlerUserId()));
|
props.setFdTaker(resolveUserRef(projectApply.getHandlerUserId()));
|
||||||
// 付款额度:TMS fundLimit(万元)× 10000 转 HCS 元
|
// 付款额度:TMS fundLimit(万元)× 10000 转 HCS 元
|
||||||
@@ -224,6 +224,9 @@ public class HcsProjectSyncSupport {
|
|||||||
// 金蝶项目立项ID 来源系统主键 ID:TMS 项目立项单主键(D14,对账/幂等候选键)
|
// 金蝶项目立项ID 来源系统主键 ID:TMS 项目立项单主键(D14,对账/幂等候选键)
|
||||||
// props.setFdKingdeeId(String.valueOf(projectApply.getId()));
|
// props.setFdKingdeeId(String.valueOf(projectApply.getId()));
|
||||||
|
|
||||||
|
// 【必填】申请单位金蝶编码:项目业务部门上溯平台公司的金蝶编码(业务部门未维护/未归属平台公司/平台公司未维护金蝶编码时拦截推送)
|
||||||
|
props.setFdHtId(kingdeeApBillSyncSupport.kingdeeOrgNumber(projectApply.getId(), KingdeeSyncContext.empty()));
|
||||||
|
|
||||||
// 创建人:项目经办人登录名(扫描推送无登录上下文,取单据承办人,§9-U2)
|
// 创建人:项目经办人登录名(扫描推送无登录上下文,取单据承办人,§9-U2)
|
||||||
props.setFdCreator(resolveUserRef(projectApply.getHandlerUserId()));
|
props.setFdCreator(resolveUserRef(projectApply.getHandlerUserId()));
|
||||||
formData.setDynamicProps(props);
|
formData.setDynamicProps(props);
|
||||||
|
|||||||
+5
@@ -148,6 +148,11 @@ public class HcsProjectPropsDTO implements Serializable {
|
|||||||
*/
|
*/
|
||||||
@JsonProperty("fd_kingdee_id")
|
@JsonProperty("fd_kingdee_id")
|
||||||
private String fdKingdeeId;
|
private String fdKingdeeId;
|
||||||
|
/**
|
||||||
|
* 申请单位金蝶编码(必填,项目业务部门上溯平台公司的金蝶编码,未维护时拦截推送)
|
||||||
|
*/
|
||||||
|
@JsonProperty("fd_ht_id")
|
||||||
|
private String fdHtId;
|
||||||
/**
|
/**
|
||||||
* 创建人 {fdLoginName}
|
* 创建人 {fdLoginName}
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user