diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java index 11a8ad0..3f3c99b 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java @@ -9,6 +9,7 @@ import java.math.BigDecimal; import java.time.LocalDateTime; import io.swagger.annotations.ApiModelProperty; +import lombok.Builder; import lombok.Data; import lombok.Getter; import lombok.Setter; @@ -42,6 +43,12 @@ public class CostStandardDetail implements Serializable { @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段") private String materialNumber; + /** + * 物料名称 + */ + @TableField("material_name") + private String materialName; + /** * 父类物料号 */ @@ -70,7 +77,7 @@ public class CostStandardDetail implements Serializable { * 用量 */ @TableField("dosage") - private String dosage; + private Double dosage; /** * 单位 diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml index 3037f7e..2028f3d 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml @@ -6,6 +6,7 @@ + diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java index 2ceb0b9..9f322e2 100644 --- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java +++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java @@ -2,7 +2,10 @@ package com.zzsmart.qomo.kn.cost.manage.vo; import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail; import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; @@ -15,6 +18,9 @@ import java.io.Serializable; * @since 2024-06-19 */ @Data +@Builder +@NoArgsConstructor +@AllArgsConstructor public class CostStandardDetailVO extends CostStandardDetail implements Serializable { /** * 版本号