브랜드 창고관리 버그 수정

src/main/java/com/oqpo/api/enums/WhsDvsn.java

@@ -0,0 +1,35 @@
+package com.oqpo.api.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+public enum WhsDvsn {
+
+    BRAND("W01", "본사"), //
+    STORE("W02", "매장"), //
+    ;
+
+    WhsDvsn(String cd, String nm) {
+        this.cd = cd;
+        this.name = nm;
+    }
+
+    @Getter
+    @Setter
+    private String cd;
+
+    @Getter
+    @Setter
+    private String name;
+
+    public static String getName(String ccd) {
+        WhsDvsn[] values = WhsDvsn.values();
+        for (WhsDvsn icd : values) {
+            if (icd.cd.equals(ccd)) {
+                return icd.name;
+            }
+        }
+        return ccd;
+    }
+
+}

src/main/java/com/oqpo/api/service/stockmng/WhsMngService.java

@@ -4,9 +4,11 @@ package com.oqpo.api.service.stockmng;
 import com.oqpo.api.entity.CodeEntity;
 import com.oqpo.api.entity.stockmng.*;
 import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.enums.WhsDvsn;
 import com.oqpo.api.exception.GlobalException;
 import com.oqpo.api.mapper.stockmng.WhsMngMapper;
 import com.oqpo.api.service.CommonService;
+import com.oqpo.api.util.StringUtil;
 import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.stockmng.SaveWhsInfoRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
@@ -107,6 +109,7 @@ public class WhsMngService extends CommonService {
             entity.setAddr2(saveWhsInfoRequest.getAddr2());
             entity.setWhsStCd(saveWhsInfoRequest.getWhsStCd());
             entity.setStoreId(saveWhsInfoRequest.getStoreId());
+            entity.setWhsDvsn(StringUtil.isEmpty(entity.getStoreId()) ? WhsDvsn.BRAND.getCd() : WhsDvsn.STORE.getCd());
             whsMngMapper.insertWhsMgntBaseInfo(userId, entity);
 
             // 창고로케이션정보
@@ -143,6 +146,7 @@ public class WhsMngService extends CommonService {
             entity.setAddr2(saveWhsInfoRequest.getAddr2());
             entity.setWhsStCd(saveWhsInfoRequest.getWhsStCd());
             entity.setStoreId(saveWhsInfoRequest.getStoreId());
+            entity.setWhsDvsn(StringUtil.isEmpty(entity.getStoreId()) ? WhsDvsn.BRAND.getCd() : WhsDvsn.STORE.getCd());
             whsMngMapper.updateWhsMgntBaseInfo(userId, entity);
 
             // 창고로케이션정보
@@ -250,7 +254,7 @@ public class WhsMngService extends CommonService {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
-        int gridRecords = 0 ;
+        int gridRecords = 0;
         int gridTotal = 0;
 
         //창고구분(브랜드 W01/매장 W02)
@@ -267,10 +271,10 @@ public class WhsMngService extends CommonService {
                         .brandNm(m.getBrandNm())
                         .whsId(m.getWhsId())
                         .whsNm(m.getWhsNm())
-                        .location(m.getLocationInfo() == null ? "" : m.getLocationInfo().getLocation() == null ? "" : m.getLocationInfo().getLocation() )
-                        .locationNm(m.getLocationInfo() == null ? "" : m.getLocationInfo().getLocationNm() == null ? "" : m.getLocationInfo().getLocationNm() )
-                        .stckDvsn(m.getLocationInfo() == null ? "" : m.getLocationInfo().getStckDvsn() == null ? "" : m.getLocationInfo().getStckDvsn() )
-                        .stckDvsnNm(m.getLocationInfo() == null ? "" : m.getLocationInfo().getStckDvsnNm() == null ? "" : m.getLocationInfo().getStckDvsnNm() )
+                        .location(m.getLocationInfo() == null ? "" : m.getLocationInfo().getLocation() == null ? "" : m.getLocationInfo().getLocation())
+                        .locationNm(m.getLocationInfo() == null ? "" : m.getLocationInfo().getLocationNm() == null ? "" : m.getLocationInfo().getLocationNm())
+                        .stckDvsn(m.getLocationInfo() == null ? "" : m.getLocationInfo().getStckDvsn() == null ? "" : m.getLocationInfo().getStckDvsn())
+                        .stckDvsnNm(m.getLocationInfo() == null ? "" : m.getLocationInfo().getStckDvsnNm() == null ? "" : m.getLocationInfo().getStckDvsnNm())
                         .build())
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);