zgty/zt-base
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

国贸2.0系统推送合同回调：消息固定R_JG_MY_00应答，_interfaceType__固定传R_MY_JG_10

Browse Source 
合同主信息添加货权转移类型(字典：ASY_MTNG_TP)字段
This commit is contained in:
guojunyun
2025-11-11 09:35:41 +08:00
parent 37cb17bd7d
commit e6aa0042d9
5 changed files with 174 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/ContractRespDTO.java
View File

@@ -236,6 +236,9 @@ public class ContractRespDTO {
@Schema(description = "代理方名称")
private String agentName;
@Schema(description = "货权转移类型(字典：ASY_MTNG_TP)")
private String meteringType;
// 物料信息
private List<DetailRespDTO> detail;

3
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractRespVO.java
View File

@@ -242,6 +242,9 @@ public class ContractRespVO {
@Schema(description = "代理方名称")
private String agentName;
@Schema(description = "货权转移类型(字典：ASY_MTNG_TP)")
private String meteringType;
// 物料信息
private List<DetailRespVO> detail;

3
zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/ContractSaveReqVO.java
View File

@@ -211,6 +211,9 @@ public class ContractSaveReqVO {
@Schema(description = "代理方名称")
private String agentName;
@Schema(description = "货权转移类型(字典：ASY_MTNG_TP)")
private String meteringType;
// 物料信息
private List<DetailSaveReqVO> detail;

4
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/api/ContractApiImpl.java
View File

@@ -378,7 +378,7 @@ public class ContractApiImpl implements ContractApi {
// 返回数据
IntPushContractRespVO body = new IntPushContractRespVO();
body.set__requestId_(pushReqVO.get__requestId_());
body.set__interfaceType__(pushReqVO.get__interfaceType__());
body.set__interfaceType__("R_MY_JG_10");
body.setBusiBillCode(pushReqVO.getBusiBillCode());
body.setCode(code);
body.setMessage(String.format("推送合同[%s]%s", pushReqVO.getData().getContractCode(), code >= 0 ? "成功" : "失败：" + msg));
@@ -388,7 +388,7 @@ public class ContractApiImpl implements ContractApi {
// 回调参数
JSONObject req = new JSONObject();
req.set("messageKey", pushReqVO.getBusiBillCode());
req.set("messageKey", "R_JG_MY_00");
req.set("messageBody", body);
try {
log.info("国贸系统推送合同回调参数：{}",req);

468
zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractMainDO.java
View File

@@ -6,6 +6,8 @@ import lombok.*;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import static com.zt.plat.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
/**
* 合同主信息 DO
*
@@ -24,379 +26,235 @@ import java.time.LocalDateTime;
*/
public class ContractMainDO extends BusinessBaseDO {
/**
* 主键
*/
@TableId(type = IdType.ASSIGN_ID)
private Long id;
/**
* 模板实例主键
*/
@TableField("INSC_ID")
@Schema(description = "模板实例主键", example = "2571")
private Long instanceId;
/**
* 系统合同编号;自动生成，校验唯一
*/
@TableField("SYS_CTRT_NUM")
@Schema(description = "系统合同编号;自动生成，校验唯一")
private String systemContractNumber;
/**
* 状态(字典: BSE_CTRT_STS)
*/
@TableField("STS")
@Schema(description = "状态(字典: BSE_CTRT_STS)", example = "1")
private String status;
/**
* 合同名称;与ERP(HTMC)对应，校验唯一
*/
@TableField("CTRT_NAME")
@Schema(description = "合同名称;与ERP(HTMC)对应，校验唯一", example = "李四")
private String contractName;
/**
* 合同编号;与ERP(HTBH)对应，校验唯一
*/
@TableField("CTRT_PPR_NUM")
@Schema(description = "合同编号;与ERP(HTBH)对应，校验唯一")
private String contractPaperNumber;
/**
* 是否虚拟合同;与ERP(SFXNHT)对应
*/
@TableField("CTRT_VRTL")
@Schema(description = "是否虚拟合同;与ERP(SFXNHT)对应")
private String contractVirtual;
/**
* 交易方式(字典: HS_PYBL_TP)
*/
@TableField("HS_PYBL")
@Schema(description = "交易方式(字典: HS_PYBL_TP)")
private String hasPayable;
/**
* 收支性质;与ERP(SZXZ)对应
*/
@TableField("DRCT")
@Schema(description = "收支性质;与ERP(SZXZ)对应")
private String direction;
/**
* 合同类型
*/
@TableField("CTRT_TP")
@Schema(description = "合同类型", example = "1")
private String contractType;
/**
* 签署日期;与ERP(HTQDRQ)对应
*/
@TableField("SGN_DT")
private LocalDateTime signDate;
/**
* 开始日期;与ERP(HTQSRQ)对应
*/
@TableField("STRT_DT")
private LocalDateTime startDate;
/**
* 结束日期;与ERP(HTZZRQ)对应
*/
@TableField("END_DT")
private LocalDateTime endDate;
/**
* 签署地
*/
@TableField("SGN_PLCE")
@Schema(description = "签署日期;与ERP(HTQDRQ)对应")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] signDate;
@Schema(description = "开始日期;与ERP(HTQSRQ)对应")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] startDate;
@Schema(description = "结束日期;与ERP(HTZZRQ)对应")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] endDate;
@Schema(description = "签署地")
private String signPlace;
/**
* 甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。
*/
@TableField("PRCH_CPN_NUM")
@Schema(description = "甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。")
private String purchaseCompanyNumber;
/**
* 甲方公司名称
*/
@TableField("PRCH_CPN_NAME")
@Schema(description = "甲方公司名称", example = "芋艿")
private String purchaseCompanyName;
/**
* 甲方地址
*/
@TableField("PRCH_ADR")
@Schema(description = "甲方地址")
private String purchaseAddress;
/**
* 甲方法定代表人
*/
@TableField("PRCH_LDR")
@Schema(description = "甲方法定代表人")
private String purchaseLeader;
/**
* 乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。
*/
@TableField("SALE_CPN_NUM")
@Schema(description = "乙方公司编号;如果是销售合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是采购合同，手动选择，且与ERP(WLDWBH)对应。")
private String salesCompanyNumber;
/**
* 乙方公司名称
*/
@TableField("SALE_CPN_NAME")
@Schema(description = "乙方公司名称", example = "赵六")
private String salesCompanyName;
/**
* 乙方地址
*/
@TableField("SALE_ADR")
@Schema(description = "乙方地址")
private String salesAddress;
/**
* 乙方企业负责人
*/
@TableField("SALE_PRCH_LDR")
@Schema(description = "乙方企业负责人")
private String salesPurchaseLeader;
/**
* 币种;与ERP(BZBH)对应
*/
@TableField("CUR")
@Schema(description = "币种;与ERP(BZBH)对应")
private String currency;
/**
* 原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额
*/
@TableField("COO_AMT")
@Schema(description = "原币金额;与ERP(HTYBZJE)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额")
private BigDecimal cooAmount;
/**
* 本币金额;与ERP(HTBWBZJE)对应
*/
@TableField("BSC_AMT")
@Schema(description = "本币金额;与ERP(HTBWBZJE)对应")
private BigDecimal basicAmount;
/**
* 是否有履约保证金;为是，则保证金必填。
*/
@TableField("HS_DPST")
@Schema(description = "是否有履约保证金;为是，则保证金必填。")
private String hasDeposit;
/**
* 原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额
*/
@TableField("COO_AMT_DPST")
@Schema(description = "原币履约保证金;与ERP(LYBZJBGQYB)对应，币种不是人民币时，显示并手动填写，如果是人民币，隐藏且等于本币金额")
private BigDecimal cooAmountDeposit;
/**
* 本币履约保证金;与ERP(LYBZJBGQBWB)对应
*/
@TableField("BSC_AMT_DPST")
@Schema(description = "本币履约保证金;与ERP(LYBZJBGQBWB)对应")
private BigDecimal basicAmountDeposit;
/**
* 是否有预付款;与ERP(SFYYFK)对应
*/
@TableField("HS_PPYM")
@Schema(description = "是否有预付款;与ERP(SFYYFK)对应")
private String hasPrepayment;
/**
* 预付款比例;与ERP(YFKBL)对应
*/
@TableField("PPYM_RTIO")
@Schema(description = "预付款比例;与ERP(YFKBL)对应")
private BigDecimal prepaymentRatio;
/**
* 预付款金额;与ERP(YFKJE)对应
*/
@TableField("PPYM_AMT")
@Schema(description = "预付款金额;与ERP(YFKJE)对应")
private BigDecimal prepaymentAmount;
/**
* 是否有质保金;与ERP(SFHZBJ)对应
*/
@TableField("HS_QLT_AMT")
@Schema(description = "是否有质保金;与ERP(SFHZBJ)对应")
private String hasQualityAmount;
/**
* 质保金比例;与ERP(ZBJBL)对应
*/
@TableField("QLT_RTIO")
@Schema(description = "质保金比例;与ERP(ZBJBL)对应")
private BigDecimal qualityRatio;
/**
* 质保金金额;与ERP(BZJJE)对应
*/
@TableField("QLT_AMT")
@Schema(description = "质保金金额;与ERP(BZJJE)对应")
private BigDecimal qualityAmount;
/**
* 补充协议类型;变更协议/增加条款
*/
@TableField("RPL_AGR_TP")
@Schema(description = "补充协议类型;变更协议/增加条款", example = "1")
private String replenishAgreementType;
/**
* 备注;与ERP(BZXX)对应
*/
@TableField("RMK")
@Schema(description = "备注;与ERP(BZXX)对应")
private String remark;
/**
* 施工类型编号;与ERP(HTLXBH)对应，拓展信息
*/
@TableField("CON_TP_NUM")
@Schema(description = "施工类型编号(字典:ERP_CTRT_HTLXBH);与ERP(HTLXBH)对应，拓展信息")
private String constructionTypeNumber;
/**
* 施工类型名称;与ERP(HTLXMC)对应，拓展信息
*/
@TableField("CON_TP_NAME")
@Schema(description = "施工类型名称(字典:ERP_CTRT_HTLXBH);与ERP(HTLXMC)对应，拓展信息", example = "芋艿")
private String constructionTypeName;
/**
* 代理方;与ERP(ZLIFNR)对应，拓展信息
*/
@TableField("AGT")
@Schema(description = "代理方;与ERP(ZLIFNR)对应，拓展信息")
private String agent;
/**
* 类别;与ERP(HTLB)对应，拓展信息
*/
@TableField("CTGR")
@Schema(description = "类别;与ERP(HTLB)对应，拓展信息")
private String category;
/**
* 原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息
*/
@TableField("CHG_COO_AMT")
@Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息")
private BigDecimal changeCooAmount;
/**
* 本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息
*/
@TableField("CHG_BSC_AMT")
@Schema(description = "本币金额-变更后;与ERP(BGHHTBWBZJE)对应，拓展信息")
private BigDecimal changeBasicAmount;
/**
* 原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息
*/
@TableField("CHG_COO_AMT_DPST")
@Schema(description = "原币履约保证金-变更后;与ERP(LYBZJBGHYB)对应，拓展信息")
private BigDecimal changeCooAmountDeposit;
/**
* 本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息
*/
@TableField("CHG_BSC_AMT_DPST")
@Schema(description = "本币履约保证金-变更后;与ERP(LYBZJBGHBWB)对应，拓展信息")
private BigDecimal changeBasicAmountDeposit;
/**
* 是否框架合同;与ERP(SFKJHT)对应，拓展信息
*/
@TableField("IS_FMWK")
@Schema(description = "是否框架合同;与ERP(SFKJHT)对应，拓展信息")
private String isFramework;
/**
* 境内/境外;与ERP(JNJW)对应，拓展信息
*/
@TableField("IS_DOM")
@Schema(description = "境内/境外;与ERP(JNJW)对应，拓展信息")
private String isDomestic;
/**
* 建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填
*/
@TableField("ARCH_SVC_PLCE")
private String architectureServicePlace;
/**
* 达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填
*/
@TableField("PYEE_CND_AMT")
@Schema(description = "建筑服务发生地;与ERP(JZFWFSD)对应，拓展信息，销售合同，且类型为SAP02COSR必填")
private String architectureService‌Place;
@Schema(description = "达到收款条件金额;与ERP(DDSKJE)对应，拓展信息，销售合同，且类型为SAP02COSR必填")
private BigDecimal payeeConditionAmount;
/**
* 步骤
*/
@TableField("STP")
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "步骤")
private Integer step;
/**
* ERP请求状态(字典: ERP_REQ_STS)
*/
@TableField("ERP_STS")
@Schema(description = "ERP请求状态(字典: ERP_REQ_STS)", example = "1")
private String erpStatus;
/**
* ERP请求失败原因
*/
@TableField("CAUS")
@Schema(description = "ERP请求失败原因")
private String cause;
/**
* 流程实例编号
*/
@TableField("PRCS_INSC_ID")
@Schema(description = "流程实例编号", example = "9043")
private String processInstanceId;
/**
* 审批意见
*/
@TableField("RVW_ONN")
@Schema(description = "审批意见")
private String reviewOpinion;
/**
* 任务节点主键
*/
@TableField("TSK_NDE_ID")
@Schema(description = "任务节点主键", example = "32486")
private String taskNodeId;
/**
* 交货地点
*/
@TableField("DLVY_ADR")
@Schema(description = "交货地点")
private String deliveryAddress;
/**
* 交货方式(字典:FRCST_ASN)
*/
@TableField("DLVY_WY")
@Schema(description = "交货方式(字典:FRCST_ASN)")
private String deliveryWay;
/**
* 甲方联系人
*/
@TableField("PRCH_HMN")
@Schema(description = "甲方联系人")
private String purchaseHuman;
/**
* 甲方电话
*/
@TableField("PRCH_TEL")
@Schema(description = "甲方电话")
private String purchaseTel;
/**
* 甲方邮箱
*/
@TableField("PRCH_EM")
@Schema(description = "甲方邮箱")
private String purchaseEmail;
/**
* 甲方传真
*/
@TableField("PRCH_FAX")
@Schema(description = "甲方传真")
private String purchaseFax;
/**
* 甲方联系地址
*/
@TableField("PRCH_CTCT_ADR")
@Schema(description = "甲方联系地址")
private String purchaseContactAddress;
/**
* 乙方联系人
*/
@TableField("SALE_HMN")
@Schema(description = "乙方联系人")
private String salesHuman;
/**
* 乙方电话
*/
@TableField("SALE_TEL")
@Schema(description = "乙方电话")
private String salesTel;
/**
* 乙方邮箱
*/
@TableField("SALE_EM")
@Schema(description = "乙方邮箱")
private String salesEmail;
/**
* 乙方传真
*/
@TableField("SALE_FAX")
@Schema(description = "乙方传真")
private String salesFax;
/**
* 乙方联系地址
*/
@TableField("SALE_CTCT_ADR")
@Schema(description = "乙方联系地址")
private String salesContactAddress;
/**
* ERP甲方公司编号
*/
@TableField("ERP_PRCH_CPN_NUM")
@Schema(description = "ERP甲方公司编号")
private String erpPurchaseCompanyNumber;
/**
* ERP甲方公司名称
*/
@TableField("ERP_PRCH_CPN_NAME")
@Schema(description = "ERP甲方公司名称", example = "芋艿")
private String erpPurchaseCompanyName;
/**
* ERP乙方公司编码
*/
@TableField("ERP_SALE_CPN_NUM")
@Schema(description = "ERP乙方公司编码")
private String erpSalesCompanyNumber;
/**
* ERP乙方公司名称
*/
@TableField("ERP_SALE_CPN_NAME")
@Schema(description = "ERP乙方公司名称", example = "赵六")
private String erpSalesCompanyName;
/**
* 是否内部企业(字典：ERP_CTRT_YN)
*/
@TableField("IS_INTL")
@Schema(description = "是否内部企业(字典：ERP_CTRT_YN)")
private String isInternal;
/**
* 其它附件对象存储
*/
@TableField("FILE_OBJ_OTH")
@Schema(description = "其它附件对象存储")
private String fileObjectOther;
/**
* 模板附件对象存储
*/
@TableField("FILE_OBJ")
@Schema(description = "模板附件对象存储")
private String fileObject;
/**
* 合同分类(字典：SPLY_BSN_TP)
*/
@TableField("BSN_TP")
@Schema(description = "合同分类(字典：SPLY_BSN_TP)", example = "2")
private String businessType;
/**
* 代理方名称
*/
@TableField("AGT_NAME")
@Schema(description = "代理方名称", example = "王五")
private String agentName;
@Schema(description = "货权转移类型(字典：ASY_MTNG_TP)", example = "1")
private String meteringType;
}