반품처리 임시작업저장

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

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

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

@@ -39,10 +39,12 @@ public class RtnProcInfoPtclEntity implements Serializable {
     private String unit;
     @ApiModelProperty(value = "단가금액")
     private long unitAmt;
-    @ApiModelProperty(value = "반품수량")
-    private int rtnQty;
+    @ApiModelProperty(value = "반품요청수량")
+    private int rtnReqQty;
     @ApiModelProperty(value = "반품발주수량")
     private int rtnOdrQty;
+    @ApiModelProperty(value = "반품수거요청수량")
+    private int colReqQty;
     @ApiModelProperty(value = "수거수량")
     private int colQty;
     @ApiModelProperty(value = "수거요청일자")

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

@@ -64,6 +64,8 @@ public enum SystemMessageCode {
     ERR_INGPOCNT (40032, "발주 진행중인건이 있어서 반품 반려 처리를 할 수 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_INGCOLCNT (40033, "발주 진행중인건이 있어서 반품 취소처리를 할 수 없습니다.", HttpStatus.BAD_REQUEST),
     ERR_POPICKQTY (40034, "반품 발주 수량보다 수거 수량이 많습니다.", HttpStatus.BAD_REQUEST),
+    ERR_NOTRTNQTY (40035, "반품입고수량은 수거수량보다 적거나 같아야 합니다.", HttpStatus.BAD_REQUEST),
+    ERR_NOTRTNINWHS (40036, "반품입고창고가 수거서 반품입고창고와 상이합니다.", HttpStatus.BAD_REQUEST),
     ;
 
 

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

@@ -55,8 +55,11 @@ public interface ColOdrMapper {
     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> selectColRtnInstProcList(@Param("brandId") String brandId, @Param("whsId") String whsId,List<RtnProcInfoPtclEntity> gridUpdateData )throws Exception;
 
 
+    //int insertRtnProcInfoPtcl(@Param("userId") String userId, RtnProcInfoPtclEntity entity) throws Exception;
+
     /*
     List<PchOdrBaseInfoEntity> selectShmtTargetOdrGridList(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm, GridRequest gridRequest)throws Exception;
     int selectShmtTargetOdrGridCnt(@Param("sBrandId") String sBrandId, @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sShmtWhsId") String sShmtWhsId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm)throws Exception;

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

@@ -4,6 +4,7 @@ package com.oqpo.api.service.inoutmng;
 import com.oqpo.api.entity.inoutmng.*;
 import com.oqpo.api.entity.loanmng.LoanMgntBaseInfoEntity;
 import com.oqpo.api.entity.oper.FileEntity;
+import com.oqpo.api.entity.oper.UserMngEntity;
 import com.oqpo.api.entity.pomng.PchOdrBaseInfoEntity;
 import com.oqpo.api.entity.pomng.PchOdrDtlPtclEntity;
 import com.oqpo.api.entity.rtnmng.RtnOdrBaseInfoEntity;
@@ -23,6 +24,7 @@ import com.oqpo.api.mapper.FileMapper;
 import com.oqpo.api.mapper.inoutmng.ColOdrMapper;
 import com.oqpo.api.mapper.inoutmng.ShmtOdrMapper;
 import com.oqpo.api.mapper.loanmng.LoanStateMapper;
+import com.oqpo.api.mapper.oper.UserMngMapper;
 import com.oqpo.api.mapper.pomng.PchOrdMapper;
 import com.oqpo.api.mapper.rtnmng.RtnOdrMapper;
 import com.oqpo.api.mapper.stinfo.BrandMapper;
@@ -68,10 +70,12 @@ public class ColOdrService extends CommonService {
     private StoreBaseInfoMapper storeBaseInfoMapper;
 
     @Autowired
-    private LoanStateMapper loanStateMapper;
+    private FileMapper fileMapper;
 
     @Autowired
-    private FileMapper fileMapper;
+    private UserMngMapper userMngMapper;
+
+
 
     /*
       수거 대상 그리드 리스트 조회
@@ -769,189 +773,176 @@ public class ColOdrService extends CommonService {
     @Transactional
     public void saveRtnStockProc(String userId, SaveRtnStockProcRequest saveRtnStockProcRequest) throws Exception {
         try {
-
             List<RtnProcInfoPtclEntity> gridInsertData = saveRtnStockProcRequest.toCodeEntities(saveRtnStockProcRequest.getGridInsertData());
             List<RtnProcInfoPtclEntity> searchList = new ArrayList<RtnProcInfoPtclEntity>();
             if (gridInsertData.size() > 0) {
-                for (int i = 0 ; i < gridInsertData.size() ; i++) {
+                for (int i = 0; i < gridInsertData.size(); i++) {
                     RtnProcInfoPtclEntity targetData = gridInsertData.get(i);
                     RtnProcInfoPtclEntity procData = new RtnProcInfoPtclEntity();
-                    procData.setColPickUnqNo (targetData.getColPickUnqNo() + targetData.getColPickDtlNo());
+                    procData.setColPickUnqNo(targetData.getColPickUnqNo() + targetData.getColPickDtlNo());
                     searchList.add(procData);
-                }  ==> 여기까지
-
-                List<PickInfoMgntEntity> targetList  =   shmtOdrMapper.selectWarehouseProcList(saveWarehouseProcRequest.getBrandId(), saveWarehouseProcRequest.getWhsId(), serarchList);
-
-                List<WhsProcInfoPtclEntity> gridUpdateData = new ArrayList<WhsProcInfoPtclEntity>();
-                List<StckMgntBaseInfoEntity> wareGridUpdateData = new ArrayList<StckMgntBaseInfoEntity>();
-                List<DeliDtlMgntEntity> deliDtlGridUpdateData = new ArrayList<DeliDtlMgntEntity>();
-                List<ShmtOdrDtlEntity> shmtDtlGridUpdateData = new ArrayList<ShmtOdrDtlEntity>();
-                List<PchOdrDtlPtclEntity> PchOdrDtlGridUpdateData = new ArrayList<PchOdrDtlPtclEntity>();
-
-
-                // loan_mgnt_unq_no 매장납품일 경우
-                //selectStoreLoanMgntUnqNo
-                String loanMgntUnqNo = "";
-                long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
-                if (!"".equals(saveWarehouseProcRequest.getStoreId())) {
-                    loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(saveWarehouseProcRequest.getStoreId());
                 }
 
-                // 우선 입고수량과 납품수량 비교를 처리함
-                for (int i = 0 ; i < gridInsertData.size() ; i++) {
-                    WhsProcInfoPtclEntity whsProcData = gridInsertData.get(i);
+                //로그인 사용자 정보
+                UserMngEntity uEntity = userMngMapper.selectGroupUserInfo(userId);
 
-                    for (int j = 0  ; j < targetList.size() ; j++) {
-                        DeliInfoMgntEntity targetData = targetList.get(j);
-                        //System.out.println("=whsProcData=======getDlvSttmtUnqNo============>" + i + "==" + j + "==>" + whsProcData.getDlvSttmtUnqNo() +  "==" +  targetData.getDlvSttmtUnqNo());
-                       // System.out.println("=whsProcData=======getDlvSttmtDtlNo============>" + i + "==" + j + "==>"  + whsProcData.getDlvSttmtDtlNo() +  "==" +   targetData.getDeliDtlMgntInfo().getDlvSttmtDtlNo());
-                        if (whsProcData.getDlvSttmtUnqNo().equals(targetData.getDlvSttmtUnqNo()) && whsProcData.getDlvSttmtDtlNo().equals(targetData.getDeliDtlMgntInfo().getDlvSttmtDtlNo())) {
 
-                            if (whsProcData.getWhsQty() > targetData.getDeliDtlMgntInfo().getDlvQty()) {
-                                 // 오류 처리
-                                throw new GlobalException(SystemMessageCode.ERR_NOTWAREHOUSE);
-                            }
+                // 반품처리를 위한 관련정보를 가져온다
+                List<PickInfoMgntEntity> targetList = colOdrMapper.selectColRtnInstProcList(saveRtnStockProcRequest.getBrandId(), saveRtnStockProcRequest.getWhsId(), searchList);
 
-                            // 입고번호 생성
-                            whsProcData.setWhsMgntUnqNo(fnGetDealNo(17,""));
-
-                            //System.out.println("=whsProcData=======setWhsMgntUnqNo============>" + i + "==" + j + "==>"  + whsProcData.getWhsMgntUnqNo());
-
-                            whsProcData.setDlvSttmtDtlNo(targetData.getDeliDtlMgntInfo().getDlvSttmtDtlNo());
-                            whsProcData.setDlvSttmtUnqNo(targetData.getDlvSttmtUnqNo());
-                            whsProcData.setBrandId(targetData.getBrandId());
-                            whsProcData.setStoreId(targetData.getStoreId());
-                            whsProcData.setWhsId(targetData.getWhsId());
-                            whsProcData.setLocation(targetData.getLocation());
-                            whsProcData.setSpplyId(targetData.getSpplyId());
-                            whsProcData.setSpplyNm(targetData.getSpplyNm());
-                            whsProcData.setWhsDvsn(targetData.getWhsDvsn());
-                            whsProcData.setPodrQty(targetData.getDeliDtlMgntInfo().getPodrQty());
-                            whsProcData.setDlvQty(targetData.getDeliDtlMgntInfo().getDlvQty());
-                            whsProcData.setUnit(targetData.getDeliDtlMgntInfo().getUnit());
-                            whsProcData.setUnitAmt(targetData.getDeliDtlMgntInfo().getUnitAmt());
-                            whsProcData.setDlvReqDt(targetData.getDlvReqDt());
-                            whsProcData.setDlvSchDt(targetData.getDlvSchDt());
-                            whsProcData.setWhsCnfmNm(userId);
-                            whsProcData.setDlvMgrNm(targetData.getDlvMgrNm());
-                            whsProcData.setDlvMgrTelNo(targetData.getDlvMgrTelNo());
-                            whsProcData.setDlvMgrEmal(targetData.getDlvMgrEmal());
-                            whsProcData.setDlvMgrMblNo(targetData.getDlvMgrMblNo());
-                            whsProcData.setItemId(targetData.getDeliDtlMgntInfo().getItemId());
-                            whsProcData.setItemNm(targetData.getDeliDtlMgntInfo().getItemNm());
-                            whsProcData.setWhsAmt(Long.valueOf(targetData.getDeliDtlMgntInfo().getUnitAmt() * whsProcData.getWhsQty()));
-                            whsProcData.setWhsDlvChrg(null);
-                            //whsProcData.setDlvMgrId(targetData.getdlvmgr);
-                            whsProcData.setDlvCnfmDocFileNo(whsProcData.getDlvCnfmDocFileNo());
-                            whsProcData.setSttlYn("N");
-                            whsProcData.setPchPodrUnqNo(targetData.getDeliDtlMgntInfo().getPchPodrUnqNo());
-                            whsProcData.setPchPodrDtlNo(targetData.getDeliDtlMgntInfo().getPchPodrDtlNo());
-                            whsProcData.setPchReqUnqNo(targetData.getDeliDtlMgntInfo().getPchReqUnqNo());
-                            whsProcData.setPchReqDtlNo(targetData.getDeliDtlMgntInfo().getPchReqDtlNo());
-                            whsProcData.setShmtReqUnqNo(targetData.getDeliDtlMgntInfo().getShmtReqUnqNo());
-                            whsProcData.setShmtReqDtlNo(targetData.getDeliDtlMgntInfo().getShmtReqDtlNo());
-
-                            gridUpdateData.add(whsProcData);
-
-                            // 정산할때 함 여신관련한 여신차감할 입고금액 세팅
-                            //loanAmt = loanAmt + (targetData.getDeliDtlMgntInfo().getUnitAmt() * whsProcData.getWhsQty());
-
-                            // 재고처리를 위한 작업업
-                            StckMgntBaseInfoEntity smbaseInfoEntity = new StckMgntBaseInfoEntity();
-                            smbaseInfoEntity.setBrandId(saveWarehouseProcRequest.getBrandId());
-                            smbaseInfoEntity.setWhsId(saveWarehouseProcRequest.getWhsId());
-                            smbaseInfoEntity.setLocation(whsProcData.getLocation());
-                            smbaseInfoEntity.setItemId(whsProcData.getItemId());
-                            smbaseInfoEntity.setStckQty(whsProcData.getWhsQty());
-                            wareGridUpdateData.add(smbaseInfoEntity);
-
-                            // 납품서 상태 정의  dlvSttmtUnqNo  dlvDtlStCd
-                            DeliDtlMgntEntity deliDtlEntity = new DeliDtlMgntEntity();
-                            deliDtlEntity.setDlvSttmtUnqNo(whsProcData.getDlvSttmtUnqNo());
-                            deliDtlEntity.setDlvSttmtDtlNo(whsProcData.getDlvSttmtDtlNo());
-                            if (whsProcData.getWhsQty() > 0 ) {
-                                deliDtlEntity.setDlvDtlStCd("DLD1");
-                            } else {
-                                deliDtlEntity.setDlvDtlStCd("DLD3");
-                            }
-                            deliDtlGridUpdateData.add(deliDtlEntity);
+                for (int i = 0; i < gridInsertData.size(); i++) {
+                    RtnProcInfoPtclEntity requestData = gridInsertData.get(i);
 
+                    for (int j = 0; j < targetList.size(); j++) {
+                        PickInfoMgntEntity targetData = targetList.get(j);
 
-                            // 출하지시 상태정의
-                            if (!"".equals(whsProcData.getShmtReqUnqNo()) && whsProcData.getShmtReqUnqNo() != null) {
-                                ShmtOdrDtlEntity shmtDtlData = new ShmtOdrDtlEntity();
-                                shmtDtlData.setShmtReqUnqNo(whsProcData.getShmtReqUnqNo());
-                                shmtDtlData.setShmtReqDtlNo(whsProcData.getPchReqDtlNo());
-                                if (whsProcData.getWhsQty() > 0 ) {
-                                    shmtDtlData.setShmtDtlStCd("SHMD2");
-                                } else {
-                                    shmtDtlData.setShmtDtlStCd("SHMD3");
-                                }
+                        RtnProcInfoPtclEntity rtnProcInfoEntity = new RtnProcInfoPtclEntity();
 
-                                shmtDtlGridUpdateData.add(shmtDtlData);
+                        if (requestData.getColPickDtlNo().equals(targetData.getColPickUnqNo()) && requestData.getColPickDtlNo().equals(targetData.getPickDtlInfo().getColPickDtlNo())) {
+                            if (requestData.getColQty() > targetData.getPickDtlInfo().getColReqQty()) {
+                                // 반품입고수량이 수거요청수량보다 클 수 없습니다.
+                                throw new GlobalException(SystemMessageCode.ERR_NOTRTNQTY);
                             }
 
-                            PchOdrDtlPtclEntity pchOdrDtlData = new PchOdrDtlPtclEntity();
-                            pchOdrDtlData.setPchPodrUnqNo(whsProcData.getPchPodrUnqNo());
-                            pchOdrDtlData.setPchPodrDtlNo(whsProcData.getPchPodrDtlNo());
-                            if (whsProcData.getWhsQty() > 0 ) {
-                                pchOdrDtlData.setPodrDtlStCd("POD4");
-                            } else {
-                                pchOdrDtlData.setPodrDtlStCd("POD2");
-
-                                if (!"".equals(loanMgntUnqNo)) {
-                                    loanAmt = loanAmt + ( targetData.getDeliDtlMgntInfo().getDlvQty() * targetData.getDeliDtlMgntInfo().getUnitAmt() ) ;
-                                }
+                            if (targetData.getColDvsn().equals("C001") && !saveRtnStockProcRequest.getWhsId().equals(targetData.getWhsId())) {
+                                // 본사 수거이변서 입고창고가 상이하면 오류
+                                throw new GlobalException(SystemMessageCode.ERR_NOTRTNINWHS);
                             }
-
-                            PchOdrDtlGridUpdateData.add(pchOdrDtlData);
-                            break;
                         }
 
+                        // 반품처리  진행 데이타생성
+
+                        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);
+                        }
 
-                    }  // or문 종료
-                }
-
-                    // 입고데이타 저장
-                    shmtOdrMapper.insertWhsProcInfoPtcl(userId, gridUpdateData);
-
-                    // 재고관련 정리 필요
-                    stockMngMapper.updateWarehouseStockQty(userId, wareGridUpdateData);
-
-                    // 납품서 상세 처리
-                    shmtOdrMapper.updateDeliDtlStCd(userId, deliDtlGridUpdateData);
-
-                    // 납품서 헤더 상태 처리
-                    List<DeliInfoMgntEntity> deliInfoStList = shmtOdrMapper.selectDeliInfoStList(userId, deliDtlGridUpdateData);
-                    shmtOdrMapper.updateDeliInfoStCd(userId, deliInfoStList);
-
-                    // 출하지시서 상태 업데이트
-                    if (shmtDtlGridUpdateData.size() > 0) {
-                        shmtOdrMapper.updateShmtDtlStCd(userId,shmtDtlGridUpdateData );
-                        List<ShmtOdrBaseEntity> shmtInfoStList = shmtOdrMapper.selectShmtInfoStList(userId, shmtDtlGridUpdateData);
-                        shmtOdrMapper.updateShmtInfoStCd(userId, shmtInfoStList);
-                    }
-
-
-                    shmtOdrMapper.updatePchPodrDtlStCd(userId, PchOdrDtlGridUpdateData);
-
-                    String pchPodrUnqNo = "";
-                    for (int k = 0; k < PchOdrDtlGridUpdateData.size(); k++) {
-                        if (!pchPodrUnqNo.equals(PchOdrDtlGridUpdateData.get(k).getPchPodrUnqNo())) {
-                            pchPodrUnqNo = PchOdrDtlGridUpdateData.get(k).getPchPodrUnqNo();
-                            String pchOdrStCd = pchOrdService.selectOdrDtlStatusList(pchPodrUnqNo);
-                            pchOrdMapper.updateChgPodrStCd(userId, pchOdrStCd, pchPodrUnqNo);
+                        // 반품수거서 건별 업데이트
+                        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");
                         }
-                    }
 
-                    // 발주 헤더가 취소면 해당 발주건에 대한 사용금액을 원복 처리한다.
-                    if (!"".equals(loanMgntUnqNo) && loanAmt > 0) {
-                        // 여신관련 정리 필요 loanAmt 업데이트
-                        loanStateMapper.updateloanMinusInstProc(loanMgntUnqNo, saveWarehouseProcRequest.getStoreId(), loanAmt);
-                    }
+                        //저장된 정보 신규 등록 및 업데이트 처리함
+                        colOdrMapper.insertRtnProcInfoPtcl(userId,rtnProcInfoEntity );
+
+                    } //==> targetList db에서 가온 수거정보
 
 
 
+                } //==> request에서 가져온 전달받은 정보
             }
 
         } catch (GlobalException e) {
@@ -1010,46 +1001,7 @@ public class ColOdrService extends CommonService {
                 .collect(Collectors.toList());
         return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
     }
-    /*
-      입고 현황 그리드 리스트 조회  @Param("sBrandId") String sBrandId, @Param("sStoreId") String sStoreId,
-      @Param("fromDt") String fromDt, @Param("toDt") String toDt, @Param("sPchPodrUnqNo") String sPchPodrUnqNo, @Param("sSpplyId") String sSpplyId, @Param("sWhsId") String sWhsId, @Param("sItemNm") String sItemNm
 
-    public GridResponse selectWarehouseGridList(String sBrandId, String sStoreId,  String fromDt, String toDt, String sPchPodrUnqNo, String sSpplyId, String sWhsId, String sItemNm, GridRequest gridRequest) throws Exception {
-        int gridPage = gridRequest.getGridPage();
-        int gridSize = gridRequest.getGridSize();
-
-        fromDt = fromDt == null ? null : fromDt.replace(".", "");
-        toDt = toDt == null ? null : toDt.replace(".", "");
-
-        int gridRecords = shmtOdrMapper.selectWarehouseCnt(sBrandId, sStoreId, fromDt, toDt, sPchPodrUnqNo, sSpplyId, sWhsId, sItemNm);
-        int gridTotal = fnCalculateGridTotal(gridSize, gridRecords);
-        List<WhsProcInfoPtclEntity> entities = shmtOdrMapper.selectWarehouseList(sBrandId, sStoreId, fromDt, toDt, sPchPodrUnqNo, sSpplyId, sWhsId, sItemNm, gridRequest);
-        List<Object> gridRows = entities.stream()
-                .map(m -> WarehouseSearchGridListResponse.builder()
-                        .viewCd("R")
-                        .pchPodrUnqNo(m.getPchPodrUnqNo() == null ? "" : m.getPchPodrUnqNo())
-                        .pchPodrDtlNo(m.getPchPodrDtlNo() == null ? "" : m.getPchPodrDtlNo())
-                        .dlvSttmtUnqNo(m.getDlvSttmtUnqNo() == null ? "" : m.getDlvSttmtUnqNo())
-                        .dlvSttmtDtlNo(m.getDlvSttmtDtlNo() == null ? "" : m.getDlvSttmtDtlNo() )
-                        .podrQty(m.getPodrQty() == null ? 0 : m.getPodrQty())
-                        .dlvQty(m.getDlvQty() == null ? 0 : m.getDlvQty())
-                        .whsQty(m.getWhsQty() == null ? 0 : m.getWhsQty())
-                        .dlvReqDt(m.getDlvReqDt() == null ? "" : m.getDlvReqDt())
-                        .dlvSchDt(m.getDlvSchDt() == null ? "" : m.getDlvSchDt())
-                        .dlvCmpltDt(m.getDlvCmpltDt() == null ? "" : m.getDlvCmpltDt())
-                        .whsCnfmNm(m.getWhsCnfmNm() == null ? "" : m.getWhsCnfmNm())
-                        .dlvMgrNm(m.getDlvMgrNm() == null ? "" : m.getDlvMgrNm())
-                        .dlvMgrTelNo(m.getDlvMgrTelNo() == null ? "" : m.getDlvMgrTelNo())
-                        .itemId(m.getItemId() == null ? "" : m.getItemId())
-                        .itemNm(m.getItemNm() == null ? "" : m.getItemNm())
-                        .unit(m.getUnit() == null ? "" : m.getUnit())
-                        .whsAmt(m.getWhsAmt() == null ? 0 : m.getWhsAmt())
-                        .build())
-                .collect(Collectors.toList());
-        return GridResponse.toDTO(gridPage, gridTotal, gridRecords, gridRows);
-    }
-
- */
 
 }
 

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

@@ -260,7 +260,7 @@ public class ColOdrController {
             @ApiImplicitParam(name = "X-AUTH-TOKEN", value = "CONN-KEY", required = true, dataType = "String", paramType = "header")
     })
     @ApiOperation(value = " 입고 현황 그리드 리스트")
-    @PostMapping("/warehouse-grid-list")
+    @PostMapping("/save-retstock")
     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/SaveRtnStockProcRequest.java

@@ -22,7 +22,7 @@ public class SaveRtnStockProcRequest {
     @NotBlank
     @ApiModelProperty(value = "입고창고아이디") private String whsId;
 
-    @ApiModelProperty(value = "매장창고 입고처리시 필수") private String storeId;
+    @ApiModelProperty(value = "매장창고 반품처리시 필수") private String storeId;
     //colCnfmDocFileNo
     @ApiModelProperty(value = "반품처리대상 리스트")
     private List<RtnStockProcDataList> gridInsertData;

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

@@ -783,28 +783,28 @@
             #{item.colPickUnqNo}
         </foreach>
     </select>
-
-    <insert id="insertRtnProcInfoPtcl">
-        insert into rtn_proc_info_ptcl
-        (rtn_mgnt_unq_no, brand_id, store_id, item_id, item_nm
-        , whs_id, location, unit, unit_amt, rtn_req_qty
-        , rtn_odr_qty, col_req_qty, col_qty, col_req_dt, col_sch_dt
-        , col_dt, col_cnfm_nm, col_mgr_nm, col_mgr_tel_no, col_mgr_emal
-        , col_mgr_mbl_no, col_amt, col_agr_yn, col_cnfm_doc_file_no, sttl_yn
-        , spply_id, spply_nm, col_pick_unq_no, col_pick_dtl_no, col_cmd_unq_no
-        , col_cmd_dtl_no, rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no, rtn_req_dtl_no
-        , sttl_mgnt_unq_no, sttl_mgnt_dtl_no
-        , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
-        values
-        (#{entity.rtnMgntUnqNo}, #{entity.brandId}, #{entity.storeId}, #{entity.itemId}, #{entity.itemNm}
-        , #{entity.whsId}, #{entity.location}, #{entity.unit}, #{entity.unitAmt}, #{entity.rtnReqQty}
-        , #{entity.rtnOdrQty}, #{entity.colReqQty}, #{entity.colQty}, #{entity.colReqDt}, #{entity.colSchDt}
-        , date_fromat(now(),'%Y%m%d'), #{entity.colCnfmNm}, #{entity.colMgrNm}, #{entity.colMgrTelNo}, #{entity.colMgrEmal}
-        , #{entity.colMgrMblNo}, #{entity.colAmt}, #{entity.colAgrYn}, #{entity.colCnfmDocFileNo}, #{entity.sttlYn}
-        , #{entity.spplyId}, #{entity.spplyNm}, #{entity.colPickUnqNo}, #{entity.colPickDtlNo}, #{entity.colCmdUnqNo}
-        , #{entity.colCmdDtlNo}, #{entity.rtnPodrUnqNo}, #{entity.rtnPodrDtlNo}, #{entity.rtnReqUnqNo}, #{entity.rtnReqDtlNo}
-        , #{entity.sttlMgntUnqNo}, #{entity.sttlMgntDtlNo}
-        , now(), #{userId}, now(), #{userId})
-    </insert>
-
-</mapper>
+    <!--
+        <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_req_qty
+            , rtn_odr_qty, col_req_qty, col_qty, col_req_dt, col_sch_dt
+            , col_dt, col_cnfm_nm, col_mgr_nm, col_mgr_tel_no, col_mgr_emal
+            , col_mgr_mbl_no, col_amt, col_agr_yn, col_cnfm_doc_file_no, sttl_yn
+            , spply_id, spply_nm, col_pick_unq_no, col_pick_dtl_no, col_cmd_unq_no
+            , col_cmd_dtl_no, rtn_podr_unq_no, rtn_podr_dtl_no, rtn_req_unq_no, rtn_req_dtl_no
+            , sttl_mgnt_unq_no, sttl_mgnt_dtl_no
+            , sys_reg_dttm, sys_reg_id, sys_chg_dttm, sys_chg_id)
+            values
+            (#{entity.rtnMgntUnqNo}, #{entity.brandId}, #{entity.storeId}, #{entity.itemId}, #{entity.itemNm}
+            , #{entity.whsId}, #{entity.location}, #{entity.unit}, #{entity.unitAmt}, #{entity.rtnReqQty}
+            , #{entity.rtnOdrQty}, #{entity.colReqQty}, #{entity.colQty}, #{entity.colReqDt}, #{entity.colSchDt}
+            , date_fromat(now(),'%Y%m%d'), #{entity.colCnfmNm}, #{entity.colMgrNm}, #{entity.colMgrTelNo}, #{entity.colMgrEmal}
+            , #{entity.colMgrMblNo}, #{entity.colAmt}, #{entity.colAgrYn}, #{entity.colCnfmDocFileNo}, #{entity.sttlYn}
+            , #{entity.spplyId}, #{entity.spplyNm}, #{entity.colPickUnqNo}, #{entity.colPickDtlNo}, #{entity.colCmdUnqNo}
+            , #{entity.colCmdDtlNo}, #{entity.rtnPodrUnqNo}, #{entity.rtnPodrDtlNo}, #{entity.rtnReqUnqNo}, #{entity.rtnReqDtlNo}
+            , #{entity.sttlMgntUnqNo}, #{entity.sttlMgntDtlNo}
+            , now(), #{userId}, now(), #{userId})
+        </insert>
+    -->
+    </mapper>

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

@@ -54,7 +54,7 @@
             rpip.store_id, FN_STORE_NM(rpip.brand_id, rpip.store_id) AS store_nm,
             smbi.sttl_st_cd, FN_CODE_NM('STTL_ST_CD', smbi.sttl_st_cd) AS sttl_st_nm,           /* 정산상태 */
             rpip.item_id, rpip.item_nm, rpip.unit, rpip.unit_amt,
-            rpip.rtn_qty, 0 as dlv_qty, rpip.col_qty, rpip.col_dt, rpip.col_amt,
+            rpip.col_req_qty as rtn_qty, 0 as dlv_qty, rpip.col_qty, rpip.col_dt, rpip.col_amt,
             IFNULL(smdp.sttl_dvsn, 'SC00') AS sttl_dvsn, FN_CODE_NM('STTL_DVSN', IFNULL(smdp.sttl_dvsn, 'SC00')) AS sttl_dvsn_nm, /* 정산구분 */
             rpip.rtn_podr_unq_no, rpip.rtn_podr_dtl_no,
             store.loan_mgnt_unq_no,     /* 여신관리고유번호 */