Bladeren bron

품목 일괄 저장

marseyes 2 jaren geleden
bovenliggende
commit
74ceaa80f2

+ 47 - 0
src/main/java/com/oqpo/api/enums/DstrbtCostUnit.java

@@ -0,0 +1,47 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum DstrbtCostUnit {
8
+
9
+    CBM("CBM", "부피"), //
10
+    EA("EA", "개수"), //
11
+    BOX("BOX", "박수"), //
12
+    ;
13
+
14
+    DstrbtCostUnit(String cd, String nm) {
15
+        this.cd = cd;
16
+        this.name = nm;
17
+    }
18
+
19
+    @Getter
20
+    @Setter
21
+    private String cd;
22
+
23
+    @Getter
24
+    @Setter
25
+    private String name;
26
+
27
+    public static String getCd(String nname) {
28
+        DstrbtCostUnit[] values = DstrbtCostUnit.values();
29
+        for (DstrbtCostUnit icd : values) {
30
+            if (icd.name.equals(nname)) {
31
+                return icd.cd;
32
+            }
33
+        }
34
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
35
+    }
36
+
37
+    public static String getName(String ccd) {
38
+        DstrbtCostUnit[] values = DstrbtCostUnit.values();
39
+        for (DstrbtCostUnit icd : values) {
40
+            if (icd.cd.equals(ccd)) {
41
+                return icd.name;
42
+            }
43
+        }
44
+        return ccd;
45
+    }
46
+
47
+}

+ 51 - 0
src/main/java/com/oqpo/api/enums/HeightUnit.java

@@ -0,0 +1,51 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum HeightUnit {
8
+
9
+    CM("10", "cm"), //
10
+    M("20", "m"), //
11
+    MM("30", "mm"), //
12
+    KM("40", "km"), //
13
+    INCH("50", "inch"), //
14
+    FT("60", "ft"), //
15
+    YD("70", "yd"), //
16
+    ;
17
+
18
+    HeightUnit(String cd, String nm) {
19
+        this.cd = cd;
20
+        this.name = nm;
21
+    }
22
+
23
+    @Getter
24
+    @Setter
25
+    private String cd;
26
+
27
+    @Getter
28
+    @Setter
29
+    private String name;
30
+
31
+    public static String getCd(String nname) {
32
+        HeightUnit[] values = HeightUnit.values();
33
+        for (HeightUnit icd : values) {
34
+            if (icd.name.equals(nname)) {
35
+                return icd.cd;
36
+            }
37
+        }
38
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
39
+    }
40
+
41
+    public static String getName(String ccd) {
42
+        HeightUnit[] values = HeightUnit.values();
43
+        for (HeightUnit icd : values) {
44
+            if (icd.cd.equals(ccd)) {
45
+                return icd.name;
46
+            }
47
+        }
48
+        return ccd;
49
+    }
50
+
51
+}

+ 51 - 0
src/main/java/com/oqpo/api/enums/HighUnit.java

@@ -0,0 +1,51 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum HighUnit {
8
+
9
+    CM("10", "cm"), //
10
+    M("20", "m"), //
11
+    MM("30", "mm"), //
12
+    KM("40", "km"), //
13
+    INCH("50", "inch"), //
14
+    FT("60", "ft"), //
15
+    YD("70", "yd"), //
16
+    ;
17
+
18
+    HighUnit(String cd, String nm) {
19
+        this.cd = cd;
20
+        this.name = nm;
21
+    }
22
+
23
+    @Getter
24
+    @Setter
25
+    private String cd;
26
+
27
+    @Getter
28
+    @Setter
29
+    private String name;
30
+
31
+    public static String getCd(String nname) {
32
+        HighUnit[] values = HighUnit.values();
33
+        for (HighUnit icd : values) {
34
+            if (icd.name.equals(nname)) {
35
+                return icd.cd;
36
+            }
37
+        }
38
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
39
+    }
40
+
41
+    public static String getName(String ccd) {
42
+        HighUnit[] values = HighUnit.values();
43
+        for (HighUnit icd : values) {
44
+            if (icd.cd.equals(ccd)) {
45
+                return icd.name;
46
+            }
47
+        }
48
+        return ccd;
49
+    }
50
+
51
+}

+ 46 - 0
src/main/java/com/oqpo/api/enums/ImpDvsn.java

@@ -0,0 +1,46 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum ImpDvsn {
8
+
9
+    IMP0("IMP0", "국내"), //
10
+    IMP1("IMP1", "수입"), //
11
+    ;
12
+
13
+    ImpDvsn(String cd, String nm) {
14
+        this.cd = cd;
15
+        this.name = nm;
16
+    }
17
+
18
+    @Getter
19
+    @Setter
20
+    private String cd;
21
+
22
+    @Getter
23
+    @Setter
24
+    private String name;
25
+
26
+    public static String getCd(String nname) {
27
+        ImpDvsn[] values = ImpDvsn.values();
28
+        for (ImpDvsn icd : values) {
29
+            if (icd.name.equals(nname)) {
30
+                return icd.cd;
31
+            }
32
+        }
33
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
34
+    }
35
+
36
+    public static String getName(String ccd) {
37
+        ImpDvsn[] values = ImpDvsn.values();
38
+        for (ImpDvsn icd : values) {
39
+            if (icd.cd.equals(ccd)) {
40
+                return icd.name;
41
+            }
42
+        }
43
+        return ccd;
44
+    }
45
+
46
+}

+ 46 - 0
src/main/java/com/oqpo/api/enums/ItemType.java

@@ -0,0 +1,46 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum ItemType {
8
+
9
+    R01("IT00", "소모품"), //
10
+    R02("IT01", "자산용"), //
11
+    ;
12
+
13
+    ItemType(String cd, String nm) {
14
+        this.cd = cd;
15
+        this.name = nm;
16
+    }
17
+
18
+    @Getter
19
+    @Setter
20
+    private String cd;
21
+
22
+    @Getter
23
+    @Setter
24
+    private String name;
25
+
26
+    public static String getCd(String nname) {
27
+        ItemType[] values = ItemType.values();
28
+        for (ItemType icd : values) {
29
+            if (icd.name.equals(nname)) {
30
+                return icd.cd;
31
+            }
32
+        }
33
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
34
+    }
35
+
36
+    public static String getName(String ccd) {
37
+        ItemType[] values = ItemType.values();
38
+        for (ItemType icd : values) {
39
+            if (icd.cd.equals(ccd)) {
40
+                return icd.name;
41
+            }
42
+        }
43
+        return ccd;
44
+    }
45
+
46
+}

+ 46 - 0
src/main/java/com/oqpo/api/enums/PodrPssblDvsn.java

