Browse Source

품목단가 및 분류 정보 수정

dwkim 2 years ago
parent
commit
d453300edf

+ 5 - 0
src/main/java/com/oqpo/api/entity/stinfo/ItemClassMngEntity.java

@@ -30,4 +30,9 @@ public class ItemClassMngEntity implements Serializable {
30 30
     private String sysChgId ;
31 31
     private String itemClass;
32 32
 
33
+    private String itemClass1Nm ;
34
+    private String itemClass2Nm ;
35
+    private String itemClass3Nm ;
36
+    private String itemClass4Nm ;
37
+
33 38
 }

+ 4 - 0
src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -271,6 +271,10 @@ public class ItemService extends CommonService {
271 271
                         .itemClass2(m.getItemClass2() == null ? "" : m.getItemClass2())
272 272
                         .itemClass3(m.getItemClass3() == null ? "" : m.getItemClass3())
273 273
                         .itemClass4(m.getItemClass4() == null ? "" : m.getItemClass4())
274
+                        .itemClass1Nm(m.getItemClass1Nm() == null ? "" : m.getItemLevel() >= 1 ?  m.getItemClass1Nm() : "")
275
+                        .itemClass2Nm(m.getItemClass2Nm() == null ? "" : m.getItemLevel() >= 2 ?  m.getItemClass2Nm() : "")
276
+                        .itemClass3Nm(m.getItemClass3Nm() == null ? "" : m.getItemLevel() >= 3 ?  m.getItemClass3Nm() : "")
277
+                        .itemClass4Nm(m.getItemClass4Nm() == null ? "" : m.getItemLevel() >= 4 ?  m.getItemClass4Nm() : "")
274 278
                         .prnSeq(m.getPrnSeq() == null ? 99 : m.getPrnSeq())
275 279
                         .build())
276 280
                 .collect(Collectors.toList());

+ 6 - 1
src/main/java/com/oqpo/api/service/stinfo/ItemUnitService.java

@@ -17,6 +17,7 @@ import com.oqpo.api.web.dto.request.stinfo.item.SaveItemClassMngInfolRequest;
17 17
 import com.oqpo.api.web.dto.request.stinfo.item.SaveItemInfolRequest;
18 18
 import com.oqpo.api.web.dto.request.stinfo.itemUnit.SaveItemUnitInfolRequest;
19 19
 import com.oqpo.api.web.dto.request.stinfo.itemUnit.SaveStoreItemUnitInfolRequest;
20
+import com.oqpo.api.web.dto.request.stinfo.itemUnit.StoreItemUnitInfolRequest;
20 21
 import com.oqpo.api.web.dto.response.GridResponse;
21 22
 import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
22 23
 import com.oqpo.api.web.dto.response.stinfo.item.*;
