모바일 재고실사, 창고품목조회 및 바코드를 통한 품목정보 조회

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

@@ -64,4 +64,14 @@ public interface StockMngMapper {
     List<StckMgntBaseInfoEntity> selectWhsLocOutPassQty(@Param("brandId") String brandId, @Param("whsId") String whsId, @Param("location") String location,
                                                         List<StckMgntBaseInfoEntity> gridItemData) throws Exception;
 
+    /* 창고별 품목 현황 */
+    List<StckMgntBaseInfoEntity> selectPopItemStockMngGridList(@Param("sBrandId") String sBrandId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation
+                                                        ,@Param("sItemNm") String sItemNm, GridRequest gridRequest) throws Exception;
+
+    int selectPopItemStockMngGridCnt(@Param("sBrandId") String sBrandId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation
+                                     ,@Param("sItemNm") String sItemNm) throws Exception;
+
+    StckMgntBaseInfoEntity selectPopItemStockInfo(@Param("sBrandId") String sBrandId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation
+            ,@Param("sBarcode") String sBarcode) throws Exception;
+
 }

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

@@ -12,9 +12,7 @@ import com.oqpo.api.web.dto.request.GridRequest;
 import com.oqpo.api.web.dto.request.stockmng.ProcStockRequest;
 import com.oqpo.api.web.dto.request.stockmng.StockMngCddGridRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-import com.oqpo.api.web.dto.response.stockmng.StockHistListResponse;
