수거지시 및 관려부분 수정조치

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

@@ -0,0 +1,42 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class PickDtlPtclEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String colPickUnqNo;
+    private String colPickDtlNo;
+    private String rtnPodrUnqNo;
+    private String rtnPodrDtlNo;
+    private String rtnReqUnqNo;
+    private String rtnReqDtlNo;
+    private String colCmdUnqNo;
+    private String colCmdDtlNo;
+    private String pickDtlStCd;
+    private String pickDtlStNm;
+    private String itemId;
+    private String itemNm;
+    private String unit;
+    private Long unitAmt;
+    private String priceUnit;
+    private Integer rodrQty;
+    private Integer colQty;
+    private Long rtnAmt;
+    private Long colAmt;
+    private String delayYn;
+    private String delayRsn;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+
+}

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

@@ -0,0 +1,45 @@
+package com.oqpo.api.entity.inoutmng;
+
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.io.Serializable;
+
+@Getter
+@Setter
+@ToString
+public class PickInfoMgntEntity implements Serializable {
+    private static final long serialVersionUID = -3590936033715917450L;
+
+    private String colPickUnqNo;
+    private String spplyId;
+    private String spplyNm;
+    private String storeId;
+    private String colRegDt;
+    private Long colTotAmt;
+    private String pickMgrNm;
+    private String pickMgrTelNo;
+    private String pickMgrEmal;
+    private String pickMgrMblNo;
+    private String pndrTelNo;
+    private String pickStCd;
+    private String pickStNm;
+    private String rodrRegDt;
+    private String colReqDt;
+    private String colSchDt;
+    private String colCmpltDt;
+    private String whsId;
+    private String whsNm;
+    private String location;
+    private String locationNm;
+    private String whsDvsn;
+    private String whsDvsnNm;
+    private String brandId;
+    private String colDesc;
+    private String sysRegDttm;
+    private String sysRegId;
+    private String sysChgDttm;
+    private String sysChgId;
+
+}

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

@@ -43,6 +43,8 @@ public class RtnOdrDtlPtclEntity implements Serializable {
     private String storeUnitUnqNo;
     private String unitGubun;
     private Integer rtnReqQty;
+    private Integer colQty;
+    private Integer rtnStatusCnt;
 
 
 

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

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

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

@@ -1,12 +1,11 @@
 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.inoutmng.*;
 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.stockmng.WhsProcInfoPtclEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -18,6 +17,16 @@ import java.util.List;
 public interface ColOdrMapper {
     int selectColRtnIngCnt(@Param("brandId") String brandId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo)throws Exception;
 
+    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> selectPickJobDataList(@Param("brandId") String brandId, List<RtnOdrDtlPtclEntity> gridInsertData)throws Exception;
+
+    int insertColOdrBase(@Param("userId") String userId, ColOdrBaseEntity entity)throws Exception;
+    int insertColOdrDtl(@Param("userId") String userId, List<ColOdrDtlPtclEntity> gridInsertData)throws Exception;
+    int insertPickMgntBase(@Param("userId") String userId, PickInfoMgntEntity entity)throws Exception;
+    int insertPickDtlPtcl(@Param("userId") String userId, List<PickDtlPtclEntity> 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;
     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/mapper/rtnmng/RtnOdrMapper.java

@@ -28,14 +28,17 @@ public interface RtnOdrMapper {
 
     RtnOdrDtlPtclEntity selectRtnItemDtlSaveInfo(@Param("brandId") String brandId, @Param("itemId") String itemId, @Param("brandUnitUnqNo") String brandUnitUnqNo)throws Exception;
 
-    List<RtnOdrBaseInfoEntity>  selectRtnOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sRtnOdrStCd") String sRtnOdrStCd, @Param("sRtnWhsId") String sRtnWhsId, @Param("sColDvsn") String sColDvsn, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sItemNm") String sItemNm, GridRequest gridRequest);
-    int selectRtnOdrGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sRtnOdrStCd") String sRtnOdrStCd, @Param("sRtnWhsId") String sRtnWhsId, @Param("sColDvsn") String sColDvsn, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sItemNm") String sItemNm);
+    List<RtnOdrBaseInfoEntity>  selectRtnOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sRtnOdrStCd") String sRtnOdrStCd, @Param("sRtnWhsId") String sRtnWhsId, @Param("sColDvsn") String sColDvsn, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sItemNm") String sItemNm, GridRequest gridRequest) throws Exception;;
+    int selectRtnOdrGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sRtnOdrStCd") String sRtnOdrStCd, @Param("sRtnWhsId") String sRtnWhsId, @Param("sColDvsn") String sColDvsn, @Param("sWhsId") String sWhsId, @Param("sSpplyId") String sSpplyId, @Param("sItemNm") String sItemNm) throws Exception;;
 
