창고 팝업 구분자 추가로 수정조치함

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

@@ -249,7 +249,7 @@ public class WhsMngService extends CommonService {
     /*
         창고 팝업 검색
      */
-    public GridResponse searchPopWhsLocationList(String sBrandId, String sStoreId, String sWhsNm, GridRequest gridRequest) throws Exception {
+    public GridResponse searchPopWhsLocationList(String sBrandId, String sStoreId, String sWhsNm, String sWhsDvsn,  GridRequest gridRequest) throws Exception {
 
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
@@ -258,11 +258,12 @@ public class WhsMngService extends CommonService {
         int gridTotal = 0;
 
         //창고구분(브랜드 W01/매장 W02)
+        /*
         String sWhsDvsn = "W01";
         if (!"".equals(sStoreId) && sStoreId != null) {
             sWhsDvsn = "W02";
         }
-
+        */
         List<WhsMgntBaseInfoEntity> entities = whsMngMapper.selectPopWhsLocList(sBrandId, sWhsDvsn, sStoreId, sWhsNm);
 
         List<Object> gridRows = entities.stream()

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

@@ -157,6 +157,7 @@ public class WhsMngController {
         return ResponseEntity.ok(whsMngService.searchPopWhsLocationList(popWhsLocationRequest.getSBrandId()
                                                                         , popWhsLocationRequest.getSStoreId()
                                                                         , popWhsLocationRequest.getSWhsNm()
+                                                                        , popWhsLocationRequest.getSWhsDvsn()
                                                                         , popWhsLocationRequest.toDTO(popWhsLocationRequest)   ));
     }
 }

src/main/java/com/oqpo/api/web/dto/request/stockmng/PopWhsLocationRequest.java

@@ -23,6 +23,9 @@ public class PopWhsLocationRequest extends GridRequest {
     @ApiModelProperty(value = "창고명")
     private String sWhsNm;
 
+    @ApiModelProperty(value = "창고구분")
+    private String sWhsDvsn;
+
     protected PopWhsLocationRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
         super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
     }

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

@@ -262,7 +262,9 @@
         left outer join whs_mgnt_base_loc locInfo on whsInfo.brand_id = locInfo.brand_id and whsInfo.whs_id = locInfo.whs_id and locInfo.loc_st_cd = 'LOC001'
         where whsInfo.whs_st_cd = 'W001'
         and   whsInfo.brand_id = #{sBrandId}
+        <if test="sWhsDvsn != null and sWhsDvsn != ''">
         and   whsInfo.whs_dvsn = #{sWhsDvsn}
+        </if>
         <if test="sStoreId != null and sStoreId != ''">
             and   whsInfo.store_id = #{sStoreId}
         </if>