@@ -0,0 +1,46 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum PodrPssblDvsn {
8
+
9
+    PODR_Y("PO01", "발주가능"), //
10
+    PODR_N("PO02", "발주불가")
11
+    ;
12
+
13
+    PodrPssblDvsn(String cd, String nm) {
14
+        this.cd = cd;
15
+        this.name = nm;
16
+    }
17
+
18
+    @Getter
19
+    @Setter
20
+    private String cd;
21
+
22
+    @Getter
23
+    @Setter
24
+    private String name;
25
+
26
+    public static String getCd(String nname) {
27
+        PodrPssblDvsn[] values = PodrPssblDvsn.values();
28
+        for (PodrPssblDvsn icd : values) {
29
+            if (icd.name.equals(nname)) {
30
+                return icd.cd;
31
+            }
32
+        }
33
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
34
+    }
35
+
36
+    public static String getName(String ccd) {
37
+        PodrPssblDvsn[] values = PodrPssblDvsn.values();
38
+        for (PodrPssblDvsn icd : values) {
39
+            if (icd.cd.equals(ccd)) {
40
+                return icd.name;
41
+            }
42
+        }
43
+        return ccd;
44
+    }
45
+
46
+}

+ 46 - 0
src/main/java/com/oqpo/api/enums/RtnDvsn.java

@@ -0,0 +1,46 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum RtnDvsn {
8
+
9
+    R01("R01", "실물반품"), //
10
+    R02("R02", "폐기반품"), //
11
+    ;
12
+
13
+    RtnDvsn(String cd, String nm) {
14
+        this.cd = cd;
15
+        this.name = nm;
16
+    }
17
+
18
+    @Getter
19
+    @Setter
20
+    private String cd;
21
+
22
+    @Getter
23
+    @Setter
24
+    private String name;
25
+
26
+    public static String getCd(String nname) {
27
+        RtnDvsn[] values = RtnDvsn.values();
28
+        for (RtnDvsn icd : values) {
29
+            if (icd.name.equals(nname)) {
30
+                return icd.cd;
31
+            }
32
+        }
33
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
34
+    }
35
+
36
+    public static String getName(String ccd) {
37
+        RtnDvsn[] values = RtnDvsn.values();
38
+        for (RtnDvsn icd : values) {
39
+            if (icd.cd.equals(ccd)) {
40
+                return icd.name;
41
+            }
42
+        }
43
+        return ccd;
44
+    }
45
+
46
+}