-    RtnOdrBaseInfoEntity selectRtnOdrInfo(@Param("rtnPodrUnqNo") String rtnPodrUnqNo);
-    List<RtnOdrDtlPtclEntity> selectROdrDtlList(@Param("rtnPodrUnqNo") String rtnPodrUnqNo);
+    RtnOdrBaseInfoEntity selectRtnOdrInfo(@Param("rtnPodrUnqNo") String rtnPodrUnqNo) throws Exception;;
+    List<RtnOdrDtlPtclEntity> selectROdrDtlList(@Param("rtnPodrUnqNo") String rtnPodrUnqNo) throws Exception;;
 
-    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);
+    int updateChgRodrStCd(@Param("userId") String userId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo, @Param("rtnOdrStCd") String rtnOdrStCd) throws Exception;;
+    int updateChangeRodrDtlStCd(@Param("userId") String userId, @Param("rtnPodrUnqNo") String rtnPodrUnqNo, @Param("rodrDtlStCd") String rodrDtlStCd) throws Exception;;
+    int updateChangeMultiRodrDtlStCd(@Param("userId") String userId, List<RtnOdrDtlPtclEntity> gridUpdateData) throws Exception;;
+
+    List<RtnOdrDtlPtclEntity> selectRtnOdrDtlStatusList(String rtnPodrUnqNo) throws Exception;;
 
     /*
 

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

@@ -692,7 +692,6 @@ public class ShmtOdrService extends CommonService {
                 if (i == 0 ) {
                     dlvSttmtUnqNo = fnGetDealNo(15, ""); // 납품서번호
                     deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
-                    deliBaseEntity.setDlvSttmtUnqNo(dlvSttmtUnqNo);
                     deliBaseEntity.setSpplyId(entity.getSpplyId());
                     deliBaseEntity.setSpplyNm(entity.getSpplyNm());
                     deliBaseEntity.setStoreId(entity.getStoreId());

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

@@ -519,10 +519,10 @@ public class PchOrdService extends CommonService {
         }
     }
 
-    public String  selectOdrDtlStatusList(String  pchReqUnqNo) throws Exception {
+    public String  selectOdrDtlStatusList(String  pchPodrUnqNo) throws Exception {
         //PCH_ODR_ST_CD
         String pchOdrStCd = "";
-        List<PchOdrDtlPtclEntity> dtlEntity = pchOrdMapper.selectOdrDtlStatusList( pchReqUnqNo);
+        List<PchOdrDtlPtclEntity> dtlEntity = pchOrdMapper.selectOdrDtlStatusList( pchPodrUnqNo);
 
         int pod0 = 0 ;
         int pod1 = 0 ;

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

@@ -305,8 +305,10 @@ public class RtnOdrService extends CommonService {
                     rtnSaveDtlEntity.setRtnDvsn(rtnDtlEntity.getRtnDvsn());
                     rtnSaveDtlEntity.setRtnRsn(rtnDtlEntity.getRtnRsn());
                     rtnSaveDtlEntity.setRtnRsnDvsn(rtnDtlEntity.getRtnRsnDvsn());
-                    rtnSaveDtlEntity.setRtnReqQty(rtnDtlEntity.getRtnReqQty());
+                    rtnSaveDtlEntity.setRtnOdrQty(rtnDtlEntity.getRtnQty());
                     rtnSaveDtlEntity.setRtnOdrAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt());
+
+
                     rtnSaveDtlEntity.setRodrDtlStCd("ROD0");
 
                     rtnTotAmt = rtnTotAmt +  rtnSaveDtlEntity.getRtnOdrAmt();
@@ -449,7 +451,7 @@ public class RtnOdrService extends CommonService {
 
             //반품요청 취소처리
             rtnOdrMapper.updateChgRodrStCd(userId, cancelRtnOrdDtlRequest.getRtnPodrUnqNo(),"RO99");
-            rtnOdrMapper.updateChangeRodrDtlStCd(userId, cancelRtnOrdDtlRequest.getRtnPodrUnqNo(),"ROD2");
+            rtnOdrMapper.updateChangeRodrDtlStCd(userId, cancelRtnOrdDtlRequest.getRtnPodrUnqNo(),"ROD4");
 
             RtnOdrBaseInfoEntity rtnOdrInfo = rtnOdrMapper.selectRtnOdrInfo(cancelRtnOrdDtlRequest.getRtnPodrUnqNo());
 
@@ -492,6 +494,44 @@ public class RtnOdrService extends CommonService {
         }
     }
 
+
+    public String  selectRtnOdrDtlStatusList(String  rtnPodrUnqNo) throws Exception {
+        //PCH_ODR_ST_CD
+        String rtnOdrStCd = "";
+        List<RtnOdrDtlPtclEntity> dtlEntity = rtnOdrMapper.selectRtnOdrDtlStatusList( rtnPodrUnqNo);
+
+        int rod0 = 0 ;
+        int rod1 = 0 ;
+        int rod2 = 0 ;
+        int rod3 = 0 ;
+        int rod4 = 0 ;
+
+        for (int i = 0 ; i < dtlEntity.size() ; i++ ) {
+            RtnOdrDtlPtclEntity entity = dtlEntity.get(i);
+            if ( "ROD0".equals(entity.getRodrDtlStCd())) {  // 임시저장
+                rod0 = rod0 + entity.getRtnStatusCnt() ;
+            } else if ( "ROD1".equals(entity.getRodrDtlStCd())) {  // 요청
+                rod1 = rod1 + entity.getRtnStatusCnt() ;
+            } else if ( "ROD3".equals(entity.getRodrDtlStCd())) {  //접수
+                rod3 = rod3 + entity.getRtnStatusCnt() ;
+            } else if ( "ROD4".equals(entity.getRodrDtlStCd())) {  //취소
+                rod4 = rod4 + entity.getRtnStatusCnt() ;
+            }
+        }
+
+        if (rod0 > 0 ) {
+            rtnOdrStCd = "RO00";  //임시저장
+        } else if ( rod0 == 0 && rod1 > 0 ) {
+            rtnOdrStCd = "RO20";  // 접수
+        } else if ( rod0 == 0 && rod1 == 0 && rod3 > 0 ) {
+            rtnOdrStCd = "RO30";  // 취소
+        } else {
+            rtnOdrStCd = "RO99";  // 취소
+        }
+
+        return rtnOdrStCd;
+    }
+
     /*
      공급사 수주현황 리스트
 

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

@@ -0,0 +1,248 @@
+package com.oqpo.api.web.controller.inoutmng;
+
+import com.oqpo.api.enums.SystemMessageCode;
+import com.oqpo.api.service.inoutmng.ColOdrService;
+import com.oqpo.api.service.inoutmng.ShmtOdrService;
+import com.oqpo.api.web.dto.request.inoutmng.*;
+import com.oqpo.api.web.dto.response.GridResponse;
+import com.oqpo.api.web.dto.response.SaveResponse;
+import com.oqpo.api.web.dto.response.inoutmng.InvInfoResponse;
+import com.oqpo.api.web.dto.response.inoutmng.SpplyInvInitResponse;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
+
+import javax.validation.Valid;
+
+@Slf4j
+@RestController
+@RequestMapping("/api/rtnmng/inoutmng")
+@Api(tags = {"수거지시 / 공급사 수거서 생성 관리 (ColOdrController) -- 진행중"})
+public class ColOdrController {
+    @Autowired
+    private ColOdrService colOdrService;
+
+
+    /**
+     * 설명 : 수거지시 대상리스트트 그리 리스트
+     *
+     * @param colOdrTargetRtnGridRequest
+     * @return
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @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)));
+    }
+
+    /**
+     * 설명 : 출하지시 정보 저장
+     *
+     * @param userId
+     * @param instShmtOdrRequest
+     * @return SaveResponse
+     * @throws Exception
+     */
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "수거지시 정보 저장")
+    @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));
+    }
+
+    /**
+     * 설명 : 출하현황 그리 리스트
+     *
+     * @param ShmtOutSearchGridRequest
+     * @return
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 출하현황 그리 리스트")
+    @PostMapping("/outsearch-grid-list")
+    public ResponseEntity<GridResponse> selectShmtOutSearchGridList(@RequestBody @Valid ShmtOutSearchGridRequest shmtOutSearchGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectShmtSearchGridList(shmtOutSearchGridRequest.getSBrandId(), shmtOutSearchGridRequest.getFromDt(), shmtOutSearchGridRequest.getToDt(), shmtOutSearchGridRequest.getSShmtWhsId(), shmtOutSearchGridRequest.getSShmtReqStCd(),  shmtOutSearchGridRequest.getSWhsId(), shmtOutSearchGridRequest.getSItemNm(),  shmtOutSearchGridRequest.toDTO(shmtOutSearchGridRequest)));
+    }
+     */
+
+    /**
+     * 설명 : 납품서정보 정보
+     *
+     * @param brandId, dlvSttmtUnqNo
+     * @return
+     * @throws Exception
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "납품서출력 정보")
+    @PostMapping("/info-inv")
+    public ResponseEntity<InvInfoResponse> infoInv(@RequestBody @Valid DeliPrtInfoRequest deliPrtInfoRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectInvInfo(deliPrtInfoRequest.getBrandId(), deliPrtInfoRequest.getDlvSttmtUnqNo()));
+    }
+     */
+    /**
+     * 설명 : 공급사 납품 대상리스트트 그리 리스트
+     *
+     * @param SpplyTargerOdrSearchListResponse
+     * @return
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 공급사 납품 대상리스트 그리 리스트")
+    @PostMapping("/spply-target-grid-list")
+    public ResponseEntity<GridResponse> selectSpplyTargetOdrGridList(@RequestBody @Valid SpplyOdrTargetGridRequest spplyOdrTargetGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectSpplyTargetOdrGridList(spplyOdrTargetGridRequest.getSBrandId(), spplyOdrTargetGridRequest.getFromDt(), spplyOdrTargetGridRequest.getToDt(), spplyOdrTargetGridRequest.getSSpplyId(), spplyOdrTargetGridRequest.getSWhsId(), spplyOdrTargetGridRequest.getSItemNm(),  spplyOdrTargetGridRequest.toDTO(spplyOdrTargetGridRequest)));
+    }
+     */
+
+    /**
+     * 설명 : 공급사 발주데이타 납품서 생성 초기데이타
+     *
+     * @param brandId, dlvSttmtUnqNo
+     * @return
+     * @throws Exception
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header"),
+            @ApiImplicitParam(name = "brandId", value = "브랜드번호", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "spplyId", value = "공급사아이디", required = true, dataType = "String", paramType = "query"),
+            @ApiImplicitParam(name = "pchPodrUnqNo", value = "구매발주번호", required = true, dataType = "String", paramType = "query")
+    })
+    @ApiOperation(value = "공급사 발주데이타 납품서 생성 초기데이타")
+    @GetMapping("/init-spply-inv")
+    public ResponseEntity<SpplyInvInitResponse> initSpplyInv(@RequestParam(value = "brandId") String brandId, @RequestParam(value = "spplyId") String spplyId, @RequestParam(value = "pchPodrUnqNo") String pchPodrUnqNo) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectSpplyShmtOdrInfo(brandId,spplyId, pchPodrUnqNo));
+    }
+     */
+    /**
+     * 설명 : 공급사 납품서 생성 저장
+     *
+     * @param userId
+     * @param instShmtOdrRequest
+     * @return SaveResponse
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "공급사 납품서 생성 저장 저장")
+    @PostMapping("/save-spply-inv")
+    public ResponseEntity<SaveResponse> saveSpplyInv(@ApiIgnore String userId, @RequestBody @Valid SaveSpplyDlvRequest saveSpplyDlvRequest) throws Exception {
+        shmtOdrService.saveSpplyInv(userId,  saveSpplyDlvRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+     */
+
+    /**
+     * 설명 : 납품서 현황 그리드 리스트
+     *
+     * @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)));
+    }
+     */
+    /**
+     * 설명 : 공급사 납품서 현황 그리드 리스트
+     *
+     * @param SpplyDeliDtlGridRequest
+     * @return
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 공급사 - 납품서 현황 그리드 리스트")
+    @PostMapping("/spply-deli-grid-list")
+    public ResponseEntity<GridResponse> selectSpplyDeliGridList(@RequestBody @Valid SpplyDeliDtlGridRequest spplyDeliDtlGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectSpplyDeliGridList(spplyDeliDtlGridRequest.getSBrandId(), spplyDeliDtlGridRequest.getFromDt(), spplyDeliDtlGridRequest.getToDt(),  spplyDeliDtlGridRequest.getSSpplyId(), spplyDeliDtlGridRequest.getSWhsId(), spplyDeliDtlGridRequest.getSItemNm(),  spplyDeliDtlGridRequest.toDTO(spplyDeliDtlGridRequest)));
+    }
+     */
+    /**
+     * 설명 : 입고처리 대상 리스트
+     *
+     * @param SpplyDeliDtlGridRequest
+     * @return
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @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)));
+    }
+     */
+
+    /**
+     * 설명 : 입고처리
+     *
+     * @param userId
+     * @param instShmtOdrRequest
+     * @return SaveResponse
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = "입고처리 저장")
+    @PostMapping("/save-warehouse")
+    public ResponseEntity<SaveResponse> instShmtOdr(@ApiIgnore String userId, @RequestBody @Valid SaveWarehouseProcRequest saveWarehouseProcRequest) throws Exception {
+        shmtOdrService.saveWarehouseProc(userId,  saveWarehouseProcRequest);
+        return ResponseEntity.ok(SaveResponse.toDTO(SystemMessageCode.SAVE_OK));
+    }
+     */
+
+    /**
+     * 설명 : 입고 현황 그리드 리스트
+     *
+     * @param DeliDtlGridRequest
+     * @return
+     * @throws Exception
+
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
+    })
+    @ApiOperation(value = " 입고 현황 그리드 리스트")
+    @PostMapping("/warehouse-grid-list")
+    public ResponseEntity<GridResponse> selectWarehouseGridList(@RequestBody @Valid WarehouseGridRequest warehouseGridRequest) throws Exception {
+        return ResponseEntity.ok(shmtOdrService.selectWarehouseGridList(warehouseGridRequest.getSBrandId(), warehouseGridRequest.getSStoreId(), warehouseGridRequest.getFromDt(), warehouseGridRequest.getToDt(), warehouseGridRequest.getSPchPodrUnqNo(),  warehouseGridRequest.getSSpplyId(), warehouseGridRequest.getSWhsId(), warehouseGridRequest.getSItemNm(),  warehouseGridRequest.toDTO(warehouseGridRequest)));
+    }
+     */
+}

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

