창고 관리

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

@@ -20,7 +20,9 @@ public interface WhsMngMapper {
 
     WhsMgntBaseInfoEntity selectWhsMgntBaseInfo(@Param("brandId") String brandId, @Param("whsId") String whsId) throws Exception;
 
-    List<WhsMgntBaseLocEntity> selectWhsLocGridList(@Param("brandId") String brandId, @Param("whsId") String whsId) throws Exception;
+    List<WhsMgntBaseLocEntity> selectWhsLocGridList(@Param("brandId") String brandId, @Param("whsId") String whsId, GridRequest gridRequest) throws Exception;
+
+    int selectWhsLocGridCnt(@Param("brandId") String brandId, @Param("whsId") String whsId) throws Exception;
 
     int insertWhsMgntBaseInfo(@Param("userId") String userId, WhsMgntBaseInfoEntity entity) throws Exception;
 

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

@@ -59,8 +59,31 @@ public class WhsMngService extends CommonService {
     /* 창고관리 정보 조회 */
     public WhsMngInfoResponse selectWhsMngInfo(String brandId, String whsId) throws Exception {
         WhsMgntBaseInfoEntity entity = whsMngMapper.selectWhsMgntBaseInfo(brandId, whsId);
-        List<WhsMgntBaseLocEntity> locEntityList = whsMngMapper.selectWhsLocGridList(brandId, whsId);
-        return WhsMngInfoResponse.toDTO(entity, locEntityList);
+        return WhsMngInfoResponse.toDTO(entity);
+    }
+
+    /*
+      Location 그리드 리스트 조회
+     */
+    public GridResponse selectWhsLocGridList(String brandId, String whsId, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = whsMngMapper.selectWhsLocGridCnt(brandId, whsId);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<WhsMgntBaseLocEntity> entities = whsMngMapper.selectWhsLocGridList(brandId, whsId, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> LocInfoListResponse.builder()
+                        .viewCd("R")
+                        .location(m.getLocation())
+                        .locationNm(m.getLocationNm())
+                        .stckDvsn(m.getStckDvsn())
+                        .stckDvsnNm(m.getStckDvsnNm())
+                        .locStCd(m.getLocStCd())
+                        .locStNm(m.getLocStNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
     /* 창고정보 등록 */

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

@@ -64,6 +64,23 @@ public class WhsMngController {
         return ResponseEntity.ok(whsMngService.selectWhsMngInfo(brandId, whsId));
     }
 
+    /**
+     * 설명 : Location 그리드 리스트
+     *
+     * @param locationGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "Location 그리드 리스트")
+    @PostMapping("/location-grid-list")
+    public ResponseEntity<GridResponse> locationGridList(@RequestBody @Valid LocationGridRequest locationGridRequest) throws Exception {
+        return ResponseEntity.ok(whsMngService.selectWhsLocGridList(locationGridRequest.getBrandId(), locationGridRequest.getWhsId(),
+                locationGridRequest.toDTO(locationGridRequest)));
+    }
+
     /**
      * 설명 : 창고 신규등록
      *

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

@@ -0,0 +1,21 @@
+package com.oqpo.api.web.dto.request.stockmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+
+@Getter
+@Setter
+public class LocationGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "창고아이디")
+    private String whsId;
+
+    protected LocationGridRequest(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/LocInfoListResponse.java

@@ -0,0 +1,30 @@
+package com.oqpo.api.web.dto.response.stockmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class LocInfoListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "LOCATION")
+    private String location;
+    @ApiModelProperty(value = "로케이션명")
+    private String locationNm;
+    @ApiModelProperty(value = "재고상태구분")
+    private String stckDvsn;
+    @ApiModelProperty(value = "재고상태구분명")
+    private String stckDvsnNm;
+    @ApiModelProperty(value = "창고상태코드")
+    private String locStCd;
+    @ApiModelProperty(value = "창고상태명")
+    private String locStNm;
+
+}

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

@@ -2,14 +2,9 @@ package com.oqpo.api.web.dto.response.stockmng;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.oqpo.api.entity.stockmng.WhsMgntBaseInfoEntity;
-import com.oqpo.api.entity.stockmng.WhsMgntBaseLocEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
-
 @Getter
 @Setter
 @Builder
@@ -56,10 +51,7 @@ public class WhsMngInfoResponse {
     @ApiModelProperty(value = "시스템변경아이디")
     private String sysChgId;
 
-    @ApiModelProperty(value = "위치정보 리스트")
-    private List<LocationInfo> locationInfoList;
-
-    public static WhsMngInfoResponse toDTO(WhsMgntBaseInfoEntity entity, List<WhsMgntBaseLocEntity> locationInfoList) {
+    public static WhsMngInfoResponse toDTO(WhsMgntBaseInfoEntity entity) {
         if (entity == null) return null;
         return WhsMngInfoResponse.builder()
                 .brandId(entity.getBrandId())
@@ -81,35 +73,7 @@ public class WhsMngInfoResponse {
                 .sysRegId(entity.getSysRegId())
                 .sysChgDttm(entity.getSysChgDttm())
                 .sysChgId(entity.getSysChgId())
-                .locationInfoList(locationInfoList.stream()
-                        .map(m -> LocationInfo.builder()
-                                .location(m.getLocation())
-                                .locationNm(m.getLocationNm())
-                                .stckDvsn(m.getStckDvsn())
-                                .stckDvsnNm(m.getStckDvsnNm())
-                                .locStCd(m.getLocStCd())
-                                .locStNm(m.getLocStNm())
-                                .build())
-                        .collect(Collectors.toList()))
                 .build();
     }
 
-    @Getter
-    @Builder
-    @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class LocationInfo {
-        @ApiModelProperty(value = "LOCATION")
-        private String location;
-        @ApiModelProperty(value = "로케이션명")
-        private String locationNm;
-        @ApiModelProperty(value = "재고상태구분")
-        private String stckDvsn;
-        @ApiModelProperty(value = "재고상태구분명")
-        private String stckDvsnNm;
-        @ApiModelProperty(value = "창고상태코드")
-        private String locStCd;
-        @ApiModelProperty(value = "창고상태명")
-        private String locStNm;
-    }
-
 }

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

@@ -84,6 +84,17 @@
         WHERE A.brand_id = #{brandId}
         AND A.whs_id = #{whsId}
         ORDER BY A.location ASC
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectWhsLocGridCnt" resultType="int">
+        /* WhsMngMapper.selectWhsLocGridCnt */
+        SELECT COUNT(*)
+        FROM whs_mgnt_base_loc A
+        WHERE A.brand_id = #{brandId}
+        AND A.whs_id = #{whsId}
     </select>
 
     <insert id="insertWhsMgntBaseInfo" >