수거관련 처리

src/main/java/com/oqpo/api/entity/inoutmng/PickDtlPtclEntity.java

@@ -41,6 +41,7 @@ public class PickDtlPtclEntity implements Serializable {
     private String rtnRsnDvsn;
     private String rtnRsnDvsnNm;
     private String rtnRsn;
+    private Long colReqAmt;
 
 
 }

src/main/java/com/oqpo/api/entity/rtnmng/RtnOdrBaseInfoEntity.java

@@ -53,6 +53,7 @@ public class RtnOdrBaseInfoEntity implements Serializable {
     private String sysChgDttm;
     private String sysChgId;
     private String pickTelNo;
+
     private RtnOdrDtlPtclEntity rtnOdrDtlInfo ;
 
 }

src/main/java/com/oqpo/api/enums/SystemMessageCode.java

@@ -28,6 +28,7 @@ public enum SystemMessageCode {
     REJECT_OK (20022, "반려 되었습니다.", HttpStatus.OK),
     RTN_REQ_OK (20023, "반품요청 되었습니다.", HttpStatus.OK),
     CANCEL_OK (20024, "취소 되었습니다.", HttpStatus.OK),
+    COL_OK (20025, "수거지시 처리되었습니다.", HttpStatus.OK),
     ERR_PW(40001, "현재의 비밀번호가 틀립니다. ", HttpStatus.BAD_REQUEST),
     ERR_FIND_ID(40002, "입력하신  정보로 등록된 아이디가 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_FIND_PW(40003, "입력하신  정보로 등록된 아이디가 없습니다.", HttpStatus.BAD_REQUEST),

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

@@ -21,6 +21,9 @@ public interface ColOdrMapper {
     List<RtnOdrBaseInfoEntity> selectColTargetRtnGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
     int selectColTargetRtnGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sItemNm") String sItemNm )throws Exception;
 
+
+    List<RtnOdrBaseInfoEntity> selectColInstRtnGridList(@Param("brandId") String brandId, List<RtnOdrDtlPtclEntity> gridUpdateData, GridRequest gridRequest)throws Exception;
+
     List<RtnOdrBaseInfoEntity> selectPickJobDataList(@Param("brandId") String brandId, List<RtnOdrDtlPtclEntity> gridInsertData)throws Exception;
 
     int insertColOdrBase(@Param("userId") String userId, ColOdrBaseEntity entity)throws Exception;
@@ -49,6 +52,11 @@ 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("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("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<PchOdrBaseInfoEntity> selectShmtTargetOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
     int selectShmtTargetOdrGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm)throws Exception;

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

@@ -76,7 +76,7 @@ public class ColOdrService extends CommonService {
     /*
       수거 대상 그리드 리스트 조회
      */
-    public GridResponse selectShmtTargetOdrGridList(String sBrandId, String fromDt, String toDt, String sWhsId, String sRtnWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectColTargetOdrGridList(String sBrandId, String fromDt, String toDt, String sWhsId, String sRtnWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
@@ -99,13 +99,54 @@ public class ColOdrService extends CommonService {
                         .itemNm(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getItemNm() == null ? "" : m.getRtnOdrDtlInfo().getItemNm())
                         .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
                         .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
-                        .rntWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
+                        .rntWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm() + " - " + m.getRtnLocationNm())
                         .whsId(m.getWhsId() == null ? "" : m.getWhsId())
                         .location(m.getLocation() == null ? "" : m.getLocation())
-                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
                         .unitAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt())
                         .rtnReqQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnReqQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnReqQty())
-                        .rtnQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnQty())
+                        .rtnOdrQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty())
+                        .rtnAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt())
+                        .colReqDt(m.getColReqDt() == null ? "" : m.getColReqDt())
+                        .storeId(m.getStoreId() == null ? "" : m.getStoreId())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
+
+    /*
+      수거지시 초기 그리드 리스트 조회
+*/
+    public GridResponse selectColInstOdrGridList(String sBrandId, InstInitColOdrRequest instInitColOdrRequest, GridRequest gridRequest) throws Exception {
+
+        int gridPage = gridRequest.getGridPage();
+        int gridSize = gridRequest.getGridSize();
+
+        List<RtnOdrBaseInfoEntity> entities = colOdrMapper.selectColInstRtnGridList(sBrandId,instInitColOdrRequest.toCodeEntities(instInitColOdrRequest.getGridUpdateData()), gridRequest);
+
+        int gridRecords = entities.size();
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+
+        List<Object> gridRows = entities.stream()
+                .map(m -> ColInstInitOdrSearchListResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .rtnPodrUnqNo(m.getRtnPodrUnqNo() == null ? "" : m.getRtnPodrUnqNo())
+                        .rtnPodrDtlNo(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getRtnPodrDtlNo() == null ? "" : m.getRtnOdrDtlInfo().getRtnPodrDtlNo())
+                        .rtnReqUnqNo(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getRtnReqUnqNo() == null ? "" : m.getRtnOdrDtlInfo().getRtnReqUnqNo())
+                        .rtnReqDtlNo(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getRtnReqDtlNo() == null ? "" : m.getRtnOdrDtlInfo().getRtnReqDtlNo())
+                        .itemId(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getItemId() == null ? "" : m.getRtnOdrDtlInfo().getItemId())
+                        .itemNm(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getItemNm() == null ? "" : m.getRtnOdrDtlInfo().getItemNm())
+                        .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
+                        .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
+                        .rntWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm() + " - " + m.getRtnLocationNm())
+                        .whsId(m.getWhsId() == null ? "" : m.getWhsId())
+                        .location(m.getLocation() == null ? "" : m.getLocation())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
+                        .unitAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt())
+                        .colQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getColQty() == null ? 0 : m.getRtnOdrDtlInfo().getColQty())
+                        .rtnOdrQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty())
                         .rtnAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt())
                         .colReqDt(m.getColReqDt() == null ? "" : m.getColReqDt())
                         .storeId(m.getStoreId() == null ? "" : m.getStoreId())
@@ -122,8 +163,6 @@ public class ColOdrService extends CommonService {
         try {
 
             List<RtnOdrDtlPtclEntity> gridInsertData = instColOdrRequest.toCodeEntities(instColOdrRequest.getGridInsertData());
-
-
             List<RtnOdrBaseInfoEntity> jobList = colOdrMapper.selectPickJobDataList(instColOdrRequest.getBrandId(), gridInsertData);
 
             String whsId = "";
@@ -205,8 +244,8 @@ public class ColOdrService extends CommonService {
                     pickDtlEntity.setUnit(entity.getRtnOdrDtlInfo().getUnit());
                     pickDtlEntity.setUnitAmt(entity.getRtnOdrDtlInfo().getUnitAmt());
                     pickDtlEntity.setRodrQty(entity.getRtnOdrDtlInfo().getRtnOdrQty());
-                    pickDtlEntity.setColQty(colQty);
-                    pickDtlEntity.setColAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
+                    pickDtlEntity.setColReqQty(colQty);
+                    pickDtlEntity.setColReqAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
 
                     pickDtlList.add(pickDtlEntity);
 
@@ -251,8 +290,8 @@ public class ColOdrService extends CommonService {
                     colOdrBaseEntity.setColPickUnqNo(colPickUnqNo);
                     colOdrBaseEntity.setItemQty(itemQty);
                     colOdrBaseEntity.setColTotalAmt(colTotalAmt);
-                    colOdrBaseEntity.setColReqDt(instColOdrRequest.getColSchDt().replaceAll("//.",""));
-                    colOdrBaseEntity.setColDvsn("C001");
+                    colOdrBaseEntity.setColReqDt(instColOdrRequest.getColSchDt().replaceAll("\\.",""));
+                    colOdrBaseEntity.setColDvsn(entity.getColDvsn());
                     colOdrBaseEntity.setColCmdStCd("COL1");
                     colOdrBaseEntity.setColReqMgrNm(entity.getRtnMgrNm());
                     colOdrBaseEntity.setColReqMgrId(entity.getRtnMgrId());
@@ -260,7 +299,7 @@ public class ColOdrService extends CommonService {
                     colOdrBaseEntity.setColCnfmNm(null);
                     colOdrBaseEntity.setColCnfmId(null);
                     colOdrBaseEntity.setColMgrNm(instColOdrRequest.getPickMgrNm());
-                    colOdrBaseEntity.setColMgrTelNo(instColOdrRequest.getPickMgrTelNo());
+                    colOdrBaseEntity.setColMgrTelNo(instColOdrRequest.getPickMgrTelNo().replaceAll("-",""));
                     colOdrBaseEntity.setColMgrEmal(null);
                     colOdrBaseEntity.setColMgrMblNo(null);
                     colOdrBaseEntity.setRtnWhsId(entity.getRtnWhsId());
@@ -283,28 +322,30 @@ public class ColOdrService extends CommonService {
                     colDtlEntity.setRtnPodrDtlNo(entity.getRtnOdrDtlInfo().getRtnPodrDtlNo());
                     colDtlEntity.setRtnReqUnqNo(entity.getRtnOdrDtlInfo().getRtnReqUnqNo());
                     colDtlEntity.setRtnReqDtlNo(entity.getRtnOdrDtlInfo().getRtnReqDtlNo());
-
+                    colDtlList.add(colDtlEntity);
 
                     pickInfoMgntEntity.setColPickUnqNo(colPickUnqNo);
                     pickInfoMgntEntity.setSpplyId(entity.getSpplyId());
                     pickInfoMgntEntity.setSpplyNm(entity.getSpplyNm());
                     pickInfoMgntEntity.setStoreId(entity.getStoreId());
                     pickInfoMgntEntity.setColTotAmt(colTotalAmt);
+                    pickInfoMgntEntity.setColDvsn(entity.getColDvsn());
                     pickInfoMgntEntity.setPickMgrNm(instColOdrRequest.getPickMgrNm());
                     pickInfoMgntEntity.setPickMgrTelNo(instColOdrRequest.getPickMgrTelNo().replaceAll("-",""));
                     pickInfoMgntEntity.setPndrTelNo(entity.getPickTelNo().replaceAll("-",""));
                     pickInfoMgntEntity.setPickStCd("PICK0");
-                    pickInfoMgntEntity.setColReqDt(instColOdrRequest.getColSchDt().replaceAll("-",""));
-                    pickInfoMgntEntity.setColSchDt(instColOdrRequest.getColSchDt().replaceAll("-",""));
+                    pickInfoMgntEntity.setColReqDt(instColOdrRequest.getColSchDt().replaceAll("\\.",""));
+                    pickInfoMgntEntity.setColSchDt(instColOdrRequest.getColSchDt().replaceAll("\\.",""));
                     pickInfoMgntEntity.setColCmpltDt(null);
-                    pickInfoMgntEntity.setWhsId(entity.getWhsId());
-                    pickInfoMgntEntity.setLocation(entity.getLocation());
-                    pickInfoMgntEntity.setColDvsn(entity.getColDvsn());
+                    pickInfoMgntEntity.setWhsId(entity.getRtnWhsId());
+                    pickInfoMgntEntity.setLocation(entity.getRtnLocation());
+                    //pickInfoMgntEntity.setColDvsn(entity.getColDvsn());
                     pickInfoMgntEntity.setWhsDvsn(entity.getColDvsn() == "C001" ? "W02" : "W01");  // 본사엣 수거면 매장,,, 공급사에서 수거면 본사
                     pickInfoMgntEntity.setBrandId(entity.getBrandId());
                     pickInfoMgntEntity.setColDesc(null);
 
 
+
                     pickDtlEntity.setColPickUnqNo(colPickUnqNo);
 
                     pickDtlEntity.setColPickDtlNo("10");
@@ -319,8 +360,8 @@ public class ColOdrService extends CommonService {
                     pickDtlEntity.setUnit(entity.getRtnOdrDtlInfo().getUnit());
                     pickDtlEntity.setUnitAmt(entity.getRtnOdrDtlInfo().getUnitAmt());
                     pickDtlEntity.setRodrQty(entity.getRtnOdrDtlInfo().getRtnOdrQty());
-                    pickDtlEntity.setColQty(colQty);
-                    pickDtlEntity.setColAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
+                    pickDtlEntity.setColReqQty(colQty);
+                    pickDtlEntity.setColReqAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
 
                     pickDtlList.add(pickDtlEntity);
                 }
@@ -486,11 +527,11 @@ public class ColOdrService extends CommonService {
                         .itemId(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getItemId() == null ? "" : m.getRtnOdrDtlInfo().getItemId())
                         .itemNm(m.getRtnOdrDtlInfo() == null ? "" : m.getRtnOdrDtlInfo().getItemNm() == null ? "" : m.getRtnOdrDtlInfo().getItemNm())
                         .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
-                        .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
+                        .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm() + " - " + m.getRtnLocationNm())
                         .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
                         .unitAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt() == null ? 0 : m.getRtnOdrDtlInfo().getUnitAmt())
-                        .rtnQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnQty())
-                        .rtnAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt() == null ? 0 : m.getRtnOdrDtlInfo().getRtnAmt())
+                        .rtnOdrQty(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrQty())
+                        .rtnOdrAmt(m.getRtnOdrDtlInfo() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrAmt() == null ? 0 : m.getRtnOdrDtlInfo().getRtnOdrAmt())
                         .colReqDt(m.getColReqDt() == null ? "" : m.getColReqDt())
                         .build())
                 .collect(Collectors.toList());
@@ -548,11 +589,11 @@ public class ColOdrService extends CommonService {
                     pickInfoMgntEntity.setPickMgrTelNo(saveSpplyPickRequest.getPickMgrTelNo().replaceAll("-",""));
                     pickInfoMgntEntity.setPndrTelNo(entity.getPickTelNo().replaceAll("-",""));
                     pickInfoMgntEntity.setPickStCd("PICK0");
-                    pickInfoMgntEntity.setColReqDt(saveSpplyPickRequest.getColSchDt().replaceAll("-",""));
-                    pickInfoMgntEntity.setColSchDt(saveSpplyPickRequest.getColSchDt().replaceAll("-",""));
+                    pickInfoMgntEntity.setColReqDt(saveSpplyPickRequest.getColSchDt().replaceAll("\\.",""));
+                    pickInfoMgntEntity.setColSchDt(saveSpplyPickRequest.getColSchDt().replaceAll("\\.",""));
                     pickInfoMgntEntity.setColCmpltDt(null);
-                    pickInfoMgntEntity.setWhsId(entity.getWhsId());
-                    pickInfoMgntEntity.setLocation(entity.getLocation());
+                    pickInfoMgntEntity.setWhsId(entity.getRtnWhsId());
+                    pickInfoMgntEntity.setLocation(entity.getRtnLocation());
                     pickInfoMgntEntity.setColDvsn(entity.getColDvsn());
                     pickInfoMgntEntity.setWhsDvsn(entity.getColDvsn() == "C001" ? "W02" : "W01");  // 본사엣 수거면 매장,,, 공급사에서 수거면 본사
                     pickInfoMgntEntity.setBrandId(entity.getBrandId());
@@ -567,40 +608,40 @@ public class ColOdrService extends CommonService {
                     pickDtlEntity.setRtnReqUnqNo(entity.getRtnOdrDtlInfo().getRtnReqUnqNo());
                     pickDtlEntity.setRtnReqDtlNo(entity.getRtnOdrDtlInfo().getRtnReqDtlNo());
                     pickDtlEntity.setColCmdUnqNo(null);
-                    pickDtlEntity.setColCmdDtlNo("10");
+                    pickDtlEntity.setColCmdDtlNo(null);
                     pickDtlEntity.setItemId(entity.getRtnOdrDtlInfo().getItemId());
                     pickDtlEntity.setItemNm(entity.getRtnOdrDtlInfo().getItemNm());
                     pickDtlEntity.setUnit(entity.getRtnOdrDtlInfo().getUnit());
                     pickDtlEntity.setUnitAmt(entity.getRtnOdrDtlInfo().getUnitAmt());
                     pickDtlEntity.setRodrQty(entity.getRtnOdrDtlInfo().getRtnOdrQty());
-                    pickDtlEntity.setColQty(colQty);
+                    pickDtlEntity.setColReqQty(colQty);
                     colTotalAmt = colQty * entity.getRtnOdrDtlInfo().getUnitAmt();
-                    pickDtlEntity.setColAmt(colTotalAmt);
+                    pickDtlEntity.setColReqAmt(colTotalAmt);
 
                     pickDtlList.add(pickDtlEntity);
-                }
+                } else {
+
+                    int dtlNo = (i + 1) * 10;
 
-                int dtlNo = (i+1) * 10;
-
-                PickDtlPtclEntity pickDtlEntity = new PickDtlPtclEntity();
-                pickDtlEntity.setColPickUnqNo(colPickUnqNo);
-
-                pickDtlEntity.setColPickDtlNo("10");
-                pickDtlEntity.setRtnPodrUnqNo(entity.getRtnPodrUnqNo());
-                pickDtlEntity.setRtnPodrDtlNo(entity.getRtnOdrDtlInfo().getRtnPodrDtlNo());
-                pickDtlEntity.setRtnReqUnqNo(entity.getRtnOdrDtlInfo().getRtnReqUnqNo());
-                pickDtlEntity.setRtnReqDtlNo(entity.getRtnOdrDtlInfo().getRtnReqDtlNo());
-                pickDtlEntity.setColCmdUnqNo(null);
-                pickDtlEntity.setColCmdDtlNo("10");
-                pickDtlEntity.setItemId(entity.getRtnOdrDtlInfo().getItemId());
-                pickDtlEntity.setItemNm(entity.getRtnOdrDtlInfo().getItemNm());
-                pickDtlEntity.setUnit(entity.getRtnOdrDtlInfo().getUnit());
-                pickDtlEntity.setUnitAmt(entity.getRtnOdrDtlInfo().getUnitAmt());
-                pickDtlEntity.setRodrQty(entity.getRtnOdrDtlInfo().getRtnOdrQty());
-                pickDtlEntity.setColQty(colQty);
-                pickDtlEntity.setColAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
-                colTotalAmt = colTotalAmt + (colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
-                pickDtlList.add(pickDtlEntity);
+                    PickDtlPtclEntity pickDtlEntity = new PickDtlPtclEntity();
+                    pickDtlEntity.setColPickUnqNo(colPickUnqNo);
+
+                    pickDtlEntity.setColPickDtlNo(Integer.toString(dtlNo));
+                    pickDtlEntity.setRtnPodrUnqNo(entity.getRtnPodrUnqNo());
+                    pickDtlEntity.setRtnPodrDtlNo(entity.getRtnOdrDtlInfo().getRtnPodrDtlNo());
+                    pickDtlEntity.setRtnReqUnqNo(entity.getRtnOdrDtlInfo().getRtnReqUnqNo());
+                    pickDtlEntity.setRtnReqDtlNo(entity.getRtnOdrDtlInfo().getRtnReqDtlNo());
+                    pickDtlEntity.setColCmdUnqNo(null);
+                    pickDtlEntity.setColCmdDtlNo(null);
+                    pickDtlEntity.setItemId(entity.getRtnOdrDtlInfo().getItemId());
+                    pickDtlEntity.setItemNm(entity.getRtnOdrDtlInfo().getItemNm());
+                    pickDtlEntity.setUnit(entity.getRtnOdrDtlInfo().getUnit());
+                    pickDtlEntity.setUnitAmt(entity.getRtnOdrDtlInfo().getUnitAmt());
+                    pickDtlEntity.setRodrQty(entity.getRtnOdrDtlInfo().getRtnOdrQty());
+                    pickDtlEntity.setColReqQty(colQty);
+                    pickDtlEntity.setColReqAmt(colQty * entity.getRtnOdrDtlInfo().getUnitAmt());
+                    pickDtlList.add(pickDtlEntity);
+                }
 
             }
 
@@ -636,51 +677,6 @@ public class ColOdrService extends CommonService {
     }
 
 
-    /*
-      납품서 현황 그리드 리스트 조회
-
-    public GridResponse selectDeliGridList(String sBrandId, String dtGubun,  String fromDt, String toDt, String sDlvStCd, String sSpplyId, String sWhsId, String sItemNm, 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 = shmtOdrMapper.selectDeliGridCnt(sBrandId, dtGubun, fromDt, toDt, sDlvStCd, sSpplyId, sWhsId, sItemNm);
-        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<DeliInfoMgntEntity> entities = shmtOdrMapper.selectDeliGridList(sBrandId, dtGubun, fromDt, toDt, sDlvStCd, sSpplyId, sWhsId, sItemNm, gridRequest);
-        List<Object> gridRows = entities.stream()
-                .map(m -> DeliDtlSearchListResponse.builder()
-                        .viewCd("R")
-                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
-                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
-                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
-                        .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
-                        .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
-                        .dlvStCd(m.getDlvStCd() == null ? "" : m.getDlvStCd())
-                        .dlvStNm(m.getDlvStNm() == null ? "" : m.getDlvStNm())
-                        .whsId(m.getWhsId() == null ? "" :m.getWhsId())
-                        .location(m.getLocation() == null ? "" : m.getLocation())
-                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
-                        .podrRegDt(m.getPodrRegDt() == null ? "" : m.getPodrRegDt())
-                        .dlvRegDt(m.getDlvRegDt() == null ? "" : m.getDlvRegDt())
-                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
-                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
-                        .dlvCmpltDt(m.getDlvCmpltDt() == null ? "" : m.getDlvCmpltDt())
-                        .itemId(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemId() == null ? "" : m.getDeliDtlMgntInfo().getItemId())
-                        .itemNm(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getItemNm() == null ? "" : m.getDeliDtlMgntInfo().getItemNm())
-                        .podrQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty() == null ? 0 : m.getDeliDtlMgntInfo().getPodrQty())
-                        .dlvQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty() == null ? 0 : m.getDeliDtlMgntInfo().getDlvQty())
-                        .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
-                        .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
-                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
-                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
-                        .build())
-                .collect(Collectors.toList());
-        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
-    }
-*/
-
     /*
       공급사  - 수거서 현황 그리드 리스트 조회
  */
@@ -708,11 +704,11 @@ public class ColOdrService extends CommonService {
                         .colCmpltDt(m.getColCmpltDt() == null ? "" : m.getColCmpltDt())
                         .itemId(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemId() == null ? "" :  m.getPickDtlInfo().getItemId())
                         .itemNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemNm() == null ? "" :  m.getPickDtlInfo().getItemNm())
-                        .colQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColQty() == null ? 0 :  m.getPickDtlInfo().getColQty())
+                        .colReqQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqQty() == null ? 0 :  m.getPickDtlInfo().getColReqQty())
                         .rtnRsnDvsn(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnRsnDvsn() == null ? "" :  m.getPickDtlInfo().getRtnRsnDvsn())
                         .rtnRsnDvsnNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnRsnDvsnNm() == null ? "" :  m.getPickDtlInfo().getRtnRsnDvsnNm())
                         .unitAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getUnitAmt() == null ? 0 :  m.getPickDtlInfo().getUnitAmt())
-                        .colAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColAmt() == null ? 0 :  m.getPickDtlInfo().getColAmt())
+                        .colReqAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqAmt() == null ? 0 :  m.getPickDtlInfo().getColReqAmt())
                         .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
                         .pickMgrNm(m.getPickMgrNm() == null ? "" : m.getPickMgrNm())
                         .pickMgrTelNo(m.getPickMgrTelNo() == null ? "" : m.getPickMgrTelNo())
@@ -721,7 +717,7 @@ public class ColOdrService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
-    /*
+  /*
       반품처리 그리드 리스트 조회
  */
     public GridResponse selectRtnStockTargetList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
@@ -740,17 +736,18 @@ public class ColOdrService extends CommonService {
                         .brandId(m.getBrandId() == null ? "" : m.getBrandId())
                         .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
                         .colPickUnqNo(m.getColPickUnqNo() == null ? "" : m.getColPickUnqNo())
-                        .colPickDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getColPickUnqNo() == null ? "" :m.getPickDtlInfo().getColPickUnqNo() )
+                        .colPickDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getColPickDtlNo() == null ? "" :m.getPickDtlInfo().getColPickDtlNo() )
                         .rtnPodrUnqNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnPodrUnqNo() == null ? "" :m.getPickDtlInfo().getRtnPodrUnqNo() )
                         .rtnPodrDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnPodrDtlNo() == null ? "" :m.getPickDtlInfo().getRtnPodrDtlNo() )
                         .itemId(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemId() == null ? "" :m.getPickDtlInfo().getItemId() )
                         .itemNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemNm() == null ? "" :m.getPickDtlInfo().getItemNm() )
                         .colQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColQty() == null ? 0 :m.getPickDtlInfo().getColQty() )
                         .colReqQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqQty() == null ? 0 :m.getPickDtlInfo().getColReqQty() )
+                        .rodrQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getRodrQty() == null ? 0 :m.getPickDtlInfo().getRodrQty() )
                         .colAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColAmt() == null ? 0 :m.getPickDtlInfo().getColAmt() )
                         .whsId(m.getWhsId() == null ? "" : m.getWhsId())
                         .location(m.getLocation() == null ? "" : m.getLocation())
-                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
                         .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
                         .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
                         .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
@@ -764,22 +761,26 @@ public class ColOdrService extends CommonService {
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
 
+
+
+
+
     /* 입고처리 저장
     @Transactional
     public void saveRtnStockProc(String userId, SaveRtnStockProcRequest saveRtnStockProcRequest) throws Exception {
         try {
 
             List<RtnProcInfoPtclEntity> gridInsertData = saveRtnStockProcRequest.toCodeEntities(saveRtnStockProcRequest.getGridInsertData());
-            List<RtnProcInfoPtclEntity> serarchList = new ArrayList<RtnProcInfoPtclEntity>();
+            List<RtnProcInfoPtclEntity> searchList = new ArrayList<RtnProcInfoPtclEntity>();
             if (gridInsertData.size() > 0) {
                 for (int i = 0 ; i < gridInsertData.size() ; i++) {
-                    RtnProcInfoPtclEntity whsProcData = gridInsertData.get(i);
-                    DeliDtlMgntEntity deliData = new DeliDtlMgntEntity();
-                    deliData.setDlvSttmtDtlNo(whsProcData.getDlvSttmtUnqNo() + whsProcData.getDlvSttmtDtlNo());
-                    serarchList.add(deliData);
-                }
+                    RtnProcInfoPtclEntity targetData = gridInsertData.get(i);
+                    RtnProcInfoPtclEntity procData = new RtnProcInfoPtclEntity();
+                    procData.setColPickUnqNo (targetData.getColPickUnqNo() + targetData.getColPickDtlNo());
+                    searchList.add(procData);
+                }  ==> 여기까지
 
-                List<DeliInfoMgntEntity> targetList  =   shmtOdrMapper.selectWarehouseProcList(saveWarehouseProcRequest.getBrandId(), saveWarehouseProcRequest.getWhsId(), serarchList);
+                List<PickInfoMgntEntity> targetList  =   shmtOdrMapper.selectWarehouseProcList(saveWarehouseProcRequest.getBrandId(), saveWarehouseProcRequest.getWhsId(), serarchList);
 
                 List<WhsProcInfoPtclEntity> gridUpdateData = new ArrayList<WhsProcInfoPtclEntity>();
                 List<StckMgntBaseInfoEntity> wareGridUpdateData = new ArrayList<StckMgntBaseInfoEntity>();
@@ -963,7 +964,52 @@ public class ColOdrService extends CommonService {
         }
     }
 */
+    /*
+      반품처리현황 그리드 리스트 조회
+ */
+    public GridResponse selectRtnStockResultList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, 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, fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
+        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
+        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstResultGridList(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
+        List<Object> gridRows = entities.stream()
+                .map(m -> RtnColStockResultResponse.builder()
+                        .viewCd("R")
+                        .brandId(m.getBrandId() == null ? "" : m.getBrandId())
+                        .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
+                        .colPickUnqNo(m.getColPickUnqNo() == null ? "" : m.getColPickUnqNo())
+                        .colPickDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getColPickDtlNo() == null ? "" :m.getPickDtlInfo().getColPickDtlNo() )
+                        .rtnPodrUnqNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnPodrUnqNo() == null ? "" :m.getPickDtlInfo().getRtnPodrUnqNo() )
+                        .rtnPodrDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getRtnPodrDtlNo() == null ? "" :m.getPickDtlInfo().getRtnPodrDtlNo() )
+                        .itemId(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemId() == null ? "" :m.getPickDtlInfo().getItemId() )
+                        .itemNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getItemNm() == null ? "" :m.getPickDtlInfo().getItemNm() )
+                        .colQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColQty() == null ? 0 :m.getPickDtlInfo().getColQty() )
+                        .colReqQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColReqQty() == null ? 0 :m.getPickDtlInfo().getColReqQty() )
+                        .rodrQty(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getRodrQty() == null ? 0 :m.getPickDtlInfo().getRodrQty() )
+                        .colAmt(m.getPickDtlInfo() == null ? 0 : m.getPickDtlInfo().getColAmt() == null ? 0 :m.getPickDtlInfo().getColAmt() )
+                        .whsId(m.getWhsId() == null ? "" : m.getWhsId())
+                        .location(m.getLocation() == null ? "" : m.getLocation())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm() + " - " + m.getLocationNm())
+                        .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
+                        .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
+                        .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
+                        .colSchDt(m.getColSchDt() == null ? "" : m.getColSchDt())
+                        .colCmpltDt(m.getColCmpltDt() == null ? "" : m.getColCmpltDt())
+                        .pickDtlStCd(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getPickDtlStCd() == null ? "" : m.getPickDtlInfo().getPickDtlStCd())
+                        .pickDtlStNm(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getPickDtlStNm() == null ? "" : m.getPickDtlInfo().getPickDtlStNm())
+                        .pickMgrNm(m.getPickMgrNm() == null ? "" : m.getPickMgrNm())
+                        .pickMgrTelNo(m.getPickMgrTelNo() == null ? "" : m.getPickMgrTelNo())
+                        .spplyId(m.getSpplyId() == null ? "" : m.getSpplyId())
+                        .spplyNm(m.getSpplyNm() == null ? "" : m.getSpplyNm())
+                        .build())
+                .collect(Collectors.toList());
+        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
+    }
     /*
       입고 현황 그리드 리스트 조회  @Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,
       @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchPodrUnqNo") String sPchPodrUnqNo, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm

src/main/java/com/oqpo/api/web/controller/inoutmng/ColOdrController.java

@@ -42,14 +42,32 @@ public class ColOdrController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
-    @ApiOperation(value = " 수거지시 대상리스트트 그리 리스트")
+    @ApiOperation(value = " 수거지시 대상 그리드 리스트")
     @PostMapping("/col-target-grid-list")
     public ResponseEntity<GridResponse> selectColTargetOdrGridList(@RequestBody @Valid ColOdrTargetRtnGridRequest colOdrTargetRtnGridRequest) throws Exception {
-        return ResponseEntity.ok(colOdrService.selectShmtTargetOdrGridList(colOdrTargetRtnGridRequest.getSBrandId(), colOdrTargetRtnGridRequest.getFromDt(), colOdrTargetRtnGridRequest.getToDt(), colOdrTargetRtnGridRequest.getSWhsId(), colOdrTargetRtnGridRequest.getSRtnWhsId(), colOdrTargetRtnGridRequest.getSItemNm(),  colOdrTargetRtnGridRequest.toDTO(colOdrTargetRtnGridRequest)));
+        return ResponseEntity.ok(colOdrService.selectColTargetOdrGridList(colOdrTargetRtnGridRequest.getSBrandId(), colOdrTargetRtnGridRequest.getFromDt(), colOdrTargetRtnGridRequest.getToDt(), colOdrTargetRtnGridRequest.getSWhsId(), colOdrTargetRtnGridRequest.getSRtnWhsId(), colOdrTargetRtnGridRequest.getSItemNm(),  colOdrTargetRtnGridRequest.toDTO(colOdrTargetRtnGridRequest)));
     }
 
+
     /**
-     * 설명 : 출하지시 정보 저장
+     * 설명 : 수거지시 초기 대상 정보 리스트
+     *
+     * @param colOdrTargetRtnGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 수거지시 초기정보 리스트\n")
+    @PostMapping("/col-inst-inti-grid-list")
+    public ResponseEntity<GridResponse> selectColInstOdrGridList(@RequestBody @Valid InstInitColOdrRequest instInitColOdrRequest) throws Exception {
+        return ResponseEntity.ok(colOdrService.selectColInstOdrGridList(instInitColOdrRequest.getBrandId(), instInitColOdrRequest, instInitColOdrRequest.toDTO(instInitColOdrRequest)));
+    }
+
+    /**
+     * 설명 : 수거지시 정보 저장
      *
      * @param userId
      * @param instShmtOdrRequest
@@ -64,11 +82,11 @@ public class ColOdrController {
     @PostMapping("/save-inst-col")
     public ResponseEntity<SaveResponse> instShmtOdr(@ApiIgnore String userId, @RequestBody @Valid InstColOdrRequest instColOdrRequest) throws Exception {
         colOdrService.instColOdr(userId,  instColOdrRequest);
-        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.COL_OK));
     }
 
     /**
-     * 설명 : 출하현황 그리 리스트
+     * 설명 : 수거현황 그리 리스트
      *
      * @param ShmtOutSearchGridRequest
      * @return
@@ -120,7 +138,7 @@ public class ColOdrController {
 
 
     /**
-     * 설명 : 공급사 발주데이타 납품서 생성 초기데이타
+     * 설명 : 공급사 발주데이타 수거서 생성 초기데이타
      *
      * @param brandId, spplyId, rtnPodrUnqNo
      * @return
@@ -139,7 +157,7 @@ public class ColOdrController {
     }
 
     /**
-     * 설명 : 공급사 납품서 생성 저장
+     * 설명 : 공급사 수거서 생성 저장
      *
      * @param userId
      * @param instShmtOdrRequest
@@ -158,23 +176,6 @@ public class ColOdrController {
     }
 
 
-    /**
-     * 설명 : 납품서 현황 그리드 리스트
-     *
-     * @param DeliDtlGridRequest
-     * @return
-     * @throws Exception
-
-
-    @ApiImplicitParams({
-            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
-    })
-    @ApiOperation(value = " 납품서 현황 그리드 리스트")
-    @PostMapping("/deli-grid-list")
-    public ResponseEntity<GridResponse> selectDeliGridList(@RequestBody @Valid DeliDtlGridRequest deliDtlGridRequest) throws Exception {
-        return ResponseEntity.ok(shmtOdrService.selectDeliGridList(deliDtlGridRequest.getSBrandId(), deliDtlGridRequest.getDtlGubun(), deliDtlGridRequest.getFromDt(), deliDtlGridRequest.getToDt(), deliDtlGridRequest.getSDlvStCd(),  deliDtlGridRequest.getSSpplyId(), deliDtlGridRequest.getSWhsId(), deliDtlGridRequest.getSItemNm(),  deliDtlGridRequest.toDTO(deliDtlGridRequest)));
-    }
-     */
     /**
      * 설명 : 공급사 수거서 현황 그리드 리스트
      *
@@ -186,7 +187,7 @@ public class ColOdrController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
-    @ApiOperation(value = " 공급사 - 납품서 현황 그리드 리스트")
+    @ApiOperation(value = " 공급사 - 수거서 현황 그리드 리스트")
     @PostMapping("/spply-pick-grid-list")
     public ResponseEntity<GridResponse> selectSpplyDeliGridList(@RequestBody @Valid SpplyPickDtlGridRequest spplyPickDtlGridRequest) throws Exception {
         return ResponseEntity.ok(colOdrService.selectSpplyPickGridList(spplyPickDtlGridRequest.getSBrandId(), spplyPickDtlGridRequest.getFromDt(), spplyPickDtlGridRequest.getToDt(),  spplyPickDtlGridRequest.getSSpplyId(), spplyPickDtlGridRequest.getSWhsId(), spplyPickDtlGridRequest.getSItemNm(),  spplyPickDtlGridRequest.toDTO(spplyPickDtlGridRequest)));
@@ -204,7 +205,7 @@ public class ColOdrController {
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
     @ApiOperation(value = " 반품처리 대상 그리드 리스트")
-    @PostMapping("/warehouse-target-grid-list")
+    @PostMapping("/retstock-target-grid-list")
     public ResponseEntity<GridResponse> selectRtnStockTargetList(@RequestBody @Valid RtnStockTragetGridRequest rtnStockTragetGridRequest) throws Exception {
         return ResponseEntity.ok(colOdrService.selectRtnStockTargetList(rtnStockTragetGridRequest.getSBrandId(),rtnStockTragetGridRequest.getSStoreId(), rtnStockTragetGridRequest.getFromDt(), rtnStockTragetGridRequest.getToDt(), rtnStockTragetGridRequest.getSRtnWhsId(), rtnStockTragetGridRequest.getSSpplyId(), rtnStockTragetGridRequest.getSWhsId(), rtnStockTragetGridRequest.getSItemNm(),  rtnStockTragetGridRequest.toDTO(rtnStockTragetGridRequest)));
     }
@@ -230,6 +231,23 @@ public class ColOdrController {
     }
      */
 
+    /**
+     * 설명 : 반품처리 현황 리스트
+     *
+     * @param RtnStockTragetGridRequest
+     * @return
+     * @throws Exception
+
+     */
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 반품처리 현황 그리드 리스트")
+    @PostMapping("/retstock-result-grid-list")
+    public ResponseEntity<GridResponse> selectRtnStockResultList(@RequestBody @Valid RtnStockTragetGridRequest rtnStockTragetGridRequest) throws Exception {
+        return ResponseEntity.ok(colOdrService.selectRtnStockResultList(rtnStockTragetGridRequest.getSBrandId(),rtnStockTragetGridRequest.getSStoreId(), rtnStockTragetGridRequest.getFromDt(), rtnStockTragetGridRequest.getToDt(), rtnStockTragetGridRequest.getSRtnWhsId(), rtnStockTragetGridRequest.getSSpplyId(), rtnStockTragetGridRequest.getSWhsId(), rtnStockTragetGridRequest.getSItemNm(),  rtnStockTragetGridRequest.toDTO(rtnStockTragetGridRequest)));
+    }
+
     /**
      * 설명 : 입고 현황 그리드 리스트
      *

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

@@ -0,0 +1,56 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class InstInitColOdrRequest  extends GridRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+
+    @ApiModelProperty(value = "수거지시대상 리스트")
+    private List<InstInitColItemDataList> gridUpdateData;
+
+
+    public List<RtnOdrDtlPtclEntity> toCodeEntities(List<InstInitColItemDataList> gridData) {
+        List<RtnOdrDtlPtclEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            RtnOdrDtlPtclEntity entity = new RtnOdrDtlPtclEntity();
+            entity.setRtnPodrUnqNo(x.getRtnPodrUnqNo());
+            entity.setRtnPodrDtlNo(x.getRtnPodrDtlNo());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class InstInitColItemDataList {
+
+        @NotBlank
+        @ApiModelProperty(value = "반품발주고유번호") private String rtnPodrUnqNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "반품발주항번") private String rtnPodrDtlNo;
+
+    }
+
+    protected InstInitColOdrRequest(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/inoutmng/ColInfoResponse.java

@@ -74,7 +74,7 @@ public class ColInfoResponse {
                                 .itemId(m.getItemId() == null ? "" : m.getItemId())
                                 .itemNm(m.getItemNm() == null ? "" : m.getItemNm())
                                 .rodrQty(m.getRodrQty() == null ? 0 : m.getRodrQty())
-                                .colQty(m.getColQty() == null ? 0 : m.getColQty())
+                                .colReqQty(m.getColReqQty() == null ? 0 : m.getColReqQty())
                                 .rtnRsnDvsnNm(m.getRtnRsnDvsnNm() == null ? "" : m.getRtnRsnDvsnNm())
                                 .rtnRsn(m.getRtnRsn() == null ? "" : m.getRtnRsn())
                                 .build())
@@ -90,7 +90,7 @@ public class ColInfoResponse {
         @ApiModelProperty(value = "품목아이디") private String itemId;
         @ApiModelProperty(value = "품목명") private String itemNm;
         @ApiModelProperty(value = "반품수량") private Integer rodrQty;
-        @ApiModelProperty(value = "수거수량") private Integer colQty;
+        @ApiModelProperty(value = "수거수량") private Integer colReqQty;
         @ApiModelProperty(value = "반품사유구분") private String rtnRsnDvsnNm;
         @ApiModelProperty(value = "반품사유") private String rtnRsn;
     }

src/main/java/com/oqpo/api/web/dto/response/inoutmng/ColInstInitOdrSearchListResponse.java

@@ -0,0 +1,47 @@
+package com.oqpo.api.web.dto.response.inoutmng;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.oqpo.api.entity.oper.UserMngEntity;
+import com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity;
+import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import com.oqpo.api.web.dto.response.rtnmng.rtnOrd.RtnOrdInitInfoResponse;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@Setter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@JsonInclude(JsonInclude.Include.ALWAYS)
+public class ColInstInitOdrSearchListResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "반품발주번호") private String rtnPodrUnqNo;
+    @ApiModelProperty(value = "반품발주항번") private String rtnPodrDtlNo;
+    @ApiModelProperty(value = "반품요청번호") private String rtnReqUnqNo;
+    @ApiModelProperty(value = "반품요청항번") private String rtnReqDtlNo;
+    @ApiModelProperty(value = "품목아이디") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "수거창고아이디") private String rtnWhsId;
+    @ApiModelProperty(value = "수거LOCATION") private String rtnLocation;
+    @ApiModelProperty(value = "수거창고명") private String rntWhsNm;
+    @ApiModelProperty(value = "입고창고아이디") private String whsId;
+    @ApiModelProperty(value = "입고LOCATION") private String location;
+    @ApiModelProperty(value = "입고창고명") private String whsNm;
+    @ApiModelProperty(value = "단가") private Long unitAmt;
+    @ApiModelProperty(value = "수거수량") private Integer colQty;
+    @ApiModelProperty(value = "반품발주수량") private Integer rtnOdrQty;
+    @ApiModelProperty(value = "발주금액") private Long rtnAmt;
+    @ApiModelProperty(value = "수거요청일") private String colReqDt;
+    @ApiModelProperty(value = "매장아이디") private String storeId;
+
+
+
+}

src/main/java/com/oqpo/api/web/dto/response/inoutmng/ColTragetOdrSearchListResponse.java

@@ -29,8 +29,8 @@ public class ColTragetOdrSearchListResponse {
     @ApiModelProperty(value = "입고LOCATION") private String location;
     @ApiModelProperty(value = "입고창고명") private String whsNm;
     @ApiModelProperty(value = "단가") private Long unitAmt;
-    @ApiModelProperty(value = "반품발주수량") private Integer rtnReqQty;
-    @ApiModelProperty(value = "수거수량") private Integer rtnQty;
+    @ApiModelProperty(value = "반품요청수량") private Integer rtnReqQty;
+    @ApiModelProperty(value = "반품발주수량") private Integer rtnOdrQty;
     @ApiModelProperty(value = "발주금액") private Long rtnAmt;
     @ApiModelProperty(value = "수거요청일") private String colReqDt;
     @ApiModelProperty(value = "매장아이디") private String storeId;

src/main/java/com/oqpo/api/web/dto/response/inoutmng/PickDtlSearchListResponse.java

@@ -25,11 +25,11 @@ public class PickDtlSearchListResponse {
     @ApiModelProperty(value = "수거완료일") private String colCmpltDt;
     @ApiModelProperty(value = "품목아이디") private String itemId;
     @ApiModelProperty(value = "품목명") private String itemNm;
-    @ApiModelProperty(value = "수거수량") private Integer colQty;
+    @ApiModelProperty(value = "수거수량") private Integer colReqQty;
     @ApiModelProperty(value = "수거구분") private String rtnRsnDvsn;
     @ApiModelProperty(value = "수거구분명") private String rtnRsnDvsnNm;
     @ApiModelProperty(value = "수거단가") private Long unitAmt;
-    @ApiModelProperty(value = "수거금액") private Long colAmt;
+    @ApiModelProperty(value = "수거금액") private Long colReqAmt;
     @ApiModelProperty(value = "수거창고") private String whsNm;
     @ApiModelProperty(value = "납품담당자명") private String pickMgrNm;
     @ApiModelProperty(value = "납품담당자연락처") private String pickMgrTelNo;

src/main/java/com/oqpo/api/web/dto/response/inoutmng/RtnColStockResultResponse.java

@@ -0,0 +1,44 @@
+package com.oqpo.api.web.dto.response.inoutmng;
+
+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 RtnColStockResultResponse {
+
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+    @ApiModelProperty(value = "브랜드명") private String brandNm;
+    @ApiModelProperty(value = "수거서번호") private String colPickUnqNo;
+    @ApiModelProperty(value = "수거서항번") private String colPickDtlNo;
+    @ApiModelProperty(value = "반품번호") private String rtnPodrUnqNo;
+    @ApiModelProperty(value = "반품항번") private String rtnPodrDtlNo;
+    @ApiModelProperty(value = "품목아이디") private String itemId;
+    @ApiModelProperty(value = "품목명") private String itemNm;
+    @ApiModelProperty(value = "수거수량") private Integer colQty;
+    @ApiModelProperty(value = "수거요청수량") private Integer colReqQty;
+    @ApiModelProperty(value = "반품발주수량") private Integer rodrQty;
+    @ApiModelProperty(value = "수거금액") private Long colAmt;
+    @ApiModelProperty(value = "반품입고창고") private String whsId;
+    @ApiModelProperty(value = "반품입고창고location") private String location;
+    @ApiModelProperty(value = "반품입고창고명") private String whsNm;
+    @ApiModelProperty(value = "수거창고") private String rtnWhsId;
+    @ApiModelProperty(value = "수거LOCATION") private String rtnLocation;
+    @ApiModelProperty(value = "수거창고명") private String rtnWhsNm;
+    @ApiModelProperty(value = "수거예정일") private String colSchDt;
+    @ApiModelProperty(value = "수거완료일") private String colCmpltDt;
+    @ApiModelProperty(value = "수거담당자명") private String pickMgrNm;
+    @ApiModelProperty(value = "수거담당자연락처") private String pickMgrTelNo;
+    @ApiModelProperty(value = "수거상태") private String pickDtlStCd;
+    @ApiModelProperty(value = "수거상태명") private String pickDtlStNm;
+    @ApiModelProperty(value = "공급사아이디") private String spplyId;
+    @ApiModelProperty(value = "공급사명") private String spplyNm;
+
+}

src/main/java/com/oqpo/api/web/dto/response/inoutmng/RtnStockTargetResponse.java

@@ -24,6 +24,7 @@ public class RtnStockTargetResponse {
     @ApiModelProperty(value = "품목명") private String itemNm;
     @ApiModelProperty(value = "수거수량") private Integer colQty;
     @ApiModelProperty(value = "수거요청수량") private Integer colReqQty;
+    @ApiModelProperty(value = "반품발주수량") private Integer rodrQty;
     @ApiModelProperty(value = "수거금액") private Long colAmt;
     @ApiModelProperty(value = "반품입고창고") private String whsId;
     @ApiModelProperty(value = "반품입고창고location") private String location;

src/main/java/com/oqpo/api/web/dto/response/inoutmng/SpplyPickInitResponse.java

@@ -53,7 +53,7 @@ public class SpplyPickInitResponse {
                                 .itemNm(m.getItemNm() == null ? "" :m.getItemNm())
                                 .unit(m.getUnit() == null ? "" : m.getUnit())
                                 .unitAmt(m.getUnitAmt() == null ? 0 : m.getUnitAmt())
-                                .rtnQty(m.getRtnQty() == null ? 0 :m.getRtnQty())
+                                .rtnOdrQty(m.getRtnOdrQty() == null ? 0 :m.getRtnOdrQty())
                                 .coltQty(m.getColQty() == null ? 0 : m.getColQty())
                                 .rtnRsnDvsn(m.getRtnRsnDvsn() == null ? "" : m.getRtnRsnDvsn())
                                 .rtnRsn(m.getRtnRsn() == null ? "" : m.getRtnRsn())
@@ -72,7 +72,7 @@ public class SpplyPickInitResponse {
         @ApiModelProperty(value = "품목명") private String itemNm;
         @ApiModelProperty(value = "단위") private String unit;
         @ApiModelProperty(value = "단가") private Long unitAmt;
-        @ApiModelProperty(value = "반품수량") private Integer rtnQty;
+        @ApiModelProperty(value = "반품발주수량") private Integer rtnOdrQty;
         @ApiModelProperty(value = "수거수량") private Integer coltQty;
         @ApiModelProperty(value = "반품사유") private String rtnRsnDvsn;
         @ApiModelProperty(value = "비고") private String rtnRsn;

src/main/java/com/oqpo/api/web/dto/response/inoutmng/SpplyTargerRtnSearchListResponse.java

@@ -24,8 +24,8 @@ public class SpplyTargerRtnSearchListResponse {
     @ApiModelProperty(value = "수거창고명") private String rtnWhsNm;
     @ApiModelProperty(value = "수거LOCATION") private String rtnLocation;
     @ApiModelProperty(value = "단가") private Long unitAmt;
-    @ApiModelProperty(value = "반품수량") private Integer rtnQty;
-    @ApiModelProperty(value = "반품금액") private Long rtnAmt;
+    @ApiModelProperty(value = "반품수량") private Integer rtnOdrQty;
+    @ApiModelProperty(value = "반품금액") private Long rtnOdrAmt;
     @ApiModelProperty(value = "수거요청일") private String colReqDt;
 
 }

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

@@ -17,8 +17,10 @@
             , base.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no as 'rtnOdrDtlInfo.rtn_podr_dtl_no'
             , ptcl.rtn_req_unq_no as 'rtnOdrDtlInfo.rtn_req_unq_no', ptcl.rtn_req_dtl_no as 'rtnOdrDtlInfo.rtn_req_dtl_no'
             , ptcl.item_id as 'rtnOdrDtlInfo.item_id', ptcl.item_nm as 'rtnOdrDtlInfo.item_nm'
-            , base.rtn_whs_id, fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm, ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
-            , ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_qty',  ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
+            , base.rtn_whs_id, base.rtn_location,  fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm
+            , fn_whs_location_nm(base.brand_id, base.rtn_whs_id, base.rtn_location) as rtn_location_nm
+            , ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
+            , ptcl.rtn_req_qty as 'rtnOdrDtlInfo.rtn_req_qty',  ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
             , date_format(base.col_req_dt,'%Y.%m.%d') as  col_req_dt, ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_amt'
             , base.whs_id,  fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
             , base.location, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
@@ -84,6 +86,31 @@
 
     </select>
 
+    <select id="selectColInstRtnGridList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity">
+        select base.brand_id, fn_brand_nm(base.brand_id) as brand_nm
+            , base.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no as 'rtnOdrDtlInfo.rtn_podr_dtl_no'
+            , ptcl.rtn_req_unq_no as 'rtnOdrDtlInfo.rtn_req_unq_no', ptcl.rtn_req_dtl_no as 'rtnOdrDtlInfo.rtn_req_dtl_no'
+            , ptcl.item_id as 'rtnOdrDtlInfo.item_id', ptcl.item_nm as 'rtnOdrDtlInfo.item_nm'
+            , base.rtn_whs_id, base.rtn_location,  fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm
+            , fn_whs_location_nm(base.brand_id, base.rtn_whs_id, base.rtn_location) as rtn_location_nm
+            , ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
+            , ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.col_qty',  ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
+            , date_format(base.col_req_dt,'%Y.%m.%d') as  col_req_dt, ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_amt'
+            , base.whs_id,  fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
+            , base.location, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
+            , base.store_id
+        from rtn_odr_base_info base
+            , rtn_odr_dtl_ptcl ptcl
+        where 1=1
+        and    base.rtn_podr_unq_no = ptcl.rtn_podr_unq_no
+        and    base.brand_id = #{brandId}
+        and concat(base.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no) in
+        <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+            concat(#{item.rtnPodrUnqNo},#{item.rtnPodrDtlNo})
+        </foreach>
+    </select>
+
+
     <select id="selectPickJobDataList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity">
         select  base.brand_id,base.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no as 'rtnOdrDtlInfo.rtn_podr_dtl_no'
             ,ptcl.item_id as 'rtnOdrDtlInfo.item_id' , ptcl.item_nm as 'rtnOdrDtlInfo.item_nm', base.whs_id
@@ -95,9 +122,9 @@
             , date_format(base.rtn_odr_reg_dt,'%Y%m%d') as rtn_odr_req_dt
             , base.spply_id, fn_spply_nm(base.spply_id) as spply_nm
             , ptcl.rtn_rsn_dvsn as  'rtnOdrDtlInfo.rtn_rsn_dvsn', ptcl.rtn_rsn as 'rtnOdrDtlInfo.rtn_rsn'
-            , base.col_dvsn
+            , base.col_dvsn, ptcl.unit as 'rtnOdrDtlInfo.unit'
         from   rtn_odr_base_info base
-        join rtn_odr_dtl_ptcl ptcl on base.rtn_podr_unq_no = ptcl.rtn_podr_unq_no and ptcl.rodr_dtl_st_cd = 'ROD0'
+        join rtn_odr_dtl_ptcl ptcl on base.rtn_podr_unq_no = ptcl.rtn_podr_unq_no and ptcl.rodr_dtl_st_cd = 'ROD1'
         join item_base_info itm on ptcl.item_id = itm.item_id
         and    base.brand_id = #{brandId}
         and    concat(base.rtn_podr_unq_no,ptcl.rtn_podr_dtl_no) in
@@ -117,7 +144,7 @@
             , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         values
             (#{entity.colCmdUnqNo}, date_format(now(),'%Y%m%d'), #{entity.brandId}, #{entity.whsId}, #{entity.location}
-            , #{entity.storeId}, #{entity.itemQty}, #{entity.colTotalAmt}, #{entity.colReqDt}, #{entity.colReqDt}, #{entity.colDvsn}
+            , #{entity.storeId}, #{entity.itemQty}, #{entity.colTotalAmt}, #{entity.colReqDt}, #{entity.colDvsn}
             , #{entity.colCmdStCd}, #{entity.colReqMgrNm}, #{entity.colReqMgrId}, #{entity.colDt}, #{entity.colCnfmNm}
             , #{entity.colCnfmId}, #{entity.colMgrNm}, #{entity.colMgrTelNo}, #{entity.colMgrEmal}, #{entity.colMgrMblNo}
             , #{entity.rtnWhsId}, #{entity.rtnLocation}, #{entity.spplyId}, #{entity.spplyNm}, #{entity.colPickUnqNo}
@@ -145,13 +172,13 @@
         (col_pick_unq_no, spply_id, spply_nm, store_id, col_reg_dt
         , col_tot_amt, pick_mgr_nm, pick_mgr_tel_no, pick_mgr_emal, pick_mgr_mbl_no
         , pndr_tel_no, pick_st_cd, rodr_reg_dt, col_req_dt, col_sch_dt
-        , col_cmplt_dt, whs_id, location, whs_dvsn, brand_id, col_desc
+        , col_cmplt_dt, whs_id, location, whs_dvsn, brand_id, col_desc, col_dvsn
         , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         values
         (#{entity.colPickUnqNo}, #{entity.spplyId}, #{entity.spplyNm}, #{entity.storeId}, date_format(now(),'%Y%m%d')
         , #{entity.colTotAmt}, #{entity.pickMgrNm}, #{entity.pickMgrTelNo}, #{entity.pickMgrEmal}, #{entity.pickMgrMblNo}
         , #{entity.pndrTelNo}, #{entity.pickStCd}, date_format(now(),'%Y%m%d'), #{entity.colReqDt}, #{entity.colSchDt}
-        , #{entity.colCmpltDt}, #{entity.whsId}, #{entity.location}, #{entity.whsDvsn}, #{entity.brandId}, #{entity.colDesc}
+        , #{entity.colCmpltDt}, #{entity.whsId}, #{entity.location}, #{entity.whsDvsn}, #{entity.brandId}, #{entity.colDesc}, #{entity.colDvsn}
         , now(), #{userId}, now(), #{userId})
     </insert>
 
@@ -160,15 +187,15 @@
         (col_pick_unq_no, col_pick_dtl_no, rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no
         , rtn_req_dtl_no, col_cmd_unq_no, col_cmd_dtl_no, pick_dtl_st_cd, item_id
         , item_nm, unit, unit_amt, price_unit, rodr_qty
-        , col_qty, col_amt, delay_yn, delay_rsn
+        , col_req_qty, col_req_amt, delay_yn, delay_rsn
         , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
         values
         <foreach collection="gridInsertData" item="item" separator=",">
         (#{item.colPickUnqNo}, #{item.colPickDtlNo}, #{item.rtnPodrUnqNo}, #{item.rtnPodrDtlNo}, #{item.rtnReqUnqNo}
         , #{item.rtnReqDtlNo}, #{item.colCmdUnqNo}, #{item.colCmdDtlNo}, 'PICKD0', #{item.itemId}
         , #{item.itemNm}, #{item.unit}, #{item.unitAmt}, #{item.priceUnit}, #{item.rodrQty}
-        , #{item.colQty}, #{item.colAmt}, #{item.delayYn}, #{item.delayRsn}
-        , now(), #{item.sysRegId}, now(), #{item.sysChgId})
+        , #{item.colReqQty}, #{item.colReqAmt}, #{item.delayYn}, #{item.delayRsn}
+        , now(), #{userId}, now(), #{userId})
         </foreach>
     </insert>
 
@@ -247,24 +274,7 @@
         <if test="sItemNm != null and sItemNm != ''">
             and   ( ptcl.item_id like concat('%',#{sItemNm},'%') or ptcl_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 base.col_cmd_unq_no asc , ptcl.col_cmd_dtl_no asc
-                    </if>
-                    <if test="gridRequest.sord == 'desc'.toString()">
-                        order by base.col_cmd_unq_no desc , ptcl.col_cmd_dtl_no asc
-                    </if>
-                </if>
-            </when>
-            <otherwise>
-                order by base.col_cmd_unq_no desc , ptcl.col_cmd_dtl_no asc
-            </otherwise>
-        </choose>
-        <if test="gridRequest.pagingYn == true">
-            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
-        </if>
+
     </select>
 
     <select id="selectPickInfo" resultType="com.oqpo.api.entity.inoutmng.PickInfoMgntEntity">
@@ -287,11 +297,11 @@
             , ptcl.rtn_req_dtl_no, ptcl.col_cmd_unq_no, ptcl.col_cmd_dtl_no
             , ptcl.pick_dtl_st_cd, fn_code_nm('PICK_DTL_ST_CD',ptcl.pick_dtl_st_cd) as pick_dtl_st_nm, ptcl.item_id
             , ptcl.item_nm, ptcl.unit, ptcl.unit_amt, ptcl.price_unit, ptcl.rodr_qty
-            , ptcl.col_qty, ptcl.col_amt, ptcl.delay_yn, ptcl.delay_rsn
+            , ptcl.col_req_qty, ptcl.col_req_amt, ptcl.delay_yn, ptcl.delay_rsn
             , rptcl.rtn_rsn_dvsn, fn_code_nm('RTN_RSN_DVSN', rptcl.rtn_rsn_dvsn ) as rtn_rsn_dvsn_nm
             , rptcl.rtn_rsn
         from pick_info_mgnt base, pick_dtl_ptcl ptcl
-            , rtn_dor_dtl_ptcl rptcl
+            , rtn_odr_dtl_ptcl rptcl
         where base.col_pick_unq_no = ptcl.col_pick_unq_no
         and   ptcl.rtn_podr_unq_no = rptcl.rtn_podr_unq_no
         and   ptcl.rtn_podr_dtl_no = rptcl.rtn_podr_dtl_no
@@ -304,12 +314,14 @@
                 , base.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no as 'rtnOdrDtlInfo.rtn_podr_dtl_no'
                 , ptcl.rtn_req_unq_no as 'rtnOdrDtlInfo.rtn_req_unq_no', ptcl.rtn_req_dtl_no as 'rtnOdrDtlInfo.rtn_req_dtl_no'
                 , ptcl.item_id as 'rtnOdrDtlInfo.item_id', ptcl.item_nm as 'rtnOdrDtlInfo.item_nm'
-                , base.rtn_whs_id, fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm, ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
-                , ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_qty',  ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
+                , base.rtn_whs_id, fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm
+                 , base.rtn_location, fn_whs_location_nm(base.brand_id, base.rtn_whs_id, base.rtn_location) as rtn_location_nm
+                , ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
+                , ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
                 , date_format(base.col_req_dt,'%Y.%m.%d') as  col_req_dt, ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_amt'
                 , base.whs_id,  fn_whs_nm(base.brand_id, base.whs_id) as whs_nm
                 , base.location, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
-                , base.store_id
+                , base.store_id, ptcl.rtn_odr_amt  as 'rtnOdrDtlInfo.rtn_odr_amt'
         from rtn_odr_base_info base
         , rtn_odr_dtl_ptcl ptcl
         where 1=1
@@ -318,13 +330,13 @@
         and    base.spply_id = #{sSpplyId}
         and    base.col_req_dt between #{fromDt} and #{toDt}
         and    base.rtn_odr_st_cd = 'RO20'
-        and    ptcl.rodr_dtl_st_cd = 'ROD0'
+        and    ptcl.rodr_dtl_st_cd = 'ROD1'
         and    base.col_dvsn = 'C002'
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
             and    base.rtn_whs_id = #{sRtnWhsId}
         </if>
         <if test="sItemNm != null and sItemNm != ''">
-            and   (ptcl.item_id like concat('%', '', '%') or ptcl.item_nm like concat('%', '', '%'))
+            and   (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
         <choose>
             <when test="gridRequest.sidx != null and gridRequest.sidx != ''">
@@ -356,32 +368,15 @@
         and    base.spply_id = #{sSpplyId}
         and    base.col_req_dt between #{fromDt} and #{toDt}
         and    base.rtn_odr_st_cd = 'RO20'
-        and    ptcl.rodr_dtl_st_cd = 'ROD0'
+        and    ptcl.rodr_dtl_st_cd = 'ROD1'
         and    base.col_dvsn = 'C002'
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
             and    base.rtn_whs_id = #{sRtnWhsId}
         </if>
         <if test="sItemNm != null and sItemNm != ''">
-            and   (ptcl.item_id like concat('%', '', '%') or ptcl.item_nm like concat('%', '', '%'))
-        </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 base.rtn_podr_unq_no asc , ptcl.rtn_podr_dtl_no asc
-                    </if>
-                    <if test="gridRequest.sord == 'desc'.toString()">
-                        order by base.rtn_podr_unq_no desc , ptcl.rtn_podr_dtl_no asc
-                    </if>
-                </if>
-            </when>
-            <otherwise>
-                order by base.rtn_podr_unq_no asc , ptcl.rtn_podr_dtl_no asc
-            </otherwise>
-        </choose>
-        <if test="gridRequest.pagingYn == true">
-            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+            and   (ptcl.item_id like concat('%', #{sItemNm}, '%') or ptcl.item_nm like concat('%', #{sItemNm}, '%'))
         </if>
+
     </select>
 
 
@@ -390,7 +385,7 @@
                , (select sum(rtn_amt) from  rtn_odr_dtl_ptcl where rtn_podr_unq_no = #{rtnPodrUnqNo} and rodr_dtl_st_cd = 'ROD1' ) as rtn_dodr_total_amt
                , base.rtn_whs_id, fn_whs_nm(base.brand_id, base.rtn_whs_id) as rtn_whs_nm
                , base.rtn_location, fn_whs_location_nm(brand_id, base.rtn_whs_id, base.rtn_location) as rtn_location_nm
-               , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as rtn_tel_no
+               , fn_get_telno((select tel_no from store_base_info where store_id = base.store_id )) as pick_tel_no
         from    rtn_odr_base_info base
         where  1=1
         and    base.brand_id = #{brandId}
@@ -400,12 +395,12 @@
     </select>
 
     <select id="selectSpplyColRtnList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity">
-         select ptcl.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no, ptcl.item_id, ptcl.item_nm, ptcl.unit, ptcl.rtn_qty, ptcl.rtn_qty as colt_qty
+         select ptcl.rtn_podr_unq_no, ptcl.rtn_podr_dtl_no, ptcl.item_id, ptcl.item_nm, ptcl.unit, ptcl.rtn_odr_qty, ptcl.rtn_odr_qty as col_qty
                  , ptcl.unit_amt
                  , ptcl.rtn_rsn_dvsn, rtn_rsn
          from   rtn_odr_dtl_ptcl ptcl
          where  ptcl.rtn_podr_unq_no = #{rtnPodrUnqNo}
-         and    ptcl.rtn_dtl_st_cd = 'ROD1'
+         and    ptcl.rodr_dtl_st_cd = 'ROD1'
     </select>
 
     <!--  어디에 쓰는 쿼리인지 찿을 필요 있음
@@ -480,20 +475,13 @@
     -->
 
 
-
-
-
-
-
-
-
     <select id="selectColSpplyPickGridList" resultType="com.oqpo.api.entity.inoutmng.PickInfoMgntEntity">
         select pmgnt.brand_id, fn_brand_nm(pmgnt.brand_id) as brand_nm
             , pmgnt.col_pick_unq_no , pmgnt.pick_st_cd, fn_code_nm('PICK_ST_CD',pmgnt.pick_st_cd) as pick_st_nm
             , date_format(pmgnt.col_reg_dt, '%Y.%m.%d') as col_reg_dt , date_format(pmgnt.col_req_dt, '%Y.%m.%d') as col_req_dt
             , date_format(pmgnt.col_sch_dt, '%Y.%m.%d') as col_sch_dt , date_format(pmgnt.col_cmplt_dt, '%Y.%m.%d') as col_cmplt_dt
-            , pptcl.item_id as 'pickDtlInfo.item_id' , pptcl.item_nm as 'pickDtlInfo.item_nm', pptcl.col_qty as 'pickDtlInfo.col_qty'
-            , pptcl.col_amt as 'pickDtlInfo.col_amt' , pptcl.unit_amt as 'pickDtlInfo.unit_amt', ptcl.rtn_rsn_dvsn as 'pickDtlInfo.rtn_rsn_dvsn'
+            , pptcl.item_id as 'pickDtlInfo.item_id' , pptcl.item_nm as 'pickDtlInfo.item_nm', pptcl.col_req_qty as 'pickDtlInfo.col_req_qty'
+            , pptcl.col_req_amt as 'pickDtlInfo.col_req_amt' , pptcl.unit_amt as 'pickDtlInfo.unit_amt', ptcl.rtn_rsn_dvsn as 'pickDtlInfo.rtn_rsn_dvsn'
             , fn_code_nm('RTN_RSN_DVSN', ptcl.rtn_rsn_dvsn) as 'pickDtlInfo.rtn_rsn_dvsn_nm', pmgnt.whs_id, pmgnt.location
             , fn_whs_nm(pmgnt.brand_id, pmgnt.whs_id) as whs_nm, fn_whs_location_nm(pmgnt.brand_id, pmgnt.whs_id, pmgnt.location) as location_nm
             , pmgnt.pick_mgr_nm, fn_get_telno(pmgnt.pick_mgr_tel_no) as pick_mgr_tel_no
@@ -561,12 +549,13 @@
                ,mgnt.col_pick_unq_no, dtl.col_pick_dtl_no as 'pickDtlInfo.col_pick_dtl_no'
                , dtl.rtn_podr_unq_no as 'pickDtlInfo.rtn_podr_unq_no' , dtl.rtn_podr_dtl_no as 'pickDtlInfo.rtn_podr_dtl_no'
                ,dtl.item_id as 'pickDtlInfo.item_id', dtl.item_nm as 'pickDtlInfo.item_nm'
-               , dtl.col_req_qty as 'pickDtlInfo.col_qty' , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
-               , dtl.col_amt as 'pickDtlInfo.col_amt', mgnt.whs_id, mgnt.location
-               , fn_whs_nm(mgnt.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(mgnt.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
+               , dtl.rodr_qty as 'pickDtlInfo.rodr_qty' , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
+               , dtl.col_req_qty as 'pickDtlInfo.col_qty', dtl.col_amt as 'pickDtlInfo.col_amt'
                , date_format(mgnt.col_sch_dt,'%Y.%m.%d') as col_sch_dt, mgnt.pick_mgr_nm, fn_get_telno(mgnt.pick_mgr_tel_no) as pick_mgr_tel_no
+               , mgnt.whs_id as rtn_whs_id , mgnt.location as rtn_location
+               , fn_whs_nm(mgnt.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(mgnt.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
                , base.whs_id, base.location
-               , fn_whs_nm(mgnt.brand_id, base.whs_id) as whs_nm, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
+               , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
                , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
         from   pick_info_mgnt mgnt
               ,pick_dtl_ptcl dtl
@@ -577,13 +566,16 @@
         and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
         and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
         and   mgnt.brand_id = #{sBrandId}
-        and   mgnt.store_id = #{sStoreId}
         and   mgnt.col_sch_dt between #{fromDt} and #{toDt}
+        and   mgnt.pick_st_cd = 'PICK0'
+        <if test="sStoreId != null and sStoreId != ''">
+            and   mgnt.store_id = #{sStoreId}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
         and   base.whs_id = #{sRtnWhsId}
         </if>
-        <if test="spplyId != null and spplyId != ''">
-        and   mgnt.spply_id = #{spplyId}
+        <if test="sSpplyId != null and sSpplyId != ''">
+        and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
         and   dtl.whs_id = #{sWhsId}
@@ -622,13 +614,16 @@
         and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
         and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
         and   mgnt.brand_id = #{sBrandId}
-        and   mgnt.store_id = #{sStoreId}
         and   mgnt.col_sch_dt between #{fromDt} and #{toDt}
+        and   mgnt.pick_st_cd = 'PICK0'
+        <if test="sStoreId != null and sStoreId != ''">
+            and   mgnt.store_id = #{sStoreId}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
             and   base.whs_id = #{sRtnWhsId}
         </if>
-        <if test="spplyId != null and spplyId != ''">
-            and   mgnt.spply_id = #{spplyId}
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
             and   dtl.whs_id = #{sWhsId}
@@ -636,24 +631,7 @@
         <if test="sItemNm != null and sItemNm != ''">
             and   (mgnt.col_pick_unq_no like concat('%',#{sItemNm},'%') or dtl.item_id like concat('%',#{sItemNm},'%') or dtl.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 mgnt.col_pick_unq_no asc
-                    </if>
-                    <if test="gridRequest.sord == 'desc'.toString()">
-                        order by mgnt.col_pick_unq_no desc
-                    </if>
-                </if>
-            </when>
-            <otherwise>
-                order by mgnt.col_pick_unq_no desc
-            </otherwise>
-        </choose>
-        <if test="gridRequest.pagingYn == true">
-            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
-        </if>
+
     </select>
 
     <insert id="insertRtnProcInfoPtcl">
@@ -678,4 +656,99 @@
             , now(), #{userId}, now(), #{userId})
         </foreach>
     </insert>
+
+
+    <select id="selectColRtnInstResultGridList" resultType="com.oqpo.api.entity.inoutmng.PickInfoMgntEntity">
+        select mgnt.brand_id, fn_brand_nm(mgnt.brand_id) as brand_nm
+            ,mgnt.col_pick_unq_no, dtl.col_pick_dtl_no as 'pickDtlInfo.col_pick_dtl_no'
+            , dtl.rtn_podr_unq_no as 'pickDtlInfo.rtn_podr_unq_no' , dtl.rtn_podr_dtl_no as 'pickDtlInfo.rtn_podr_dtl_no'
+            ,dtl.item_id as 'pickDtlInfo.item_id', dtl.item_nm as 'pickDtlInfo.item_nm'
+            , dtl.rodr_qty as 'pickDtlInfo.rodr_qty' , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
+            , dtl.col_qty as 'pickDtlInfo.col_qty', dtl.col_amt as 'pickDtlInfo.col_amt'
+            , date_format(mgnt.col_sch_dt,'%Y.%m.%d') as col_sch_dt, date_format(mgnt.col_cmplt_dt,'%Y.%m.%d') as col_cmplt_dt
+            , mgnt.pick_mgr_nm, fn_get_telno(mgnt.pick_mgr_tel_no) as pick_mgr_tel_no
+            , mgnt.whs_id as rtn_whs_id , mgnt.location as rtn_location
+            , fn_whs_nm(mgnt.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(mgnt.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
+            , base.whs_id, base.location
+            , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
+            , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
+            , dtl.pick_dtl_st_cd as 'pickDtlInfo.pick_dtl_st_cd'
+            , fn_code_nm('PICK_DTL_ST_CD', dtl.pick_dtl_st_cd) as  'pickDtlInfo.pick_dtl_st_nm'
+        from   pick_info_mgnt mgnt
+            ,pick_dtl_ptcl dtl
+            ,rtn_odr_dtl_ptcl ptcl
+            ,rtn_odr_base_info base
+        where mgnt.col_pick_unq_no = dtl.col_pick_unq_no
+        and   dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no
+        and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
+        and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+        and   mgnt.brand_id = #{sBrandId}
+        and   mgnt.col_cmplt_dt between #{fromDt} and #{toDt}
+        <if test="sStoreId != null and sStoreId != ''">
+            and   mgnt.store_id = #{sStoreId}
+        </if>
+        <if test="sRtnWhsId != null and sRtnWhsId != ''">
+            and   base.whs_id = #{sRtnWhsId}
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and   mgnt.spply_id = #{sSpplyId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and   dtl.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and   (mgnt.col_pick_unq_no like concat('%',#{sItemNm},'%') or dtl.item_id like concat('%',#{sItemNm},'%') or dtl.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 mgnt.col_pick_unq_no asc
+                    </if>
+                    <if test="gridRequest.sord == 'desc'.toString()">
+                        order by mgnt.col_pick_unq_no desc
+                    </if>
+                </if>
+            </when>
+            <otherwise>
+                order by mgnt.col_pick_unq_no desc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectColRtnInstResultGridCnt" resultType="int">
+        select count(*) as cnt
+        from   pick_info_mgnt mgnt
+        ,pick_dtl_ptcl dtl
+        ,rtn_odr_dtl_ptcl ptcl
+        ,rtn_odr_base_info base
+        where mgnt.col_pick_unq_no = dtl.col_pick_unq_no
+        and   dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no
+        and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
+        and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+        and   mgnt.brand_id = #{sBrandId}
+        and   mgnt.col_cmplt_dt between #{fromDt} and #{toDt}
+        <if test="sStoreId != null and sStoreId != ''">
+            and   mgnt.store_id = #{sStoreId}
+        </if>
+        <if test="sRtnWhsId != null and sRtnWhsId != ''">
+            and   base.whs_id = #{sRtnWhsId}
+        </if>
+        <if test="sSpplyId != null and sSpplyId != ''">
+            and   mgnt.spply_id = #{sSpplyId}
+        </if>
+        <if test="sWhsId != null and sWhsId != ''">
+            and   dtl.whs_id = #{sWhsId}
+        </if>
+        <if test="sItemNm != null and sItemNm != ''">
+            and   (mgnt.col_pick_unq_no like concat('%',#{sItemNm},'%') or dtl.item_id like concat('%',#{sItemNm},'%') or dtl.item_nm  like concat('%',#{sItemNm},'%') )
+        </if>
+
+    </select>
+
+
+
 </mapper>

src/main/resources/mybatis/sqlmaps/rtnmng/RtnOrd.xml

@@ -229,7 +229,7 @@
                   , rtn_req_dvsn, fn_code_nm('RTN_REQ_DVSN', rtn_req_dvsn) as rtn_req_dvsn_nm, rtn_dodr_total_amt
                   , rtn_dodr_item_qty, rtn_mgr_nm, rtn_mgr_id, fn_get_telno(rtn_mgr_tel_no) as rtn_mgr_tel_no
                     , rtn_odr_st_cd , fn_code_nm('RTN_ODR_ST_CD',rtn_odr_st_cd) AS rtn_odr_st_nm
-                  , spply_id, fn_spply_nm(spply_id) as spply_id,  whs_id, fn_whs_nm(brand_id, whs_id) as whs_nm
+                  , spply_id, fn_spply_nm(spply_id) as spply_nm,  whs_id, fn_whs_nm(brand_id, whs_id) as whs_nm
                     , location, fn_whs_location_nm(brand_id, whs_id, location) as location_nm
                     , col_dvsn, fn_code_nm('COL_DVSN', col_dvsn) as col_dvsn_nm,  date_format(col_req_dt ,'%Y.%m.%d') as col_req_dt
                   , store_id, fn_store_nm( brand_id, store_id) as store_nm,  rtn_whs_id, rtn_location