From d4998009a123d47de0140eaf71ace26840810df7 Mon Sep 17 00:00:00 2001 From: guojunyun Date: Fri, 14 Nov 2025 09:38:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E6=98=8E=E7=BB=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/dto/contract/DetailRespDTO.java | 31 ++++++++++++++-- .../api/vo/contract/DetailRespVO.java | 31 ++++++++++++++-- .../api/vo/contract/DetailSaveReqVO.java | 37 +++++++++++++------ .../dataobject/contract/ContractDetailDO.java | 20 ++++++++++ 4 files changed, 100 insertions(+), 19 deletions(-) diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DetailRespDTO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DetailRespDTO.java index 905d564..ca0c6d7 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/contract/DetailRespDTO.java +++ b/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 plans; } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java index 8a1a079..c88720b 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailRespVO.java +++ b/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 plans; } diff --git a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java b/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java index 34c5aa6..6e06339 100644 --- a/zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/vo/contract/DetailSaveReqVO.java +++ b/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 = "含税总价") - private BigDecimal allInTaxUnitPrice; - - @Schema(description = "金属元素缩写", example = "金属元素缩写") + @Schema(description = "金属元素缩写") 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 plans; } \ No newline at end of file diff --git a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDetailDO.java b/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDetailDO.java index 6b03ee6..fae854c 100644 --- a/zt-module-contract-order/zt-module-contract-order-server/src/main/java/com/zt/plat/module/contractorder/dal/dataobject/contract/ContractDetailDO.java +++ b/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; }