+ 1 - 0
src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -69,6 +69,7 @@ public enum SystemMessageCode {
69 69
     ERR_NOTRTNQTY (40035, "반품입고수량은 수거수량보다 적거나 같아야 합니다.", HttpStatus.BAD_REQUEST),
70 70
     ERR_NOTRTNINWHS (40036, "반품입고창고가 수거서 반품입고창고와 상이합니다.", HttpStatus.BAD_REQUEST),
71 71
     ERR_AUTHSTORE (40037, "매장소속 담당자가 아닙니다.", HttpStatus.BAD_REQUEST),
72
+    ERR_CODE_NM (40038, "정의되지 않은 코드명을 사용하였습니다.", HttpStatus.BAD_REQUEST),
72 73
     ;
73 74
 
74 75
 

+ 48 - 0
src/main/java/com/oqpo/api/enums/VolumeUnit.java

@@ -0,0 +1,48 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum VolumeUnit {
8
+
9
+    CM3("10", "cm³"), //
10
+    M3("20", "m³"), //
11
+    L("30", "L"), //
12
+    ML("40", "ml"), //
13
+    ;
14
+
15
+    VolumeUnit(String cd, String nm) {
16
+        this.cd = cd;
17
+        this.name = nm;
18
+    }
19
+
20
+    @Getter
21
+    @Setter
22
+    private String cd;
23
+
24
+    @Getter
25
+    @Setter
26
+    private String name;
27
+
28
+    public static String getCd(String nname) {
29
+        VolumeUnit[] values = VolumeUnit.values();
30
+        for (VolumeUnit icd : values) {
31
+            if (icd.name.equals(nname)) {
32
+                return icd.cd;
33
+            }
34
+        }
35
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
36
+    }
37
+
38
+    public static String getName(String ccd) {
39
+        VolumeUnit[] values = VolumeUnit.values();
40
+        for (VolumeUnit icd : values) {
41
+            if (icd.cd.equals(ccd)) {
42
+                return icd.name;
43
+            }
44
+        }
45
+        return ccd;
46
+    }
47
+
48
+}

+ 48 - 0
src/main/java/com/oqpo/api/enums/WeightUnit.java

@@ -0,0 +1,48 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum WeightUnit {
8
+
9
+    KG("10", "kg"), //
10
+    G("20", "g"), //
11
+    MG("30", "mg"), //
12
+    TON("40", "ton"), //
13
+    ;
14
+
15
+    WeightUnit(String cd, String nm) {
16
+        this.cd = cd;
17
+        this.name = nm;
18
+    }
19
+
20
+    @Getter
21
+    @Setter
22
+    private String cd;
23
+
24
+    @Getter
25
+    @Setter
26
+    private String name;
27
+
28
+    public static String getCd(String nname) {
29
+        WeightUnit[] values = WeightUnit.values();
30
+        for (WeightUnit icd : values) {
31
+            if (icd.name.equals(nname)) {
32
+                return icd.cd;
33
+            }
34
+        }
35
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
36
+    }
37
+
38
+    public static String getName(String ccd) {
39
+        WeightUnit[] values = WeightUnit.values();
40
+        for (WeightUnit icd : values) {
41
+            if (icd.cd.equals(ccd)) {
42
+                return icd.name;
43
+            }
44
+        }
45
+        return ccd;
46
+    }
47
+
48
+}

+ 51 - 0
src/main/java/com/oqpo/api/enums/WidthUnit.java

@@ -0,0 +1,51 @@
1
+package com.oqpo.api.enums;
2
+
3
+import com.oqpo.api.exception.GlobalException;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+public enum WidthUnit {
8
+
9
+    CM("10", "cm"), //
10
+    M("20", "m"), //
11
+    MM("30", "mm"), //
12
+    KM("40", "km"), //
13
+    INCH("50", "inch"), //
14
+    FT("60", "ft"), //
15
+    YD("70", "yd"), //
16
+    ;
17
+
18
+    WidthUnit(String cd, String nm) {
19
+        this.cd = cd;
20
+        this.name = nm;
21
+    }
22
+
23
+    @Getter
24
+    @Setter
25
+    private String cd;
26
+
27
+    @Getter
28
+    @Setter
29
+    private String name;
30
+
31
+    public static String getCd(String nname) {
32
+        WidthUnit[] values = WidthUnit.values();
33
+        for (WidthUnit icd : values) {
34
+            if (icd.name.equals(nname)) {
35
+                return icd.cd;
36
+            }
37
+        }
38
+        throw new GlobalException(SystemMessageCode.ERR_CODE_NM);
39
+    }
40
+
41
+    public static String getName(String ccd) {
42
+        WidthUnit[] values = WidthUnit.values();
43
+        for (WidthUnit icd : values) {
44
+            if (icd.cd.equals(ccd)) {
45
+                return icd.name;
46
+            }
47
+        }
48
+        return ccd;
49
+    }
50
+
51
+}

+ 124 - 71
src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -5,7 +5,7 @@ import com.oqpo.api.entity.CodeEntity;
5 5
 import com.oqpo.api.entity.oper.FileEntity;
6 6
 import com.oqpo.api.entity.oper.UserMngEntity;
7 7
 import com.oqpo.api.entity.stinfo.*;
8
-import com.oqpo.api.enums.SystemMessageCode;
8
+import com.oqpo.api.enums.*;
9 9
 import com.oqpo.api.exception.GlobalException;
10 10
 import com.oqpo.api.mapper.FileMapper;
11 11
 import com.oqpo.api.mapper.oper.UserMngMapper;
@@ -13,11 +13,10 @@ import com.oqpo.api.mapper.stinfo.BrandMapper;
13 13
 import com.oqpo.api.mapper.stinfo.ItemMapper;
14 14
 import com.oqpo.api.mapper.stinfo.ItemUnitMapper;
15 15
 import com.oqpo.api.service.CommonService;
16
+import com.oqpo.api.util.StringUtil;
16 17
 import com.oqpo.api.web.dto.request.GridRequest;
17 18
 import com.oqpo.api.web.dto.request.stinfo.brand.SaveBrandInfolRequest;
18
-import com.oqpo.api.web.dto.request.stinfo.item.DelItemInfolRequest;
19
-import com.oqpo.api.web.dto.request.stinfo.item.SaveItemClassMngInfolRequest;
20
-import com.oqpo.api.web.dto.request.stinfo.item.SaveItemInfolRequest;
19
+import com.oqpo.api.web.dto.request.stinfo.item.*;
21 20
 import com.oqpo.api.web.dto.response.GridResponse;
22 21
 import com.oqpo.api.web.dto.response.code.CodeDtlResponse;
23 22
 import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
@@ -51,22 +50,23 @@ public class ItemService extends CommonService {
51 50
     /*
52 51
       팝업 품목 리스트 조회
53 52
      */
54
-    public GridResponse selectPopItemGridList(String sBrandId,String sStoreId, String sPodrPssblDvsn, String sItemNm, String sSpplyId, String sWhsId, String sLocation, GridRequest gridRequest) throws Exception {
53
+    public GridResponse selectPopItemGridList(String sBrandId, String sStoreId, String sPodrPssblDvsn, String sItemNm,
54
+                                              String sSpplyId, String sWhsId, String sLocation, GridRequest gridRequest) throws Exception {
55 55
         int gridPage = gridRequest.getGridPage();
56 56
         int gridSize = gridRequest.getGridSize();
57 57
 
58
-        int gridRecords = 0 ;
58
+        int gridRecords = 0;
59 59
         int gridTotal = 0;
60
-        List<ItemUnitEntity> entities =  new ArrayList<ItemUnitEntity>()  ;
60
+        List<ItemUnitEntity> entities = new ArrayList<ItemUnitEntity>();
61 61
 
62
-        if ("".equals(sStoreId)) {
63
-            gridRecords = itemUnitMapper.selectPopItemBrandUnitGridCnt( sBrandId,sItemNm,  sPodrPssblDvsn, sSpplyId, sWhsId, sLocation );
62
+        if (StringUtil.isEmpty(sStoreId)) {
63
+            gridRecords = itemUnitMapper.selectPopItemBrandUnitGridCnt(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation);
64 64
             gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
65
-            entities = itemUnitMapper.selectPopItemBrandUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation,  gridRequest);
65
+            entities = itemUnitMapper.selectPopItemBrandUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation, gridRequest);
66 66
         } else {
67
-            gridRecords = itemUnitMapper.selectPopItemStoreUnitGridCnt( sBrandId,sStoreId,sItemNm, sPodrPssblDvsn );
67
+            gridRecords = itemUnitMapper.selectPopItemStoreUnitGridCnt(sBrandId, sStoreId, sItemNm, sPodrPssblDvsn);
68 68
             gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
69
-            entities = itemUnitMapper.selectPopItemStoreUnitGridList(sBrandId,sStoreId, sItemNm, sPodrPssblDvsn,  gridRequest);
69
+            entities = itemUnitMapper.selectPopItemStoreUnitGridList(sBrandId, sStoreId, sItemNm, sPodrPssblDvsn, gridRequest);
70 70
         }
71 71
 
72 72
         List<Object> gridRows = entities.stream()
@@ -94,22 +94,22 @@ public class ItemService extends CommonService {
94 94
     /*
95 95
       팝업 신규 품목 리스트 조회
96 96
      */
97
-    public GridResponse selectPopNewItemGridList(String sBrandId,String sStoreId, String sPodrPssblDvsn, String sItemNm, String sSpplyId, String sWhsId, String sLocation, GridRequest gridRequest) throws Exception {
97
+    public GridResponse selectPopNewItemGridList(String sBrandId, String sStoreId, String sPodrPssblDvsn, String sItemNm, String sSpplyId, String sWhsId, String sLocation, GridRequest gridRequest) throws Exception {
98 98
         int gridPage = gridRequest.getGridPage();
99 99
         int gridSize = gridRequest.getGridSize();
100 100
 
101
-        int gridRecords = 0 ;
101
+        int gridRecords = 0;
102 102
         int gridTotal = 0;
103
-        List<ItemUnitEntity> entities =  new ArrayList<ItemUnitEntity>()  ;
103
+        List<ItemUnitEntity> entities = new ArrayList<ItemUnitEntity>();
104 104
 
105 105
         if ("".equals(sStoreId)) {
106
-            gridRecords = itemUnitMapper.selectPopNewItemBrandUnitGridCnt( sBrandId,sItemNm,  sPodrPssblDvsn, sSpplyId, sWhsId, sLocation );
106
+            gridRecords = itemUnitMapper.selectPopNewItemBrandUnitGridCnt(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation);
107 107
             gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
108
-            entities = itemUnitMapper.selectPopNewItemBrandUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation,  gridRequest);
108
+            entities = itemUnitMapper.selectPopNewItemBrandUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation, gridRequest);
109 109
         } else {
110
-            gridRecords = itemUnitMapper.selectPopNewItemStoreUnitGridCnt( sBrandId,sStoreId,sItemNm, sPodrPssblDvsn );
110
+            gridRecords = itemUnitMapper.selectPopNewItemStoreUnitGridCnt(sBrandId, sStoreId, sItemNm, sPodrPssblDvsn);
111 111
             gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
112
-            entities = itemUnitMapper.selectPopNewItemStoreUnitGridList(sBrandId,sStoreId, sItemNm, sPodrPssblDvsn,  gridRequest);
112
+            entities = itemUnitMapper.selectPopNewItemStoreUnitGridList(sBrandId, sStoreId, sItemNm, sPodrPssblDvsn, gridRequest);
113 113
         }
114 114
 
115 115
         List<Object> gridRows = entities.stream()
@@ -136,30 +136,39 @@ public class ItemService extends CommonService {
136 136
     /*
137 137
       품목 그리드 리스트 조회
138 138
      */
139
-    public GridResponse selectItemGridList( String sBrandId, String sItemStCd, String sPodrPssblDvsn, String sItemType, String sItemGubun, String sClass1, String sClass2, String sClass3, String sClass4, String sItemNm,  GridRequest gridRequest) throws Exception {
139
+    public GridResponse selectItemGridList(String sBrandId, String sItemStCd, String sPodrPssblDvsn, String sItemType,
140
+                                           String sItemGubun, String sClass1, String sClass2, String sClass3, String sClass4, String sItemNm,
141
+                                           String uploadYn, GridRequest gridRequest) throws Exception {
140 142
         int gridPage = gridRequest.getGridPage();
141 143
         int gridSize = gridRequest.getGridSize();
142 144
 
143
-        int gridRecords = itemMapper.selectItemGridCnt( sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm);
144
-        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
145
-        List<ItemEntity> entities = itemMapper.selectItemGridList( sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm, gridRequest);
145
+        int gridRecords = 0;
146
+        int gridTotal = 0;
147
+        List<ItemEntity> entities = new ArrayList<ItemEntity>();
148
+
149
+        if (StringUtil.isEmpty(uploadYn)) {
150
+            gridRecords = itemMapper.selectItemGridCnt(sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm);
151
+            gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
152
+            entities = itemMapper.selectItemGridList(sBrandId, "", sItemStCd, sPodrPssblDvsn, sItemType, sItemGubun, sClass1, sClass2, sClass3, sClass4, sItemNm, gridRequest);
153
+        }
154
+
146 155
         List<Object> gridRows = entities.stream()
147 156
                 .map(m -> ItemSearchListResponse.builder()
148 157
                         .viewCd("R")
149 158
                         .itemId(m.getItemId())
150
-                        .itemNm(m.getItemNm() == null ? "" :m.getItemNm()  )
151
-                        .itemType(m.getItemType() == null ? "" :m.getItemType() )
152
-                        .itemTypeNm(m.getItemTypeNm() == null ? "" :m.getItemTypeNm() )
159
+                        .itemNm(m.getItemNm() == null ? "" : m.getItemNm())
160
+                        .itemType(m.getItemType() == null ? "" : m.getItemType())
161
+                        .itemTypeNm(m.getItemTypeNm() == null ? "" : m.getItemTypeNm())
153 162
                         .itemClassMgntNo(m.getItemClassInfo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo())
154 163
                         .itemClassNm(m.getItemClassMngInfo() == null ? "" : m.getItemClassMngInfo().getItemClassNm() == null ? "" : m.getItemClassMngInfo().getItemClassNm())
155
-                        .itemStCd(m.getItemStCd() == null ? "" :m.getItemStCd())
156
-                        .itemStNm(m.getItemStNm() == null ? "" :m.getItemStNm() )
164
+                        .itemStCd(m.getItemStCd() == null ? "" : m.getItemStCd())
165
+                        .itemStNm(m.getItemStNm() == null ? "" : m.getItemStNm())
157 166
                         .podrPssblDvsn(m.getPodrPssblDvsn() == null ? "" : m.getPodrPssblDvsn())
158
-                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm() == null ? "" :m.getPodrPssblDvsnNm())
167
+                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm() == null ? "" : m.getPodrPssblDvsnNm())
159 168
                         .unit(m.getUnit() == null ? "" : m.getUnit())
160
-                        .unitNm(m.getUnitNm() == null ? "" :m.getUnitNm() )
169
+                        .unitNm(m.getUnitNm() == null ? "" : m.getUnitNm())
161 170
                         .pchItemYn(m.getPchItemYn() == null ? "" : m.getPchItemYn())
162
-                        .saleItemYn(m.getSaleItemYn() == null ? "" :m.getSaleItemYn() )
171
+                        .saleItemYn(m.getSaleItemYn() == null ? "" : m.getSaleItemYn())
163 172
                         .build())
164 173
                 .collect(Collectors.toList());
165 174
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
@@ -168,30 +177,30 @@ public class ItemService extends CommonService {
168 177
     /*
169 178
       품목 그리드 리스트 조회
170 179
      */
171
-    public GridResponse selectSpplyItemGridList( String sBrandId, String sSpplyId, String sItemStCd, String sPodrPssblDvsn, String sItemNm,  GridRequest gridRequest) throws Exception {
180
+    public GridResponse selectSpplyItemGridList(String sBrandId, String sSpplyId, String sItemStCd, String sPodrPssblDvsn, String sItemNm, GridRequest gridRequest) throws Exception {
172 181
         int gridPage = gridRequest.getGridPage();
173 182
         int gridSize = gridRequest.getGridSize();
174 183
 
175
-        int gridRecords = itemMapper.selectItemGridCnt( sBrandId,sSpplyId , sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm);
184
+        int gridRecords = itemMapper.selectItemGridCnt(sBrandId, sSpplyId, sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm);
176 185
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
177
-        List<ItemEntity> entities = itemMapper.selectItemGridList( sBrandId, sSpplyId, sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm, gridRequest);
186
+        List<ItemEntity> entities = itemMapper.selectItemGridList(sBrandId, sSpplyId, sItemStCd, sPodrPssblDvsn, "", "", "", "", "", "", sItemNm, gridRequest);
178 187
         List<Object> gridRows = entities.stream()
179 188
                 .map(m -> ItemSearchListResponse.builder()
180 189
                         .viewCd("R")
181 190
                         .itemId(m.getItemId())
182
-                        .itemNm(m.getItemNm() == null ? "" :m.getItemNm()  )
183
-                        .itemType(m.getItemType() == null ? "" :m.getItemType() )
184
-                        .itemTypeNm(m.getItemTypeNm() == null ? "" :m.getItemTypeNm() )
191
+                        .itemNm(m.getItemNm() == null ? "" : m.getItemNm())
192
+                        .itemType(m.getItemType() == null ? "" : m.getItemType())
193
+                        .itemTypeNm(m.getItemTypeNm() == null ? "" : m.getItemTypeNm())
185 194
                         .itemClassMgntNo(m.getItemClassInfo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo() == null ? "" : m.getItemClassInfo().getItemClassMgntNo())
186 195
                         .itemClassNm(m.getItemClassMngInfo() == null ? "" : m.getItemClassMngInfo().getItemClassNm() == null ? "" : m.getItemClassMngInfo().getItemClassNm())
187
-                        .itemStCd(m.getItemStCd() == null ? "" :m.getItemStCd())
188
-                        .itemStNm(m.getItemStNm() == null ? "" :m.getItemStNm() )
196
+                        .itemStCd(m.getItemStCd() == null ? "" : m.getItemStCd())
197
+                        .itemStNm(m.getItemStNm() == null ? "" : m.getItemStNm())
189 198
                         .podrPssblDvsn(m.getPodrPssblDvsn() == null ? "" : m.getPodrPssblDvsn())
190
-                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm() == null ? "" :m.getPodrPssblDvsnNm())
199
+                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm() == null ? "" : m.getPodrPssblDvsnNm())
191 200
                         .unit(m.getUnit() == null ? "" : m.getUnit())
192
-                        .unitNm(m.getUnitNm() == null ? "" :m.getUnitNm() )
201
+                        .unitNm(m.getUnitNm() == null ? "" : m.getUnitNm())
193 202
                         .pchItemYn(m.getPchItemYn() == null ? "" : m.getPchItemYn())
194
-                        .saleItemYn(m.getSaleItemYn() == null ? "" :m.getSaleItemYn() )
203
+                        .saleItemYn(m.getSaleItemYn() == null ? "" : m.getSaleItemYn())
195 204
                         .build())
196 205
                 .collect(Collectors.toList());
197 206
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
@@ -200,16 +209,16 @@ public class ItemService extends CommonService {
200 209
     /* 품목 정보 */
201 210
     public ItemInfoResponse selectItemInfo(String brandId, String itemId) throws Exception {
202 211
 
203
-        ItemEntity entity = itemMapper.selectItemInfo( brandId, itemId);
212
+        ItemEntity entity = itemMapper.selectItemInfo(brandId, itemId);
204 213
         List<FileEntity> fileImageInfoList = null;
205 214
 
206 215
         if (!"".equals(entity.getItemImageFileNo())) {
207
-            fileImageInfoList = fileMapper.selectFileList(entity.getItemImageFileNo()) ;
216
+            fileImageInfoList = fileMapper.selectFileList(entity.getItemImageFileNo());
208 217
         } else {
209 218
             fileImageInfoList = new ArrayList<FileEntity>();
210 219
         }
211 220
 
212
-        return ItemInfoResponse.toDTO(entity,fileImageInfoList );
221
+        return ItemInfoResponse.toDTO(entity, fileImageInfoList);
213 222
 
214 223
     }
215 224
 
@@ -275,7 +284,7 @@ public class ItemService extends CommonService {
275 284
                 iClassEntity.setItemClass2(saveItemInfolRequest.getItemClass2());
276 285
                 iClassEntity.setItemClass3(saveItemInfolRequest.getItemClass3());
277 286
                 iClassEntity.setItemClass4(saveItemInfolRequest.getItemClass4());
278
-                ItemClassMngEntity itemClassInfo =  itemMapper.selectItemClassMngNo(entity.getBrandId(), iClassEntity.getItemClass1(),iClassEntity.getItemClass2(),iClassEntity.getItemClass3(),iClassEntity.getItemClass4());
287
+                ItemClassMngEntity itemClassInfo = itemMapper.selectItemClassMngNo(entity.getBrandId(), iClassEntity.getItemClass1(), iClassEntity.getItemClass2(), iClassEntity.getItemClass3(), iClassEntity.getItemClass4());
279 288
                 iClassEntity.setItemClassMgntNo(itemClassInfo.getItemClassMgntNo());
280 289
 
281 290
                 itemMapper.insertItemClassInfo(userId, iClassEntity);
@@ -290,32 +299,80 @@ public class ItemService extends CommonService {
290 299
         }
291 300
     }
292 301
 
302
+    @Transactional
303
+    public void saveItemList(String userId, SaveItemListRequest saveItemListRequest) throws Exception {
304
+        try {
305
+            List<SaveItemListData> list = saveItemListRequest.getList();
306
+            for (SaveItemListData item : list) {
307
+                ItemEntity entity = new ItemEntity();
308
+                entity.setItemNm(item.getItemNm());
309
+                entity.setItemStCd("IS00"); // 사용
310
+                entity.setBrandId(saveItemListRequest.getBrandId());
311
+                entity.setUnit(DstrbtCostUnit.getCd(item.getUnitNm())); // 단위
312
+                // entity.setPchUnit(item.getPchUnit()); // 구매단위
313
+                // entity.setSaleUnit(item.getSaleUnit()); // 판매단위
314
+                // entity.setStckUnit(item.getStckUnit()); // 재고단위
315
+                entity.setWeight(item.getWeight());
316
+                entity.setWeightUnit(WeightUnit.getCd(item.getWeightUnitNm()));
317
+                entity.setVolume(item.getVolume());
318
+                entity.setVolumeUnit(VolumeUnit.getCd(item.getVolumeUnitNm()));
319
+                entity.setWidth(item.getWidth());
320
+                entity.setWidthUnit(WidthUnit.getCd(item.getWidthUnitNm()));
321
+                entity.setHeight(item.getHeight());
322
+                entity.setHeightUnit(HeightUnit.getCd(item.getHeightUnitNm()));
323
+                entity.setHigh(item.getHigh());
324
+                entity.setHighUnit(HighUnit.getCd(item.getHighUnitNm()));
325
+                entity.setPodrPssblDvsn(PodrPssblDvsn.getCd(item.getPodrPssblDvsnNm()));
326
+                entity.setRtnPssblYn(item.getRtnPssblYn());
327
+                entity.setExpryYn(item.getExpryYn());
328
+                entity.setExpryPeriod(item.getExpryPeriod());
329
+                entity.setRtnDvsn(RtnDvsn.getCd(item.getRtnDvsnNm()));
330
+                entity.setImpDvsn(ImpDvsn.getCd(item.getImpDvsnNm()));
331
+                entity.setPchItemYn(item.getPchItemYn());
332
+                entity.setSaleItemYn(item.getSaleItemYn());
333
+                entity.setItemType( ItemType.getCd( item.getItemTypeNm() )  );
334
+                entity.setBarcode(item.getBarcode());
335
+                entity.setSysRegId(userId);
336
+                entity.setSysChgId(userId);
337
+
338
+                // 품목 아이디 부여  22  entity.setContentsNo(fnGetKeyNo(17));
339
+                entity.setItemId(fnGetDealNo(26, ""));  // 품목아이디 생성
340
+                itemMapper.insertItemInfo(userId, entity);
341
+            }
342
+        } catch (GlobalException e) {
343
+            e.getStackTrace();
344
+            throw new GlobalException(e.getSystemMessageCode());
345
+        } catch (Exception e) {
346
+            e.getStackTrace();
347
+            throw new RuntimeException();
348
+        }
349
+    }
293 350
 
294 351
     //
295 352
     /*
296 353
        품목분류 리스트 조회
297 354
      */
298
-    public GridResponse selectItemClassMngGridList(String sBrandId, String sItemClass1, String sItemClass2, String sItemClass3, String sItemClass4, String sItemClassNm,GridRequest gridRequest) throws Exception {
355
+    public GridResponse selectItemClassMngGridList(String sBrandId, String sItemClass1, String sItemClass2, String sItemClass3, String sItemClass4, String sItemClassNm, GridRequest gridRequest) throws Exception {
299 356
         int gridPage = gridRequest.getGridPage();
300 357
         int gridSize = gridRequest.getGridSize();
301 358
 
302
-        int gridRecords = itemMapper.selectItemClassMngGridCnt( sBrandId, sItemClass1,  sItemClass2, sItemClass3, sItemClass4,sItemClassNm );
359
+        int gridRecords = itemMapper.selectItemClassMngGridCnt(sBrandId, sItemClass1, sItemClass2, sItemClass3, sItemClass4, sItemClassNm);
303 360
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
304
-        List<ItemClassMngEntity> entities = itemMapper.selectItemClassMngGridList(sBrandId, sItemClass1,  sItemClass2, sItemClass3, sItemClass4,sItemClassNm, gridRequest);
361
+        List<ItemClassMngEntity> entities = itemMapper.selectItemClassMngGridList(sBrandId, sItemClass1, sItemClass2, sItemClass3, sItemClass4, sItemClassNm, gridRequest);
305 362
         List<Object> gridRows = entities.stream()
306 363
                 .map(m -> ItemClassMngSearchResponse.builder()
307 364
                         .viewCd("R")
308 365
                         .brandId(m.getBrandId())
309 366
                         .itemClassMgntNo(m.getItemClassMgntNo())
310
-                        .itemClassNm(m.getItemClassNm() == null ? "" : m.getItemClassNm() )
367
+                        .itemClassNm(m.getItemClassNm() == null ? "" : m.getItemClassNm())
311 368
                         .itemClass1(m.getItemClass1() == null ? "" : m.getItemClass1())
312 369
                         .itemClass2(m.getItemClass2() == null ? "" : m.getItemClass2())
313 370
                         .itemClass3(m.getItemClass3() == null ? "" : m.getItemClass3())
314 371
                         .itemClass4(m.getItemClass4() == null ? "" : m.getItemClass4())
315
-                        .itemClass1Nm(m.getItemClass1Nm() == null ? "" : m.getItemLevel() >= 1 ?  m.getItemClass1Nm() : "")
316
-                        .itemClass2Nm(m.getItemClass2Nm() == null ? "" : m.getItemLevel() >= 2 ?  m.getItemClass2Nm() : "")
317
-                        .itemClass3Nm(m.getItemClass3Nm() == null ? "" : m.getItemLevel() >= 3 ?  m.getItemClass3Nm() : "")
318
-                        .itemClass4Nm(m.getItemClass4Nm() == null ? "" : m.getItemLevel() >= 4 ?  m.getItemClass4Nm() : "")
372
+                        .itemClass1Nm(m.getItemClass1Nm() == null ? "" : m.getItemLevel() >= 1 ? m.getItemClass1Nm() : "")
373
+                        .itemClass2Nm(m.getItemClass2Nm() == null ? "" : m.getItemLevel() >= 2 ? m.getItemClass2Nm() : "")
374
+                        .itemClass3Nm(m.getItemClass3Nm() == null ? "" : m.getItemLevel() >= 3 ? m.getItemClass3Nm() : "")
375
+                        .itemClass4Nm(m.getItemClass4Nm() == null ? "" : m.getItemLevel() >= 4 ? m.getItemClass4Nm() : "")
319 376
                         .prnSeq(m.getPrnSeq() == null ? 99 : m.getPrnSeq())
320 377
                         .build())
321 378
                 .collect(Collectors.toList());
@@ -324,7 +381,7 @@ public class ItemService extends CommonService {
324 381
 
325 382
     /* 품목 분류 정보 */
326 383
     public ItemClassMngInfoResponse selectItemClassMngInfo(String brandId, String itemClassMgnNo) throws Exception {
327
-        return ItemClassMngInfoResponse.toDTO(itemMapper.selectItemClassMngInfo(brandId, itemClassMgnNo) );
384
+        return ItemClassMngInfoResponse.toDTO(itemMapper.selectItemClassMngInfo(brandId, itemClassMgnNo));
328 385
 
329 386
     }
330 387
 
@@ -344,23 +401,19 @@ public class ItemService extends CommonService {
344 401
 
345 402
             if ("C".equals(saveItemClassMngInfolRequest.getViewCd())) {
346 403
                 Integer itemLevel = 1;
347
-                if ("".equals(entity.getItemClass1()))
348
-                {
404
+                if ("".equals(entity.getItemClass1())) {
349 405
                     // level 1 추가
350 406
                     itemLevel = 1;
351 407
                 } else {
352
-                    if ("".equals(entity.getItemClass2()))
353
-                    {
408
+                    if ("".equals(entity.getItemClass2())) {
354 409
                         // level 2 추가
355 410
                         itemLevel = 2;
356 411
                     } else {
357
-                        if ("".equals(entity.getItemClass3()))
358
-                        {
412
+                        if ("".equals(entity.getItemClass3())) {
359 413
                             // level 3 추가
360 414
                             itemLevel = 3;
361 415
                         } else {
362
-                            if ("".equals(entity.getItemClass4()))
363
-                            {
416
+                            if ("".equals(entity.getItemClass4())) {
364 417
                                 // level 4 추가
365 418
                                 itemLevel = 4;
366 419
                             } else {
@@ -371,16 +424,16 @@ public class ItemService extends CommonService {
371 424
                     }
372 425
                 }
373 426
 
374
-                System.out.println("=classLevel============================>" + itemLevel );
427
+                System.out.println("=classLevel============================>" + itemLevel);
375 428
                 entity.setItemLevel(itemLevel);
376
-                int classNum = itemMapper.selectItemClassMaxClass(entity.getBrandId(), entity.getItemLevel(), entity.getItemClass1(), entity.getItemClass2(), entity.getItemClass3(), entity.getItemClass4() ) ;
429
+                int classNum = itemMapper.selectItemClassMaxClass(entity.getBrandId(), entity.getItemLevel(), entity.getItemClass1(), entity.getItemClass2(), entity.getItemClass3(), entity.getItemClass4());
377 430
                 if (itemLevel == 1) {
378 431
                     entity.setItemClass1(Integer.toString(classNum));
379 432
                 } else if (itemLevel == 2) {
380 433
                     entity.setItemClass2(Integer.toString(classNum));
381
-                }  else if (itemLevel == 3) {
434
+                } else if (itemLevel == 3) {
382 435
                     entity.setItemClass3(Integer.toString(classNum));
383
-                }  else if (itemLevel == 4) {
436
+                } else if (itemLevel == 4) {
384 437
                     entity.setItemClass4(Integer.toString(classNum));
385 438
                 }
386 439
                 entity.setItemClassMgntNo(fnGetKeyNo(31));        // 품목분류 아이디 부여
@@ -403,12 +456,12 @@ public class ItemService extends CommonService {
403 456
     @Transactional
404 457
     public void delItemClassMngInfo(String userId, String brandId, String itemClassMgntNo) throws Exception {
405 458
         try {
406
-            List<ItemClassMngEntity> icmngList = new ArrayList<ItemClassMngEntity>() ;
459
+            List<ItemClassMngEntity> icmngList = new ArrayList<ItemClassMngEntity>();
407 460
 
408 461
             String[] icmNoList = itemClassMgntNo.split(",");
409
-            for (int i = 0 ; i < icmNoList.length ; i++) {
462
+            for (int i = 0; i < icmNoList.length; i++) {
410 463
                 List<ItemClassMngEntity> belongList = itemMapper.selectItemClassBeLongList(brandId, icmNoList[i]);
411
-                for (int j = 0 ; j < belongList.size() ; j++) {
464
+                for (int j = 0; j < belongList.size(); j++) {
412 465
                     ItemClassMngEntity delEntity = belongList.get(j);
413 466
                     delEntity.setItemClassMgntNo(delEntity.getItemClassMgntNo());
414 467
                     icmngList.add(delEntity);
@@ -427,7 +480,7 @@ public class ItemService extends CommonService {
427 480
     /* 품목 분류 level 리스트  */
428 481
 
429 482
     public ItemClassLevelResponse searchItemClassList(String sBrandId, int sItemLevel, String sItemClass1, String sItemClass2, String sItemClass3) throws Exception {
430
-        List<ItemClassMngEntity> entities = itemMapper.selectItemLevelList(sBrandId, sItemLevel, sItemClass1, sItemClass2, sItemClass3 );
483
+        List<ItemClassMngEntity> entities = itemMapper.selectItemLevelList(sBrandId, sItemLevel, sItemClass1, sItemClass2, sItemClass3);
431 484
         return ItemClassLevelResponse.toDTO(entities);
432 485
     }
433 486
 }

+ 35 - 12
src/main/java/com/oqpo/api/web/controller/stinfo/ItemController.java

@@ -1,5 +1,6 @@
1 1
 package com.oqpo.api.web.controller.stinfo;
2 2
 
3
+import com.kicc.common.e.i;
3 4
 import com.oqpo.api.enums.SystemMessageCode;
4 5
 import com.oqpo.api.service.stinfo.ItemService;
5 6
 import com.oqpo.api.service.stinfo.SpplyService;
@@ -37,7 +38,7 @@ public class ItemController {
37 38
     /**
38 39
      * 설명 : 품목 팝업 그리드 리스트
39 40
      *
40
-     * @param ItemPopGridRequest
41
+     * @param itemPopGridRequest
41 42
      * @return
42 43
      * @throws Exception
43 44
      */
@@ -46,8 +47,10 @@ public class ItemController {
46 47
     })
47 48
     @ApiOperation(value = " 품목 팝업 그리드 리스트")
48 49
     @PostMapping("/pop-grid-list")
49
-    public ResponseEntity<GridResponse> selectPopItemGridList( @RequestBody @Valid ItemPopGridRequest itemPopGridRequest) throws Exception {
50
-        return ResponseEntity.ok(itemService.selectPopItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(), itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(), itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)) );
50
+    public ResponseEntity<GridResponse> selectPopItemGridList(@RequestBody @Valid ItemPopGridRequest itemPopGridRequest) throws Exception {
51
+        return ResponseEntity.ok(itemService.selectPopItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(),
52
+                itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(),
53
+                itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)));
51 54
     }
52 55
 
53 56
     /**
@@ -62,8 +65,8 @@ public class ItemController {
62 65
     })
63 66
     @ApiOperation(value = " 품목 신규 팝업 그리드 리스트")
64 67
     @PostMapping("/pop-new-grid-list")
65
-    public ResponseEntity<GridResponse> selectPopNewItemGridList( @RequestBody @Valid ItemPopGridRequest itemPopGridRequest) throws Exception {
66
-        return ResponseEntity.ok(itemService.selectPopNewItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(), itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(), itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)) );
68
+    public ResponseEntity<GridResponse> selectPopNewItemGridList(@RequestBody @Valid ItemPopGridRequest itemPopGridRequest) throws Exception {
69
+        return ResponseEntity.ok(itemService.selectPopNewItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(), itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(), itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)));
67 70
     }
68 71
 
69 72
     /**
@@ -80,7 +83,10 @@ public class ItemController {
80 83
     @ApiOperation(value = " 품목 그리드 리스트")
81 84
     @PostMapping("/detail-grid-list")
82 85
     public ResponseEntity<GridResponse> detailGridList(@RequestBody @Valid ItemGridRequest itemGridRequest) throws Exception {
83
-        return ResponseEntity.ok(itemService.selectItemGridList( itemGridRequest.getSBrandId(), itemGridRequest.getSItemStCd(), itemGridRequest.getSPodrPssblDvsn(), itemGridRequest.getSItemType(), itemGridRequest.getSItemGubun(), itemGridRequest.getSClass1(), itemGridRequest.getSClass2(), itemGridRequest.getSClass3(), itemGridRequest.getSClass4(), itemGridRequest.getSItemNm(),  itemGridRequest.toDTO(itemGridRequest)));
86
+        return ResponseEntity.ok(itemService.selectItemGridList(itemGridRequest.getSBrandId(), itemGridRequest.getSItemStCd(),
87
+                itemGridRequest.getSPodrPssblDvsn(), itemGridRequest.getSItemType(), itemGridRequest.getSItemGubun(),
88
+                itemGridRequest.getSClass1(), itemGridRequest.getSClass2(), itemGridRequest.getSClass3(), itemGridRequest.getSClass4(),
89
+                itemGridRequest.getSItemNm(), itemGridRequest.getUploadYn(), itemGridRequest.toDTO(itemGridRequest)));
84 90
     }
85 91
 
86 92
     /**
@@ -97,7 +103,7 @@ public class ItemController {
97 103
     @ApiOperation(value = " 공급사 품목 그리드 리스트")
98 104
     @PostMapping("/spply-grid-list")
99 105
     public ResponseEntity<GridResponse> spplyDetailGridList(@RequestBody @Valid SpplyItemGridRequest spplyItemGridRequest) throws Exception {
100
-        return ResponseEntity.ok(itemService.selectSpplyItemGridList( spplyItemGridRequest.getSBrandId(), spplyItemGridRequest.getSSpplyId(),  spplyItemGridRequest.getSItemStCd(), spplyItemGridRequest.getSPodrPssblDvsn(), spplyItemGridRequest.getSItemNm(),  spplyItemGridRequest.toDTO(spplyItemGridRequest)));
106
+        return ResponseEntity.ok(itemService.selectSpplyItemGridList(spplyItemGridRequest.getSBrandId(), spplyItemGridRequest.getSSpplyId(), spplyItemGridRequest.getSItemStCd(), spplyItemGridRequest.getSPodrPssblDvsn(), spplyItemGridRequest.getSItemNm(), spplyItemGridRequest.toDTO(spplyItemGridRequest)));
101 107
     }
102 108
 
103 109
 
@@ -116,10 +122,9 @@ public class ItemController {
116 122
     @ApiOperation(value = "품목 정보")
117 123
     @GetMapping("/info-item")
118 124
     public ResponseEntity<ItemInfoResponse> infoItem(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "itemId") String itemId) throws Exception {
119
-        return ResponseEntity.ok(itemService.selectItemInfo(brandId,itemId));
125
+        return ResponseEntity.ok(itemService.selectItemInfo(brandId, itemId));
120 126
     }
121 127
 
122
-
123 128
     /**
124 129
      * 설명 : 품목 정보 저장
125 130
      *
@@ -138,6 +143,23 @@ public class ItemController {
138 143
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
139 144
     }
140 145
 
146
+    /**
147
+     * 설명 : 품목 정보 저장
148
+     *
149
+     * @param userId
150
+     * @param saveItemListRequest
151
+     * @return SaveResponse
152
+     * @throws Exception
153
+     */
154
+    @ApiImplicitParams({
155
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
156
+    })
157
+    @ApiOperation(value = "품목 일괄 저장")
158
+    @PostMapping("/save-item-list")
159
+    public ResponseEntity<SaveResponse> saveItemList(@ApiIgnore String userId, @RequestBody @Valid SaveItemListRequest saveItemListRequest) throws Exception {
160
+        itemService.saveItemList(userId, saveItemListRequest);
161
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
162
+    }
141 163
 
142 164
     /**
143 165
      * 설명 : 품목분류 그리드 리스트
@@ -153,11 +175,12 @@ public class ItemController {
153 175
     @ApiOperation(value = " 품목분류 그리드 리스트")
154 176
     @PostMapping("/itemclass-grid-list")
155 177
     public ResponseEntity<GridResponse> itemClassGridList(@RequestBody @Valid ItemClassGridRequest itemClassGridRequest) throws Exception {
156
-        return ResponseEntity.ok(itemService.selectItemClassMngGridList(itemClassGridRequest.getSBrandId(), itemClassGridRequest.getSItemClass1(), itemClassGridRequest.getSItemClass2(), itemClassGridRequest.getSItemClass3(), itemClassGridRequest.getSItemClass4(), itemClassGridRequest.getSItemClassNm(),  itemClassGridRequest.toDTO(itemClassGridRequest)));
178
+        return ResponseEntity.ok(itemService.selectItemClassMngGridList(itemClassGridRequest.getSBrandId(), itemClassGridRequest.getSItemClass1(), itemClassGridRequest.getSItemClass2(), itemClassGridRequest.getSItemClass3(), itemClassGridRequest.getSItemClass4(), itemClassGridRequest.getSItemClassNm(), itemClassGridRequest.toDTO(itemClassGridRequest)));
157 179
     }
158 180
 
159 181
 
160 182
     //selectItemClassMngInfo
183
+
161 184
     /**
162 185
      * 설명 : 품목분류 정보
163 186
      *
@@ -173,7 +196,7 @@ public class ItemController {
173 196
     @ApiOperation(value = "품목분류 정보")
174 197
     @GetMapping("/info-itemClassMng")
175 198
     public ResponseEntity<ItemClassMngInfoResponse> infoItemClassMng(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "itemClassMgnNo") String itemClassMgnNo) throws Exception {
176
-        return ResponseEntity.ok(itemService.selectItemClassMngInfo(brandId,itemClassMgnNo));
199
+        return ResponseEntity.ok(itemService.selectItemClassMngInfo(brandId, itemClassMgnNo));
177 200
     }
178 201
 
179 202
 
@@ -211,7 +234,7 @@ public class ItemController {
211 234
     })
212 235
     @ApiOperation(value = "품목분류 삭제")
213 236
     @GetMapping("/del-itemClassMng")
214
-    public ResponseEntity<SaveResponse> saveItemClassMng(@ApiIgnore String userId,  @RequestParam(value = "brandId") String brandId, @RequestParam(value = "itemClassMgntNo") String itemClassMgntNo) throws Exception {
237
+    public ResponseEntity<SaveResponse> saveItemClassMng(@ApiIgnore String userId, @RequestParam(value = "brandId") String brandId, @RequestParam(value = "itemClassMgntNo") String itemClassMgntNo) throws Exception {
215 238
         itemService.delItemClassMngInfo(userId, brandId, itemClassMgntNo);
216 239
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
217 240
     }

+ 3 - 1
src/main/java/com/oqpo/api/web/dto/request/stinfo/item/ItemGridRequest.java

@@ -23,7 +23,7 @@ public class ItemGridRequest extends GridRequest {
23 23
     private String sItemStCd;
24 24
 
25 25
     @ApiModelProperty(value = "품목유형")
26
-   private String sItemType;
26
+    private String sItemType;
27 27
 
28 28
     @ApiModelProperty(value = "품목타입 P 구매품목, S 판매품목")
29 29
     private String sItemGubun;
@@ -43,6 +43,8 @@ public class ItemGridRequest extends GridRequest {
43 43
     @ApiModelProperty(value = "품목명")
44 44
     private String sItemNm;
45 45
 
46
+    @ApiModelProperty(value = "엑셀업로드여부")
47
+    private String uploadYn;
46 48
 
47 49
     protected ItemGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
48 50
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);

+ 0 - 1
src/main/java/com/oqpo/api/web/dto/request/stinfo/item/ItemPopGridRequest.java

@@ -34,7 +34,6 @@ public class ItemPopGridRequest extends GridRequest {
34 34
     @ApiModelProperty(value = "Location")
35 35
     private String sLocation;
36 36
 
37
-
38 37
     protected ItemPopGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
39 38
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
40 39
     }

+ 81 - 0
src/main/java/com/oqpo/api/web/dto/request/stinfo/item/SaveItemListData.java

@@ -0,0 +1,81 @@
1
+package com.oqpo.api.web.dto.request.stinfo.item;
2
+
3
+import io.swagger.annotations.ApiModelProperty;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+import javax.validation.constraints.NotBlank;
8
+
9
+@Getter
10
+@Setter
11
+public class SaveItemListData {
12
+
13
+    @ApiModelProperty(value = "CRUD")
14
+    private String viewCd;
15
+
16
+    @ApiModelProperty(value = "품목명")
17
+    private String itemNm;
18
+
19
+    @ApiModelProperty(value = "무게")
20
+    private Float weight;
21
+
22
+    @ApiModelProperty(value = "무게")
23
+    private String weightUnitNm;
24
+
25
+    @ApiModelProperty(value = "부피")
26
+    private Float volume;
27
+
28
+    @ApiModelProperty(value = "부피단위")
29
+    private String volumeUnitNm;
30
+
31
+    @ApiModelProperty(value = "가로")
32
+    private Float width;
33
+
34
+    @ApiModelProperty(value = "가로단위")
35
+    private String widthUnitNm;
36
+
37
+    @ApiModelProperty(value = "세로")
38
+    private Float height;
39
+
40
+    @ApiModelProperty(value = "세로단위")
41
+    private String heightUnitNm;
42
+
43
+    @ApiModelProperty(value = "높이")
44
+    private Float high;
45
+
46
+    @ApiModelProperty(value = "높이단위")
47
+    private String highUnitNm;
48
+
49
+    @ApiModelProperty(value = "유통기한여부")
50
+    private String expryYn;
51
+
52
+    @ApiModelProperty(value = "유통기한기간")
53
+    private Integer expryPeriod;
54
+
55
+    @ApiModelProperty(value = "반품구분코드")
56
+    private String rtnDvsnNm;
57
+
58
+    @ApiModelProperty(value = "수입구분코드")
59
+    private String impDvsnNm;
60
+
61
+    @ApiModelProperty(value = "발주가능구분")
62
+    private String podrPssblDvsnNm;
63
+
64
+    @ApiModelProperty(value = "구매품목여부")
65
+    private String pchItemYn;
66
+
67
+    @ApiModelProperty(value = "판매품목여부")
68
+    private String saleItemYn;
69
+
70
+    @ApiModelProperty(value = "품목유형")
71
+    private String itemTypeNm;
72
+
73
+    @ApiModelProperty(value = "단위")
74
+    private String unitNm;
75
+
76
+    @ApiModelProperty(value = "반품가능여부")
77
+    private String rtnPssblYn;
78
+
79
+    @ApiModelProperty(value = "바코드")
80
+    private String barcode;
81
+}

+ 21 - 0
src/main/java/com/oqpo/api/web/dto/request/stinfo/item/SaveItemListRequest.java

@@ -0,0 +1,21 @@
1
+package com.oqpo.api.web.dto.request.stinfo.item;
2
+
3
+import io.swagger.annotations.ApiModelProperty;
4
+import lombok.Getter;
5
+import lombok.Setter;
6
+
7
+import javax.validation.constraints.NotBlank;
8
+import java.util.List;
9
+
10
+@Getter
11
+@Setter
12
+public class SaveItemListRequest {
13
+
14
+    @NotBlank
15
+    @ApiModelProperty(value = "브랜드아이디")
16
+    private String brandId;
17
+
18
+    @ApiModelProperty(value = "품목 리스트")
19
+    private List<SaveItemListData> list;
20
+
21
+}