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

---
 .../manage/entity/CostStandardDetail.java     | 82 +++++--------------
 .../mapper/CostStandardDetailMapper.java      |  5 +-
 .../mapper/xml/CostStandardDetailMapper.xml   |  2 +
 .../cost/manage/vo/CostStandardDetailVO.java  | 14 +---
 .../qomo/kn/cost/manage/ApplicationTests.java | 12 +--
 5 files changed, 33 insertions(+), 82 deletions(-)

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 fae984d..11a8ad0 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
@@ -7,6 +7,9 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
@@ -16,11 +19,10 @@ import lombok.experimental.Accessors;
  * 标准成本明细表
  * </p>
  *
- * @author cost_purchase_price
- * @since 2024-06-19
+ * @author  
+ * @since 2024-06-20
  */
-@Getter
-@Setter
+@Data
 @Accessors(chain = true)
 @TableName("cost_standard_detail")
 public class CostStandardDetail implements Serializable {
@@ -34,11 +36,18 @@ public class CostStandardDetail implements Serializable {
     private String id;
 
     /**
-     * 子物料号,关联kn_new_sap_mara表matnr字段
+     * 物料号,关联kn_new_sap_mara表matnr字段
      */
     @TableField("material_number")
+    @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
     private String materialNumber;
 
+    /**
+     * 父类物料号
+     */
+    @TableField("parent_material_number")
+    private String parentMaterialNumber;
+
     /**
      * 版本号id
      */
@@ -49,7 +58,7 @@ public class CostStandardDetail implements Serializable {
      * 层级
      */
     @TableField("level")
-    private String level;
+    private Integer level;
 
     /**
      * 图号
@@ -195,61 +204,10 @@ public class CostStandardDetail implements Serializable {
     @TableField("remark")
     private String remark;
 
-
-    public static final String ID = "id";
-
-    public static final String MATERIAL_NUMBER = "material_number";
-
-    public static final String VERSION_NUMBER_ID = "version_number_id";
-
-    public static final String LEVEL = "level";
-
-    public static final String FIGURE_NUMBER = "figure_number";
-
-    public static final String DOSAGE = "dosage";
-
-    public static final String UNIT = "unit";
-
-    public static final String SPECIFICATION = "specification";
-
-    public static final String BOM_COST = "bom_cost";
-
-    public static final String PACKING_COST = "packing_cost";
-
-    public static final String AUXILIARY_COST = "auxiliary_cost";
-
-    public static final String LABOR_COST = "labor_cost";
-
-    public static final String EUIP_DEPRECIATION_COST = "euip_depreciation_cost";
-
-    public static final String EQUIP_CONSUME_COST = "equip_consume_cost";
-
-    public static final String HYDROELECTRICITY_COST = "hydroelectricity_cost";
-
-    public static final String OTHER_COST = "other_cost";
-
-    public static final String TRAIL_COST = "trail_cost";
-
-    public static final String MANUFACTURE_COST = "manufacture_cost";
-
-    public static final String TOTAL_LABOR_COST = "total_labor_cost";
-
-    public static final String TOTAL_EQUIP_CONSUME_COST = "total_equip_consume_cost";
-
-    public static final String TOTAL_EUIP_DEPRECIATION_COST = "total_euip_depreciation_cost";
-
-    public static final String TOTAL_HYDROELECTRICITY_COST = "total_hydroelectricity_cost";
-
-    public static final String TOTAL_OTHER_COST = "total_other_cost";
-
-    public static final String CREATE_BY = "create_by";
-
-    public static final String CREATE_TIME = "create_time";
-
-    public static final String UPDATE_BY = "update_by";
-
-    public static final String UPDATE_TIME = "update_time";
-
-    public static final String REMARK = "remark";
+    /**
+     * 序号
+     */
+    @TableField("sort")
+    private Integer sort;
 
 }
diff --git a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
index ec9a168..916aead 100644
--- a/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
+++ b/qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,8 +15,8 @@ import org.apache.ibatis.annotations.Param;
  * 标准成本明细表 Mapper 接口
  * </p>
  *
- * @author cost_purchase_price
- * @since 2024-06-19
+ * @author  
+ * @since 2024-06-20
  */
 @Mapper
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
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 95faa0f..3037f7e 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="parent_material_number" property="parentMaterialNumber" />
         <result column="version_number_id" property="versionNumberId" />
         <result column="version_number" property="versionNumber" />
         <result column="level" property="level" />
@@ -33,6 +34,7 @@
         <result column="update_by" property="updateBy" />
         <result column="update_time" property="updateTime" />
         <result column="remark" property="remark" />
+        <result column="sort" property="sort" />
     </resultMap>
     <select id="pageList" resultMap="CostStandardDetailVOResultMap">
         select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
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 977d1c7..2ceb0b9 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
@@ -1,19 +1,10 @@
 package com.zzsmart.qomo.kn.cost.manage.vo;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-import lombok.experimental.Accessors;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
 
 /**
  * <p>
@@ -24,9 +15,10 @@ import java.time.LocalDateTime;
  * @since 2024-06-19
  */
 @Data
-public class CostStandardDetailVO  extends CostStandardDetail implements Serializable  {
+public class CostStandardDetailVO extends CostStandardDetail implements Serializable {
     /**
      * 版本号
      */
+    @ApiModelProperty(value = "版本号")
     private String versionNumber;
 }
diff --git a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java
index 8be40ab..55265ec 100644
--- a/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java
+++ b/qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java
@@ -42,7 +42,7 @@ public class ApplicationTests {
                             .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
                 })
                 .strategyConfig(builder -> {
-                    builder.addInclude("cost_material_bom")// todo 设置需要生成的表名
+                    builder.addInclude("cost_standard_detail")// todo 设置需要生成的表名
                             //.addTablePrefix("sys_")//设置表前缀过滤
                             .entityBuilder()
                             .enableLombok()
@@ -66,11 +66,11 @@ public class ApplicationTests {
                             .enableRestStyle();
                 })
                 // 使用Freemarker引擎模板，默认的是Velocity引擎模板
-//                .templateConfig(builder -> {
-//                    builder.disable(TemplateType.CONTROLLER)
-//                            .disable(TemplateType.SERVICE)
-//                            .disable(TemplateType.SERVICEIMPL);
-//                })
+                .templateConfig(builder -> {
+                    builder.disable(TemplateType.CONTROLLER)
+                            .disable(TemplateType.SERVICE)
+                            .disable(TemplateType.SERVICEIMPL);
+                })
                 .templateEngine(new FreemarkerTemplateEngine())
                 .execute();