@@ -0,0 +1,41 @@
+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 ColOdrTargetRtnGridRequest extends GridRequest {
+
+    @NotBlank
+    @ApiModelProperty(value = "시작일자")
+    private String fromDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "종료일자")
+    private String toDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디")
+    private String sBrandId;
+
+    @ApiModelProperty(value = "수거창고아이디")
+    private String sRtnWhsId;
+
+    @ApiModelProperty(value = "입고창고아이디")
+    private String sWhsId;
+
+    @ApiModelProperty(value = "품목명")
+    private String sItemNm;
+
+
+
+    protected ColOdrTargetRtnGridRequest(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/InstColOdrRequest.java

@@ -0,0 +1,67 @@
+package com.oqpo.api.web.dto.request.inoutmng;
+
+import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
+import com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+
+import javax.validation.constraints.NotBlank;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+public class InstColOdrRequest {
+    @NotBlank
+    @ApiModelProperty(value = "CRUD")
+    private String viewCd;
+
+    @NotBlank
+    @ApiModelProperty(value = "브랜드아이디") private String brandId;
+
+    @NotBlank
+    @ApiModelProperty(value = "수거예정일") private String colSchDt;
+
+    @NotBlank
+    @ApiModelProperty(value = "수거담당자명") private String pickMgrNm;
+
+    @NotBlank
+    @ApiModelProperty(value = "수거담당자연락처") private String pickMgrTelNo;
+
+
+    @ApiModelProperty(value = "수거지시대상 리스트")
+    private List<InstColItemDataList> gridInsertData;
+
+
+    public List<RtnOdrDtlPtclEntity> toCodeEntities(List<InstColItemDataList> 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());
+            entity.setColQty(x.getColQty());
+            entities.add(entity);
+        });
+        return entities;
+    }
+
+    @Getter
+    @Builder
+    @AllArgsConstructor(access = AccessLevel.PROTECTED)
+    static class InstColItemDataList {
+
+        @NotBlank
+        @ApiModelProperty(value = "반품발주고유번호") private String rtnPodrUnqNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "반품발주항번") private String rtnPodrDtlNo;
+
+        @NotBlank
+        @ApiModelProperty(value = "수거수량") private Integer colQty ;
+
+
+    }
+}

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

