반품현황 쿼리 반품발주번호 추가

src/main/java/com/oqpo/api/mapper/inoutmng/ColOdrMapper.java

@@ -54,8 +54,8 @@ public interface ColOdrMapper {
 
     int insertRtnProcInfoPtcl(@Param("userId") String userId, List<RtnProcInfoPtclEntity> gridInsertData) throws Exception;
 
-    List<PickInfoMgntEntity> selectColRtnInstResultGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sColPickUnqNo") String sColPickUnqNo,  @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
-    int selectColRtnInstResultGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sColPickUnqNo") String sColPickUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm) throws Exception;
+    List<PickInfoMgntEntity> selectColRtnInstResultGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sColPickUnqNo") String sColPickUnqNo, @Param("sRtnPodrUnqNo") String sRtnPodrUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectColRtnInstResultGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sColPickUnqNo") String sColPickUnqNo, @Param("sRtnPodrUnqNo") String sRtnPodrUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm) throws Exception;
 
     List<PickInfoMgntEntity> selectColRtnInstProcList(@Param("brandId") String brandId, @Param("whsId") String whsId,List<RtnProcInfoPtclEntity> gridUpdateData )throws Exception;
 

src/main/java/com/oqpo/api/service/inoutmng/ColOdrService.java

@@ -1092,16 +1092,16 @@ public class ColOdrService extends CommonService {
     /*
       반품처리현황 그리드 리스트 조회
  */
-    public GridResponse selectRtnStockResultList(String sBrandId, String sStoreId, String sColPickUnqNo, String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectRtnStockResultList(String sBrandId, String sStoreId, String sColPickUnqNo, String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, String sRtnPodrUnqNo, 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 = colOdrMapper.selectColRtnInstResultGridCnt(sBrandId, sStoreId,sColPickUnqNo,  fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
+        int gridRecords = colOdrMapper.selectColRtnInstResultGridCnt(sBrandId, sStoreId,sColPickUnqNo, sRtnPodrUnqNo,  fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstResultGridList(sBrandId, sStoreId, sColPickUnqNo, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
+        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstResultGridList(sBrandId, sStoreId, sColPickUnqNo, sRtnPodrUnqNo, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> RtnColStockResultResponse.builder()
                         .viewCd("R")

src/main/java/com/oqpo/api/web/dto/request/inoutmng/RtnStockResultGridRequest.java

@@ -22,6 +22,9 @@ public class RtnStockResultGridRequest extends GridRequest {
     @ApiModelProperty(value = "수거서번호")
     private String sColPickUnqNo;
 
+    @ApiModelProperty(value = "반품발주번호")
+    private String sRtnPodrUnqNo;
+
     @NotBlank
     @ApiModelProperty(value = "시작일자")
     private String fromDt;

src/main/resources/mybatis/sqlmaps/inoutmng/ColOdr.xml

@@ -707,6 +707,9 @@
         <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
             and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
         </if>
+        <if test="sRtnPodrUnqNo != null and sRtnPodrUnqNo != ''">
+            and   base.rtn_podr_unq_no = #{sRtnPodrUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
             and   mgnt.whs_id = #{sRtnWhsId}
         </if>
@@ -757,6 +760,9 @@
         <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
             and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
         </if>
+        <if test="sRtnPodrUnqNo != null and sRtnPodrUnqNo != ''">
+            and   base.rtn_podr_unq_no = #{sRtnPodrUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
             and   mgnt.whs_id = #{sRtnWhsId}
         </if>