-import com.oqpo.api.web.dto.response.stockmng.StockMngInfoResponse;
-import com.oqpo.api.web.dto.response.stockmng.StockMngListResponse;
+import com.oqpo.api.web.dto.response.stockmng.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -228,6 +226,36 @@ public class StockMngService extends CommonService {
 
     */
 
+    /*
+          재고관리 그리드 리스트 조회
+         */
+    public GridResponse selectPopItemStockMngGridList(String sBrandId, String sWhsId, String sLocation,
+                                                String sItemNm, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = stockMngMapper.selectPopItemStockMngGridCnt(sBrandId, sWhsId, sLocation, sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<StckMgntBaseInfoEntity> entities = stockMngMapper.selectPopItemStockMngGridList(sBrandId, sWhsId, sLocation, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> PopItemWhsStockListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId())
+                        .brandNm(m.getBrandNm())
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .unit(m.getUnit())
+                        .stckQty(m.getStckQty())
+                        .waitQty(m.getWaitQty())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
 
+    /* 바코드 품목 정보 조회 */
+    public BarcodeWhsItemInfoResponse selectBarcodeWhsItemMngInfo(String sBrandId, String sWhsId, String sLocation, String sBarcode) throws Exception {
+        StckMgntBaseInfoEntity entity = stockMngMapper.selectPopItemStockInfo(sBrandId, sWhsId, sLocation, sBarcode);
+        return BarcodeWhsItemInfoResponse.toDTO(entity);
+    }
 
 }

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

@@ -5,6 +5,7 @@ import com.oqpo.api.service.stockmng.StockMngService;
 import com.oqpo.api.web.dto.request.stockmng.*;
 import com.oqpo.api.web.dto.response.GridResponse;
 import com.oqpo.api.web.dto.response.SaveResponse;
+import com.oqpo.api.web.dto.response.stockmng.BarcodeWhsItemInfoResponse;
 import com.oqpo.api.web.dto.response.stockmng.StockMngInfoResponse;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -143,6 +144,44 @@ public class StockMngController {
     }
    */
 
+    /**
+     * 설명 : 창고별 품목 조회 팝업
+     *
+     * @param stockMngGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "창고별 품목 조회 팝업")
+    @PostMapping("/pop-whs-item-grid-list")
+    public ResponseEntity<GridResponse> popWhsItemGridList(@RequestBody @Valid PopWhsItemStockGridRequest popWhsItemStockGridRequest) throws Exception {
+        return ResponseEntity.ok(stockMngService.selectPopItemStockMngGridList(popWhsItemStockGridRequest.getSBrandId(),
+                popWhsItemStockGridRequest.getSWhsId(), popWhsItemStockGridRequest.getSLocation(),
+                popWhsItemStockGridRequest.getSItemNm(), popWhsItemStockGridRequest.toDTO(popWhsItemStockGridRequest)));
+    }
 
+    /**
+     * 설명 : 바코드를 통한 창고 품목 정보조회
+     *
+     * @param brandId
+     * @param whsId
+     * @return
+     * @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 = "sWhsId", value = "창고아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "sLocation", value = "Location", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "sBarcode", value = "바코드", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "바코드를 통한 창고 품목 정보조회")
+    @GetMapping("/info-barcode-stock")
+    public ResponseEntity<BarcodeWhsItemInfoResponse> infoBarcodeStock(@RequestParam(value = "sBrandId") String sBrandId, @RequestParam(value = "sWhsId") String sWhsId,
+                                                                @RequestParam(value = "sLocation") String sLocation, @RequestParam(value = "sBarcode") String sBarcode) throws Exception {
+        return ResponseEntity.ok(stockMngService.selectBarcodeWhsItemMngInfo(sBrandId, sWhsId, sLocation, sBarcode));
+    }
 
 }

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

@@ -0,0 +1,25 @@
+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 PopWhsItemStockGridRequest extends GridRequest {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+    @ApiModelProperty(value = "창고아이디")
+    private String sWhsId;
+    @ApiModelProperty(value = "LOCATION")
+    private String sLocation;
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+    protected PopWhsItemStockGridRequest(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/BarcodeWhsItemInfoResponse.java

@@ -0,0 +1,44 @@
+package com.oqpo.api.web.dto.response.stockmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class BarcodeWhsItemInfoResponse {
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+    @ApiModelProperty(value = "단위")
+    private String unit;
+    @ApiModelProperty(value = "재고수량")
+    private int stckQty;
+    @ApiModelProperty(value = "출고대기수량")
+    private int waitQty;
+
+    public static BarcodeWhsItemInfoResponse toDTO(StckMgntBaseInfoEntity entity) {
+        if (entity == null) return null;
+        return BarcodeWhsItemInfoResponse.builder()
+                .brandId(entity.getBrandId())
+                .brandNm(entity.getBrandNm())
+                .itemId(entity.getItemId())
+                .itemNm(entity.getItemNm())
+                .unit(entity.getUnit())
+                .stckQty(entity.getStckQty())
+                .waitQty(entity.getWaitQty())
+                .build();
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.oqpo.api.web.dto.response.stockmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class PopItemWhsStockListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+    @ApiModelProperty(value = "브랜드명")
+    private String brandNm;
+    @ApiModelProperty(value = "품목아이디")
+    private String itemId;
+    @ApiModelProperty(value = "품목명")
+    private String itemNm;
+    @ApiModelProperty(value = "단위")
+    private String unit;
+    @ApiModelProperty(value = "재고수량-현재고수량")
+    private Integer stckQty;
+    @ApiModelProperty(value = "대기수량")
+    private Integer waitQty;
+}

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

@@ -372,4 +372,61 @@
             #{item.itemId}
         </foreach>
     </select>
+
+
+    <select id="selectPopItemStockMngGridList" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
+        select base.brand_id, fn_brand_nm(base.brand_id) as brand_nm, base.item_id, item.item_nm, base.unit, base.stck_qty, base.wait_qty
+        from  stck_mgnt_base_info base
+            , item_base_info item
+        where base.brand_id = item.brand_id
+        and   base.item_id = item.item_id
+        and   base.brand_id = #{sBrandId}
+        and   base.whs_id = #{sWhsId}
+        and   base.location = #{sLocation}
+        <if test="sItemNm != null and sItemNm != ''">
+        and   (item.item_id like concat('%', #{sItemNm},'%') or item.item_nm like concat('%', #{sItemNm},'%'))
+        </if>
+        <choose>
+            <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
+                <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
+                    <if test="gridRequest.sord == 'asc'.toString()">
+                        ORDER BY item.item_nm ASC
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        ORDER BY item.item_nm DESC
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                ORDER BY item.item_nm ASC
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+
+    </select>
+
+    <select id="selectPopItemStockMngGridCnt" resultType="int">
+        select count(*) as cnt
+        from  stck_mgnt_base_info base
+        , item_base_info item
+        where base.brand_id = item.brand_id
+        and   base.item_id = item.item_id
+        and   base.brand_id = #{sBrandId}
+        and   base.whs_id = #{sWhsId}
+        and   base.location = #{sLocation}
+        <if test="sItemNm != null and sItemNm != ''">
+            and   (item.item_id like concat('%', #{sItemNm},'%') or item.item_nm like concat('%', #{sItemNm},'%'))
+        </if>
+    </select>
+
+    <select id="selectPopItemStockInfo" resultType="com.oqpo.api.entity.stockmng.StckMgntBaseInfoEntity">
+        select base.brand_id, fn_brand_nm(base.brand_id) as brand_nm, base.item_id, item.item_nm, base.unit, base.stck_qty, base.wait_qty
+        from  item_base_info item
+         left outer join stck_mgnt_base_info base on base.brand_id = item.brand_id and base.item_id = item.item_id
+                        and   base.whs_id = #{sWhsId} and   base.location = #{sLocation}
+        where item.brand_id = #{sBrandId}
+        and   item.barcode = #{sBarcode}
+    </select>
 </mapper>