납품창고 팝업 수정

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

@@ -11,6 +11,7 @@ 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;
 import com.oqpo.api.web.dto.response.code.CodeSearchListResponse;
+import com.oqpo.api.web.dto.response.stinfo.item.ItemPopSearchResponse;
 import com.oqpo.api.web.dto.response.stockmng.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -244,7 +245,13 @@ public class WhsMngService extends CommonService {
     /*
         창고 팝업 검색
      */
-    public WhsLocationPopListResponse searchPopWhsLocationList(String sBrandId, String sStoreId, String sWhsNm) throws Exception {
+    public GridResponse searchPopWhsLocationList(String sBrandId, String sStoreId, String sWhsNm, GridRequest gridRequest) throws Exception {
+
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = 0 ;
+        int gridTotal = 0;
 
         //창고구분(브랜드 W01/매장 W02)
         String sWhsDvsn = "W01";
@@ -253,7 +260,20 @@ public class WhsMngService extends CommonService {
         }
 
         List<WhsMgntBaseInfoEntity> entities = whsMngMapper.selectPopWhsLocList(sBrandId, sWhsDvsn, sStoreId, sWhsNm);
-        return WhsLocationPopListResponse.toDTO(entities);
+
+        List<Object> gridRows = entities.stream()
+                .map(m -> WhsLocationPopListResponse.builder()
+                        .brandId(m.getBrandId())
+                        .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() )
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
 }

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

@@ -149,16 +149,14 @@ public class WhsMngController {
      * @throws Exception
      */
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
-            @ApiImplicitParam(name = "sBrandId", value = "브랜드아이디", required = true, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "sStoreId", value = "매장아이디", required = false, dataType = "String", paramType = "query"),
-            @ApiImplicitParam(name = "sWhsNm", value = "창고명", required = false, dataType = "String", paramType = "query")
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
     @ApiOperation(value = "창고 팝업 검색")
-    @GetMapping("/pop-whs-search")
-    public ResponseEntity<WhsLocationPopListResponse> searchPopWhsList(@RequestParam(value = "sBrandId", required = true) String sBrandId,
-                                                                       @RequestParam(value = "sStoreId", required = false) String sStoreId,
-                                                                       @RequestParam(value = "sWhsNm", required = false) String sWhsNm) throws Exception {
-        return ResponseEntity.ok(whsMngService.searchPopWhsLocationList(sBrandId,sStoreId, sWhsNm));
+    @PostMapping("/pop-whs-search")
+    public ResponseEntity<GridResponse> searchPopWhsList(@RequestBody @Valid PopWhsLocationRequest popWhsLocationRequest) throws Exception {
+        return ResponseEntity.ok(whsMngService.searchPopWhsLocationList(popWhsLocationRequest.getSBrandId()
+                                                                        , popWhsLocationRequest.getSStroeId()
+                                                                        , popWhsLocationRequest.getSWhsNm()
+                                                                        , popWhsLocationRequest.toDTO(popWhsLocationRequest)   ));
     }
 }

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

@@ -0,0 +1,29 @@
+package com.oqpo.api.web.dto.request.stockmng;
+
+import com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class PopWhsLocationRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "매장아이디")
+    private String sStroeId;
+
+    @ApiModelProperty(value = "창고명")
+    private String sWhsNm;
+
+    protected PopWhsLocationRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {
+        super(gridSize, gridPage, sidx, sord, pagingYn, gridFirst);
+    }
+}

src/main/java/com/oqpo/api/web/dto/response/stockmng/WhsLocationPopListResponse.java

@@ -15,31 +15,7 @@ import java.util.stream.Collectors;
 @AllArgsConstructor(access = AccessLevel.PROTECTED)
 @JsonInclude(JsonInclude.Include.ALWAYS) //null 값 전송
 public class WhsLocationPopListResponse {
-    @ApiModelProperty(value = "조회리스트")
-    private List<SearchCode> searchList;
 
-    public static WhsLocationPopListResponse toDTO(List<WhsMgntBaseInfoEntity> entities) {
-        if (entities == null) return null;
-        return WhsLocationPopListResponse.builder()
-                .searchList(entities.stream()
-                        .map(m -> SearchCode.builder()
-                                .brandId(m.getBrandId())
-                                .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() )
-                                .build())
-                        .collect(Collectors.toList()))
-                .build();
-    }
-
-    @Getter
-    @Builder
-    @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class SearchCode {
         @ApiModelProperty(value = "브랜드아이디")
         private String brandId;
 
@@ -63,5 +39,5 @@ public class WhsLocationPopListResponse {
 
         @ApiModelProperty(value = "창고구분명")
         private String stckDvsnNm;
-    }
+
 }

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

@@ -257,7 +257,7 @@
 
     <select id="selectPopWhsLocList" resultType="com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity">
         select whsInfo.brand_id, fn_brand_nm(whsInfo.brand_id) as brand_nm, whsInfo.whs_id, whsInfo.whs_nm, locInfo.location as 'locationInfo.location', locInfo.location_nm as 'locationInfo.location_nm',
-                locInfo.stck_dvsn as 'locationInfo.stck_dvsn', fn_code_nm('STCK_DVSN', locInfo.stck_dvsn) as 'locationInfo.stck_dvan_nm'
+                locInfo.stck_dvsn as 'locationInfo.stck_dvsn', fn_code_nm('STCK_DVSN', locInfo.stck_dvsn) as 'locationInfo.stck_dvsn_nm'
         from  whs_mgnt_base_info whsInfo
         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'