단위 팝업 검색 수정

src/main/java/com/oqpo/api/mapper/stinfo/ItemUnitMapper.java

@@ -22,9 +22,16 @@ public interface ItemUnitMapper {
     List<ItemUnitEntity> selectPopItemBrandUnitGridList(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation, GridRequest gridRequest)throws Exception;
     int selectPopItemBrandUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation)throws Exception;
 
+    List<ItemUnitEntity> selectPopNewItemBrandUnitGridList(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation, GridRequest gridRequest)throws Exception;
+    int selectPopNewItemBrandUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sLocation") String sLocation)throws Exception;
+
     List<ItemUnitEntity> selectPopItemStoreUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, GridRequest gridRequest)throws Exception;
     int selectPopItemStoreUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn)throws Exception;
 
+    List<ItemUnitEntity> selectPopNewItemStoreUnitGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn, GridRequest gridRequest)throws Exception;
+    int selectPopNewItemStoreUnitGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sItemNm") String sItemNm, @Param("sPodrPssblDvsn") String sPodrPssblDvsn)throws Exception;
+
+
     int insertItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
     int updateItemUnitInfo(@Param("userId") String userId, ItemUnitEntity entity) throws Exception;
 

src/main/java/com/oqpo/api/service/stinfo/ItemService.java

@@ -90,6 +90,48 @@ public class ItemService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
+    /*
+      팝업 신규 품목 리스트 조회
+     */
+    public GridResponse selectPopNewItemGridList(String sBrandId,String sStoreId, String sPodrPssblDvsn, String sItemNm, String sSpplyId, String sWhsId, String sLocation, GridRequest gridRequest) throws Exception {
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        int gridRecords = 0 ;
+        int gridTotal = 0;
+        List<ItemUnitEntity> entities =  new ArrayList<ItemUnitEntity>()  ;
+
+        if ("".equals(sStoreId)) {
+            gridRecords = itemUnitMapper.selectPopNewItemBrandUnitGridCnt( sBrandId,sItemNm,  sPodrPssblDvsn, sSpplyId, sWhsId, sLocation );
+            gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+            entities = itemUnitMapper.selectPopNewItemBrandUnitGridList(sBrandId, sItemNm, sPodrPssblDvsn, sSpplyId, sWhsId, sLocation,  gridRequest);
+        } else {
+            gridRecords = itemUnitMapper.selectPopNewItemStoreUnitGridCnt( sBrandId,sStoreId,sItemNm, sPodrPssblDvsn );
+            gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+            entities = itemUnitMapper.selectPopNewItemStoreUnitGridList(sBrandId,sStoreId, sItemNm, sPodrPssblDvsn,  gridRequest);
+        }
+
+        List<Object> gridRows = entities.stream()
+                .map(m -> ItemPopSearchResponse.builder()
+                        .viewCd("R")
+                        .itemId(m.getItemId())
+                        .itemNm(m.getItemNm())
+                        .podrPssblDvsn(m.getPodrPssblDvsn())
+                        .podrPssblDvsnNm(m.getPodrPssblDvsnNm())
+                        .unit(m.getUnit())
+                        .unitNm(m.getUnitNm())
+                        .unitAmt(m.getUnitAmt())
+                        .stddQty(m.getStddQty())
+                        .unitGubun(m.getUnitGubun())
+                        .spplyId(m.getSpplyId())
+                        .brandUnitUnqNo(m.getBrandUnitUnqNo())
+                        .storeUnitUnqNo(m.getStoreUnitUnqNo() == null ? "" : m.getStoreUnitUnqNo())
+                        .whsPassQty(m.getWhsPassQty() == null ? 0 : m.getWhsPassQty())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
     /*
       품목 그리드 리스트 조회
      */

src/main/java/com/oqpo/api/web/controller/stinfo/ItemController.java

@@ -50,6 +50,22 @@ public class ItemController {
         return ResponseEntity.ok(itemService.selectPopItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(), itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(), itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)) );
     }
 
