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

合同主信息添加货权转移类型(字典：ASY_MTNG_TP)字段

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

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

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

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

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

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

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

@@ -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);

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

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