Sfoglia il codice sorgente

优化标准成本单行查询接口

wangqiong 2 anni fa
parent
commit
495f535596

+ 20
- 62
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostStandardDetail.java Vedi File

7
 import java.io.Serializable;
7
 import java.io.Serializable;
8
 import java.math.BigDecimal;
8
 import java.math.BigDecimal;
9
 import java.time.LocalDateTime;
9
 import java.time.LocalDateTime;
10
+
11
+import io.swagger.annotations.ApiModelProperty;
12
+import lombok.Data;
10
 import lombok.Getter;
13
 import lombok.Getter;
11
 import lombok.Setter;
14
 import lombok.Setter;
12
 import lombok.experimental.Accessors;
15
 import lombok.experimental.Accessors;
16
  * 标准成本明细表
19
  * 标准成本明细表
17
  * </p>
20
  * </p>
18
  *
21
  *
19
- * @author cost_purchase_price
20
- * @since 2024-06-19
22
+ * @author  
23
+ * @since 2024-06-20
21
  */
24
  */
22
-@Getter
23
-@Setter
25
+@Data
24
 @Accessors(chain = true)
26
 @Accessors(chain = true)
25
 @TableName("cost_standard_detail")
27
 @TableName("cost_standard_detail")
26
 public class CostStandardDetail implements Serializable {
28
 public class CostStandardDetail implements Serializable {
34
     private String id;
36
     private String id;
35
 
37
 
36
     /**
38
     /**
37
-     * 物料号,关联kn_new_sap_mara表matnr字段
39
+     * 物料号,关联kn_new_sap_mara表matnr字段
38
      */
40
      */
39
     @TableField("material_number")
41
     @TableField("material_number")
42
+    @ApiModelProperty(value = "物料号,关联kn_new_sap_mara表matnr字段")
40
     private String materialNumber;
43
     private String materialNumber;
41
 
44
 
45
+    /**
46
+     * 父类物料号
47
+     */
48
+    @TableField("parent_material_number")
49
+    private String parentMaterialNumber;
50
+
42
     /**
51
     /**
43
      * 版本号id
52
      * 版本号id
44
      */
53
      */
49
      * 层级
58
      * 层级
50
      */
59
      */
51
     @TableField("level")
60
     @TableField("level")
52
-    private String level;
61
+    private Integer level;
53
 
62
 
54
     /**
63
     /**
55
      * 图号
64
      * 图号
195
     @TableField("remark")
204
     @TableField("remark")
196
     private String remark;
205
     private String remark;
197
 
206
 
198
-
199
-    public static final String ID = "id";
200
-
201
-    public static final String MATERIAL_NUMBER = "material_number";
202
-
203
-    public static final String VERSION_NUMBER_ID = "version_number_id";
204
-
205
-    public static final String LEVEL = "level";
206
-
207
-    public static final String FIGURE_NUMBER = "figure_number";
208
-
209
-    public static final String DOSAGE = "dosage";
210
-
211
-    public static final String UNIT = "unit";
212
-
213
-    public static final String SPECIFICATION = "specification";
214
-
215
-    public static final String BOM_COST = "bom_cost";
216
-
217
-    public static final String PACKING_COST = "packing_cost";
218
-
219
-    public static final String AUXILIARY_COST = "auxiliary_cost";
220
-
221
-    public static final String LABOR_COST = "labor_cost";
222
-
223
-    public static final String EUIP_DEPRECIATION_COST = "euip_depreciation_cost";
224
-
225
-    public static final String EQUIP_CONSUME_COST = "equip_consume_cost";
226
-
227
-    public static final String HYDROELECTRICITY_COST = "hydroelectricity_cost";
228
-
229
-    public static final String OTHER_COST = "other_cost";
230
-
231
-    public static final String TRAIL_COST = "trail_cost";
232
-
233
-    public static final String MANUFACTURE_COST = "manufacture_cost";
234
-
235
-    public static final String TOTAL_LABOR_COST = "total_labor_cost";
236
-
237
-    public static final String TOTAL_EQUIP_CONSUME_COST = "total_equip_consume_cost";
238
-
239
-    public static final String TOTAL_EUIP_DEPRECIATION_COST = "total_euip_depreciation_cost";
240
-
241
-    public static final String TOTAL_HYDROELECTRICITY_COST = "total_hydroelectricity_cost";
242
-
243
-    public static final String TOTAL_OTHER_COST = "total_other_cost";
244
-
245
-    public static final String CREATE_BY = "create_by";
246
-
247
-    public static final String CREATE_TIME = "create_time";
248
-
249
-    public static final String UPDATE_BY = "update_by";
250
-
251
-    public static final String UPDATE_TIME = "update_time";
252
-
253
-    public static final String REMARK = "remark";
207
+    /**
208
+     * 序号
209
+     */
210
+    @TableField("sort")
211
+    private Integer sort;
254
 
212
 
255
 }
213
 }

+ 2
- 3
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostStandardDetailMapper.java Vedi File

7
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
7
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
8
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
8
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
9
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
9
 import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO;
10
-import com.zzsmart.qomo.kn.cost.manage.vo.CostStandardVO;
11
 import org.apache.ibatis.annotations.Mapper;
10
 import org.apache.ibatis.annotations.Mapper;
