반품 발주 취소처리 함

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

@@ -0,0 +1,51 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class ColOdrBaseEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String colCmdUnqNo;
+    private String colRegDt;
+    private String brandId;
+    private String whsId;
+    private String location;
+    private String whsNm;
+    private String locationNm;
+    private String storeId;
+    private String storeNm;
+    private Integer itemQty;
+    private Long colTotalAmt;
+    private String colReqDt;
+    private String colDvsn;
+    private String colDvsnNm;
+    private String colCmdStCd;
+    private String colCmdStNm;
+    private String colReqMgrNm;
+    private String colReqMgrId;
+    private String colDt;
+    private String colCnfmNm;
+    private String colCnfmId;
+    private String colMgrNm;
+    private String colMgrTelNo;
+    private String colMgrEmal;
+    private String colMgrMblNo;
+    private String rtnWhsId;
+    private String rtnLocation;
+    private String rtnWhsNm;
+    private String rtnLocationNm;
+    private String spplyId;
+    private String spplyNm;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -0,0 +1,35 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class ColOdrDtlPtclEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String colCmdUnqNo;
+    private String colCmdDtlNo;
+    private String itemId;
+    private String itemNm;
+    private Long unitAmt;
+    private Integer colQty;
+    private Long colAmt;
+    private Integer rtnQty;
+    private Long rtnAmt;
+    private String rtnRsnDvsn;
+    private String rtnRsn;
+    private String rtnPodrUnqNo;
+    private String rtnPodrDtlNo;
+    private String rtnReqDtlNo;
+    private String rtnReqUnqNo;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -59,6 +59,7 @@ public enum SystemMessageCode {
     ERR_NOTITEM (40030, "대상품목이 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_NOTSPPLY (40031, "공급사 정보가 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_INGPOCNT (40032, "발주 진행중인건이 있어서 반품 반려 처리를 할 수 없습니다.", HttpStatus.BAD_REQUEST),
+    ERR_INGCOLCNT (40033, "발주 진행중인건이 있어서 반품 취소처리를 할 수 없습니다.", HttpStatus.BAD_REQUEST),
     ;
 
 

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

@@ -0,0 +1,73 @@
+package com.oqpo.api.mapper.inoutmng;
+
+
+import com.oqpo.api.entity.inoutmng.DeliDtlMgntEntity;
+import com.oqpo.api.entity.inoutmng.DeliInfoMgntEntity;
+import com.oqpo.api.entity.inoutmng.ShmtOdrBaseEntity;
+import com.oqpo.api.entity.inoutmng.ShmtOdrDtlEntity;
+import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
+import com.oqpo.api.web.dto.request.GridRequest;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface ColOdrMapper {
+    int selectColRtnIngCnt(@Param("brandId") String brandId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo)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;
+
+    int insertShmtOdrBase(@Param("userId") String userId, ShmtOdrBaseEntity entity)throws Exception;
+    int insertShmtOdrDtl(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridInsertData)throws Exception;
+
+    List<PchOdrBaseInfoEntity> selectShmtJobDataList(@Param("brandId") String brandId, List<PchOdrDtlPtclEntity> gridInsertData)throws Exception;
+
+    int insertDeliInfoMngt(@Param("userId") String userId, DeliInfoMgntEntity entity)throws Exception;
+    int insertDeliDtlPtcl(@Param("userId") String userId, List<DeliDtlMgntEntity> gridInsertData)throws Exception;
+
+    List<ShmtOdrBaseEntity> selectShmtSearchGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sShmtReqStCd") String sShmtReqStCd, @Param("swhsId") String swhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectShmtSearchGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sShmtReqStCd") String sShmtReqStCd, @Param("swhsId") String swhsId, @Param("sItemNm") String sItemNm)throws Exception;
+
+    DeliInfoMgntEntity selectInvInfo(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo)throws Exception;
+    List<DeliDtlMgntEntity> selectInvDtlList(@Param("brandId") String brandId, @Param("dlvSttmtUnqNo") String dlvSttmtUnqNo)throws Exception;
+
+    List<PchOdrBaseInfoEntity> selectSpplyTargetOdrGridList(@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 selectSpplyTargetOdrGridCnt(@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;
+
+    PchOdrBaseInfoEntity selectSpplyShmtOdrInfo(@Param("brandId") String brandId, @Param("spplyId") String spplyId, @Param("pchPodrUnqNo") String pchPodrUnqNo)throws Exception;
+    List<PchOdrDtlPtclEntity> selectSpplyShmtOdrList(@Param("pchPodrUnqNo") String pchPodrUnqNo)throws Exception;
+
+
+    List<DeliInfoMgntEntity> selectDeliGridList(@Param("sBrandId") String sBrandId, @Param("dtGubun") String dtGubun, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sDlvStCd") String sDlvStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectDeliGridCnt(@Param("sBrandId") String sBrandId, @Param("dtGubun") String dtGubun, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sDlvStCd") String sDlvStCd, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm)throws Exception;
+
+    List<DeliInfoMgntEntity> selectSpplyDeliGridList(@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 selectSpplyDeliGridCnt(@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<DeliInfoMgntEntity> selectWarehouseTargetGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sDlvSttmtUnqNo") String sDlvSttmtUnqNo, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectWarehouseTargetGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sDlvSttmtUnqNo") String sDlvSttmtUnqNo, @Param("sItemNm") String sItemNm)throws Exception;
+
+    int insertWhsProcInfoPtcl(@Param("userId") String userId, List<WhsProcInfoPtclEntity> gridUpdateData)throws Exception;
+
+    List<DeliInfoMgntEntity> selectWarehouseProcList(@Param("brandId") String brandId, @Param("whsId") String whsId, List<DeliDtlMgntEntity> gridUpdateData)throws Exception;
+
+
+    int updateDeliDtlStCd(@Param("userId") String userId, List<DeliDtlMgntEntity> gridUpdateData)throws Exception;
+    List<DeliInfoMgntEntity> selectDeliInfoStList(@Param("userId") String userId, List<DeliDtlMgntEntity> gridUpdateData)throws Exception;
+    int updateDeliInfoStCd(@Param("userId") String userId, List<DeliInfoMgntEntity> gridUpdateData)throws Exception;
+
+    int updateShmtDtlStCd(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridUpdateData)throws Exception;
+    List<ShmtOdrBaseEntity> selectShmtInfoStList(@Param("userId") String userId, List<ShmtOdrDtlEntity> gridUpdateData)throws Exception;
+    int updateShmtInfoStCd(@Param("userId") String userId, List<ShmtOdrBaseEntity> gridUpdateData)throws Exception;
+
+    int updatePchPodrDtlStCd(@Param("userId") String userId, List<PchOdrDtlPtclEntity> gridUpdateData)throws Exception;
+
+    List<WhsProcInfoPtclEntity> selectWarehouseList(@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, GridRequest gridRequest)throws Exception;
+    int selectWarehouseCnt(@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)throws Exception;
+    */
+}

src/main/java/com/oqpo/api/mapper/rtnmng/RtnOdrMapper.java

@@ -34,6 +34,9 @@ public interface RtnOdrMapper {
     RtnOdrBaseInfoEntity selectRtnOdrInfo(@Param("rtnPodrUnqNo") String rtnPodrUnqNo);
     List<RtnOdrDtlPtclEntity> selectROdrDtlList(@Param("rtnPodrUnqNo") String rtnPodrUnqNo);
 
+    int updateChgRodrStCd(@Param("userId") String userId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo, @Param("rtnOdrStCd") String rtnOdrStCd);
+    int updateChangeRodrDtlStCd(@Param("userId") String userId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo, @Param("rodrDtlStCd") String rodrDtlStCd);
+
     /*
 
 

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

@@ -10,6 +10,7 @@ import com.oqpo.api.entity.rtnmng.RtnReqBaseInfoEntity;
 import com.oqpo.api.entity.rtnmng.RtnReqDtlPtclEntity;
 import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.exception.GlobalException;
+import com.oqpo.api.mapper.inoutmng.ColOdrMapper;
 import com.oqpo.api.mapper.loanmng.LoanStateMapper;
 import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.rtnmng.RtnOdrMapper;
@@ -18,6 +19,8 @@ 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.response.GridResponse;
@@ -29,6 +32,7 @@ import com.oqpo.api.web.dto.response.rtnmng.rtnOrd.RtnOrdInitInfoResponse;
 import com.oqpo.api.web.dto.response.rtnmng.rtnOrd.RtnOrdNInitInfoResponse;
 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;
@@ -52,6 +56,9 @@ public class RtnOdrService extends CommonService {
     @Autowired
     private RtnReqMapper rtnReqMapper;
 
+    @Autowired
+    private ColOdrMapper colOdrMapper;
+
     @Autowired
     private StoreBaseInfoMapper storeBaseInfoMapper;
 
@@ -427,47 +434,52 @@ public class RtnOdrService extends CommonService {
 
 
     /*
-      발주 취소처리
-
+      반품 발주 취소처리
+    */
     @Transactional
-    public void cancelPchOrdDtl(String userId, CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
+    public void cancelRtnOrdDtl(String userId, CancelRtnOrdDtlRequest cancelRtnOrdDtlRequest) throws Exception {
         try {
-            // 품목 삭제 상태처리
-            long podrAmt = 0;
-            List<rtnOdrDtlPtclEntity> gridUpdateData = cancelPchOrdDtlRequest.toCodeEntities(cancelPchOrdDtlRequest.getGridUpdateData());
-            List<StckMgntBaseInfoEntity> stckList = new ArrayList<StckMgntBaseInfoEntity>();
-            if (gridUpdateData.size() > 0) {
-                pchOrdMapper.updateCancelPodrDtl(userId,  gridUpdateData) ;
 
-                for (int i = 0 ; i < gridUpdateData.size() ; i++) {
-                    rtnOdrDtlPtclEntity delItem = gridUpdateData.get(i);
-                    podrAmt = podrAmt + delItem.getPodrAmt();
+            // 수거서 생성 여부 파악 (이미생성시 반품 취소 불가)
+            int ingCnt = colOdrMapper.selectColRtnIngCnt(cancelRtnOrdDtlRequest.getBrandId(), cancelRtnOrdDtlRequest.getRtnPodrUnqNo());
 
-                    if ("DL01".equals(cancelPchOrdDtlRequest.getDlvDvsn())) { // 본사배송이면
-                        StckMgntBaseInfoEntity stckEntity = new StckMgntBaseInfoEntity();
-                        stckEntity.setItemId(delItem.getItemId());
-                        stckEntity.setWaitQty(delItem.getPodrQty());
-                        stckList.add(stckEntity);
-                    }
-                }
+            if (ingCnt > 0) {
+                throw new GlobalException(SystemMessageCode.ERR_INGCOLCNT);
             }
 
-            //발주취소로 인한 발주 head 상태값 변경처리  pchPodrUnqNo
-            String rtnOdrStCd = selectOdrDtlStatusList(cancelPchOrdDtlRequest.getPchPodrUnqNo());
-            pchOrdMapper.updateChgPodrStCd(userId, rtnOdrStCd, cancelPchOrdDtlRequest.getPchPodrUnqNo());
+            //반품요청 취소처리
+            rtnOdrMapper.updateChgRodrStCd(userId, cancelRtnOrdDtlRequest.getRtnPodrUnqNo(),"RO99");
+            rtnOdrMapper.updateChangeRodrDtlStCd(userId, cancelRtnOrdDtlRequest.getRtnPodrUnqNo(),"ROD2");
 
-            // 매장 구매요청 발주일경우 사용금액 차감 처리함
-            if (!"".equals(cancelPchOrdDtlRequest.getStoreId())) {
-                String loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(cancelPchOrdDtlRequest.getStoreId());
+            RtnOdrBaseInfoEntity rtnOdrInfo = rtnOdrMapper.selectRtnOdrInfo(cancelRtnOrdDtlRequest.getRtnPodrUnqNo());
 
-                if (loanMgntUnqNo != null) {
-                    loanStateMapper.updateloanMinusPchReqUseAmt(loanMgntUnqNo, cancelPchOrdDtlRequest.getStoreId(), podrAmt);
-                }
-            }
+            // 반품요청건에 대한 상태에 대한 처리상태 변경  RR01
+            if ("RR01".equals(rtnOdrInfo.getRtnReqDvsn())) {   // 요청반품건은 반품요청건 상태 변경처리함
+                List<RtnOdrDtlPtclEntity> rtnOrdList =  rtnOdrMapper.selectROdrDtlList(cancelRtnOrdDtlRequest.getRtnPodrUnqNo());
+
+                List<RtnReqDtlPtclEntity> rtnReqDtlList = new ArrayList<RtnReqDtlPtclEntity>();
+                List<RtnReqBaseInfoEntity> rtnReqBaseList = new ArrayList<RtnReqBaseInfoEntity>();
+                String rtnReqUnqNo = "";
+                for (int i = 0 ; i < rtnOrdList.size() ;i++) {
+                    RtnOdrDtlPtclEntity rtnOdrEntity = rtnOrdList.get(i);
+                    RtnReqDtlPtclEntity rtnReqDtlEntity = new RtnReqDtlPtclEntity();
+                    RtnReqBaseInfoEntity rtnReqBaseEntity = new RtnReqBaseInfoEntity();
+
+                    rtnReqDtlEntity.setRtnReqUnqNo(rtnOdrEntity.getRtnReqUnqNo());
+                    rtnReqDtlEntity.setRtnReqDtlNo(rtnOdrEntity.getRtnReqDtlNo());
+                    rtnReqDtlEntity.setRtnReqDtlStCd("RRD99");
+                    rtnReqDtlList.add(rtnReqDtlEntity);
 
-            //출고가능수량을 복구처리
-            if ("DL01".equals(cancelPchOrdDtlRequest.getDlvDvsn())) { // 본사배송이면
-                stockMngMapper.updateStckPoUseQty(userId, cancelPchOrdDtlRequest.getBrandId(), cancelPchOrdDtlRequest.getShmtWhsId(), cancelPchOrdDtlRequest.getShmtLocation(), stckList );
+                    if (!rtnReqUnqNo.equals(rtnOdrEntity.getRtnReqUnqNo())) {
+                        rtnReqUnqNo = rtnOdrEntity.getRtnReqUnqNo();
+                        rtnReqBaseEntity.setRtnReqUnqNo(rtnReqUnqNo);
+
+                        String rtnReqStcd = rtnReqService.selectRtnReqDtlStatusList(rtnReqUnqNo);
+                        rtnReqBaseEntity.setRtnReqStCd(rtnReqStcd);
+                        rtnReqBaseList.add(rtnReqBaseEntity);
+                    }
+                }
+                rtnReqMapper.updateRtnReqStCd(userId,rtnReqBaseList);
             }
 
         } catch (GlobalException e) {
@@ -480,40 +492,6 @@ public class RtnOdrService extends CommonService {
         }
     }
 
-    public String  selectOdrDtlStatusList(String  pchReqUnqNo) throws Exception {
-        //PCH_ODR_ST_CD
-        String rtnOdrStCd = "";
-        List<rtnOdrDtlPtclEntity> dtlEntity = pchOrdMapper.selectOdrDtlStatusList( pchReqUnqNo);
-
-        int pod0 = 0 ;
-        int pod1 = 0 ;
-        int pod2 = 0 ;
-        int pod4 = 0 ;
-
-        for (int i = 0 ; i < dtlEntity.size() ; i++ ) {
-            rtnOdrDtlPtclEntity entity = dtlEntity.get(i);
-            if ( "POD0".equals(entity.getPodrDtlStCd())) {  // 요청
-                pod0 = pod0 + entity.getPodrStatusCnt() ;
-            } else if ( "POD1".equals(entity.getPodrDtlStCd()) ||  "POD3".equals(entity.getPodrDtlStCd())) {  // 접수 ,출하
-                pod1 = pod1 + entity.getPodrStatusCnt() ;
-            } else if ( "POD2".equals(entity.getPodrDtlStCd())) {  //발주취소
-                pod2 = pod2 + entity.getPodrStatusCnt() ;
-            } else if ( "POD4".equals(entity.getPodrDtlStCd())) {  //입고완료
-                pod4 = pod4 + entity.getPodrStatusCnt() ;
-            }
-        }
-
-        if (pod0 > 0 ) {
-            rtnOdrStCd = "PO20";  //요청
-        } else if ( pod0 == 0 && pod1 == 0 &&  pod4 == 0 ) {
-            rtnOdrStCd = "PO99";  // 취소
-        } else {
-            rtnOdrStCd = "PO30";  // 접수
-        }
-
-        return rtnOdrStCd;
-    }
-*/
     /*
      공급사 수주현황 리스트
 

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

@@ -5,6 +5,7 @@ import com.oqpo.api.enums.SystemMessageCode;
 import com.oqpo.api.service.pomng.PchOrdService;
 import com.oqpo.api.service.rtnmng.RtnOdrService;
 import com.oqpo.api.web.dto.request.pomng.pchOrd.*;
+import com.oqpo.api.web.dto.request.rtnmng.CancelRtnOrdDtlRequest;
 import com.oqpo.api.web.dto.request.rtnmng.RtnOrdSearchGridRequest;
 import com.oqpo.api.web.dto.request.rtnmng.RtnReqOrdInitRequest;
 import com.oqpo.api.web.dto.request.rtnmng.SaveRtnOrdRequest;
@@ -153,18 +154,18 @@ public class RtnOrdController {
      * @param savePchReqlRequest
      * @return SaveResponse
      * @throws Exception
-
+     */
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
-    @ApiOperation(value = "구매발주 취소 처리")
-    @PostMapping("/cancel-pchPo")
-    public ResponseEntity<SaveResponse> cancelPchOdr(@ApiIgnore String userId, @RequestBody @Valid CancelPchOrdDtlRequest cancelPchOrdDtlRequest) throws Exception {
-        pchOrdService.cancelPchOrdDtl(userId,  cancelPchOrdDtlRequest);
+    @ApiOperation(value = "반품발주 취소 처리")
+    @PostMapping("/cancel-rtnPo")
+    public ResponseEntity<SaveResponse> cancelRtnOdr(@ApiIgnore String userId, @RequestBody @Valid CancelRtnOrdDtlRequest cancelRtnOrdDtlRequest) throws Exception {
+        rtnOdrService.cancelRtnOrdDtl(userId,  cancelRtnOrdDtlRequest);
         return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
     }
-     */
+
 
 
     /**

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

@@ -0,0 +1,25 @@
+package com.oqpo.api.web.dto.request.rtnmng;
+
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class CancelRtnOrdDtlRequest {
+
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "반품발주번호")
+    private String rtnPodrUnqNo;
+
+
+}

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.oqpo.api.mapper.inoutmng.ColOdrMapper">
+    <select id="selectColRtnIngCnt" resultType="int">
+        select count(*)  /* ColOdr.selectColRtnIngCnt */
+        from  col_odr_base_info base
+        ,col_odr_dtl_ptcl  ptcl
+        where base.col_cmd_unq_no = ptcl.col_cmd_unq_no
+        and   base.brand_id = #{brandId}
+        and   base.col_cmd_st_cd in ('COL1','COL2')
+        and   ptcl.rtn_podr_unq_no = #{rtnPodrUnqNo}
+    </select>
+
+</mapper>

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

@@ -248,6 +248,26 @@
                 where rtn_podr_unq_no = #{rtnPodrUnqNo}
     </select>
 
+    <update id="updateChgRodrStCd">
+            UPDATE /* RtnOrd.updateChgRodrStCd */
+            rtn_odr_base_info SET
+            rtn_odr_st_cd = #{rtnOdrStCd},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE rtn_podr_unq_no = #{rtnPodrUnqNo}
+    </update>
+
+    <update id="updateChangeRodrDtlStCd">
+            UPDATE /* RtnOrd.updateChangeRodrDtlStCd */
+            rtn_odr_dtl_ptcl SET
+            rodr_dtl_st_cd = #{rodrDtlStCd},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE rtn_podr_unq_no = #{rtnPodrUnqNo}
+    </update>
+
+
+
     <!--