매장발주 생성 검색조건 추가 및 창고는 운영중 창고만 출력되어지도록 함

src/main/java/com/oqpo/api/mapper/pomng/PchReqMapper.java

@@ -36,8 +36,8 @@ public interface PchReqMapper {
 
     PchReqBaseInfoEntity selectSumReqAmt(@Param("pchReqUnqNo") String pchReqUnqNo) throws Exception;
 
-    List<PchReqBaseInfoEntity> selectPchReqPoTargetGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm ,  GridRequest gridRequest)throws Exception;
-    int selectPchReqPoTargetGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm )throws Exception;
+    List<PchReqBaseInfoEntity> selectPchReqPoTargetGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm , @Param("sDlvDvsn") String sDlvDvsn , GridRequest gridRequest)throws Exception;
+    int selectPchReqPoTargetGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId , @Param("sWhsId") String sWhsId , @Param("sItemNm") String sItemNm, @Param("sDlvDvsn") String sDlvDvsn )throws Exception;
 
     List<PchReqDtlPtclEntity> selectPchRejectPrTargetList(@Param("pchReqUnqNo") String pchReqUnqNo) ;
 

src/main/java/com/oqpo/api/service/pomng/PchReqService.java

@@ -401,16 +401,16 @@ public class PchReqService extends CommonService {
     /*
       구매요청 그리드 리스트 조회
      */
-    public GridResponse selectPchReqPoTargetGridList(String sBrandId, String fromDt, String toDt, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectPchReqPoTargetGridList(String sBrandId, String fromDt, String toDt, String sSpplyId, String sWhsId, String sItemNm , String sDlvDvsn, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = pchReqMapper.selectPchReqPoTargetGridCnt( sBrandId,fromDt,  toDt, sSpplyId, sWhsId, sItemNm );
+        int gridRecords = pchReqMapper.selectPchReqPoTargetGridCnt( sBrandId,fromDt,  toDt, sSpplyId, sWhsId, sItemNm , sDlvDvsn);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<PchReqBaseInfoEntity> entities = pchReqMapper.selectPchReqPoTargetGridList( sBrandId,fromDt,  toDt, sSpplyId, sWhsId, sItemNm, gridRequest);
+        List<PchReqBaseInfoEntity> entities = pchReqMapper.selectPchReqPoTargetGridList( sBrandId,fromDt,  toDt, sSpplyId, sWhsId, sItemNm, sDlvDvsn, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> PchReqPoTargetSearchListResponse.builder()
                         .viewCd("R")

src/main/java/com/oqpo/api/web/controller/pomng/PchReqController.java

@@ -124,7 +124,7 @@ public class PchReqController {
     @ApiOperation(value = " 구매발주 대상 그리드 리스트")
     @PostMapping("/po-target-grid-list")
     public ResponseEntity<GridResponse> detailPoGridList(@RequestBody @Valid PchReqPoTargetSearchGridRequest pchReqPoTargetSearchGridRequest) throws Exception {
-        return ResponseEntity.ok(pchReqService.selectPchReqPoTargetGridList(pchReqPoTargetSearchGridRequest.getSBrandId(), pchReqPoTargetSearchGridRequest.getFromDt(), pchReqPoTargetSearchGridRequest.getToDt(), pchReqPoTargetSearchGridRequest.getSSpplyId(), pchReqPoTargetSearchGridRequest.getSWhsId(), pchReqPoTargetSearchGridRequest.getSItemNm(),  pchReqPoTargetSearchGridRequest.toDTO(pchReqPoTargetSearchGridRequest)));
+        return ResponseEntity.ok(pchReqService.selectPchReqPoTargetGridList(pchReqPoTargetSearchGridRequest.getSBrandId(), pchReqPoTargetSearchGridRequest.getFromDt(), pchReqPoTargetSearchGridRequest.getToDt(), pchReqPoTargetSearchGridRequest.getSSpplyId(), pchReqPoTargetSearchGridRequest.getSWhsId(), pchReqPoTargetSearchGridRequest.getSItemNm(),  pchReqPoTargetSearchGridRequest.getSDlvDvsn(), pchReqPoTargetSearchGridRequest.toDTO(pchReqPoTargetSearchGridRequest)));
     }
 
 

src/main/java/com/oqpo/api/web/dto/request/pomng/pchReq/PchReqPoTargetSearchGridRequest.java

@@ -33,6 +33,9 @@ public class PchReqPoTargetSearchGridRequest extends GridRequest {
     @ApiModelProperty(value = "품목명")
     private String sItemNm;
 
+    @ApiModelProperty(value = "배송구분")
+    private String sDlvDvsn;
+
 
 
     protected PchReqPoTargetSearchGridRequest(Integer gridSize, Integer gridPage, String sidx, String sord, Boolean pagingYn, Integer gridFirst) {

src/main/resources/mybatis/sqlmaps/pomng/PchReq.xml

@@ -240,6 +240,14 @@
         <if test="sItemNm != null and sItemNm != ''">
         and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
+        <if test="sDlvDvsn == 'DL01'">
+            and base.store_id is not null  and base.store_id <![CDATA[ <> ]]> ''
+            and item.store_deli_type = '10'
+        </if>
+        <if test="sDlvDvsn == 'DL02'">
+            and (( (base.store_id is null or base.store_id = '') and item.store_deli_type in ('10', '20'))
+            or (base.store_id is not null and base.store_id  <![CDATA[ <> ]]> '' and item.store_deli_type = '20' ) )
+        </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
                 <if test="gridRequest.sidx == 'VIEW_NUM'.toString()">
@@ -284,6 +292,14 @@
         <if test="sItemNm != null and sItemNm != ''">
             and (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
+        <if test="sDlvDvsn == 'DL01'">
+            and base.store_id is not null  and base.store_id <![CDATA[ <> ]]> ''
+            and item.store_deli_type = '10'
+        </if>
+        <if test="sDlvDvsn == 'DL02'">
+            and (( (base.store_id is null or base.store_id = '') and item.store_deli_type in ('10', '20'))
+            or (base.store_id is not null and base.store_id  <![CDATA[ <> ]]> '' and item.store_deli_type = '20' ) )
+        </if>
     </select>
 
     <select id="selectPchRejectPrTargetList" resultType="com.oqpo.api.entity.pomng.PchReqDtlPtclEntity">

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

@@ -265,7 +265,8 @@
                 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 1=1 -- whsInfo.whs_st_cd = 'W001'
+        where 1=1
+        and  whsInfo.whs_st_cd = 'W001'
         and   whsInfo.brand_id = #{sBrandId}
         <if test="sWhsDvsn != null and sWhsDvsn != ''">
         and   whsInfo.whs_dvsn = #{sWhsDvsn}