合同主信息添加合同分类

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

@@ -218,6 +218,9 @@ public class ContractRespDTO {
     @Schema(description = "乙方联系地址")
     private String salesContactAddress;
 
+    @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
+    private String businessType;
+
     // 物料信息
     private List<DetailRespDTO> detail;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractRespVO.java

@@ -222,6 +222,9 @@ public class ContractRespVO {
     @Schema(description = "乙方联系地址")
     private String salesContactAddress;
 
+    @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
+    private String businessType;
+
     // 物料信息
     private List<DetailRespVO> detail;
 

zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/controller/admin/contract/vo/contract/ContractSaveReqVO.java

@@ -30,14 +30,12 @@ public class ContractSaveReqVO {
     @Schema(description = "交货方式(字典:FRCST_ASN)")
     private String deliveryWay;
 
-    // 基础信息
     @Schema(description = "附件对象存储")
     private JSONArray fileObject;
 
     @Schema(description = "其它附件对象存储")
     private JSONArray fileObjectOther;
 
-    // 合同基本信息
     @Schema(description = "甲方公司编号;如果是采购合同，查询组织机构自动带出，且与ERP(HTQDZTBH)对应，如果是销售合同，手动选择，且与ERP(WLDWBH)对应。", example = "甲方公司编号")
     private String purchaseCompanyNumber;
 
@@ -100,7 +98,6 @@ public class ContractSaveReqVO {
     @Schema(description = "合同编号;与ERP(HTBH)对应，校验唯一", example = "合同编号")
     private String contractPaperNumber;
 
-    // @NotBlank(message = "合同类型不能为空")
     @Schema(description = "合同类型", example = "PRCH")
     private String contractType;
 
@@ -119,7 +116,6 @@ public class ContractSaveReqVO {
     @Schema(description = "签署地", example = "签署地")
     private String signPlace;
 
-    // 金额信息
     @Schema(description = "币种;与ERP(BZBH)对应", example = "CNY")
     private String currency;
 
@@ -162,7 +158,6 @@ public class ContractSaveReqVO {
     @Schema(description = "备注;与ERP(BZXX)对应", example = "备注")
     private String remark;
 
-    // 扩展信息
     @Schema(description = "原币金额-变更后;与ERP(BGHHTYBZJE)对应，拓展信息")
     private BigDecimal changeCooAmount;
 
@@ -209,10 +204,12 @@ public class ContractSaveReqVO {
     @Schema(description = "是否内部企业(字典：ERP_CTRT_YN)")
     private String isInternal;
 
-    // 模板部分
     @Schema(description = "模板实例主键", example = "10196")
     private Long instanceId;
 
+    @Schema(description = "合同分类(字典：SPLY_BSN_TP)")
+    private String businessType;
+
     // 物料信息
     private List<DetailSaveReqVO> detail;
 

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

@@ -294,16 +294,6 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("TSK_NDE_ID")
     private String taskNodeId;
-    /**
-     * 模板附件对象存储
-     */
-    @TableField("FILE_OBJ")
-    private String fileObject;
-    /**
-     * 其它附件对象存储
-     */
-    @TableField("FILE_OBJ_OTH")
-    private String fileObjectOther;
     /**
      * 交货地点
      */
@@ -389,4 +379,19 @@ public class ContractMainDO extends BusinessBaseDO {
      */
     @TableField("IS_INTL")
     private String isInternal;
+    /**
+     * 其它附件对象存储
+     */
+    @TableField("FILE_OBJ_OTH")
+    private String fileObjectOther;
+    /**
+     * 模板附件对象存储
+     */
+    @TableField("FILE_OBJ")
+    private String fileObject;
+    /**
+     * 合同分类(字典：SPLY_BSN_TP)
+     */
+    @TableField("BSN_TP")
+    private String businessType;
 }