Explorar el Código

新增bom信息列表查询,版本号列表查询接口

wangqiong hace 2 años
padre
commit
b10ac05907
Se han modificado 20 ficheros con 152 adiciones y 79 borrados
  1. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java
  2. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java
  3. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java
  4. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java
  5. 54
    4
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java
  6. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java
  7. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java
  8. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java
  9. 14
    3
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java
  10. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java
  11. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java
  12. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java
  13. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java
  14. 5
    47
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java
  15. 1
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java
  16. 10
    3
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java
  17. 8
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java
  18. 25
    2
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java
  19. 18
    1
      qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java
  20. 6
    6
      qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BomTreeController.java Ver fichero

@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
14 14
 
15 15
 import java.util.List;
16 16
 
17
-@Api(tags = "结构树查询")
17
+@Api(tags = "cost-结构树查询")
18 18
 @RestController
19 19
 @RequestMapping("//bomTree")
20 20
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/BudgetPriceController.java Ver fichero

@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
43 43
  * @Date:   2024-06-11
44 44
  * @Version: V1.0
45 45
  */
46
-@Api(tags="预算价格")
46
+@Api(tags="cost-预算价格")
47 47
 @RestController
48 48
 @RequestMapping("//budgetPrice")
49 49
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/C7525costController.java Ver fichero

@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
45 45
  * @Date:   2024-06-06
46 46
  * @Version: V1.0
47 47
  */
48
-@Api(tags="7525单价")
48
+@Api(tags="cost-7525单价")
49 49
 @RestController
50 50
 @RequestMapping("//c7525cost")
51 51
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostCenterController.java Ver fichero

@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
45 45
  * @Date:   2024-06-11
46 46
  * @Version: V1.0
47 47
  */
48
-@Api(tags="成本中心")
48
+@Api(tags="cost-成本中心")
49 49
 @RestController
50 50
 @RequestMapping("/com.zzsmart.qomo.kn.cost.manage/costCenter")
51 51
 @Slf4j

+ 54
- 4
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostMaterialBomController.java Ver fichero

@@ -1,20 +1,70 @@
1 1
 package com.zzsmart.qomo.kn.cost.manage.controller;
2 2
 
3 3
 
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5
+import com.baomidou.mybatisplus.core.metadata.IPage;
6
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
7
+import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
8
+import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
9
+import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
10
+import io.swagger.annotations.Api;
11
+import io.swagger.annotations.ApiOperation;
12
+import org.jeecg.common.api.vo.Result;
13
+import org.jeecg.common.system.query.QueryGenerator;
14
+import org.springframework.beans.factory.annotation.Autowired;
15
+import org.springframework.web.bind.annotation.GetMapping;
4 16
 import org.springframework.web.bind.annotation.RequestMapping;
5 17
 
18
+import org.springframework.web.bind.annotation.RequestParam;
6 19
 import org.springframework.web.bind.annotation.RestController;
7 20
 
21
+import javax.servlet.http.HttpServletRequest;
22
+import java.util.List;
23
+
8 24
 /**
9 25
  * <p>
10 26
  * 物料bom 前端控制器
11 27
  * </p>
12 28
  *
13
- * @author  
14
- * @since 2024-06-19
29
+ * @author
30
+ * @since 2024-06-21
15 31
  */
32
+@RequestMapping("//cost-material-bom")
33
+@Api(tags="cost-标准成本-bom信息")
16 34
 @RestController
17
-@RequestMapping("/cost-material-bom")
18 35
 public class CostMaterialBomController {
19
-
36
+    @Autowired
37
+    CostMaterialBomService costMaterialBomService;
38
+    /**
39
+     * 分页列表查询
40
+     *
41
+     * @param costMaterialBom
42
+     * @param pageNo
43
+     * @param pageSize
44
+     * @param req
45
+     * @return
46
+     */
47
+    //@AutoLog(value = "cost_standard_version-分页列表查询")
48
+    @ApiOperation(value="物料bom分页列表查询", notes="物料bom分页列表查询")
49
+    @GetMapping(value = "/pageList")
50
+    public Result<IPage<CostMaterialBom>> queryPageList(CostMaterialBom costMaterialBom,
51
+                                                            @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
52
+                                                            @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
53
+                                                            HttpServletRequest req) {
54
+        QueryWrapper<CostMaterialBom> queryWrapper = QueryGenerator.initQueryWrapper(costMaterialBom, req.getParameterMap());
55
+        Page<CostMaterialBom> page = new Page<CostMaterialBom>(pageNo, pageSize);
56
+        IPage<CostMaterialBom> pageList = costMaterialBomService.page(page, queryWrapper);
57
+        return Result.OK(pageList);
58
+    }
59
+    /**
60
+     * 列表查询
61
+     *
62
+     * @return
63
+     */
64
+    @ApiOperation(value="物料bom列表查询", notes="物料bom列表查询")
65
+    @GetMapping(value = "/list")
66
+    public Result<  List<CostMaterialBom>> queryList(@RequestParam(name = "materialNumber",required = false) String materialNumber) {
67
+        List<CostMaterialBom> list = costMaterialBomService.queryListResult(materialNumber);
68
+        return Result.OK(list);
69
+    }
20 70
 }

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostPartMissingInfoController.java Ver fichero

