From 38b75df08a1ea1e28fc75964424747b0653a1be6 Mon Sep 17 00:00:00 2001
From: wangqiong <1322446236@qq.com>
Date: Thu, 20 Jun 2024 16:50:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8D=95=E8=A1=8C=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qomo/kn/cost/manage/entity/CostStandardDetail.java   | 9 ++++++++-
 .../cost/manage/mapper/xml/CostStandardDetailMapper.xml  | 1 +
 .../qomo/kn/cost/manage/vo/CostStandardDetailVO.java     | 6 ++++++
 3 files changed, 15 insertions(+), 1 deletion(-)

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 @@
     <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
         <id column="id" property="id" />
         <result column="material_number" property="materialNumber" />
+        <result column="material_name" property="materialName" />
         <result column="parent_material_number" property="parentMaterialNumber" />
         <result column="version_number_id" property="versionNumberId" />
         <result column="version_number" property="versionNumber" />
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 {
     /**
      * 版本号