合同明细新增字段

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

@@ -4,15 +4,20 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 合同明细 Response VO")
 @Data
 public class DetailRespDTO {
-    @Schema(description = "主键")
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29552")
     private Long id;
 
-    @Schema(description = "物料名称")
+    @Schema(description = "合同主信息主键", example = "5927")
+    private Long contractMainId;
+
+    @Schema(description = "物料名称", example = "芋艿")
     private String materialName;
 
     @Schema(description = "物料编码")
@@ -24,18 +29,36 @@ public class DetailRespDTO {
     @Schema(description = "计量单位")
     private String unit;
 
-    @Schema(description = "含税单价")
+    @Schema(description = "含税单价", example = "30702")
     private BigDecimal inTaxUnitPrice;
 
     @Schema(description = "金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称")
+    @Schema(description = "金属元素名称", example = "王五")
     private String elementName;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;
 
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "含税总价", example = "2686")
+    private BigDecimal allInTaxUnitPrice;
+
+    @Schema(description = "牌号")
+    private String brandNo;
+
+    @Schema(description = "规格")
+    private String specification;
+
+    @Schema(description = "厚度")
+    private String depth;
+
+    @Schema(description = "长度")
+    private String length;
+
     // 交货计划
     private List<PlanRespDTO> plans;
 }

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

@@ -4,15 +4,20 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.List;
 
 @Schema(description = "管理后台 - 合同明细 Response VO")
 @Data
 public class DetailRespVO {
-    @Schema(description = "主键")
+
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29552")
     private Long id;
 
-    @Schema(description = "物料名称")
+    @Schema(description = "合同主信息主键", example = "5927")
+    private Long contractMainId;
+
+    @Schema(description = "物料名称", example = "芋艿")
     private String materialName;
 
     @Schema(description = "物料编码")
@@ -24,18 +29,36 @@ public class DetailRespVO {
     @Schema(description = "计量单位")
     private String unit;
 
-    @Schema(description = "含税单价")
+    @Schema(description = "含税单价", example = "30702")
     private BigDecimal inTaxUnitPrice;
 
     @Schema(description = "金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称")
+    @Schema(description = "金属元素名称", example = "王五")
     private String elementName;
 
     @Schema(description = "金属元素编码")
     private String elementNumber;
 
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "含税总价", example = "2686")
+    private BigDecimal allInTaxUnitPrice;
+
+    @Schema(description = "牌号")
+    private String brandNo;
+
+    @Schema(description = "规格")
+    private String specification;
+
+    @Schema(description = "厚度")
+    private String depth;
+
+    @Schema(description = "长度")
+    private String length;
+
     // 交货计划
     private List<PlanRespVO> plans;
 }

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

@@ -10,36 +10,51 @@ import java.util.List;
 @Data
 public class DetailSaveReqVO {
 
-    @Schema(description = "主键")
+    @Schema(description = "主键", requiredMode = Schema.RequiredMode.REQUIRED, example = "29552")
     private Long id;
 
-    @Schema(description = "物料名称", example = "物料名称")
+    @Schema(description = "合同主信息主键", example = "5927")
+    private Long contractMainId;
+
+    @Schema(description = "物料名称", example = "芋艿")
     private String materialName;
 
-    @Schema(description = "物料编码", example = "物料编码")
+    @Schema(description = "物料编码")
     private String materialNumber;
 
     @Schema(description = "数量")
     private BigDecimal quantity;
 
-    @Schema(description = "计量单位", example = "吨")
+    @Schema(description = "计量单位")
     private String unit;
 
-    @Schema(description = "含税单价", example = "28579")
+    @Schema(description = "含税单价", example = "30702")
     private BigDecimal inTaxUnitPrice;
 
-    @Schema(description = "含税总价")
+    @Schema(description = "金属元素缩写")
-    private BigDecimal allInTaxUnitPrice;
-
-    @Schema(description = "金属元素缩写", example = "金属元素缩写")
     private String elementAbbreviation;
 
-    @Schema(description = "金属元素名称", example = "金属元素名称")
+    @Schema(description = "金属元素名称", example = "王五")
     private String elementName;
 
-    @Schema(description = "金属元素编码", example = "金属元素编码")
+    @Schema(description = "金属元素编码")
     private String elementNumber;
 
+    @Schema(description = "含税总价", example = "2686")
+    private BigDecimal allInTaxUnitPrice;
+
+    @Schema(description = "牌号")
+    private String brandNo;
+
+    @Schema(description = "规格")
+    private String specification;
+
+    @Schema(description = "厚度")
+    private String depth;
+
+    @Schema(description = "长度")
+    private String length;
+
     // 交货计划
     private List<PlanSaveReqVO> plans;
 }

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

@@ -78,4 +78,24 @@ public class ContractDetailDO extends BusinessBaseDO {
      */
     @TableField("ALL_IN_TAX_UPRC")
     private BigDecimal allInTaxUnitPrice;
+    /**
+     * 牌号
+     */
+    @TableField("BRAD_NO")
+    private String brandNo;
+    /**
+     * 规格
+     */
+    @TableField("SPEC")
+    private String specification;
+    /**
+     * 厚度
+     */
+    @TableField("DPTH")
+    private String depth;
+    /**
+     * 长度
+     */
+    @TableField("LEN")
+    private String length;
 }