@@ -44,7 +44,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
44 44
  * @Date:   2024-06-13
45 45
  * @Version: V1.0
46 46
  */
47
-@Api(tags="标准成本-部件缺失信息")
47
+@Api(tags="cost-标准成本-部件缺失信息")
48 48
 @RestController
49 49
 @RequestMapping("//costPartMissingInfo")
50 50
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardController.java Ver fichero

@@ -29,7 +29,7 @@ import java.util.Arrays;
29 29
  * @Date:   2024-06-13
30 30
  * @Version: V1.0
31 31
  */
32
-@Api(tags="标准成本计算")
32
+@Api(tags="cost-标准成本计算")
33 33
 @RestController
34 34
 @RequestMapping("//costStandard")
35 35
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardDetailController.java Ver fichero

@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
27 27
  * @author cost_purchase_price
28 28
  * @since 2024-06-19
29 29
  */
30
-@Api(tags = "标准成本单行查询")
30
+@Api(tags = "cost-标准成本单行查询")
31 31
 @RestController
32 32
 @RequestMapping("//costStandardDetail")
33 33
 @Slf4j

+ 14
- 3
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/CostStandardVersionController.java Ver fichero

@@ -10,6 +10,7 @@ import java.net.URLDecoder;
10 10
 import javax.servlet.http.HttpServletRequest;
11 11
 import javax.servlet.http.HttpServletResponse;
12 12
 
13
+import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
13 14
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
14 15
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
15 16
 import com.zzsmart.qomo.kn.cost.manage.service.ICostStandardVersionService;
@@ -46,7 +47,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
46 47
  * @Date:   2024-06-13
47 48
  * @Version: V1.0
48 49
  */
49
-@Api(tags="标准成本-版本号")
50
+@Api(tags="cost-标准成本-版本号")
50 51
 @RestController
51 52
 @RequestMapping("//costStandardVersion")
52 53
 @Slf4j
@@ -65,7 +66,7 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
65 66
 	 */
66 67
 	//@AutoLog(value = "cost_standard_version-分页列表查询")
67 68
 	@ApiOperation(value="cost_standard_version-分页列表查询", notes="cost_standard_version-分页列表查询")
68
-	@GetMapping(value = "/list")
69
+	@GetMapping(value = "/pageList")
69 70
 	public Result<IPage<CostStandardVersion>> queryPageList(CostStandardVersion costStandardVersion,
70 71
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
71 72
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
@@ -75,7 +76,17 @@ public class CostStandardVersionController extends JeecgController<CostStandardV
75 76
 		IPage<CostStandardVersion> pageList = costStandardVersionService.page(page, queryWrapper);
76 77
 		return Result.OK(pageList);
77 78
 	}
78
-	
79
+	 /**
80
+	  * 列表查询
81
+	  *
82
+	  * @return
83
+	  */
84
+	 @ApiOperation(value="版本号列表查询", notes="版本号列表查询")
85
+	 @GetMapping(value = "/list")
86
+	 public Result<  List<CostStandardVersion>> queryList(@RequestParam(name = "versionNumber",required = false) String versionNumber) {
87
+		 List<CostStandardVersion> list = costStandardVersionService.queryListResult(versionNumber);
88
+		 return Result.OK(list);
89
+	 }
79 90
 	/**
80 91
 	 *   添加
81 92
 	 *

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/HourRateController.java Ver fichero

@@ -27,7 +27,7 @@ import java.util.Arrays;
27 27
  * @Date:   2024-06-06
28 28
  * @Version: V1.0
29 29
  */
30
-@Api(tags="小时费率")
30
+@Api(tags="cost-小时费率")
31 31
 @RestController
32 32
 @RequestMapping("//hourRate")
