반품입고처리및 구매발주 입고처리시 재고이력 수정

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

@@ -29,6 +29,7 @@ public enum SystemMessageCode {
     RTN_REQ_OK (20023, "반품요청 되었습니다.", HttpStatus.OK),
     CANCEL_OK (20024, "취소 되었습니다.", HttpStatus.OK),
     COL_OK (20025, "수거지시 처리되었습니다.", HttpStatus.OK),
+    RTN_PROC_OK (20026, "반품처리 되었습니다.", 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

@@ -7,6 +7,8 @@ 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.StckMgntBaseInfoEntity;
+import com.oqpo.api.entity.stockmng.StckMgntDtlHistEntity;
 import com.oqpo.api.entity.stockmng.WhsProcInfoPtclEntity;
 import com.oqpo.api.web.dto.request.GridRequest;
 import org.apache.ibatis.annotations.Mapper;
@@ -47,16 +49,31 @@ 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;
+    List<PickInfoMgntEntity> selectColRtnInstGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sColPickUnqNo") String sColPickUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectColRtnInstGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sColPickUnqNo") String sColPickUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm) throws Exception;
 
     int insertRtnProcInfoPtcl(@Param("userId") String userId, List<RtnProcInfoPtclEntity> gridInsertData) throws Exception;
 