@@ -261,7 +262,11 @@ public class ItemUnitService extends CommonService {
261 262
 
262 263
 
263 264
     /* 매장 단가 정보 */
264
-    public StoreItemUnitInfoResponse selectStoreItemUnitInfo(String brandId, String storeId, String contSttDt, String contEndDt) throws Exception {
265
+    public StoreItemUnitInfoResponse selectStoreItemUnitInfo(StoreItemUnitInfolRequest storeItemUnitInfolRequest) throws Exception {
266
+        String brandId  = storeItemUnitInfolRequest.getBrandId();
267
+        String storeId  = storeItemUnitInfolRequest.getStoreId();
268
+        String contSttDt = storeItemUnitInfolRequest.getContSttDt();
269
+        String contEndDt = storeItemUnitInfolRequest.getContEndDt();
265 270
 
266 271
         contSttDt = contSttDt == null ? null : contSttDt.replace(".", "");
267 272
         contEndDt = contEndDt == null ? null : contEndDt.replace(".", "");

+ 4 - 8
src/main/java/com/oqpo/api/web/controller/stinfo/ItemUnitController.java

@@ -174,16 +174,12 @@ public class ItemUnitController {
174 174
      * @throws Exception
175 175
      */
176 176
     @ApiImplicitParams({
177
-            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
178
-            @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
179
-            @ApiImplicitParam(name = "storeId", value = "매장아이디", required = true, dataType = "String", paramType = "query"),
180
-            @ApiImplicitParam(name = "contSttDt", value = "계약시작일시", required = true, dataType = "String", paramType = "query"),
181
-            @ApiImplicitParam(name = "contEndDt", value = "계약종료일시", required = true, dataType = "String", paramType = "query")
177
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
182 178
     })
183 179
     @ApiOperation(value = "매장단가 정보")
184
-    @GetMapping("/info-storeitemunit")
185
-    public ResponseEntity<StoreItemUnitInfoResponse> infoUnitItem(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "storeId") String storeId, @RequestParam(value = "contSttDt") String contSttDt , @RequestParam(value = "contEndDt") String contEndDt) throws Exception {
186
-        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitInfo(brandId, storeId, contSttDt, contEndDt));
180
+    @PostMapping("/info-storeitemunit")
181
+    public ResponseEntity<StoreItemUnitInfoResponse> infoUnitItem(@RequestBody @Valid StoreItemUnitInfolRequest storeItemUnitInfolRequest) throws Exception {
182
+        return ResponseEntity.ok(itemUnitService.selectStoreItemUnitInfo(storeItemUnitInfolRequest));
187 183
     }
188 184
 
189 185
     /**

+ 34 - 0
src/main/java/com/oqpo/api/web/dto/request/stinfo/itemUnit/StoreItemUnitInfolRequest.java

@@ -0,0 +1,34 @@
1
+package com.oqpo.api.web.dto.request.stinfo.itemUnit;
2
+
3
+import com.oqpo.api.entity.stinfo.StoreItemUnitEntity;
4
+import io.swagger.annotations.ApiModelProperty;
5
+import lombok.*;
6
+
7
+import javax.validation.constraints.NotBlank;
8
+import java.util.ArrayList;
9
+import java.util.List;
10
+
11
+@Getter
12
+@Setter
13
+public class StoreItemUnitInfolRequest {
14
+
15
+    @NotBlank
16
+    @ApiModelProperty(value = "매장아이디")
17
+    private String storeId;
18
+
19
+    @NotBlank
20
+    @ApiModelProperty(value = "브랜드아이디")
21
+    private String brandId;
22
+
23
+    @NotBlank
24
+    @ApiModelProperty(value = "계약시작일자")
25
+    private String contSttDt;
26
+
27
+    @NotBlank
28
+    @ApiModelProperty(value = "계약종료일자")
29
+    private String contEndDt;
30
+
31
+
32
+
33
+
34
+}

+ 12 - 0
src/main/java/com/oqpo/api/web/dto/response/stinfo/item/ItemClassMngSearchResponse.java

@@ -32,6 +32,18 @@ public class ItemClassMngSearchResponse {
32 32
     @ApiModelProperty(value = "Level4")
33 33
     private String itemClass4;
34 34
 
35
+    @ApiModelProperty(value = "Level1명")
36
+    private String itemClass1Nm;
37
+
38
+    @ApiModelProperty(value = "Level2명")
39
+    private String itemClass2Nm;
40
+
41
+    @ApiModelProperty(value = "Level3명")
42
+    private String itemClass3Nm;
43
+
44
+    @ApiModelProperty(value = "Level4명")
45
+    private String itemClass4Nm;
46
+
35 47
     @ApiModelProperty(value = "품목분류명")
36 48
     private String itemClassNm;
37 49
 

+ 5 - 1
src/main/resources/mybatis/sqlmaps/stinfo/Item.xml

@@ -372,7 +372,11 @@
372 372
         select /* selectItemClassMngGridList */
373 373
                  item_class_mgnt_no
374 374
                 , item_class1        , item_class2        , item_class3        , item_class4        , item_class_nm
375
-                , del_yn        , prn_seq        , brand_id
375
+                , del_yn        , prn_seq        , brand_id, item_level
376
+                , fn_item_class_nm(brand_id, item_class1, '','', '', 1) as  item_class1_nm
377
+                , fn_item_class_nm(brand_id, item_class1, item_class2, '','',  2) as  item_class2_nm
378
+                , fn_item_class_nm(brand_id, item_class1, item_class2, item_class3, '',  3) as  item_class3_nm
379
+                , fn_item_class_nm(brand_id, item_class1, item_class2, item_class3, item_class4,  4) as  item_class4_nm
376 380
         from item_class_mgnt
377 381
         where brand_id = #{sBrandId}
378 382
         and   del_yn = 'N'