33 33
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/LatestPurchasePriceController.java Ver fichero

@@ -45,7 +45,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
45 45
  * @Date:   2024-06-11
46 46
  * @Version: V1.0
47 47
  */
48
-@Api(tags="最新采购价")
48
+@Api(tags="cost-最新采购价")
49 49
 @RestController
50 50
 @RequestMapping("//latestPurchasePrice")
51 51
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/ProduceBatchController.java Ver fichero

@@ -46,7 +46,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
46 46
  * @Date:   2024-06-11
47 47
  * @Version: V1.0
48 48
  */
49
-@Api(tags="生产批量设置")
49
+@Api(tags="cost-生产批量设置")
50 50
 @RestController
51 51
 @RequestMapping("//produceBatch")
52 52
 @Slf4j

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/controller/SapSubfactoryController.java Ver fichero

@@ -43,7 +43,7 @@ import org.apache.shiro.authz.annotation.RequiresPermissions;
43 43
  * @Date:   2024-06-11
44 44
  * @Version: V1.0
45 45
  */
46
-@Api(tags="工厂信息")
46
+@Api(tags="cost-工厂信息")
47 47
 @RestController
48 48
 @RequestMapping("/com.zzsmart.qomo.kn.cost.manage/sapSubfactory")
49 49
 @Slf4j

+ 5
- 47
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/entity/CostMaterialBom.java Ver fichero

@@ -4,14 +4,9 @@ import com.baomidou.mybatisplus.annotation.IdType;
4 4
 import com.baomidou.mybatisplus.annotation.TableField;
5 5
 import com.baomidou.mybatisplus.annotation.TableId;
6 6
 import com.baomidou.mybatisplus.annotation.TableName;
7
-
8 7
 import java.io.Serializable;
9 8
 import java.math.BigDecimal;
10 9
 import java.time.LocalDateTime;
11
-
12
-import io.swagger.annotations.ApiModel;
13
-import io.swagger.annotations.ApiModelProperty;
14
-import lombok.EqualsAndHashCode;
15 10
 import lombok.Getter;
16 11
 import lombok.Setter;
17 12
 import lombok.experimental.Accessors;
@@ -21,14 +16,13 @@ import lombok.experimental.Accessors;
21 16
  * 物料bom
22 17
  * </p>
23 18
  *
24
- * @author
25
- * @since 2024-06-19
19
+ * @author  
20
+ * @since 2024-06-21
26 21
  */
27 22
 @Getter
28 23
 @Setter
29 24
 @Accessors(chain = true)
30 25
 @TableName("cost_material_bom")