+    /**
+     * 설명 : 품목 신규팝업 그리드 리스트
+     *
+     * @param ItemPopGridRequest
+     * @return
+     * @throws Exception
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 품목 신규 팝업 그리드 리스트")
+    @PostMapping("/pop-new-grid-list")
+    public ResponseEntity<GridResponse> selectPopNewItemGridList( @RequestBody @Valid ItemPopGridRequest itemPopGridRequest) throws Exception {
+        return ResponseEntity.ok(itemService.selectPopNewItemGridList(itemPopGridRequest.getSBrandId(), itemPopGridRequest.getSStoreId(), itemPopGridRequest.getSPodrPssblDvsn(), itemPopGridRequest.getSItemNm(), itemPopGridRequest.getSSpplyId(), itemPopGridRequest.getSWhsId(), itemPopGridRequest.getSLocation(), itemPopGridRequest.toDTO(itemPopGridRequest)) );
+    }
+
     /**
      * 설명 : 품목 그리드 리스트
      *

src/main/resources/mybatis/sqlmaps/stinfo/ItemUnit.xml

@@ -262,6 +262,73 @@
         </if>
     </select>
 
+
+    <select id="selectPopNewItemBrandUnitGridList" resultType="com.oqpo.api.entity.stinfo.ItemUnitEntity">
+        select  /* selectPopNewItemBrandUnitGridList */
+        iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
+        ,iInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', iInfo.unit) as unit_nm, bInfo.stdd_qty, bInfo.unit_amt, bInfo.brand_unit_unq_no
+        ,'B' as unit_gubun, bInfo.spply_id
+        <if test="sWhsId == null or sWhsId == '' or sLocation = null or sLocation == ''">
+            ,0 as whs_pass_qty
+        </if>
+        <if test="sWhsId != null and sWhsId != '' and sLocation != null and sLocation != ''">
+            , nvl((stck.stck_qty - stck.wait_qty),0) as whs_pass_qty
+        </if>
+        from item_base_info iInfo
+        left outer join brand_item_unit_info bInfo on iInfo.brand_id = bInfo.brand_id and iInfo.item_id = bInfo.item_id and date_format(now(),'%Y%m%d') between bInfo.cont_stt_dt and bInfo.cont_end_dt
+        <if test="sSpplyId != null and sSpplyId != '' ">
+            and bInfo.spply_id = #{sSpplyId}
+        </if>
+
+        <if test="sWhsId != null and sWhsId != '' and sLocation != null and sLocation != ''">
+            left outer join stck_mgnt_base_info stck on stck.brand_id = iInfo.brand_id and stck.item_id = iInfo.item_id and whs_id = #{sWhsId} and location = #{sLocation}
+        </if>
+        where iInfo.brand_id = #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </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 iInfo.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by iInfo.item_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by iInfo.item_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectPopNewItemBrandUnitGridCnt" resultType="int">
+        select  /* selectPopNewItemBrandUnitGridCnt */
+        count(*)
+        from item_base_info iInfo
+        left outer join brand_item_unit_info bInfo on iInfo.brand_id = bInfo.brand_id and iInfo.item_id = bInfo.item_id and date_format(now(),'%Y%m%d') between bInfo.cont_stt_dt and bInfo.cont_end_dt
+        <if test="sSpplyId != null and sSpplyId != '' ">
+            and bInfo.spply_id = #{sSpplyId}
+        </if>
+        where iInfo.brand_id = #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </if>
+    </select>
+
     <select id="selectPopItemStoreUnitGridList" resultType="com.oqpo.api.entity.stinfo.ItemUnitEntity">
         select  /* selectPopItemStoreUnitGridList */
                 iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
@@ -319,4 +386,61 @@
         </if>
     </select>
 
+    <select id="selectPopNewItemStoreUnitGridList" resultType="com.oqpo.api.entity.stinfo.ItemUnitEntity">
+        select  /* selectPopNewItemStoreUnitGridList */
+        iInfo.item_id,iInfo.item_nm,iInfo.podr_pssbl_dvsn, fn_code_nm('PODR_PSSBL_DVSN',iInfo.podr_pssbl_dvsn) AS podr_pssbl_dvsn_nm
+        ,iInfo.unit, fn_code_nm('DSTRBT_COST_UNIT', iInfo.unit) as unit_nm, sInfo.stdd_qty, sInfo.unit_amt, sInfo.store_unit_unq_no
+        ,'S' as unit_gubun, sInfo.brand_unit_unq_no
+        , 0 as whs_pass_qty, '' as spply_id
+        from item_base_info iInfo
+        join store_base_info store on iInfo.brand_id = store.brand_id   and store.store_id = #{sStoreId}
+        join store_item_unit_info sInfo on iInfo.brand_id = sInfo.brand_id and iInfo.item_id = sInfo.item_id and sInfo.unit_target_cd = 'Y'
+        and store.store_id = sInfo.store_id  and sInfo.store_id =  #{sStoreId}
+        and date_format(now(),'%Y%m%d') between sInfo.cont_stt_dt and sInfo.cont_end_dt
+        where iInfo.brand_id =  #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </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 iInfo.item_nm asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by iInfo.item_nm desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by iInfo.item_nm asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectPopNewItemStoreUnitGridCnt" resultType="int">
+        select  /* selectPopNewItemStoreUnitGridCnt */
+        count(*)
+        from item_base_info iInfo
+        join store_base_info store on iInfo.brand_id = store.brand_id   and store.store_id = #{sStoreId}
+        join store_item_unit_info sInfo on iInfo.brand_id = sInfo.brand_id and iInfo.item_id = sInfo.item_id and sInfo.unit_target_cd = 'Y'
+        and store.store_id = sInfo.store_id  and sInfo.store_id =  #{sStoreId}
+        and date_format(now(),'%Y%m%d') between sInfo.cont_stt_dt and sInfo.cont_end_dt
+        where iInfo.brand_id =  #{sBrandId}
+        AND   iInfo.item_st_cd = 'IS00'
+        <if test="sItemNm != null and sItemNm != ''">
+            and  (iInfo.item_nm like concat('%',#{sItemNm},'%') or iInfo.item_id like concat('%',#{sItemNm},'%'))
+        </if>
+        <if test="sPodrPssblDvsn != null and sPodrPssblDvsn != ''">
+            and   iInfo.podr_pssbl_dvsn = #{sPodrPssblDvsn}
+        </if>
+    </select>
+
 </mapper>