-    List<PickInfoMgntEntity> selectColRtnInstResultGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
-    int selectColRtnInstResultGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm) throws Exception;
+    List<PickInfoMgntEntity> selectColRtnInstResultGridList(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId, @Param("sColPickUnqNo") String sColPickUnqNo,  @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
+    int selectColRtnInstResultGridCnt(@Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,  @Param("sColPickUnqNo") String sColPickUnqNo, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sSpplyId") String sSpplyId, @Param("sRtnWhsId") String sRtnWhsId, @Param("sWhsId") String sWhsId,  @Param("sItemNm") String sItemNm) throws Exception;
 
     List<PickInfoMgntEntity> selectColRtnInstProcList(@Param("brandId") String brandId, @Param("whsId") String whsId,List<RtnProcInfoPtclEntity> gridUpdateData )throws Exception;
 
+    int updateChgStckQtyStckMgnt(@Param("userId") String userId, List<StckMgntBaseInfoEntity> gridUpdateData) throws Exception;
+
+    int insertChgStckStckMgntDtlHist(@Param("userId") String userId, List<StckMgntDtlHistEntity> gridInsertData) throws Exception;
+
+    int updateChgStckCloDtlStCd(@Param("userId") String userId, List<ColOdrDtlPtclEntity> gridUpdateData) throws Exception;
+
+    int updateChgStckPickDtlStCd(@Param("userId") String userId, List<PickDtlPtclEntity> gridUpdateData) throws Exception;
+
+    List<ColOdrBaseEntity> selectColCmdStDtlList(@Param("userId") String userId, List<ColOdrBaseEntity> gridUpdateData ) throws Exception;
+
+    int updateChgStckColOdrStCd(@Param("userId") String userId, List<ColOdrBaseEntity> gridUpdateData) throws Exception;
+
+    List<PickInfoMgntEntity> selectColPickStList(@Param("userId") String userId, List<PickInfoMgntEntity> gridUpdateData ) throws Exception;
+
+    int updateChgStckPickStCd(@Param("userId") String userId, List<PickInfoMgntEntity> gridUpdateData) throws Exception;
 
     //int insertRtnProcInfoPtcl(@Param("userId") String userId, RtnProcInfoPtclEntity entity) throws Exception;
 

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

@@ -724,16 +724,16 @@ public class ColOdrService extends CommonService {
   /*
       반품처리 그리드 리스트 조회
  */
-    public GridResponse selectRtnStockTargetList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectRtnStockTargetList(String sBrandId, String sStoreId, String sColPickUnqNo ,String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = colOdrMapper.selectColRtnInstGridCnt(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
+        int gridRecords = colOdrMapper.selectColRtnInstGridCnt(sBrandId, sStoreId,sColPickUnqNo, fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstGridList(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
+        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstGridList(sBrandId, sStoreId, sColPickUnqNo, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> RtnStockTargetResponse.builder()
                         .viewCd("R")
@@ -769,7 +769,7 @@ public class ColOdrService extends CommonService {
 
 
 
-    /* 입고처리 저장
+    /* 입고처리 저장 */
     @Transactional
     public void saveRtnStockProc(String userId, SaveRtnStockProcRequest saveRtnStockProcRequest) throws Exception {
         try {
@@ -786,9 +786,16 @@ public class ColOdrService extends CommonService {
                 //로그인 사용자 정보
                 UserMngEntity uEntity = userMngMapper.selectGroupUserInfo(userId);
 
+                List<RtnProcInfoPtclEntity> rtnProcInfoPtclList = new ArrayList<RtnProcInfoPtclEntity>();
+                List<StckMgntBaseInfoEntity> stckMgntBaseInfoList = new ArrayList<StckMgntBaseInfoEntity>();
+                List<StckMgntDtlHistEntity> stckMgntDtlHistList= new ArrayList<StckMgntDtlHistEntity>();
+                List<ColOdrDtlPtclEntity> colOdrDtlPtclList= new ArrayList<ColOdrDtlPtclEntity>();
+                List<PickDtlPtclEntity> pickDtlPtclList= new ArrayList<PickDtlPtclEntity>();
+                List<ColOdrBaseEntity> colOdrBaseList= new ArrayList<ColOdrBaseEntity>();
+                List<PickInfoMgntEntity> pickInfoMgntList = new ArrayList<PickInfoMgntEntity>();
 
                 // 반품처리를 위한 관련정보를 가져온다
-                List<PickInfoMgntEntity> targetList = colOdrMapper.selectColRtnInstProcList(saveRtnStockProcRequest.getBrandId(), saveRtnStockProcRequest.getWhsId(), searchList);
+                List<PickInfoMgntEntity> targetList = colOdrMapper.selectColRtnInstProcList(saveRtnStockProcRequest.getBrandId(), saveRtnStockProcRequest.getRtnWhsId(), searchList);
 
                 for (int i = 0; i < gridInsertData.size(); i++) {
                     RtnProcInfoPtclEntity requestData = gridInsertData.get(i);
@@ -798,7 +805,12 @@ public class ColOdrService extends CommonService {
 
                         RtnProcInfoPtclEntity rtnProcInfoEntity = new RtnProcInfoPtclEntity();
 
-                        if (requestData.getColPickDtlNo().equals(targetData.getColPickUnqNo()) && requestData.getColPickDtlNo().equals(targetData.getPickDtlInfo().getColPickDtlNo())) {
+                        if (requestData.getColPickUnqNo().equals(targetData.getColPickUnqNo()) && requestData.getColPickDtlNo().equals(targetData.getPickDtlInfo().getColPickDtlNo())) {
+
+                            if (targetData.getColDvsn().equals("C001") && "".equals(saveRtnStockProcRequest.getStoreId())) {
+                                throw new GlobalException(SystemMessageCode.ERR_NONSTOREID);
+                            }
+
                             if (requestData.getColQty() > targetData.getPickDtlInfo().getColReqQty()) {
                                 // 반품입고수량이 수거요청수량보다 클 수 없습니다.
                                 throw new GlobalException(SystemMessageCode.ERR_NOTRTNQTY);
@@ -811,138 +823,190 @@ public class ColOdrService extends CommonService {
                         }
 
                         // 반품처리  진행 데이타생성
+                        if (requestData.getColPickUnqNo().equals(targetData.getColPickUnqNo()) && requestData.getColPickDtlNo().equals(targetData.getPickDtlInfo().getColPickDtlNo())) {
+                            String rtnMgntUnqNo = fnGetDealNo(37, "");
+                            rtnProcInfoEntity.setRtnMgntUnqNo(rtnMgntUnqNo);
+                            rtnProcInfoEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
+                            rtnProcInfoEntity.setStoreId(saveRtnStockProcRequest.getStoreId());
+                            rtnProcInfoEntity.setItemId(requestData.getItemId());
+                            rtnProcInfoEntity.setItemNm(targetData.getPickDtlInfo().getItemNm());
+                            rtnProcInfoEntity.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                            rtnProcInfoEntity.setLocation(targetData.getRtnLocation());
+                            rtnProcInfoEntity.setUnit(targetData.getPickDtlInfo().getUnit());
+                            rtnProcInfoEntity.setUnitAmt(targetData.getPickDtlInfo().getUnitAmt());
+                            rtnProcInfoEntity.setRtnReqQty(targetData.getPickDtlInfo().getRtnReqQty());
+                            rtnProcInfoEntity.setRtnOdrQty(targetData.getPickDtlInfo().getRodrQty());
+                            rtnProcInfoEntity.setColReqQty(targetData.getPickDtlInfo().getColReqQty());
+                            rtnProcInfoEntity.setColQty(requestData.getColQty());
+                            rtnProcInfoEntity.setColReqDt(targetData.getColReqDt());
+                            rtnProcInfoEntity.setColSchDt(targetData.getColSchDt());
+                            rtnProcInfoEntity.setColCnfmNm(uEntity.getUserNm());
+                            rtnProcInfoEntity.setColMgrTelNo(targetData.getPickMgrTelNo());
+                            rtnProcInfoEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+                            rtnProcInfoEntity.setColAgrYn("Y");
+                            // rtnProcInfoEntity.setColCnfmDocFileNo(saveRtnStockProcRequest.); 수거서 파일 첨부 제거
+                            rtnProcInfoEntity.setSttlYn("N");
+                            rtnProcInfoEntity.setSpplyId(targetData.getSpplyId());
+                            rtnProcInfoEntity.setSpplyNm(targetData.getSpplyNm());
+                            rtnProcInfoEntity.setColPickUnqNo(targetData.getColPickUnqNo());
+                            rtnProcInfoEntity.setColPickDtlNo(targetData.getPickDtlInfo().getColPickDtlNo());
+                            rtnProcInfoEntity.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
+                            rtnProcInfoEntity.setColCmdDtlNo(targetData.getPickDtlInfo().getColCmdDtlNo());
+                            rtnProcInfoEntity.setRtnPodrUnqNo(targetData.getPickDtlInfo().getRtnPodrUnqNo());
+                            rtnProcInfoEntity.setRtnPodrDtlNo(targetData.getPickDtlInfo().getRtnPodrDtlNo());
+                            rtnProcInfoEntity.setRtnReqUnqNo(targetData.getPickDtlInfo().getRtnReqUnqNo());
+                            rtnProcInfoEntity.setRtnReqDtlNo(targetData.getPickDtlInfo().getRtnReqDtlNo());
+                            rtnProcInfoPtclList.add(rtnProcInfoEntity);
+
+                            // 본사 수거 반품입고처리시
+                            if (targetData.getColDvsn().equals("C001") && requestData.getColQty() > 0) {
+                                //본사수거 .
+                                // 1. 매장재고참감처리, 본사재고 증가, 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
+                                // 매장재고 차감
+                                StckMgntBaseInfoEntity stckWEntity = new StckMgntBaseInfoEntity();
+                                stckWEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckWEntity.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                                stckWEntity.setLocation(targetData.getRtnLocation());
+                                stckWEntity.setItemId(requestData.getItemId());
+                                stckWEntity.setStckQty(requestData.getColQty() * (-1));
+                                stckWEntity.setUnit(targetData.getPickDtlInfo().getUnit());
+                                stckMgntBaseInfoList.add(stckWEntity);
+
+                                // 재고 이력정보 등록
+                                StckMgntDtlHistEntity stckWHist = new StckMgntDtlHistEntity();
+                                stckWHist.setStckMgntDtlNo(fnGetDealNo(37, ""));
+                                stckWHist.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckWHist.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                                stckWHist.setLocation(targetData.getRtnLocation());
+                                stckWHist.setItemId(requestData.getItemId());
+                                stckWHist.setItemNm(targetData.getPickDtlInfo().getItemNm());
+                                stckWHist.setInoutCd("OUT");
+                                stckWHist.setInoutQty(requestData.getColQty());
+                                stckWHist.setChgDvsn("ROUT");
+                                stckWHist.setRelationNo(rtnMgntUnqNo);
+                                stckMgntDtlHistList.add(stckWHist);
+
+                                //본사재고 증가
+                                StckMgntBaseInfoEntity stckW1Entity = new StckMgntBaseInfoEntity();
+                                stckW1Entity.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckW1Entity.setWhsId(saveRtnStockProcRequest.getWhsId());
+                                stckW1Entity.setLocation(targetData.getLocation());
+                                stckW1Entity.setItemId(requestData.getItemId());
+                                stckW1Entity.setStckQty(requestData.getColQty());
+                                stckW1Entity.setUnit(targetData.getPickDtlInfo().getUnit());
+                                stckMgntBaseInfoList.add(stckW1Entity);
+
+                                // 재고 이력정보 등록
+                                StckMgntDtlHistEntity stckW1Hist = new StckMgntDtlHistEntity();
+                                stckW1Hist.setStckMgntDtlNo(fnGetDealNo(37, ""));
+                                stckW1Hist.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckW1Hist.setWhsId(saveRtnStockProcRequest.getWhsId());
+                                stckW1Hist.setLocation(targetData.getLocation());
+                                stckW1Hist.setItemId(requestData.getItemId());
+                                stckW1Hist.setItemNm(targetData.getPickDtlInfo().getItemNm());
+                                stckW1Hist.setInoutCd("OUT");
+                                stckW1Hist.setInoutQty(requestData.getColQty());
+                                stckW1Hist.setChgDvsn("ROUT");
+                                stckW1Hist.setRelationNo(rtnMgntUnqNo);  //======================================
+                                stckMgntDtlHistList.add(stckW1Hist);
+
+                            } else if (targetData.getColDvsn().equals("C002") && requestData.getColQty() > 0) {
+                                //  공급사 수거일경우 - 본사창고 재고 차감 처리
+                                // 1. 참감처리 , 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
+                                // 본사재고 차감 처리  stck_mgnt_base_info  stck_mgnt_dtl_hist
+                                StckMgntBaseInfoEntity stckWEntity = new StckMgntBaseInfoEntity();
+                                stckWEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckWEntity.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                                stckWEntity.setLocation(targetData.getRtnLocation());
+                                stckWEntity.setItemId(requestData.getItemId());
+                                stckWEntity.setStckQty(requestData.getColQty() * (-1));
+                                stckWEntity.setUnit(targetData.getPickDtlInfo().getUnit());
+                                stckMgntBaseInfoList.add(stckWEntity);
+
+                                // 재고 이력정보 등록
+                                StckMgntDtlHistEntity stckWHist = new StckMgntDtlHistEntity();
+                                stckWHist.setStckMgntDtlNo(fnGetDealNo(37, ""));
+                                stckWHist.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                stckWHist.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                                stckWHist.setLocation(targetData.getRtnLocation());
+                                stckWHist.setItemId(requestData.getItemId());
+                                stckWHist.setItemNm(targetData.getPickDtlInfo().getItemNm());
+                                stckWHist.setInoutCd("OUT");
+                                stckWHist.setInoutQty(requestData.getColQty());
+                                stckWHist.setChgDvsn("ROUT");
+                                stckWHist.setRelationNo(rtnMgntUnqNo);  //======================================
+                                stckMgntDtlHistList.add(stckWHist);
+                            }
 
-                        String rtnMgntUnqNo = fnGetDealNo(37,"");
-                        rtnProcInfoEntity.setRtnMgntUnqNo(rtnMgntUnqNo);
-                        rtnProcInfoEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
-                        rtnProcInfoEntity.setStoreId(saveRtnStockProcRequest.getStoreId());
-                        rtnProcInfoEntity.setItemId(requestData.getItemId());
-                        rtnProcInfoEntity.setItemNm(targetData.getPickDtlInfo().getItemNm());
-                        rtnProcInfoEntity.setWhsId(targetData.getRtnWhsId());
-                        rtnProcInfoEntity.setLocation(targetData.getRtnLocation());
-                        rtnProcInfoEntity.setUnit(targetData.getPickDtlInfo().getUnit());
-                        rtnProcInfoEntity.setUnitAmt(targetData.getPickDtlInfo().getUnitAmt());
-                        rtnProcInfoEntity.setRtnReqQty(targetData.getPickDtlInfo().getRtnReqQty());
-                        rtnProcInfoEntity.setRtnOdrQty(targetData.getPickDtlInfo().getRodrQty());
-                        rtnProcInfoEntity.setColReqQty(targetData.getPickDtlInfo().getColReqQty());
-                        rtnProcInfoEntity.setColQty(requestData.getColQty());
-                        rtnProcInfoEntity.setColReqDt(targetData.getColReqDt());
-                        rtnProcInfoEntity.setColSchDt(targetData.getColSchDt());
-                        rtnProcInfoEntity.setColCnfmNm(uEntity.getUserNm());
-                        rtnProcInfoEntity.setColMgrTelNo(targetData.getPickMgrTelNo());
-                        rtnProcInfoEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
-                        rtnProcInfoEntity.setColAgrYn("Y");
-                        // rtnProcInfoEntity.setColCnfmDocFileNo(saveRtnStockProcRequest.); 수거서 파일 첨부 제거
-                        rtnProcInfoEntity.setSttlYn("N");
-                        rtnProcInfoEntity.setSpplyId(targetData.getSpplyId());
-                        rtnProcInfoEntity.setSpplyNm(targetData.getSpplyNm());
-                        rtnProcInfoEntity.setColPickUnqNo(targetData.getColPickUnqNo());
-                        rtnProcInfoEntity.setColPickDtlNo(targetData.getPickDtlInfo().getColPickDtlNo());
-                        rtnProcInfoEntity.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
-                        rtnProcInfoEntity.setColCmdDtlNo(targetData.getPickDtlInfo().getColCmdDtlNo());
-                        rtnProcInfoEntity.setRtnPodrUnqNo(targetData.getPickDtlInfo().getRtnPodrUnqNo());
-                        rtnProcInfoEntity.setRtnPodrDtlNo(targetData.getPickDtlInfo().getRtnPodrDtlNo());
-                        rtnProcInfoEntity.setRtnReqUnqNo(targetData.getPickDtlInfo().getRtnReqUnqNo());
-                        rtnProcInfoEntity.setRtnReqDtlNo(targetData.getPickDtlInfo().getRtnReqDtlNo());
-
-                        // 본사 수거 반품입고처리시
-                        if (targetData.getColDvsn().equals("C001") && requestData.getColQty() > 0) {
-                            //본사수거 .
-                            // 1. 매장재고참감처리, 본사재고 증가, 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
-                            // 매장재고 차감
-                            StckMgntBaseInfoEntity stckWEntity = new StckMgntBaseInfoEntity();
-                            stckWEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckWEntity.setWhsId(targetData.getRtnWhsId());
-                            stckWEntity.setLocation(targetData.getRtnLocation());
-                            stckWEntity.setItemId(requestData.getItemId());
-                            stckWEntity.setStckQty(requestData.getColQty() * (-1));
-                            stckWEntity.setUnit(targetData.getPickDtlInfo().getUnit());
-                            //StckBaseList.add(stckWEntity);
-
-                            // 재고 이력정보 등록
-                            StckMgntDtlHistEntity stckWHist = new StckMgntDtlHistEntity();
-                            stckWHist.setStckMgntDtlNo("");
-                            stckWHist.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckWHist.setWhsId(targetData.getRtnWhsId());
-                            stckWHist.setLocation(targetData.getRtnLocation());
-                            stckWHist.setItemId(requestData.getItemId());
-                            stckWHist.setItemNm(targetData.getPickDtlInfo().getItemNm());
-                            stckWHist.setInoutCd("OUT");
-                            stckWHist.setInoutQty(requestData.getColQty());
-                            stckWHist.setChgDvsn("ROUT");
-                            stckWHist.setRelationNo(rtnMgntUnqNo);
-                            //StckHistList.add(stckWHist);
-
-                            //본사재고 증가
-                            StckMgntBaseInfoEntity stckW1Entity = new StckMgntBaseInfoEntity();
-                            stckW1Entity.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckW1Entity.setWhsId(saveRtnStockProcRequest.getWhsId());
-                            stckW1Entity.setLocation(targetData.getLocation());
-                            stckW1Entity.setItemId(requestData.getItemId());
-                            stckW1Entity.setStckQty(requestData.getColQty());
-                            stckW1Entity.setUnit(targetData.getPickDtlInfo().getUnit());
-                            //StckBaseList.add(stckWEntity);
-
-                            // 재고 이력정보 등록
-                            StckMgntDtlHistEntity stckW1Hist = new StckMgntDtlHistEntity();
-                            stckW1Hist.setStckMgntDtlNo("");
-                            stckW1Hist.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckW1Hist.setWhsId(saveRtnStockProcRequest.getWhsId());
-                            stckW1Hist.setLocation(targetData.getLocation());
-                            stckW1Hist.setItemId(requestData.getItemId());
-                            stckW1Hist.setItemNm(targetData.getPickDtlInfo().getItemNm());
-                            stckW1Hist.setInoutCd("OUT");
-                            stckW1Hist.setInoutQty(requestData.getColQty());
-                            stckW1Hist.setChgDvsn("ROUT");
-                            stckW1Hist.setRelationNo(rtnMgntUnqNo);  //======================================
-                            //StckHistList.add(stckWHist);
-
-                        } else if (targetData.getColDvsn().equals("C002") && requestData.getColQty() > 0) {
-                            //  공급사 수거일경우 - 본사창고 재고 차감 처리
-                            // 1. 참감처리 , 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
-                            // 본사재고 차감 처리  stck_mgnt_base_info  stck_mgnt_dtl_hist
-                            StckMgntBaseInfoEntity stckWEntity = new StckMgntBaseInfoEntity();
-                            stckWEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckWEntity.setWhsId(saveRtnStockProcRequest.getWhsId());
-                            stckWEntity.setLocation(targetData.getLocation());
-                            stckWEntity.setItemId(requestData.getItemId());
-                            stckWEntity.setStckQty(requestData.getColQty() * (-1));
-                            stckWEntity.setUnit(targetData.getPickDtlInfo().getUnit());
-                            //StckBaseList.add(stckWEntity);
-
-                            // 재고 이력정보 등록
-                            StckMgntDtlHistEntity stckWHist = new StckMgntDtlHistEntity();
-                            stckWHist.setStckMgntDtlNo("");
-                            stckWHist.setBrandId(saveRtnStockProcRequest.getBrandId());
-                            stckWHist.setWhsId(saveRtnStockProcRequest.getWhsId());
-                            stckWHist.setLocation(targetData.getLocation());
-                            stckWHist.setItemId(requestData.getItemId());
-                            stckWHist.setItemNm(targetData.getPickDtlInfo().getItemNm());
-                            stckWHist.setInoutCd("OUT");
-                            stckWHist.setInoutQty(requestData.getColQty());
-                            stckWHist.setChgDvsn("ROUT");
-                            stckWHist.setRelationNo(rtnMgntUnqNo);  //======================================
-                            //StckHistList.add(stckWHist);
-                        }
+                            if (targetData.getColDvsn().equals("C001")) {  // 본사수거지시 일 경우
+                                ColOdrDtlPtclEntity colOdrDtlPtclEntity = new ColOdrDtlPtclEntity();
+                                colOdrDtlPtclEntity.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
+                                colOdrDtlPtclEntity.setColCmdDtlNo(targetData.getPickDtlInfo().getColCmdDtlNo());
+                                if (requestData.getColQty() > 0) {
+                                    colOdrDtlPtclEntity.setColCmdDtlStCd("CDLD2");
+                                } else {
+                                    colOdrDtlPtclEntity.setColCmdDtlStCd("COLD3");
+                                }
+                                colOdrDtlPtclList.add(colOdrDtlPtclEntity);
+
+                                ColOdrBaseEntity colOdrBase = new ColOdrBaseEntity();
+                                colOdrBase.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
+                                colOdrBaseList.add(colOdrBase);
+                            }
 
-                        // 반품수거서 건별 업데이트
-                        ColOdrDtlPtclEntity colOdrDtlPtclEntity = new ColOdrDtlPtclEntity;
-                        colOdrDtlPtclEntity.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
-                        colOdrDtlPtclEntity.setColCmdDtlNo(targetData.getPickDtlInfo().getColCmdDtlNo());
-                        if (requestData.getColQty() > 0) {
-                            colOdrDtlPtclEntity.setColCmdDtlStCd("CDLD2");
-                        } else {
-                            colOdrDtlPtclEntity.setColCmdDtlStCd("COLD3");
-                        }
+                            // 수거서 건별 업데이트
+                            PickDtlPtclEntity pickDtlPtclEntity = new PickDtlPtclEntity();
+                            pickDtlPtclEntity.setColPickUnqNo(targetData.getColPickUnqNo());
+                            pickDtlPtclEntity.setColPickDtlNo(targetData.getPickDtlInfo().getColPickDtlNo());
+                            pickDtlPtclEntity.setColQty(requestData.getColQty());
+                            pickDtlPtclEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+                            if (requestData.getColQty() > 0) {
+                                pickDtlPtclEntity.setPickDtlStCd("PICKD1");
+                            } else {
+                                pickDtlPtclEntity.setPickDtlStCd("PICKD3");
+                            }
+                            pickDtlPtclList.add(pickDtlPtclEntity);
 
-                        //저장된 정보 신규 등록 및 업데이트 처리함
-                        colOdrMapper.insertRtnProcInfoPtcl(userId,rtnProcInfoEntity );
+                            PickInfoMgntEntity pickInfoEntity = new PickInfoMgntEntity();
+                            pickInfoEntity.setColPickUnqNo(targetData.getColPickUnqNo());
+                            pickInfoMgntList.add(pickInfoEntity);
+                        }
 
                     } //==> targetList db에서 가온 수거정보
+                } //==> request에서 가져온 전달받은 정보
+
+                //정보 저장함
+                if (rtnProcInfoPtclList.size() > 0 ) {
+                    colOdrMapper.insertRtnProcInfoPtcl(userId,rtnProcInfoPtclList );
+                }
 
+                if (stckMgntBaseInfoList.size() > 0 ) {
+                    colOdrMapper.updateChgStckQtyStckMgnt(userId, stckMgntBaseInfoList);
+                }
 
+                if (stckMgntDtlHistList.size() > 0 ) {
+                    colOdrMapper.insertChgStckStckMgntDtlHist(userId, stckMgntDtlHistList);
+                }
 
-                } //==> request에서 가져온 전달받은 정보
+                if (colOdrDtlPtclList.size() > 0 ) {
+                    colOdrMapper.updateChgStckCloDtlStCd(userId, colOdrDtlPtclList);
+                }
+
+                if (pickDtlPtclList.size() > 0 ) {
+                    colOdrMapper.updateChgStckPickDtlStCd(userId, pickDtlPtclList);
+                }
+
+                // 마스터성 수거지시 마스터  업데이트
+                if (colOdrBaseList.size() > 0 ) {
+                    List<ColOdrBaseEntity>  colOdrStList = colOdrMapper.selectColCmdStDtlList(userId, colOdrBaseList);
+                    colOdrMapper.updateChgStckColOdrStCd(userId,colOdrStList );
+                }
+
+                // 수거서 마스터 업데이트
+                if (pickInfoMgntList.size() > 0 ) {
+                    List<PickInfoMgntEntity>  pickInfoList = colOdrMapper.selectColPickStList(userId, pickInfoMgntList);
+                    colOdrMapper.updateChgStckPickStCd(userId, pickInfoList);
+                }
             }
 
         } catch (GlobalException e) {
@@ -954,20 +1018,20 @@ public class ColOdrService extends CommonService {
             throw new RuntimeException();
         }
     }
-*/
+
     /*
       반품처리현황 그리드 리스트 조회
  */
-    public GridResponse selectRtnStockResultList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
+    public GridResponse selectRtnStockResultList(String sBrandId, String sStoreId, String sColPickUnqNo, String fromDt, String toDt, String sRtnWhsId, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
         int gridPage = gridRequest.getGridPage();
         int gridSize = gridRequest.getGridSize();
 
         fromDt = fromDt == null ? null : fromDt.replace(".", "");
         toDt = toDt == null ? null : toDt.replace(".", "");
 
-        int gridRecords = colOdrMapper.selectColRtnInstResultGridCnt(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
+        int gridRecords = colOdrMapper.selectColRtnInstResultGridCnt(sBrandId, sStoreId,sColPickUnqNo,  fromDt, toDt, sSpplyId, sRtnWhsId,  sWhsId,  sItemNm);
         int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstResultGridList(sBrandId, sStoreId, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
+        List<PickInfoMgntEntity> entities = colOdrMapper.selectColRtnInstResultGridList(sBrandId, sStoreId, sColPickUnqNo, fromDt, toDt, sSpplyId, sRtnWhsId, sWhsId, sItemNm, gridRequest);
         List<Object> gridRows = entities.stream()
                 .map(m -> RtnColStockResultResponse.builder()
                         .viewCd("R")

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

@@ -935,7 +935,7 @@ public class ShmtOdrService extends CommonService {
                 List<DeliDtlMgntEntity> deliDtlGridUpdateData = new ArrayList<DeliDtlMgntEntity>();
                 List<ShmtOdrDtlEntity> shmtDtlGridUpdateData = new ArrayList<ShmtOdrDtlEntity>();
                 List<PchOdrDtlPtclEntity> PchOdrDtlGridUpdateData = new ArrayList<PchOdrDtlPtclEntity>();
-
+                List<StckMgntDtlHistEntity> stckMgntDtlHistList= new ArrayList<StckMgntDtlHistEntity>();
 
                 // loan_mgnt_unq_no 매장납품일 경우
                 //selectStoreLoanMgntUnqNo
@@ -1013,6 +1013,22 @@ public class ShmtOdrService extends CommonService {
                             smbaseInfoEntity.setStckQty(whsProcData.getWhsQty());
                             wareGridUpdateData.add(smbaseInfoEntity);
 
+                            // 재고 이력정보 등록
+                            StckMgntDtlHistEntity stckWHist = new StckMgntDtlHistEntity();
+                            stckWHist.setStckMgntDtlNo(fnGetDealNo(37, ""));
+                            stckWHist.setBrandId(saveWarehouseProcRequest.getBrandId());
+                            stckWHist.setWhsId(saveWarehouseProcRequest.getWhsId());
+                            stckWHist.setLocation(whsProcData.getLocation());
+                            stckWHist.setItemId(whsProcData.getItemId());
+                            stckWHist.setItemNm(targetData.getDeliDtlMgntInfo().getItemNm());
+                            stckWHist.setInoutCd("IN");
+                            stckWHist.setInoutQty(whsProcData.getWhsQty());
+                            stckWHist.setChgDvsn("PIN");
+                            stckWHist.setRelationNo(whsProcData.getWhsMgntUnqNo());
+                            stckMgntDtlHistList.add(stckWHist);
+
+
+
                             // 납품서 상태 정의  dlvSttmtUnqNo  dlvDtlStCd
                             DeliDtlMgntEntity deliDtlEntity = new DeliDtlMgntEntity();
                             deliDtlEntity.setDlvSttmtUnqNo(whsProcData.getDlvSttmtUnqNo());
@@ -1065,6 +1081,7 @@ public class ShmtOdrService extends CommonService {
 
                     // 재고관련 정리 필요
                     stockMngMapper.updateWarehouseStockQty(userId, wareGridUpdateData);
+                    stockMngMapper.insertMultiStckMgntDtlHist(userId, stckMgntDtlHistList);
 
                     // 납품서 상세 처리
                     shmtOdrMapper.updateDeliDtlStCd(userId, deliDtlGridUpdateData);

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

@@ -19,6 +19,9 @@ public class RtnStockTragetGridRequest extends GridRequest {
     @ApiModelProperty(value = "매장")
     private String sStoreId;
 
+    @ApiModelProperty(value = "수거서번호")
+    private String sColPickUnqNo;
+
     @NotBlank
     @ApiModelProperty(value = "시작일자")
     private String fromDt;

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

@@ -20,6 +20,8 @@ public class SaveRtnStockProcRequest {
     @ApiModelProperty(value = "브랜드아이디") private String brandId;
 
     @NotBlank
+    @ApiModelProperty(value = "반품창고아이디") private String rtnWhsId;
+
     @ApiModelProperty(value = "입고창고아이디") private String whsId;
 
     @ApiModelProperty(value = "매장창고 반품처리시 필수") private String storeId;

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

@@ -571,14 +571,17 @@
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
         </if>
+        <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
+            and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
-        and   base.whs_id = #{sRtnWhsId}
+        and   mgnt.whs_id = #{sRtnWhsId}
         </if>
         <if test="sSpplyId != null and sSpplyId != ''">
         and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
-        and   mgnt.whs_id = #{sWhsId}
+        and   base.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},'%') )
@@ -619,14 +622,17 @@
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
         </if>
+        <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
+            and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
-            and   base.whs_id = #{sRtnWhsId}
+            and   mgnt.whs_id = #{sRtnWhsId}
         </if>
         <if test="sSpplyId != null and sSpplyId != ''">
             and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
-            and   mgnt.whs_id = #{sWhsId}
+            and   base.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},'%') )
@@ -637,8 +643,8 @@
     <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
+            , whs_id, location, unit, unit_amt, rtn_req_qty
+            , rtn_odr_qty, col_qty, col_req_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
@@ -647,8 +653,8 @@
         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.whsId}, #{item.location}, #{item.unit}, #{item.unitAmt}, #{item.rtnReqQty}
+            , #{item.rtnOdrQty}, #{item.colQty}, #{item.colReqQty}, #{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}
@@ -687,14 +693,17 @@
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
         </if>
+        <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
+            and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
-            and   base.whs_id = #{sRtnWhsId}
+            and   mgnt.whs_id = #{sRtnWhsId}
         </if>
         <if test="sSpplyId != null and sSpplyId != ''">
             and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
-            and   mgnt.whs_id = #{sWhsId}
+            and   base.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},'%') )
@@ -734,14 +743,17 @@
         <if test="sStoreId != null and sStoreId != ''">
             and   mgnt.store_id = #{sStoreId}
         </if>
+        <if test="sColPickUnqNo != null and sColPickUnqNo != ''">
+            and   mgnt.col_pick_unq_no = #{sColPickUnqNo}
+        </if>
         <if test="sRtnWhsId != null and sRtnWhsId != ''">
-            and   base.whs_id = #{sRtnWhsId}
+            and   mgnt.whs_id = #{sRtnWhsId}
         </if>
         <if test="sSpplyId != null and sSpplyId != ''">
             and   mgnt.spply_id = #{sSpplyId}
         </if>
         <if test="sWhsId != null and sWhsId != ''">
-            and   mgnt.whs_id = #{sWhsId}
+            and   base.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},'%') )
@@ -754,12 +766,14 @@
             , mgnt.store_id,dtl.item_id as 'pickDtlInfo.item_id', dtl.item_nm as 'pickDtlInfo.item_nm'
             , base.whs_id, base.location
             , fn_whs_nm(base.brand_id, base.whs_id) as whs_nm, fn_whs_location_nm(base.brand_id, base.whs_id, base.location) as location_nm
+            , mgnt.whs_id as rtn_whs_id, mgnt.location as rtn_location
+            , fn_whs_nm(base.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(base.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
             , dtl.unit as 'pickDtlInfo.unit' , dtl.unit_amt as 'pickDtlInfo.unit_amt'
             , ptcl.rtn_req_qty as  'pickDtlInfo.rtn_req_qty'   , dtl.rodr_qty as 'pickDtlInfo.rodr_qty'
             , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
-            , date_format(mgnt.col_req_dt,'%Y.%m.%d') as col_req_dt
-            , date_format(mgnt.col_sch_dt,'%Y.%m.%d') as col_sch_dt
-            , date_format(mgnt.col_cmplt_dt,'%Y.%m.%d') as col_cmplt_dt
+            , date_format(mgnt.col_req_dt,'%Y%m%d') as col_req_dt
+            , date_format(mgnt.col_sch_dt,'%Y%m%d') as col_sch_dt
+            , date_format(mgnt.col_cmplt_dt,'%Y%m%d') as col_cmplt_dt
             , mgnt.pick_mgr_nm, fn_get_telno(mgnt.pick_mgr_tel_no) as pick_mgr_tel_no
             , dtl.col_req_amt as 'pickDtlInfo.col_req_amt'
             , mgnt.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
@@ -777,13 +791,120 @@
         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 = #{brandId}
-        and   base.whs_id = #{whsId}
-        and    concat(base.col_pick_unq_no, ptcl.col_pick_dtl_no) in
+        and   mgnt.whs_id = #{whsId}
+        and    concat(mgnt.col_pick_unq_no, dtl.col_pick_dtl_no) in
         <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
             #{item.colPickUnqNo}
         </foreach>
     </select>
+
+
+    <update id="updateChgStckQtyStckMgnt">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update stck_mgnt_base_info
+            set    sys_chg_id = #{userId}
+                 , sys_chg_dttm = now()
+                 , stck_qty = stck_qty + #{item.stckQty}
+            where brand_id = #{item.brandId}
+            and   whs_id = #{item.whsId}
+            and   location = #{item.location}
+            and   item_id = #{item.itemId}
+        </foreach>
+    </update>
+
+    <insert id="insertChgStckStckMgntDtlHist" >
+        /* StockMngMapper.insertStckMgntDtlHist */
+        INSERT INTO stck_mgnt_dtl_hist
+            (stck_mgnt_dtl_no, brand_id, whs_id, location, item_id, item_nm, inout_cd, inout_qty, whs_mgnt_unq_no,
+             rtn_mgnt_unq_no, chg_dvsn, relation_no, sys_reg_dttm,
+             sys_reg_id, sys_chg_dttm, sys_chg_id)
+        VALUES
+        <foreach collection="gridInsertData" item="item" separator=",">
+            (#{item.stckMgntDtlNo}, #{item.brandId}, #{item.whsId}, #{item.location}, #{item.itemId},
+             #{item.itemNm}, #{item.inoutCd}, #{item.inoutQty}, #{item.whsMgntUnqNo}, #{item.rtnMgntUnqNo}, #{item.chgDvsn}, #{item.relationNo},
+             NOW(), #{userId}, NOW(), #{userId})
+        </foreach>
+    </insert>
+    <update id="updateChgStckCloDtlStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update col_odr_dtl_ptcl
+            set    sys_chg_id = #{userId}
+                , sys_chg_dttm = now()
+                , col_cmd_dtl_st_cd = #{item.colCmdDtlStCd}
+            where col_cmd_unq_no = #{item.colCmdUnqNo}
+            and   col_cmd_dtl_no = #{item.colCmdDtlNo}
+        </foreach>
+    </update>
+
+    <update id="updateChgStckPickDtlStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update pick_dtl_ptcl
+            set    sys_chg_id = #{userId}
+                , sys_chg_dttm = now()
+                , pick_dtl_st_cd = #{item.pickDtlStCd}
+            where col_pick_unq_no = #{item.colPickUnqNo}
+            and   col_pick_dtl_no = #{item.colPickDtlNo}
+        </foreach>
+    </update>
+
+    <select id="selectColCmdStDtlList" resultType="com.oqpo.api.entity.inoutmng.ColOdrBaseEntity">
+        select stData.col_cmd_unq_no , case when stData.cdld1 <![CDATA[>]]> 0 then 'COL1' when stData.cdld1 = 0 and stData.cdld2 <![CDATA[>]]> 0 then 'COL2' else 'COL3' end as col_cmd_st_cd
+        from  (
+                select col_cmd_unq_no
+                    , sum(case when col_cmd_dtl_st_cd = 'CDLD1' then 1 else 0 end)  as cdld1
+                    , sum(case when col_cmd_dtl_st_cd = 'CDLD2' then 1 else 0 end)  as cdld2
+                    , sum(case when col_cmd_dtl_st_cd = 'CDLD3' then 1 else 0 end)  as cdld3
+                from  col_odr_dtl_ptcl
+                where col_cmd_unq_no in
+                <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+                    #{item.colCmdUnqNo}
+                </foreach>
+                group by col_cmd_unq_no
+        ) stData
+    </select>
+
+    <update id="updateChgStckColOdrStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update col_odr_base_info
+            set    sys_chg_id = #{userId}
+                , sys_chg_dttm = now()
+                , col_cmd_st_cd = #{item.colCmdStCd}
+            where col_cmd_unq_no = #{item.colCmdUnqNo}
+        </foreach>
+    </update>
+
+    <select id="selectColPickStList" resultType="com.oqpo.api.entity.inoutmng.PickInfoMgntEntity">
+        select stData.col_pick_unq_no , case when stData.pickd0 <![CDATA[>]]> 0 then 'PICK0' when stData.pickd0 = 0 and stData.pickd1 <![CDATA[>]]> 0 then 'PICK1' else 'PICK3' end as pick_st_cd
+        from  (
+            select col_pick_unq_no
+                , sum(case when pick_dtl_st_cd = 'PICKD0' then 1 else 0 end)  as pickd0
+                , sum(case when pick_dtl_st_cd = 'PICKD1' then 1 else 0 end)  as pickd1
+                , sum(case when pick_dtl_st_cd = 'PICKD3' then 1 else 0 end)  as pickd3
+            from  pick_dtl_ptcl
+            where col_pick_unq_no in
+                <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+                    #{item.colPickUnqNo}
+                </foreach>
+            group by col_pick_unq_no
+        ) stData
+    </select>
+
+    <update id="updateChgStckPickStCd">
+        <foreach collection="gridUpdateData" item="item" separator=";">
+            update pick_info_mgnt
+            set    sys_chg_id = #{userId}
+                , sys_chg_dttm = now()
+                , pick_st_cd = #{item.pickStCd}
+            where col_pick_unq_no = #{item.colPickUnqNo}
+        </foreach>
+    </update>
     <!--
+
+
+    in
+        <foreach collection="gridUpdateData" item="item" separator="," open="(" close=")">
+            concat(#{item.rtnPodrUnqNo},#{item.rtnPodrDtlNo})
+        </foreach>
         <insert id="insertRtnProcInfoPtcl">
             insert into rtn_proc_info_ptcl
             (rtn_mgnt_unq_no, brand_id, store_id, item_id, item_nm