31
-@ApiModel(value = "cost_material_bom对象", description = "cost_material_bom")
32 26
 public class CostMaterialBom implements Serializable {
33 27
 
34 28
     private static final long serialVersionUID = 1L;
@@ -36,233 +30,198 @@ public class CostMaterialBom implements Serializable {
36 30
     /**
37 31
      * id
38 32
      */
39
-    @ApiModelProperty(value = "id")
40 33
     @TableId(value = "id", type = IdType.AUTO)
41 34
     private String id;
42 35
 
43 36
     /**
44 37
      * 物料编码
45 38
      */
46
-    @ApiModelProperty(value = "物料编码")
47 39
     @TableField("material_code")
48 40
     private String materialCode;
49 41
 
50 42
     /**
51 43
      * 物料名称
52 44
      */
53
-    @ApiModelProperty(value = "物料名称")
54 45
     @TableField("material_name")
55 46
     private String materialName;
56 47
 
57 48
     /**
58 49
      * 父级物料编码
59 50
      */
60
-    @ApiModelProperty(value = "父级物料编码")
61 51
     @TableField("parent_material_code")
62 52
     private String parentMaterialCode;
63 53
 
64 54
     /**
65 55
      * 级别
66 56
      */
67
-    @ApiModelProperty(value = "级别")
68 57
     @TableField("level")
69 58
     private String level;
70 59
 
71 60
     /**
72 61
      * 排序
73 62
      */
74
-    @ApiModelProperty(value = "排序")
75 63
     @TableField("sort")
76 64
     private Integer sort;
77 65
 
78 66
     /**
79 67
      * 计量单位
80 68
      */
81
-    @ApiModelProperty(value = "计量单位")
82 69
     @TableField("unit")
83 70
     private String unit;
84 71
 
85 72
     /**
86 73
      * 数量
87 74
      */
88
-    @ApiModelProperty(value = "id")
89
-    @TableField("数量")
75
+    @TableField("number")
90 76
     private Integer number;
91 77
 
92 78
     /**
93 79
      * 人工工时(分钟)
94 80
      */
95
-    @ApiModelProperty(value = "人工工时(分钟)")
96 81
     @TableField("labor_hours")
97 82
     private BigDecimal laborHours;
98 83
 
99 84
     /**
100 85
      * 设备工时
101 86
      */
102
-    @ApiModelProperty(value = "设备工时")
103 87
     @TableField("device_hours")
104 88
     private BigDecimal deviceHours;
105 89
 
106 90
     /**
107 91
      * 借用物料编码
108 92
      */
109
-    @ApiModelProperty(value = "借用物料编码")
110 93
     @TableField("borrow_material_code")
111 94
     private String borrowMaterialCode;
112 95
 
113 96
     /**
114 97
      * 参考物料编码
115 98
      */
116
-    @ApiModelProperty(value = "参考物料编码")
117 99
     @TableField("refer_material_code")
118 100
     private String referMaterialCode;
119 101
 
120 102
     /**
121 103
      * 采购类型
122 104
      */
123
-
124
-    @ApiModelProperty(value = "采购类型")
125 105
     @TableField("purchase_type")
126 106
     private String purchaseType;
127 107
 
128 108
     /**
129 109
      * 特殊采购类型
130 110
      */
131
-
132
-    @ApiModelProperty(value = "特殊采购类型")
133 111
     @TableField("special_purchase_type")
134 112
     private String specialPurchaseType;
135 113
 
136 114
     /**
137 115
      * 说明
138 116
      */
139
-    @ApiModelProperty(value = "说明")
140 117
     @TableField("explanation")
141 118
     private String explanation;
142 119
 
143 120
     /**
144 121
      * 单位数量
145 122
      */
146
-    @ApiModelProperty(value = "单位数量")
147 123
     @TableField("quantity")
148 124
     private BigDecimal quantity;
149 125
 
150 126
     /**
151 127
      * 重量(g)
152 128
      */
153
-    @ApiModelProperty(value = "重量(g)")
154 129
     @TableField("weight")
155 130
     private String weight;
156 131
 
157 132
     /**
158 133
      * 材料/牌号
159 134
      */
160
-    @ApiModelProperty(value = "材料/牌号")
161 135
     @TableField("material_and_brand")
162 136
     private String materialAndBrand;
163 137
 
164 138
     /**
165 139
      * 表面处理,材料
166 140
      */
167
-    @ApiModelProperty(value = "表面处理,材料")
168 141
     @TableField("surface_material")
169 142
     private String surfaceMaterial;
170 143
 
171 144
     /**
172 145
      * 厚度(mm)
173 146
      */
174
-    @ApiModelProperty(value = "厚度(mm)")
175 147
     @TableField("surface_thickness")
176 148
     private String surfaceThickness;
177 149
 
178 150
     /**
179 151
      * 表面积(mm²)
180 152
      */
181
-    @ApiModelProperty(value = "表面积(mm²)")
182 153
     @TableField("surface_area")
183 154
     private String surfaceArea;
184 155
 
185 156
     /**
186 157
      * 长(mm)
187 158
      */
188
-    @ApiModelProperty(value = "长(mm)")
189 159
     @TableField("length")
190 160
     private String length;
191 161
 
192 162
     /**
193 163
      * 宽(mm)
194 164
      */
195
-    @ApiModelProperty(value = "宽(mm)")
196 165
     @TableField("width")
197 166
     private String width;
198 167
 
199 168
     /**
200 169
      * 高(mm)
201 170
      */
202
-    @ApiModelProperty(value = "高(mm)")
203 171
     @TableField("height")
204 172
     private String height;
205 173
 
206 174
     /**
207 175
      * 图示/图档/文档 文件ID
208 176
      */
209
-    @ApiModelProperty(value = "图示/图档/文档 文件ID")
210 177
     @TableField("figure_file_id")
211 178
     private Long figureFileId;
212 179
 
213 180
     /**
214
-     * 是否新具(0否 1是)
181
+     * 是否新具(0否 1是)
215 182
      */
216
-    @ApiModelProperty(value = "是否新模具(0否 1是)")
217 183
     @TableField("new_tooling")
218 184
     private Boolean newTooling;
219 185
 
220 186
     /**
221 187
      * 成型方式(枚举)
222 188
      */
223
-    @ApiModelProperty(value = "成型方式(枚举)")
224 189
     @TableField("shaping_method")
225 190
     private String shapingMethod;
226 191
 
227 192
     /**
228 193
      * 作业内容
229 194
      */
230
-    @ApiModelProperty(value = "作业内容")
231 195
     @TableField("work_content")
232 196
     private String workContent;
233 197
 
234 198
     /**
235 199
      * 加工地点
236 200
      */
237
-    @ApiModelProperty(value = "加工地点")
238 201
     @TableField("process_location")
239 202
     private String processLocation;
240 203
 
241 204
     /**
242 205
      * 成本中心
243 206
      */
244
-    @ApiModelProperty(value = "成本中心")
245 207
     @TableField("cost_center")
246 208
     private String costCenter;
247 209
 
248 210
     /**
249 211
      * 单价(未税)
250 212
      */
251
-    @ApiModelProperty(value = "单价(未税)")
252 213
     @TableField("unit_price")
253 214
     private BigDecimal unitPrice;
254 215
 
255 216
     /**
256 217
      * 总价(未税)
257 218
      */
258
-    @ApiModelProperty(value = "总价(未税)")
259 219
     @TableField("total_price")
260 220
     private BigDecimal totalPrice;
261 221
 
262 222
     /**
263
-     * 具费(未税)
223
+     * 具费(未税)
264 224
      */
265
-    @ApiModelProperty(value = "模具费(未税)")
266 225
     @TableField("mould_price")
267 226
     private BigDecimal mouldPrice;
268 227
 
@@ -293,7 +252,6 @@ public class CostMaterialBom implements Serializable {
293 252
     /**
294 253
      * 备注(特殊技术信息)
295 254
      */
296
-    @ApiModelProperty(value = "备注(特殊技术信息)")
297 255
     @TableField("remark")
298 256
     private String remark;
299 257
 

+ 1
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/CostMaterialBomMapper.java Ver fichero

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
10 10
  * </p>
11 11
  *
12 12
  * @author  
13
- * @since 2024-06-19
13
+ * @since 2024-06-21
14 14
  */
15 15
 @Mapper
16 16
 public interface CostMaterialBomMapper extends BaseMapper<CostMaterialBom> {

+ 10
- 3
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/CostMaterialBomService.java Ver fichero

@@ -3,14 +3,21 @@ package com.zzsmart.qomo.kn.cost.manage.service;
3 3
 import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5 5
 
6
+import java.util.List;
7
+
6 8
 /**
7 9
  * <p>
8 10
  * 物料bom 服务类
9 11
  * </p>
10 12
  *
11
- * @author  
12
- * @since 2024-06-19
13
+ * @author
14
+ * @since 2024-06-21
13 15
  */
14 16
 public interface CostMaterialBomService extends IService<CostMaterialBom> {
15
-
17
+    /**
18
+     * 分页查询
19
+     * @param
20
+     * @return
21
+     */
22
+    List<CostMaterialBom> queryListResult(String materialNumber);
16 23
 }

+ 8
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/ICostStandardVersionService.java Ver fichero

@@ -2,11 +2,13 @@ package com.zzsmart.qomo.kn.cost.manage.service;
2 2
 
3 3
 
4 4
 import com.baomidou.mybatisplus.extension.service.IService;
5
+import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
5 6
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
6 7
 import org.jeecg.common.api.vo.Result;
7 8
 
8 9
 import javax.servlet.http.HttpServletRequest;
9 10
 import javax.servlet.http.HttpServletResponse;
11
+import java.util.List;
10 12
 
11 13
 
12 14
 /**
@@ -24,5 +26,10 @@ public interface ICostStandardVersionService extends IService<CostStandardVersio
24 26
      * @return
25 27
      */
26 28
     Result<?> importExcel(HttpServletRequest request, HttpServletResponse response, Class<CostStandardVersion> costStandardVersionClass);
27
-
29
+    /**
30
+     * 分页查询
31
+     * @param
32
+     * @return
33
+     */
34
+    List<CostStandardVersion> queryListResult(String versionNumber);
28 35
 }

+ 25
- 2
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostMaterialBomServiceImpl.java Ver fichero

@@ -1,20 +1,43 @@
1 1
 package com.zzsmart.qomo.kn.cost.manage.service.impl;
2 2
 
3
+import cn.hutool.core.util.StrUtil;
4
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 5
 import com.zzsmart.qomo.kn.cost.manage.entity.CostMaterialBom;
4 6
 import com.zzsmart.qomo.kn.cost.manage.mapper.CostMaterialBomMapper;
5 7
 import com.zzsmart.qomo.kn.cost.manage.service.CostMaterialBomService;
6 8
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
9
+import org.springframework.beans.factory.annotation.Autowired;
7 10
 import org.springframework.stereotype.Service;
8 11
 
12
+import java.util.List;
13
+
9 14
 /**
10 15
  * <p>
11 16
  * 物料bom 服务实现类
12 17
  * </p>
13 18
  *
14
- * @author  
15
- * @since 2024-06-19
19
+ * @author
20
+ * @since 2024-06-21
16 21
  */
17 22
 @Service
18 23
 public class CostMaterialBomServiceImpl extends ServiceImpl<CostMaterialBomMapper, CostMaterialBom> implements CostMaterialBomService {
24
+    @Autowired
25
+    CostMaterialBomMapper costMaterialBomMapper;
19 26
 
27
+    /**
28
+     * 分页查询
29
+     *
30
+     * @param materialNumber
31
+     * @return
32
+     */
33
+    @Override
34
+    public List<CostMaterialBom> queryListResult(String materialNumber) {
35
+        QueryWrapper queryWrapper = new QueryWrapper();
36
+        if (StrUtil.isNotEmpty(materialNumber)) {
37
+            // 物料号
38
+            queryWrapper.like("material_code", materialNumber);
39
+        }
40
+        List list = costMaterialBomMapper.selectList(queryWrapper);
41
+        return list;
42
+    }
20 43
 }

+ 18
- 1
qomo-kn-cost-manage/src/main/java/com/zzsmart/qomo/kn/cost/manage/service/impl/CostStandardVersionServiceImpl.java Ver fichero

@@ -3,6 +3,7 @@ package com.zzsmart.qomo.kn.cost.manage.service.impl;
3 3
 
4 4
 import cn.hutool.core.collection.CollectionUtil;
5 5
 import cn.hutool.core.util.StrUtil;
6
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 7
 import com.zzsmart.qomo.kn.cost.manage.constants.Constants;
7 8
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandard;
8 9
 import com.zzsmart.qomo.kn.cost.manage.entity.CostStandardVersion;
@@ -48,7 +49,7 @@ import java.util.Map;
48 49
 @Service
49 50
 public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVersionMapper, CostStandardVersion> implements ICostStandardVersionService {
50 51
     @Autowired
51
-    private CostStandardMapper costStandardMapper;
52
+    private CostStandardVersionMapper costStandardVersionMapper;
52 53
     private static final Logger log = LoggerFactory.getLogger(CostStandardVersionServiceImpl.class);
53 54
 
54 55
     @Transactional(rollbackFor = Exception.class)
@@ -209,4 +210,20 @@ public class CostStandardVersionServiceImpl extends ServiceImpl<CostStandardVers
209 210
         }
210 211
 
211 212
     }
213
+
214
+    /**
215
+     * 分页查询
216
+     *
217
+     * @param versionNumber@return
218
+     */
219
+    @Override
220
+    public List<CostStandardVersion> queryListResult(String versionNumber) {
221
+        QueryWrapper queryWrapper = new QueryWrapper();
222
+        if (StrUtil.isNotEmpty(versionNumber)) {
223
+            // 物料号
224
+            queryWrapper.like("version_number", versionNumber);
225
+        }
226
+        List list = costStandardVersionMapper.selectList(queryWrapper);
227
+        return list;
228
+    }
212 229
 }

+ 6
- 6
qomo-kn-cost-manage/src/test/java/com/zzsmart/qomo/kn/cost/manage/ApplicationTests.java Ver fichero

@@ -42,7 +42,7 @@ public class ApplicationTests {
42 42
                             .pathInfo(Collections.singletonMap(OutputFile.mapperXml,System.getProperty("user.dir")+"/src/main/java/com/zzsmart/qomo/kn/cost/manage/mapper/xml"));
43 43
                 })
44 44
                 .strategyConfig(builder -> {
45
-                    builder.addInclude("cost_standard_detail")// todo 设置需要生成的表名
45
+                    builder.addInclude("cost_material_bom")// todo 设置需要生成的表名
46 46
                             //.addTablePrefix("sys_")//设置表前缀过滤
47 47
                             .entityBuilder()
48 48
                             .enableLombok()
@@ -66,11 +66,11 @@ public class ApplicationTests {
66 66
                             .enableRestStyle();
67 67
                 })
68 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 74
                 .templateEngine(new FreemarkerTemplateEngine())
75 75
                 .execute();
76 76