12
 import org.apache.ibatis.annotations.Param;
11
 import org.apache.ibatis.annotations.Param;
13
 
12
 
16
  * 标准成本明细表 Mapper 接口
15
  * 标准成本明细表 Mapper 接口
17
  * </p>
16
  * </p>
18
  *
17
  *
19
- * @author cost_purchase_price
20
- * @since 2024-06-19
18
+ * @author  
19
+ * @since 2024-06-20
21
  */
20
  */
22
 @Mapper
21
 @Mapper
23
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {
22
 public interface CostStandardDetailMapper extends BaseMapper<CostStandardDetail> {

+ 2
- 0
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml/CostStandardDetailMapper.xml Vedi File

6
     <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
6
     <resultMap id="CostStandardDetailVOResultMap" type="com.zzsmart.qomo.kn.cost.manage.vo.CostStandardDetailVO">
7
         <id column="id" property="id" />
7
         <id column="id" property="id" />
8
         <result column="material_number" property="materialNumber" />
8
         <result column="material_number" property="materialNumber" />
9
+        <result column="parent_material_number" property="parentMaterialNumber" />
9
         <result column="version_number_id" property="versionNumberId" />
10
         <result column="version_number_id" property="versionNumberId" />
10
         <result column="version_number" property="versionNumber" />
11
         <result column="version_number" property="versionNumber" />
11
         <result column="level" property="level" />
12
         <result column="level" property="level" />
33
         <result column="update_by" property="updateBy" />
34
         <result column="update_by" property="updateBy" />
34
         <result column="update_time" property="updateTime" />
35
         <result column="update_time" property="updateTime" />
35
         <result column="remark" property="remark" />
36
         <result column="remark" property="remark" />
37
+        <result column="sort" property="sort" />
36
     </resultMap>
38
     </resultMap>
37
     <select id="pageList" resultMap="CostStandardDetailVOResultMap">
39
     <select id="pageList" resultMap="CostStandardDetailVOResultMap">
38
         select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year
40
         select c1.*, c2.version_number, c2.version_status, c2.stage,c2.version_year

+ 3
- 11
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/vo/CostStandardDetailVO.java Vedi File

1
 package com.zzsmart.qomo.kn.cost.manage.vo;
1
 package com.zzsmart.qomo.kn.cost.manage.vo;
2
 
2
 
3
-import com.baomidou.mybatisplus.annotation.IdType;
4
-import com.baomidou.mybatisplus.annotation.TableField;
5
-import com.baomidou.mybatisplus.annotation.TableId;
6
-import com.baomidou.mybatisplus.annotation.TableName;
7
-import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
8
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
3
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardDetail;
4
+import io.swagger.annotations.ApiModelProperty;
9
 import lombok.Data;
5
 import lombok.Data;
10
-import lombok.Getter;
11
-import lombok.Setter;
12
-import lombok.experimental.Accessors;
13
 
6
 
14
 import java.io.Serializable;
7
 import java.io.Serializable;
15
-import java.math.BigDecimal;
16
-import java.time.LocalDateTime;
17
 
8
 
18
 /**
9
 /**
19
  * <p>
10
  * <p>
24
  * @since 2024-06-19
15
  * @since 2024-06-19
25
  */
16
  */
26
 @Data
17
 @Data
27
-public class CostStandardDetailVO  extends CostStandardDetail implements Serializable  {
18
+public class CostStandardDetailVO extends CostStandardDetail implements Serializable {
28
     /**
19
     /**
29
      * 版本号
20
      * 版本号
30
      */
21
      */
22
+    @ApiModelProperty(value = "版本号")
31
     private String versionNumber;
23
     private String versionNumber;
32
 }
24
 }

+ 6
- 6
qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java Vedi File

42
                             .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
42
                             .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
43
                 })
43
                 })
44
                 .strategyConfig(builder -> {
44
                 .strategyConfig(builder -> {
45
-                    builder.addInclude("cost_material_bom")// todo 设置需要生成的表名
45
+                    builder.addInclude("cost_standard_detail")// todo 设置需要生成的表名
46
                             //.addTablePrefix("sys_")//设置表前缀过滤
46
                             //.addTablePrefix("sys_")//设置表前缀过滤
47
                             .entityBuilder()
47
                             .entityBuilder()
48
                             .enableLombok()
48
                             .enableLombok()
66
                             .enableRestStyle();
66
                             .enableRestStyle();
67
                 })
67
                 })
68
                 // 使用Freemarker引擎模板,默认的是Velocity引擎模板
68
                 // 使用Freemarker引擎模板,默认的是Velocity引擎模板
69
-//                .templateConfig(builder -> {
70
-//                    builder.disable(TemplateType.CONTROLLER)
71
-//                            .disable(TemplateType.SERVICE)
72
-//                            .disable(TemplateType.SERVICEIMPL);
73
-//                })
69
+                .templateConfig(builder -> {
70
+                    builder.disable(TemplateType.CONTROLLER)
71
+                            .disable(TemplateType.SERVICE)
72
+                            .disable(TemplateType.SERVICEIMPL);
73
+                })
74
                 .templateEngine(new FreemarkerTemplateEngine())
74
                 .templateEngine(new FreemarkerTemplateEngine())
75
                 .execute();
75
                 .execute();
76
 
76