매장창고 정보 관련 수정

src/main/java/com/oqpo/api/mapper/stockmng/WhsMngMapper.java

@@ -18,7 +18,7 @@ public interface WhsMngMapper {
     int selectWhsMngGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sWhsDvsn") String sWhsDvsn, @Param("sWhsStCd") String sWhsStCd,
                             @Param("sWhsNm") String sWhsNm) throws Exception;
 
-    WhsMgntBaseInfoEntity selectWhsMgntBaseInfo(@Param("brandId") String brandId, @Param("whsId") String whsId) throws Exception;
+    WhsMgntBaseInfoEntity selectWhsMgntBaseInfo(@Param("brandId") String brandId, @Param("storeId") String storeId, @Param("whsId") String whsId) throws Exception;
 
     List<WhsMgntBaseLocEntity> selectWhsLocGridList(@Param("brandId") String brandId, @Param("whsId") String whsId, GridRequest gridRequest) throws Exception;
 

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

@@ -60,8 +60,8 @@ public class WhsMngService extends CommonService {
     }
 
     /* 창고관리 정보 조회 */
-    public WhsMngInfoResponse selectWhsMngInfo(String brandId, String whsId) throws Exception {
-        WhsMgntBaseInfoEntity entity = whsMngMapper.selectWhsMgntBaseInfo(brandId, whsId);
+    public WhsMngInfoResponse selectWhsMngInfo(String brandId, String storeId, String whsId) throws Exception {
+        WhsMgntBaseInfoEntity entity = whsMngMapper.selectWhsMgntBaseInfo(brandId, storeId, whsId);
         return WhsMngInfoResponse.toDTO(entity);
     }
 
@@ -248,11 +248,11 @@ public class WhsMngService extends CommonService {
 
         //창고구분(브랜드 W01/매장 W02)
         String sWhsDvsn = "W01";
-        if (!"".equals(sStoreId)  && sStoreId !=  null) {
+        if (!"".equals(sStoreId) && sStoreId != null) {
             sWhsDvsn = "W02";
         }
 
-        List<WhsMgntBaseInfoEntity> entities = whsMngMapper.selectPopWhsLocList(sBrandId,sWhsDvsn,sStoreId, sWhsNm);
+        List<WhsMgntBaseInfoEntity> entities = whsMngMapper.selectPopWhsLocList(sBrandId, sWhsDvsn, sStoreId, sWhsNm);
         return WhsLocationPopListResponse.toDTO(entities);
     }
 

src/main/java/com/oqpo/api/web/controller/stockmng/WhsMngController.java

@@ -58,12 +58,14 @@ public class WhsMngController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
             @ApiImplicitParam(name = "brandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "whsId", value = "창고아이디", required = true, dataType = "String", paramType = "query")
+            @ApiImplicitParam(name = "storeId", value = "매장아이디", required = false, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "whsId", value = "창고아이디", required = false, dataType = "String", paramType = "query")
     })
     @ApiOperation(value = "창고 정보")
     @GetMapping("/info-whs")
-    public ResponseEntity<WhsMngInfoResponse> infoWhs(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "whsId") String whsId) throws Exception {
-        return ResponseEntity.ok(whsMngService.selectWhsMngInfo(brandId, whsId));
+    public ResponseEntity<WhsMngInfoResponse> infoWhs(@RequestParam(value = "brandId") String brandId,
+                                                      @RequestParam(value = "storeId") String storeId, @RequestParam(value = "whsId") String whsId) throws Exception {
+        return ResponseEntity.ok(whsMngService.selectWhsMngInfo(brandId, storeId, whsId));
     }
 
     /**

src/main/resources/mybatis/sqlmaps/stockmng/WhsMng.xml

@@ -72,7 +72,12 @@
             DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
         FROM whs_mgnt_base_info A
         WHERE A.brand_id = #{brandId}
+        <if test="whsId != null and whsId != ''">
         AND A.whs_id = #{whsId}
+        </if>
+        <if test="storeId != null and storeId != ''">
+        AND A.store_id = #{storeId}
+        </if>
     </select>
 
     <select id="selectWhsLocGridList" resultType="com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity">