반품관련작업 진행

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

@@ -27,8 +27,9 @@ public class PickDtlPtclEntity implements Serializable {
     private String unit;
     private Long unitAmt;
     private String priceUnit;
-    private Integer rodrQty;
+    private Integer rodrQty;  // 컬럼 삭제 대상
     private Integer colQty;
+    private Integer colReqQty; // 수거요청수량
     private Long rtnAmt;
     private Long colAmt;
     private String delayYn;

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

@@ -33,6 +33,11 @@ public class PickInfoMgntEntity implements Serializable {
     private String whsNm;
     private String location;
     private String locationNm;
+    private String RtnWhsId;
+    private String RtnWhsNm;
+    private String RtnLocation;
+    private String RtnLocationNm;
+
     private String whsDvsn;
     private String whsDvsnNm;
     private String brandId;

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 import lombok.ToString;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
 @Getter
@@ -96,6 +97,10 @@ public class RtnProcInfoPtclEntity implements Serializable {
     private String sysChgDttm;
     @ApiModelProperty(value = "시스템변경아이디")
     private String sysChgId;
+    @ApiModelProperty(value = "수거서번호")
+    private String colPickUnqNo;
+    @ApiModelProperty(value = "수거서항번")
+    private String colPickDtlNo;
 
 
 }

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

@@ -26,6 +26,7 @@ public enum SystemMessageCode {
     RUN_OK (20062, "실행 요청하였습니다.", HttpStatus.OK),
     BATCH_OK (90000, "배치 성공", HttpStatus.OK),
     REJECT_OK (20022, "반려 되었습니다.", HttpStatus.OK),
+    RTN_REQ_OK (20023, "반품요청 되었습니다.", 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

@@ -6,6 +6,7 @@ import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity;
 import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -43,6 +44,10 @@ public interface ColOdrMapper {
     List<PickInfoMgntEntity> selectColSpplyPickGridList(@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 selectColSpplyPickGridCnt(@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<PickInfoMgntEntity> selectColRtnInstGridList(@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 selectColRtnInstGridCnt(@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;
+
+    int insertRtnProcInfoPtcl(@Param("userId") String userId, List<RtnProcInfoPtclEntity> gridInsertData) 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;

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

@@ -8,6 +8,7 @@ import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity;
 import com.oqpo.api.entity.stinfo.BrandEntity;
 import com.oqpo.api.entity.stinfo.SpplyEntity;
 import com.oqpo.api.entity.stinfo.StoreBaseInfoEntity;
@@ -721,61 +722,58 @@ public class ColOdrService extends CommonService {
     }
 
     /*
-      입고처리 그리드 리스트 조회
-
-    public GridResponse selectWarehouseTargetList(String sBrandId, String fromDt, String toDt, String sWhsId, String sSpplyId, String sDlvSttmtUnqNo, String sItemNm, GridRequest gridRequest) throws Exception {
+      반품처리 그리드 리스트 조회
+ */
+    public GridResponse selectRtnStockTargetList(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 = shmtOdrMapper.selectWarehouseTargetGridCnt(sBrandId,  fromDt, toDt, sWhsId, sSpplyId, sDlvSttmtUnqNo, sItemNm);
+        int gridRecords = colOdrMapper.selectColRtnInstGridCnt(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<DeliInfoMgntEntity> entities = shmtOdrMapper.selectWarehouseTargetGridList(sBrandId,  fromDt, toDt, sWhsId, sSpplyId, sDlvSttmtUnqNo, sItemNm, gridRequest);
+        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstGridList(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
-                .map(m -> WarehouseTargetResponse.builder()
+                .map(m -> RtnStockTargetResponse.builder()
                         .viewCd("R")
                         .brandId(m.getBrandId() == null ? "" : m.getBrandId())
                         .brandNm(m.getBrandNm() == null ? "" : m.getBrandNm())
-                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
-                        .dlvSttmtDtlNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getDlvSttmtDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getDlvSttmtDtlNo())
-                        .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())
-                        .whsQty(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getWhsQty() == null ? 0 : m.getDeliDtlMgntInfo().getWhsQty())
-                        .whsAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getWhsAmt() == null ? 0 : m.getDeliDtlMgntInfo().getWhsAmt())
-                        .unit(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getUnit() == null ? "" : m.getDeliDtlMgntInfo().getUnit())
-                        .unitAmt(m.getDeliDtlMgntInfo() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt() == null ? 0 : m.getDeliDtlMgntInfo().getUnitAmt())
-                        .whsId(m.getWhsId() == null ? "" :m.getWhsId())
+                        .colPickUnqNo(m.getColPickUnqNo() == null ? "" : m.getColPickUnqNo())
+                        .colPickDtlNo(m.getPickDtlInfo() == null ? "" : m.getPickDtlInfo().getColPickUnqNo() == null ? "" :m.getPickDtlInfo().getColPickUnqNo() )
+                        .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() )
+                        .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())
-                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
-                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
-                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
-                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
-                        .pchPodrUnqNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrUnqNo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrUnqNo())
-                        .pchPodrDtlNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getPchPodrDtlNo())
-                        .pchReqUnqNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqUnqNo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqUnqNo())
-                        .pchReqDltNo(m.getDeliDtlMgntInfo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqDtlNo() == null ? "" : m.getDeliDtlMgntInfo().getPchReqDtlNo())
+                        .whsNm(m.getWhsNm() == null ? "" : m.getWhsNm())
+                        .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
+                        .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
+                        .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
+                        .colSchDt(m.getColSchDt() == null ? "" : m.getColSchDt())
+                        .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);
     }
- */
+
     /* 입고처리 저장
     @Transactional
-    public void saveWarehouseProc(String userId, SaveWarehouseProcRequest saveWarehouseProcRequest) throws Exception {
+    public void saveRtnStockProc(String userId, SaveRtnStockProcRequest saveRtnStockProcRequest) throws Exception {
         try {
 
-            List<WhsProcInfoPtclEntity> gridInsertData = saveWarehouseProcRequest.toCodeEntities(saveWarehouseProcRequest.getGridInsertData());
-            List<DeliDtlMgntEntity> serarchList = new ArrayList<DeliDtlMgntEntity>();
+            List<RtnProcInfoPtclEntity> gridInsertData = saveRtnStockProcRequest.toCodeEntities(saveRtnStockProcRequest.getGridInsertData());
+            List<RtnProcInfoPtclEntity> serarchList = new ArrayList<RtnProcInfoPtclEntity>();
             if (gridInsertData.size() > 0) {
                 for (int i = 0 ; i < gridInsertData.size() ; i++) {
-                    WhsProcInfoPtclEntity whsProcData = gridInsertData.get(i);
+                    RtnProcInfoPtclEntity whsProcData = gridInsertData.get(i);
                     DeliDtlMgntEntity deliData = new DeliDtlMgntEntity();
                     deliData.setDlvSttmtDtlNo(whsProcData.getDlvSttmtUnqNo() + whsProcData.getDlvSttmtDtlNo());
                     serarchList.add(deliData);

src/main/java/com/oqpo/api/service/rtnmng/RtnOdrService.java

@@ -3,7 +3,6 @@ package com.oqpo.api.service.rtnmng;
 
 
 import com.oqpo.api.entity.oper.UserMngEntity;
-import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnReqBaseInfoEntity;
@@ -19,17 +18,12 @@ import com.oqpo.api.mapper.stinfo.StoreBaseInfoMapper;
 import com.oqpo.api.mapper.stockmng.StockMngMapper;
 import com.oqpo.api.service.CommonService;
 import com.oqpo.api.web.dto.request.GridRequest;
-import com.oqpo.api.web.dto.request.pomng.pchOrd.CancelPchOrdDtlRequest;
 import com.oqpo.api.web.dto.request.rtnmng.CancelRtnOrdDtlRequest;
 import com.oqpo.api.web.dto.request.rtnmng.RtnReqOrdInitRequest;
-import com.oqpo.api.web.dto.request.rtnmng.SaveRtnOrdRequest;
+import com.oqpo.api.web.dto.request.rtnmng.SaveRtnOdrRequest;
 import com.oqpo.api.web.dto.response.GridResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOdrInfoResponse;
-import com.oqpo.api.web.dto.response.pomng.pchOrd.PchOdrSearchListResponse;
 import com.oqpo.api.web.dto.response.rtnmng.rtnOrd.*;
-import com.oqpo.api.web.dto.response.rtnmng.rtnReq.RtnReqInitInfoResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -215,7 +209,7 @@ public class RtnOdrService extends CommonService {
       발주 정보 저장
 */
     @Transactional
-    public void saveRtnOdrInfo(String userId, SaveRtnOrdRequest saveRtnOrdRequest) throws Exception {
+    public void saveRtnOdrInfo(String userId, SaveRtnOdrRequest saveRtnOdrRequest) throws Exception {
         try {
 
             // 로그인 정보 가져오기
@@ -226,30 +220,30 @@ public class RtnOdrService extends CommonService {
             RtnOdrBaseInfoEntity rtnOrdEntity = new RtnOdrBaseInfoEntity();
 
             rtnOrdEntity.setRtnPodrUnqNo(rtnPodrUnqNo);
-            rtnOrdEntity.setBrandId(saveRtnOrdRequest.getBrandId());
-            rtnOrdEntity.setRtnReqDvsn(saveRtnOrdRequest.getRtnReqDvsn());
+            rtnOrdEntity.setBrandId(saveRtnOdrRequest.getBrandId());
+            rtnOrdEntity.setRtnReqDvsn(saveRtnOdrRequest.getRtnReqDvsn());
             rtnOrdEntity.setRtnMgrNm(uEntity.getUserNm());
             rtnOrdEntity.setRtnMgrId(userId);
             rtnOrdEntity.setRtnMgrTelNo(uEntity.getTelNo());
-            rtnOrdEntity.setSpplyId(saveRtnOrdRequest.getSpplyId());
-            rtnOrdEntity.setWhsId(saveRtnOrdRequest.getWhsId());
-            rtnOrdEntity.setLocation(saveRtnOrdRequest.getLocation());
-            rtnOrdEntity.setColDvsn(saveRtnOrdRequest.getColDvsn());
-            rtnOrdEntity.setColReqDt(saveRtnOrdRequest.getColReqDt().replaceAll("\\.",""));
-            rtnOrdEntity.setStoreId(saveRtnOrdRequest.getStoreId());
-            rtnOrdEntity.setRtnWhsId(saveRtnOrdRequest.getRtnWhsId());
-            rtnOrdEntity.setRtnLocation(saveRtnOrdRequest.getRtnLocation());
+            rtnOrdEntity.setSpplyId(saveRtnOdrRequest.getSpplyId());
+            rtnOrdEntity.setWhsId(saveRtnOdrRequest.getWhsId());
+            rtnOrdEntity.setLocation(saveRtnOdrRequest.getLocation());
+            rtnOrdEntity.setColDvsn(saveRtnOdrRequest.getColDvsn());
+            rtnOrdEntity.setColReqDt(saveRtnOdrRequest.getColReqDt().replaceAll("\\.",""));
+            rtnOrdEntity.setStoreId(saveRtnOdrRequest.getStoreId());
+            rtnOrdEntity.setRtnWhsId(saveRtnOdrRequest.getRtnWhsId());
+            rtnOrdEntity.setRtnLocation(saveRtnOdrRequest.getRtnLocation());
 
             Integer dtlRow = 0 ;
             List<RtnOdrDtlPtclEntity> rtnOrdDtlList = new ArrayList<RtnOdrDtlPtclEntity>();
-            List<RtnOdrDtlPtclEntity> gridUpdateData = saveRtnOrdRequest.toCodeEntities(saveRtnOrdRequest.getGridInsertData());
+            List<RtnOdrDtlPtclEntity> gridUpdateData = saveRtnOdrRequest.toCodeEntities(saveRtnOdrRequest.getGridInsertData());
 
             // 헤더데이타 체크
             if (gridUpdateData.size() < 1) {
                 throw new GlobalException(SystemMessageCode.ERR_NOTITEM);
             }
 
-            List<RtnOdrBaseInfoEntity> headList = rtnOdrMapper.selectRecRtnInitInfo(saveRtnOrdRequest.getBrandId(),gridUpdateData);
+            List<RtnOdrBaseInfoEntity> headList = rtnOdrMapper.selectRecRtnInitInfo(saveRtnOdrRequest.getBrandId(),gridUpdateData);
             if (headList.size() > 1) {
                 // 서로다른 수거장소로 인한 처리 불가 오류 메세지 출력  본사출력이면 매장수거장소,,  공급사수거면 본사수거장소
                 throw new GlobalException(SystemMessageCode.ERR_NEQRTNWHSID);
@@ -267,8 +261,8 @@ public class RtnOdrService extends CommonService {
                     RtnOdrDtlPtclEntity rtnSaveDtlEntity = new RtnOdrDtlPtclEntity(); // 저장할 메인
                     //RtnReqBaseInfoEntity rtnReqEntity = new RtnReqBaseInfoEntity();  // 반품요청상태
                     RtnReqDtlPtclEntity rtnReqDtlEntity = new RtnReqDtlPtclEntity();  // 반품요청상세상태
-                    // 구매요청건에 대한 데이타 가져옴
-                    if ("R".equals(saveRtnOrdRequest.getJobCd())) {   // 반품요청건
+                    // 반품요청건에 대한 데이타 가져옴
+                    if ("R".equals(saveRtnOdrRequest.getJobCd())) {   // 반품요청건
                         // 구매요청번호와 항번으로 데이타 가져놈
 
                         rtnSaveDtlEntity = rtnOdrMapper.selectPoRtnDtlSaveInfo(rtnDtlEntity.getRtnReqUnqNo(), rtnDtlEntity.getRtnReqDtlNo());
@@ -280,9 +274,9 @@ public class RtnOdrService extends CommonService {
                         //rtnReqList.add(rtnReqEntity);
                         rtnReqDtlList.add(rtnReqDtlEntity);
 
-                    } else if ("P".equals(saveRtnOrdRequest.getJobCd())) {  // 신규발주건
+                    } else if ("P".equals(saveRtnOdrRequest.getJobCd())) {  // 신규발주건
                         // item id 로 데이타 가져옴  == 단가는 브랜드 단가로 처리함
-                        rtnSaveDtlEntity = rtnOdrMapper.selectRtnItemDtlSaveInfo(saveRtnOrdRequest.getBrandId(), rtnDtlEntity.getItemId(), rtnDtlEntity.getBrandUnitUnqNo());
+                        rtnSaveDtlEntity = rtnOdrMapper.selectRtnItemDtlSaveInfo(saveRtnOdrRequest.getBrandId(), rtnDtlEntity.getItemId(), rtnDtlEntity.getBrandUnitUnqNo());
                     }
 
                     if (!rtnOrdEntity.getSpplyId().equals(rtnSaveDtlEntity.getSpplyId())) {
@@ -295,7 +289,11 @@ public class RtnOdrService extends CommonService {
                     rtnSaveDtlEntity.setRtnPodrDtlNo(dtlNo);
                     rtnSaveDtlEntity.setRtnReqUnqNo(rtnDtlEntity.getRtnReqUnqNo());
                     rtnSaveDtlEntity.setRtnReqDtlNo(rtnDtlEntity.getRtnReqDtlNo());
-                    rtnSaveDtlEntity.setRtnQty(rtnDtlEntity.getRtnReqQty());
+                    rtnSaveDtlEntity.setRtnQty(rtnSaveDtlEntity.getRtnReqQty());
+                    //System.out.println("==========================================");
+                    //System.out.println(rtnDtlEntity.getRtnQty() + "===" + rtnSaveDtlEntity.getUnitAmt());
+                    //System.out.println("==========================================");
+
                     rtnSaveDtlEntity.setRtnAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt() );
                     rtnSaveDtlEntity.setBrandUnitUnqNo(rtnDtlEntity.getBrandUnitUnqNo());
                     rtnSaveDtlEntity.setStoreUnitUnqNo(rtnDtlEntity.getStoreUnitUnqNo());
@@ -303,6 +301,7 @@ public class RtnOdrService extends CommonService {
                     rtnSaveDtlEntity.setRtnRsn(rtnDtlEntity.getRtnRsn());
                     rtnSaveDtlEntity.setRtnRsnDvsn(rtnDtlEntity.getRtnRsnDvsn());
                     rtnSaveDtlEntity.setRtnOdrQty(rtnDtlEntity.getRtnQty());
+                    rtnSaveDtlEntity.setRtnReqQty(rtnDtlEntity.getRtnReqQty());
                     rtnSaveDtlEntity.setRtnOdrAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt());
 
 
@@ -318,7 +317,7 @@ public class RtnOdrService extends CommonService {
                 if ("C002".equals(rtnOrdEntity.getColDvsn())) {
                     // 공급사 수거일경우
                     // 공급사는 하나여야 함
-                    if("".equals(saveRtnOrdRequest.getSpplyId())) {
+                    if("".equals(saveRtnOdrRequest.getSpplyId())) {
                         throw new GlobalException(SystemMessageCode.ERR_NOTSPPLY);
                     }
 
@@ -349,7 +348,7 @@ public class RtnOdrService extends CommonService {
 
 
                 // 반품요청건에 대한 상태에 대한 처리상태 변경
-                if ("R".equals(saveRtnOrdRequest.getJobCd())) {   // 반품요청건
+                if ("R".equals(saveRtnOdrRequest.getJobCd())) {   // 반품요청건
                     rtnReqMapper.updateSelRtnReqDtlStCd(userId,rtnReqDtlList);
                     String rtnReqUnqNo = "";
                     List<RtnReqBaseInfoEntity> rtnReqList = new ArrayList<RtnReqBaseInfoEntity>();

src/main/java/com/oqpo/api/service/rtnmng/RtnReqService.java

@@ -195,8 +195,10 @@ public class RtnReqService extends CommonService {
                 rtnReqMapper.updateRtnReqBaseInfo(userId, entity);
             }
             // 상세코드 업데이트
-            if ("RRD20".equals(saveRtnReqlRequest.getRtnReqStCd())) {
+            if ("RR20".equals(saveRtnReqlRequest.getRtnReqStCd())) {
                 rtnReqMapper.updateAllRtnReqDtlStCd(userId, entity.getRtnReqUnqNo() , "RRD20");
+            } else {
+                rtnReqMapper.updateAllRtnReqDtlStCd(userId, entity.getRtnReqUnqNo() , "RRD00");
             }
 
         } catch (GlobalException e) {

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

@@ -193,22 +193,22 @@ public class ColOdrController {
     }
 
     /**
-     * 설명 : 입고처리 대상 리스트
+     * 설명 : 반품처리 대상 리스트
      *
      * @param SpplyDeliDtlGridRequest
      * @return
      * @throws Exception
 
-
+     */
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
-    @ApiOperation(value = " 입고처리 대상 그리드 리스트")
+    @ApiOperation(value = " 반품처리 대상 그리드 리스트")
     @PostMapping("/warehouse-target-grid-list")
-    public ResponseEntity<GridResponse> selectSpplyDeliGridList(@RequestBody @Valid WarehouseTragetGridRequest warehouseTragetGridRequest) throws Exception {
-        return ResponseEntity.ok(shmtOdrService.selectWarehouseTargetList(warehouseTragetGridRequest.getSBrandId(), warehouseTragetGridRequest.getFromDt(), warehouseTragetGridRequest.getToDt(), warehouseTragetGridRequest.getSWhsId(), warehouseTragetGridRequest.getSSpplyId(), warehouseTragetGridRequest.getSDlvSttmtUnqNo(), warehouseTragetGridRequest.getSItemNm(),  warehouseTragetGridRequest.toDTO(warehouseTragetGridRequest)));
+    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)));
     }
-     */
+
 
     /**
      * 설명 : 입고처리

src/main/java/com/oqpo/api/web/controller/rtnmng/RtnOrdController.java

@@ -104,8 +104,8 @@ public class RtnOrdController {
     })
     @ApiOperation(value = "반품발주 정보 저장")
     @PostMapping("/save-rtnPo")
-    public ResponseEntity<SaveResponse> saveRtnOdr(@ApiIgnore String userId, @RequestBody @Valid SaveRtnOrdRequest saveRtnOrdRequest) throws Exception {
-        rtnOdrService.saveRtnOdrInfo(userId,  saveRtnOrdRequest);
+    public ResponseEntity<SaveResponse> saveRtnOdr(@ApiIgnore String userId, @RequestBody @Valid SaveRtnOdrRequest saveRtnOdrRequest) throws Exception {
+        rtnOdrService.saveRtnOdrInfo(userId,  saveRtnOdrRequest);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
 

src/main/java/com/oqpo/api/web/controller/rtnmng/RtnReqController.java

@@ -73,7 +73,7 @@ public class RtnReqController {
         if ("RR00".equals(saveRtnReqlRequest.getRtnReqStCd())) {
             return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
         } else {
-            return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.REQ_OK));
+            return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.RTN_REQ_OK));
         }
 
     }

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

@@ -0,0 +1,48 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.web.dto.request.GridRequest;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+
+
+@Getter
+@Setter
+public class RtnStockTragetGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "매장")
+    private String sStoreId;
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @ApiModelProperty(value = "수거창고아이디")
+    private String sRtnWhsId;
+
+    @ApiModelProperty(value = "공급업체코드")
+    private String sSpplyId;
+
+    @ApiModelProperty(value = "반품입고창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+
+    protected RtnStockTragetGridRequest(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/request/inoutmng/SaveRtnStockProcRequest.java

@@ -0,0 +1,65 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.entity.rtnmng.RtnProcInfoPtclEntity;
+import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class SaveRtnStockProcRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "입고창고아이디") private String whsId;
+
+    @ApiModelProperty(value = "매장창고 입고처리시 필수") private String storeId;
+    //colCnfmDocFileNo
+    @ApiModelProperty(value = "반품처리대상 리스트")
+    private List<RtnStockProcDataList> gridInsertData;
+
+
+    public List<RtnProcInfoPtclEntity> toCodeEntities(List<RtnStockProcDataList> gridData) {
+        List<RtnProcInfoPtclEntity> entities = new ArrayList<>();
+        if (gridData == null || gridData.size() == 0)
+            return entities;
+
+        gridData.forEach(x -> {
+            RtnProcInfoPtclEntity entity = new RtnProcInfoPtclEntity();
+            entity.setColPickUnqNo(x.getColPickUnqNo());
+            entity.setColPickDtlNo(x.getColPickDtlNo());
+            entity.setItemId(x.getItemId());
+            entity.setColQty(x.getColQty());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class RtnStockProcDataList {
+
+        @NotBlank
+        @ApiModelProperty(value = "수거서번호") private String colPickUnqNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "수거서항번") private String colPickDtlNo;
+
+        @ApiModelProperty(value = "품목아이디") private String itemId;
+
+        @NotBlank
+        @ApiModelProperty(value = "수거수량") private Integer colQty;
+
+
+    }
+}

src/main/java/com/oqpo/api/web/dto/request/rtnmng/SaveRtnOrdRequest.java

@@ -1,7 +1,7 @@
 package com.oqpo.api.web.dto.request.rtnmng;
 
-import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import com.oqpo.api.entity.rtnmng.RtnReqDtlPtclEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
@@ -11,7 +11,7 @@ import java.util.List;
 
 @Getter
 @Setter
-public class SaveRtnOrdRequest {
+public class SaveRtnOdrRequest {
     @NotBlank
     @ApiModelProperty(value = "CRUD")
     private String viewCd;
@@ -43,10 +43,10 @@ public class SaveRtnOrdRequest {
 
 
     @ApiModelProperty(value = "등록 품목리스트")
-    private List<SaveRtnItemList> gridInsertData;
+    private List<SaveRtnOdrItemList> gridInsertData;
 
 
-    public List<RtnOdrDtlPtclEntity> toCodeEntities(List<SaveRtnItemList> gridData) {
+    public List<RtnOdrDtlPtclEntity> toCodeEntities(List<SaveRtnOdrItemList> gridData) {
         List<RtnOdrDtlPtclEntity> entities = new ArrayList<>();
         if (gridData == null || gridData.size() == 0)
             return entities;
@@ -71,7 +71,7 @@ public class SaveRtnOrdRequest {
     @Getter
     @Builder
     @AllArgsConstructor(access = AccessLevel.PROTECTED)
-    static class SaveRtnItemList {
+    static class SaveRtnOdrItemList {
 
         @ApiModelProperty(value = "반품요청고유번호") private String rtnReqUnqNo;
         @ApiModelProperty(value = "반품요청상세번호") private String rtnReqDtlNo;

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

@@ -0,0 +1,40 @@
+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 RtnStockTargetResponse {
+
+    @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 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 pickMgrNm;
+    @ApiModelProperty(value = "수거담당자연락처") private String pickMgrTelNo;
+    @ApiModelProperty(value = "공급사아이디") private String spplyId;
+    @ApiModelProperty(value = "공급사명") private String spplyNm;
+
+}

src/main/java/com/oqpo/api/web/dto/response/rtnmng/rtnOrd/RtnOrdInitInfoResponse.java

@@ -81,6 +81,8 @@ public class RtnOrdInitInfoResponse {
                                 .rtnRsnDvsn(m.getRtnRsnDvsn() == null ? "" : m.getRtnRsnDvsn())
                                 .rtnRsnDvsnNm(m.getRtnRsnDvsnNm() == null ? "" : m.getRtnRsnDvsnNm())
                                 .rtnRsn(m.getRtnRsn() == null ? "" : m.getRtnRsn())
+                                .rtnDvsn(m.getRtnDvsn() == null ? "" : m.getRtnDvsn())
+                                .rtnDvsnNm(m.getRtnDvsnNm() == null ? "" : m.getRtnDvsnNm())
                                 .unitGubun(m.getUnitGubun() == null ? "" : m.getUnitGubun())
                                 .build())
                         .collect(Collectors.toList()))
@@ -129,6 +131,8 @@ public class RtnOrdInitInfoResponse {
         @ApiModelProperty(value = "반품사유구분") private String rtnRsnDvsn;
         @ApiModelProperty(value = "반품사유구분명") private String rtnRsnDvsnNm;
         @ApiModelProperty(value = "반품사유내용") private String rtnRsn;
+        @ApiModelProperty(value = "반품구분") private String rtnDvsn;
+        @ApiModelProperty(value = "반품구분명") private String rtnDvsnNm;
         @ApiModelProperty(value = "단가구분") private String unitGubun;
 
     }

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

@@ -556,5 +556,126 @@
 
     </select>
 
+    <select id="selectColRtnInstGridList" 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.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
+               , 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
+               , 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
+               , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_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.store_id = #{sStoreId}
+        and   mgnt.col_sch_dt between #{fromDt} and #{toDt}
+        <if test="sRtnWhsId != null and sRtnWhsId != ''">
+        and   base.whs_id = #{sRtnWhsId}
+        </if>
+        <if test="spplyId != null and spplyId != ''">
+        and   mgnt.spply_id = #{spplyId}
+        </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="selectColRtnInstGridCnt" 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.store_id = #{sStoreId}
+        and   mgnt.col_sch_dt between #{fromDt} and #{toDt}
+        <if test="sRtnWhsId != null and sRtnWhsId != ''">
+            and   base.whs_id = #{sRtnWhsId}
+        </if>
+        <if test="spplyId != null and spplyId != ''">
+            and   mgnt.spply_id = #{spplyId}
+        </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>
 
+    <insert id="insertRtnProcInfoPtcl">
+        insert into rtn_proc_info_ptcl
+            (rtn_mgnt_unq_no, brand_id, store_id, item_id, item_nm
+            , whs_id, location, unit, unit_amt, rtn_qty
+            , rtn_odr_qty, col_qty, col_req_dt, col_sch_dt, col_dt
+            , col_cnfm_nm, col_mgr_nm, col_mgr_tel_no, col_mgr_emal, col_mgr_mbl_no
+            , col_amt, col_agr_yn, col_cnfm_doc_file_no, sttl_yn, spply_id
+            , spply_nm, col_pick_unq_no, col_pick_dtl_no, col_cmd_unq_no, col_cmd_dtl_no
+            , rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no, rtn_req_dtl_no, sttl_mgnt_unq_no, sttl_mgnt_dtl_no
+            , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+        <foreach collection="gridInsertData" item="item" separator=",">
+            (#{item.rtnMgntUnqNo}, #{item.brandId}, #{item.storeId}, #{item.itemId}, #{item.itemNm}
+            , #{item.whsId}, #{item.location}, #{item.unit}, #{item.unitAmt}, #{item.rtnQty}
+            , #{item.rtnOdrQty}, #{item.colQty}, #{item.colReqDt}, #{item.colSchDt}, #{item.colDt}
+            , #{item.colCnfmNm}, #{item.colMgrNm}, #{item.colMgrTelNo}, #{item.colMgrEmal}, #{item.colMgrMblNo}
+            , #{item.colAmt}, #{item.colAgrYn}, #{item.colCnfmDocFileNo}, #{item.sttlYn}, #{item.spplyId}
+            , #{item.spplyNm}, #{item.colPickUnqNo}, #{item.colPickDtlNo}, #{item.colCmdUnqNo}, #{item.colCmdDtlNo}
+            , #{item.rtnPodrUnqNo}, #{item.rtnPodrDtlNo}, #{item.rtnReqUnqNo}, #{item.rtnReqDtlNo}, #{item.sttlMgntUnqNo}, #{item.sttlMgntDtlNo}
+            , now(), #{userId}, now(), #{userId})
+        </foreach>
+    </insert>
 </mapper>

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

@@ -32,11 +32,12 @@
             , ptcl.rtn_rsn_dvsn, ptcl.rtn_rsn, ptcl.unit_gubun
             , fn_code_nm('RTN_RSN_DVSN',ptcl.rtn_rsn_dvsn) as rtn_rsn_dvsn_nm
             ,date_format(base.col_req_dt , '%Y.%m.%d') as col_req_dt
+            , ptcl.rtn_dvsn , fn_code_nm('RTN_DVSN',ptcl.rtn_dvsn ) as rtn_dvsn_nm
         from rtn_req_base_info base
             , rtn_req_dtl_ptcl ptcl
         where 1 = 1
         and base.rtn_req_unq_no = ptcl.rtn_req_unq_no
-        and base.brand_id = 'BRD221000001'
+        and base.brand_id = #{brandId}
         and base.rtn_req_st_cd = 'RR20'
         and concat(base.rtn_req_unq_no, ptcl.rtn_req_dtl_no) in
         <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
@@ -70,21 +71,21 @@
             insert into rtn_odr_dtl_ptcl
             (rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no, rtn_req_dtl_no, item_id
             , item_nm, unit, unit_amt, col_req_dt, rtn_dvsn, rtn_req_qty
-            , rtn_qty, rtn_amt, rtn_rsn_dvsn, rtn_rsn, rtn_odr_qty
+            , rtn_amt, rtn_rsn_dvsn, rtn_rsn, rtn_odr_qty
             , rtn_odr_amt, rodr_dtl_st_cd
             , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
             values
             <foreach collection="gridInsertData" item="item" separator=",">
                (#{item.rtnPodrUnqNo}, #{item.rtnPodrDtlNo}, #{item.rtnReqUnqNo}, #{item.rtnReqDtlNo}, #{item.itemId}
             , #{item.itemNm}, #{item.unit}, #{item.unitAmt}, #{item.colReqDt}, #{item.rtnDvsn}, #{item.rtnReqQty}
-            , #{item.rtnQty}, #{item.rtnAmt}, #{item.rtnRsnDvsn}, #{item.rtnRsn}, #{item.rtnOdrQty}
+            , #{item.rtnAmt}, #{item.rtnRsnDvsn}, #{item.rtnRsn}, #{item.rtnOdrQty}
             , #{item.rtnOdrAmt}, 'ROD1', NOW(), #{userId}, NOW(), #{userId})
             </foreach>
         </insert>
 
 
         <select id="selectPoRtnDtlSaveInfo" resultType="com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity">
-            select ptcl.item_id, ptcl.item_nm,  ptcl.unit, ptcl.unit_amt, bunit.spply_id
+            select ptcl.item_id, ptcl.item_nm,  ptcl.unit, ptcl.unit_amt, bunit.spply_id, ptcl.rtn_qty
             from  rtn_req_dtl_ptcl ptcl
               join rtn_req_base_info base on ptcl.rtn_req_unq_no = base.rtn_req_unq_no
               join brand_item_unit_info bunit on ptcl.brand_unit_unq_no = bunit.brand_unit_unq_no

src/main/resources/mybatis/sqlmaps/sttlmng/SttlReq.xml

@@ -332,7 +332,7 @@
             A.col_mgr_nm, A.col_mgr_tel_no, A.col_mgr_emal, A.col_mgr_mbl_no, A.col_amt, A.col_agr_yn,
             A.col_cnfm_doc_file_no, A.sttl_yn, A.spply_id, A.spply_nm, A.col_cmd_unq_no, A.col_cmd_dtl_no,
             A.rtn_podr_unq_no, A.rtn_podr_dtl_no, A.rtn_req_unq_no, A.rtn_req_dtl_no, A.sttl_mgnt_unq_no,
-            A.sttl_mgnt_dtl_no,
+            A.sttl_mgnt_dtl_no, A.col_pick_unq_no, A.col_pick_dtl_no,
             DATE_FORMAT(A.sys_reg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_reg_dttm, A.sys_reg_id, DATE_FORMAT(A.sys_chg_dttm,'%Y.%m.%d %H:%i:%s') AS sys_chg_dttm, A.sys_chg_id
         FROM rtn_proc_info_ptcl A
         WHERE A.rtn_mgnt_unq_no = #{rtnMgntUnqNo}