@@ -0,0 +1,38 @@
+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 ColTragetOdrSearchListResponse {
+
+    @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 rtnReqQty;
+    @ApiModelProperty(value = "수거수량") private Integer rtnQty;
+    @ApiModelProperty(value = "발주금액") private Long rtnAmt;
+    @ApiModelProperty(value = "수거요청일") private String colReqDt;
+    @ApiModelProperty(value = "매장아이디") private String storeId;
+
+}

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

@@ -12,4 +12,166 @@
         and   ptcl.rtn_podr_unq_no = #{rtnPodrUnqNo}
     </select>
 
+    <select id="selectColTargetRtnGridList" 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, 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'
+            , 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 = #{sBrandId}
+        and    base.col_req_dt between #{fromDt} and #{toDt}
+        and    base.rtn_odr_st_cd = 'RO20'
+        and    ptcl.rodr_dtl_st_cd = 'ROD0'
+        and    base.col_dvsn = 'C001'
+        <if test="sWhsId != null and sWhsId != ''">
+        and    base.whs_id = #{sWhsId}
+        </if>
+        <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 as , 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 as , ptcl.rtn_podr_dtl_no asc
+            </otherwise>
+        </choose>
+        <if test="gridRequest.pagingYn == true">
+            limit #{gridRequest.gridFirst}, #{gridRequest.gridSize}
+        </if>
+    </select>
+
+    <select id="selectColTargetRtnGridCnt" resultType="int">
+        select count(*) as cnt
+        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 = #{sBrandId}
+        and    base.col_req_dt between #{fromDt} and #{toDt}
+        and    base.rtn_odr_st_cd = 'RO20'
+        and    ptcl.rodr_dtl_st_cd = 'ROD0'
+        and    base.col_dvsn = 'C001'
+        <if test="sWhsId != null and sWhsId != ''">
+            and    base.whs_id = #{sWhsId}
+        </if>
+        <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>
+
+    </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
+            ,base.location, ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt', ptcl.rtn_odr_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
+            ,ptcl.rtn_odr_amt as 'rtnOdrDtlInfo.rtn_odr_amt', date_format(base.col_req_dt,'%Y.%m.%d') as col_req_dt
+            , base.rtn_whs_id, base.rtn_location, ptcl.rtn_req_unq_no as 'rtnOdrDtlInfo.rtn_req_unq_no' , ptcl.rtn_req_dtl_no as 'rtnOdrDtlInfo.rtn_req_dtl_no'
+            , base.store_id , base.rtn_mgr_nm , base.rtn_mgr_tel_no, base.rtn_mgr_id
+            , nvl(fn_get_telno((select mgr_tel_no from whs_mgnt_base_info where brand_id = base.brand_id and whs_id = base.rtn_whs_id)),'  ') as pick_tel_no
+            , 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'
+        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 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
+        <foreach collection="gridInsertData" item="item" separator="," open="(" close=")">
+            concat(#{item.rtnPodrUnqNo},#{item.rtnPodrDtlNo})
+        </foreach>
+        order by  base.brand_id, base.whs_id, base.location, base.rtn_whs_id,base.rtn_location
+    </select>
+
+    <insert id="insertColOdrBase">
+        insert into col_odr_base_info  /* ColOdr.insertColOdrBase*/
+            (col_cmd_unq_no, col_reg_dt, brand_id, whs_id, location
+            , store_id, item_qty, col_total_amt, col_req_dt, col_dvsn
+            , col_cmd_st_cd, col_req_mgr_nm, col_req_mgr_id, col_dt, col_cnfm_nm
+            , col_cnfm_id, col_mgr_nm, col_mgr_tel_no, col_mgr_emal, col_mgr_mbl_no
+            , rtn_whs_id, rtn_location, spply_id, spply_nm
+            , 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.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}
+            , now(), #{userId}, now(), #{userId})
+
+    </insert>
+
+    <insert id="insertColOdrDtl">
+        insert into col_odr_dtl_ptcl /* ColOdr.insertColOdrDtl*/
+        (col_cmd_unq_no, col_cmd_dtl_no, item_id, item_nm, unit_amt
+        , col_qty, col_amt, rtn_qty, rtn_amt, rtn_rsn_dvsn
+        , rtn_rsn, rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_dtl_no, rtn_req_unq_no, col_cmd_dtl_st_cd
+        , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+        <foreach collection="gridInsertData" item="item" separator=",">
+        (#{item.colCmdUnqNo}, #{item.colCmdDtlNo}, #{item.itemId}, #{item.itemNm}, #{item.unitAmt}
+        , #{item.colQty}, #{item.colAmt}, #{item.rtnQty}, #{item.rtnAmt}, #{item.rtnRsnDvsn}
+        , #{item.rtnRsn}, #{item.rtnPodrUnqNo}, #{item.rtnPodrDtlNo}, #{item.rtnReqDtlNo}, #{item.rtnReqUnqNo}, 'CDLD1'
+        , now(), #{userId}, now(), #{userId})
+        </foreach>
+    </insert>
+
+    <insert id="insertPickMgntBase">
+        insert into pick_info_mgnt  /* ColOdr.insertPickMgntBase */
+        (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
+        , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+        values
+        (#{entity.colPickUnqNo}, #{entity.spplyId}, #{entity.spplyNm}, #{entity.storeId}, #{entity.colRegDt}
+        , #{entity.colTotAmt}, #{entity.pickMgrNm}, #{entity.pickMgrTelNo}, #{entity.pickMgrEmal}, #{entity.pickMgrMblNo}
+        , #{entity.pndrTelNo}, #{entity.pickStCd}, #{entity.rodrRegDt}, #{entity.colReqDt}, #{entity.colSchDt}
+        , #{entity.colCmpltDt}, #{entity.whsId}, #{entity.location}, #{entity.whsDvsn}, #{entity.brandId}, #{entity.colDesc}
+        , now(), #{userId}, now(), #{userId})
+    </insert>
+
+    <insert id="insertPickDtlPtcl">
+        insert into pick_dtl_ptcl  /* ColOdr.insertPickDtlPtcl */
+        (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
+        , 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})
+        </foreach>
+    </insert>
+
+
+
 </mapper>

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

@@ -78,7 +78,7 @@
                (#{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.rtnOdrAmt}, #{item.rodrDtlStCd}, NOW(), #{userId}, NOW(), #{userId})
+            , #{item.rtnOdrAmt}, 'ROD1', NOW(), #{userId}, NOW(), #{userId})
             </foreach>
         </insert>
 
@@ -266,6 +266,25 @@
             WHERE rtn_podr_unq_no = #{rtnPodrUnqNo}
     </update>
 
+    <update id="updateChangeMultiRodrDtlStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            UPDATE /* RtnOrd.updateChangeRodrDtlStCd */
+            rtn_odr_dtl_ptcl SET
+            rodr_dtl_st_cd = #{item.rodrDtlStCd},
+            sys_chg_dttm = NOW(),
+            sys_chg_id = #{userId}
+            WHERE rtn_podr_unq_no = #{item.rtnPodrUnqNo}
+            and   rtn_podr_dtl_no = #{item.rtnPodrDtlNo}
+        </foreach>
+    </update>
+
+    <select id="selectRtnOdrDtlStatusList" resultType="com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity">
+        select rodr_dtl_st_cd, count(*) as rtn_status_cnt
+        from rtn_odr_dtl_ptcl
+        where rtn_podr_unq_no = #{rtnPodrUnqNo}
+        group by rodr_dtl_st_cd
+    </select>
+
 
 
     <!--