반품처리관련 수정

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

@@ -43,6 +43,9 @@ public class PickDtlPtclEntity implements Serializable {
     private String rtnRsn;
     private Long colReqAmt;
     private Integer rtnReqQty;
+    private long spplyUnitAmt;
+    private long reqUnitAmt;
+    private long reqRtnAmt;
 
 
 }

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

@@ -45,6 +45,7 @@ public class RtnOdrDtlPtclEntity implements Serializable {
     private Integer rtnReqQty;
     private Integer colQty;
     private Integer rtnStatusCnt;
+    private Long    spplyUnitAmt;
 
 
 

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

@@ -610,7 +610,7 @@ public class ColOdrService extends CommonService {
                     pickInfoMgntEntity.setWhsId(entity.getRtnWhsId());
                     pickInfoMgntEntity.setLocation(entity.getRtnLocation());
                     pickInfoMgntEntity.setColDvsn(entity.getColDvsn());
-                    pickInfoMgntEntity.setWhsDvsn("C001".equals(entity.getColDvsn()) ? "W02" : "W01");  // 본사엣 수거면 매장,,, 공급사에서 수거면 본사
+                    pickInfoMgntEntity.setWhsDvsn("C001".equals(entity.getColDvsn()) ? "W02" : !"".equals(entity.getStoreId()) ? "W02"  : "W01");
                     pickInfoMgntEntity.setBrandId(entity.getBrandId());
                     pickInfoMgntEntity.setColDesc(null);
 
@@ -774,7 +774,7 @@ public class ColOdrService extends CommonService {
                         .rtnWhsId(m.getRtnWhsId() == null ? "" : m.getRtnWhsId())
                         .rtnLocation(m.getRtnLocation() == null ? "" : m.getRtnLocation())
                         .rtnWhsNm(m.getRtnWhsNm() == null ? "" : m.getRtnWhsNm())
-                        .colSchDt(m.getColReqDt() == null ? "" : m.getColReqDt())
+                        .colReqDt(m.getColReqDt() == null ? "" : m.getColReqDt())
                         .colSchDt(m.getColSchDt() == null ? "" : m.getColSchDt())
                         .pickMgrNm(m.getPickMgrNm() == null ? "" : m.getPickMgrNm())
                         .pickMgrTelNo(m.getPickMgrTelNo() == null ? "" : m.getPickMgrTelNo())
@@ -831,13 +831,11 @@ public class ColOdrService extends CommonService {
 
                 //String loanMgntUnqNo = "";
                 LoanMgntBaseInfoEntity loanInfo = null ;
-                long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
+                //long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
                 if (!"".toString().equals(saveRtnStockProcRequest.getStoreId())) {
                     loanInfo = loanStateMapper.selectLoanRtnDataInfo(saveRtnStockProcRequest.getStoreId());
                 }
 
-
-
                 for (int i = 0; i < gridInsertData.size(); i++) {
                     RtnProcInfoPtclEntity requestData = gridInsertData.get(i);
 
@@ -874,7 +872,6 @@ public class ColOdrService extends CommonService {
                             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());
@@ -884,12 +881,28 @@ public class ColOdrService extends CommonService {
                             rtnProcInfoEntity.setColCnfmNm(uEntity.getUserNm());
                             rtnProcInfoEntity.setColMgrTelNo(targetData.getPickMgrTelNo());
                             rtnProcInfoEntity.setColMgrNm(targetData.getPickMgrNm());
-                            rtnProcInfoEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+
+                            if ("C002".equals(targetData.getColDvsn()) && "W02".equals(targetData.getWhsDvsn())) {
+                                rtnProcInfoEntity.setUnitAmt(targetData.getPickDtlInfo().getReqUnitAmt());
+                                rtnProcInfoEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getReqUnitAmt());
+                                rtnProcInfoEntity.setSpplyId(null);
+                                rtnProcInfoEntity.setSpplyNm(null);
+                            } else {
+                                if ("C001".equals(targetData.getColDvsn())) {
+                                    rtnProcInfoEntity.setSpplyId(null);
+                                    rtnProcInfoEntity.setSpplyNm(null);
+                                } else {
+                                    rtnProcInfoEntity.setSpplyId(targetData.getSpplyId());
+                                    rtnProcInfoEntity.setSpplyNm(targetData.getSpplyNm());
+                                }
+                                rtnProcInfoEntity.setUnitAmt(targetData.getPickDtlInfo().getUnitAmt());
+                                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());
@@ -900,6 +913,45 @@ public class ColOdrService extends CommonService {
                             rtnProcInfoEntity.setRtnReqDtlNo(targetData.getPickDtlInfo().getRtnReqDtlNo());
                             rtnProcInfoPtclList.add(rtnProcInfoEntity);
 
+                            if ("W02".equals(targetData.getWhsDvsn()) && targetData.getColDvsn().equals("C002")) {
+                                // 매장 수거를 공급사가 할경우 입고처리 row 추가
+                                RtnProcInfoPtclEntity rtnProcInfoEntity1 = new RtnProcInfoPtclEntity();
+                                String rtnMgntUnqNo1 = fnGetDealNo(37, "");
+                                rtnProcInfoEntity1.setRtnMgntUnqNo(rtnMgntUnqNo1);
+                                rtnProcInfoEntity1.setBrandId(saveRtnStockProcRequest.getBrandId());
+                                rtnProcInfoEntity1.setStoreId(null);
+                                rtnProcInfoEntity1.setItemId(requestData.getItemId());
+                                rtnProcInfoEntity1.setItemNm(targetData.getPickDtlInfo().getItemNm());
+                                rtnProcInfoEntity1.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
+                                rtnProcInfoEntity1.setLocation(targetData.getRtnLocation());
+                                rtnProcInfoEntity1.setUnit(targetData.getPickDtlInfo().getUnit());
+                                rtnProcInfoEntity1.setRtnReqQty(targetData.getPickDtlInfo().getRtnReqQty());
+                                rtnProcInfoEntity1.setRtnOdrQty(targetData.getPickDtlInfo().getRodrQty());
+                                rtnProcInfoEntity1.setColReqQty(targetData.getPickDtlInfo().getColReqQty());
+                                rtnProcInfoEntity1.setColQty(requestData.getColQty());
+                                rtnProcInfoEntity1.setColReqDt(targetData.getColReqDt());
+                                rtnProcInfoEntity1.setColSchDt(targetData.getColSchDt());
+                                rtnProcInfoEntity1.setColCnfmNm(uEntity.getUserNm());
+                                rtnProcInfoEntity1.setColMgrTelNo(targetData.getPickMgrTelNo());
+                                rtnProcInfoEntity1.setColMgrNm(targetData.getPickMgrNm());
+                                rtnProcInfoEntity1.setUnitAmt(targetData.getPickDtlInfo().getUnitAmt());
+                                rtnProcInfoEntity1.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+                                rtnProcInfoEntity1.setSpplyId(targetData.getSpplyId());
+                                rtnProcInfoEntity1.setSpplyNm(targetData.getSpplyNm());
+                                rtnProcInfoEntity1.setColAgrYn("Y");
+                                // rtnProcInfoEntity.setColCnfmDocFileNo(saveRtnStockProcRequest.); 수거서 파일 첨부 제거
+                                rtnProcInfoEntity1.setSttlYn("N");
+                                rtnProcInfoEntity1.setColPickUnqNo(targetData.getColPickUnqNo());
+                                rtnProcInfoEntity1.setColPickDtlNo(targetData.getPickDtlInfo().getColPickDtlNo());
+                                rtnProcInfoEntity1.setColCmdUnqNo(targetData.getPickDtlInfo().getColCmdUnqNo());
+                                rtnProcInfoEntity1.setColCmdDtlNo(targetData.getPickDtlInfo().getColCmdDtlNo());
+                                rtnProcInfoEntity1.setRtnPodrUnqNo(targetData.getPickDtlInfo().getRtnPodrUnqNo());
+                                rtnProcInfoEntity1.setRtnPodrDtlNo(targetData.getPickDtlInfo().getRtnPodrDtlNo());
+                                rtnProcInfoEntity1.setRtnReqUnqNo(targetData.getPickDtlInfo().getRtnReqUnqNo());
+                                rtnProcInfoEntity1.setRtnReqDtlNo(targetData.getPickDtlInfo().getRtnReqDtlNo());
+                                rtnProcInfoPtclList.add(rtnProcInfoEntity1);
+                            }
+
                             // 본사 수거 반품입고처리시
                             if (targetData.getColDvsn().equals("C001") && requestData.getColQty() > 0) {
                                 //본사수거 .
@@ -948,19 +1000,19 @@ public class ColOdrService extends CommonService {
                                 stckW1Hist.setLocation(targetData.getLocation());
                                 stckW1Hist.setItemId(requestData.getItemId());
                                 stckW1Hist.setItemNm(targetData.getPickDtlInfo().getItemNm());
-                                stckW1Hist.setInoutCd("OUT");
+                                stckW1Hist.setInoutCd("IN");
                                 stckW1Hist.setInoutQty(requestData.getColQty());
                                 stckW1Hist.setChgDvsn("ROUT");
                                 stckW1Hist.setRelationNo(rtnMgntUnqNo);  //======================================
                                 stckMgntDtlHistList.add(stckW1Hist);
 
-                                //반품 금액 계산
                                 acctbalAmt = acctbalAmt +  (targetData.getPickDtlInfo().getUnitAmt() * requestData.getColQty()) ;
 
                             } else if (targetData.getColDvsn().equals("C002") && requestData.getColQty() > 0) {
                                 //  공급사 수거일경우 - 본사창고 재고 차감 처리
                                 // 1. 참감처리 , 2. 반품처리테이블 생성, 3. 수거서 업데이타, 4, 반품발주건 업데이트
-                                // 본사재고 차감 처리  stck_mgnt_base_info  stck_mgnt_dtl_hist
+                                // 매장 재고 차감 처리  stck_mgnt_base_info  stck_mgnt_dtl_hist
+                                //if ("W02".equals(targetData.getWhsDvsn())) {
                                 StckMgntBaseInfoEntity stckWEntity = new StckMgntBaseInfoEntity();
                                 stckWEntity.setBrandId(saveRtnStockProcRequest.getBrandId());
                                 stckWEntity.setWhsId(saveRtnStockProcRequest.getRtnWhsId());
@@ -983,12 +1035,20 @@ public class ColOdrService extends CommonService {
                                 stckWHist.setChgDvsn("ROUT");
                                 stckWHist.setRelationNo(rtnMgntUnqNo);  //======================================
                                 stckMgntDtlHistList.add(stckWHist);
+
+                                    //반품 금액 계산
+                                if ("W02".equals(targetData.getWhsDvsn())) {
+                                    acctbalAmt = acctbalAmt +  (targetData.getPickDtlInfo().getReqUnitAmt() * requestData.getColQty()) ;
+                                }
+
+
                             }
 
                             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 {
@@ -1006,7 +1066,14 @@ public class ColOdrService extends CommonService {
                             pickDtlPtclEntity.setColPickUnqNo(targetData.getColPickUnqNo());
                             pickDtlPtclEntity.setColPickDtlNo(targetData.getPickDtlInfo().getColPickDtlNo());
                             pickDtlPtclEntity.setColQty(requestData.getColQty());
-                            pickDtlPtclEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+
+                            if ("W02".equals(targetData.getWhsDvsn()) && targetData.getColDvsn().equals("C002")) {
+                                pickDtlPtclEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getReqUnitAmt());
+                            } else {
+                                pickDtlPtclEntity.setColAmt(requestData.getColQty() * targetData.getPickDtlInfo().getUnitAmt());
+                            }
+
+
                             if (requestData.getColQty() > 0) {
                                 pickDtlPtclEntity.setPickDtlStCd("PICKD1");
                             } else {

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

@@ -306,8 +306,16 @@ public class RtnOdrService extends CommonService {
                     //System.out.println("==========================================");
                     //System.out.println(rtnDtlEntity.getRtnQty() + "===" + rtnSaveDtlEntity.getUnitAmt());
                     //System.out.println("==========================================");
+                    if ("C002".equals(saveRtnOdrRequest.getColDvsn())) {
+                        rtnSaveDtlEntity.setUnitAmt(rtnSaveDtlEntity.getSpplyUnitAmt());
+                    }
+
+                    if ("C002".equals(saveRtnOdrRequest.getColDvsn())) {
+                        rtnSaveDtlEntity.setRtnAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getSpplyUnitAmt());
+                    } else {
+                        rtnSaveDtlEntity.setRtnAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt() );
+                    }
 
-                    rtnSaveDtlEntity.setRtnAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt() );
                     rtnSaveDtlEntity.setBrandUnitUnqNo(rtnDtlEntity.getBrandUnitUnqNo());
                     rtnSaveDtlEntity.setStoreUnitUnqNo(rtnDtlEntity.getStoreUnitUnqNo());
                     rtnSaveDtlEntity.setRtnDvsn(rtnDtlEntity.getRtnDvsn());
@@ -315,7 +323,12 @@ public class RtnOdrService extends CommonService {
                     rtnSaveDtlEntity.setRtnRsnDvsn(rtnDtlEntity.getRtnRsnDvsn());
                     rtnSaveDtlEntity.setRtnOdrQty(rtnDtlEntity.getRtnQty());
                     rtnSaveDtlEntity.setRtnReqQty(rtnDtlEntity.getRtnReqQty());
-                    rtnSaveDtlEntity.setRtnOdrAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt());
+
+                    if ("C002".equals(saveRtnOdrRequest.getColDvsn())) {
+                        rtnSaveDtlEntity.setRtnOdrAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getSpplyUnitAmt());
+                    } else {
+                        rtnSaveDtlEntity.setRtnOdrAmt(Long.valueOf(rtnDtlEntity.getRtnQty()) * rtnSaveDtlEntity.getUnitAmt());
+                    }
 
 
                     rtnSaveDtlEntity.setRodrDtlStCd("ROD0");
@@ -720,18 +733,18 @@ public class RtnOdrService extends CommonService {
                                 tempTargetPtcl.setItemId(rtnPodrEntity.getRtnOdrDtlInfo().getItemId());
                                 tempTargetPtcl.setItemNm(rtnPodrEntity.getRtnOdrDtlInfo().getItemNm());
                                 tempTargetPtcl.setUnit(rtnPodrEntity.getRtnOdrDtlInfo().getUnit());
-                                tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getUnitAmt());
+                                tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setColReqDt(rtnPodrEntity.getColReqDt());
                                 tempTargetPtcl.setRtnReqQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty());
                                 tempTargetPtcl.setRtnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnDvsn());
-                                tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt());
+                                tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setRtnRsnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsnDvsn());
                                 tempTargetPtcl.setRtnRsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsn());
                                 tempTargetPtcl.setRtnOdrQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty());
-                                tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrAmt());
+                                tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty()  * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setRodrDtlStCd("ROD1");
                                 tempTargetPtclList.add(tempTargetPtcl);
-                                rtnTotAmt = rtnTotAmt +  rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt();
+                                rtnTotAmt = rtnTotAmt +  ( rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty()  * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt() );
                                 rtnItemCnt = rtnItemCnt + 1;
                             } else {
                                 //공급사 상이 신규추가
@@ -760,6 +773,7 @@ public class RtnOdrService extends CommonService {
 
                                 tempTargetBase.setRtnPodrUnqNo(rtnPodrUnqNo);
                                 preColDvsn = rtnPodrEntity.getColDvsn();
+                                preSpplyId = rtnPodrEntity.getSpplyId();
                                 tempTargetBase.setBrandId(saveRtnSteamlineOdrRequest.getBrandId());
                                 tempTargetBase.setRtnOdrRegDt(rtnPodrEntity.getRtnOdrRegDt());
                                 tempTargetBase.setRtnReqDvsn(rtnPodrEntity.getRtnReqDvsn());
@@ -782,18 +796,18 @@ public class RtnOdrService extends CommonService {
                                 tempTargetPtcl.setItemId(rtnPodrEntity.getRtnOdrDtlInfo().getItemId());
                                 tempTargetPtcl.setItemNm(rtnPodrEntity.getRtnOdrDtlInfo().getItemNm());
                                 tempTargetPtcl.setUnit(rtnPodrEntity.getRtnOdrDtlInfo().getUnit());
-                                tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getUnitAmt());
+                                tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setColReqDt(rtnPodrEntity.getColReqDt());
                                 tempTargetPtcl.setRtnReqQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty());
                                 tempTargetPtcl.setRtnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnDvsn());
-                                tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt());
+                                tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setRtnRsnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsnDvsn());
                                 tempTargetPtcl.setRtnRsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsn());
                                 tempTargetPtcl.setRtnOdrQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty());
-                                tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrAmt());
+                                tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 tempTargetPtcl.setRodrDtlStCd("ROD1");
                                 tempTargetPtclList.add(tempTargetPtcl);
-                                rtnTotAmt = rtnTotAmt +  rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt();
+                                rtnTotAmt = rtnTotAmt +  ( rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
                                 rtnItemCnt = rtnItemCnt + 1;
                             }
                         }
@@ -824,6 +838,7 @@ public class RtnOdrService extends CommonService {
                         tempTargetBase.setRtnPodrUnqNo(rtnPodrUnqNo);
                         tempTargetBase.setRtnOdrStCd("RO20");
                         preColDvsn = rtnPodrEntity.getColDvsn();
+                        preSpplyId = rtnPodrEntity.getSpplyId();
                         tempTargetBase.setBrandId(saveRtnSteamlineOdrRequest.getBrandId());
                         tempTargetBase.setRtnOdrRegDt(rtnPodrEntity.getRtnOdrRegDt());
                         tempTargetBase.setRtnReqDvsn(rtnPodrEntity.getRtnReqDvsn());
@@ -846,17 +861,41 @@ public class RtnOdrService extends CommonService {
                         tempTargetPtcl.setItemId(rtnPodrEntity.getRtnOdrDtlInfo().getItemId());
                         tempTargetPtcl.setItemNm(rtnPodrEntity.getRtnOdrDtlInfo().getItemNm());
                         tempTargetPtcl.setUnit(rtnPodrEntity.getRtnOdrDtlInfo().getUnit());
-                        tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getUnitAmt());
+                        if ("C001".equals(rtnPodrEntity.getColDvsn())) {
+                            tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getUnitAmt());
+                        } else {
+                            tempTargetPtcl.setUnitAmt(rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
+                        }
+
+
                         tempTargetPtcl.setColReqDt(rtnPodrEntity.getColReqDt());
                         tempTargetPtcl.setRtnReqQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty());
                         tempTargetPtcl.setRtnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnDvsn());
                         tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt());
+
+                        if ("C001".equals(rtnPodrEntity.getColDvsn())) {
+                            tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt());
+                        } else {
+                            tempTargetPtcl.setRtnAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
+                        }
+
                         tempTargetPtcl.setRtnRsnDvsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsnDvsn());
                         tempTargetPtcl.setRtnRsn(rtnPodrEntity.getRtnOdrDtlInfo().getRtnRsn());
                         tempTargetPtcl.setRtnOdrQty(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty());
-                        tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrAmt());
+                        if ("C001".equals(rtnPodrEntity.getColDvsn())) {
+                            tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrAmt());
+                        } else {
+                            tempTargetPtcl.setRtnOdrAmt(rtnPodrEntity.getRtnOdrDtlInfo().getRtnOdrQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt());
+                        }
+
+
                         tempTargetPtclList.add(tempTargetPtcl);
-                        rtnTotAmt = rtnTotAmt +  rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt();
+                        if ("C001".equals(rtnPodrEntity.getColDvsn())) {
+                            rtnTotAmt = rtnTotAmt + rtnPodrEntity.getRtnOdrDtlInfo().getRtnAmt();
+                        } else {
+                            rtnTotAmt = rtnTotAmt + rtnPodrEntity.getRtnOdrDtlInfo().getRtnQty() * rtnPodrEntity.getRtnOdrDtlInfo().getSpplyUnitAmt();
+                        }
+
                         rtnItemCnt = rtnItemCnt + 1;
 
                         //본사수거일경우 수거지시 , 수거서 생성 처리함
@@ -935,7 +974,7 @@ public class RtnOdrService extends CommonService {
                             pickBaseEntity.setBrandId(saveRtnSteamlineOdrRequest.getBrandId());
                             pickBaseEntity.setColDesc(null);
                             pickBaseEntity.setColDvsn(rtnPodrEntity.getColDvsn());
-                            pickBaseEntity.setWhsDvsn("C001".equals(rtnPodrEntity.getColDvsn()) ? "W02" : "W01");  // 본사엣 수거면 매장,,, 공급사에서 수거면 본사
+                            pickBaseEntity.setWhsDvsn("C001".equals(rtnPodrEntity.getColDvsn()) ? "W02" : "W01");
                             //pickBaseList.add(pickBaseEntity);
 
                             pickDtlEntity.setColPickUnqNo(colPickUnqNo);

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

@@ -551,23 +551,22 @@
                , dtl.rtn_podr_unq_no as 'pickDtlInfo.rtn_podr_unq_no' , dtl.rtn_podr_dtl_no as 'pickDtlInfo.rtn_podr_dtl_no'
                ,dtl.item_id as 'pickDtlInfo.item_id', dtl.item_nm as 'pickDtlInfo.item_nm'
                , dtl.rodr_qty as 'pickDtlInfo.rodr_qty' , dtl.col_req_qty as 'pickDtlInfo.col_req_qty'
-               , dtl.col_req_amt as 'pickDtlInfo.col_req_amt'
-               /* , null as 'pickDtlInfo.col_qty', null as 'pickDtlInfo.col_amt' */
+                 , case when  mgnt.WHS_DVSN = 'W02' and  mgnt.col_dvsn = 'C002' then reqdtl.unit_amt * dtl.col_req_qty else dtl.col_req_amt end as 'pickDtlInfo.col_req_amt'
+        /* , null as 'pickDtlInfo.col_qty', null as 'pickDtlInfo.col_amt' */
                , date_format(mgnt.col_sch_dt,'%Y.%m.%d') as col_sch_dt, mgnt.pick_mgr_nm, fn_get_telno(mgnt.pick_mgr_tel_no) as pick_mgr_tel_no
                , mgnt.whs_id as rtn_whs_id , mgnt.location as rtn_location
                , fn_whs_nm(mgnt.brand_id, mgnt.whs_id) as rtn_whs_nm, fn_whs_location_nm(mgnt.brand_id, mgnt.whs_id, mgnt.location) as rtn_location_nm
                , 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.spply_id, fn_spply_nm(mgnt.spply_id) as spply_nm
-                , dtl.unit_amt as 'pickDtlInfo.unit_amt', date_format(mgnt.col_req_dt,'%Y.%m.%d') as col_req_dt
-        from   pick_info_mgnt mgnt
-              ,pick_dtl_ptcl dtl
-              ,rtn_odr_dtl_ptcl ptcl
-              ,rtn_odr_base_info base
-        where mgnt.col_pick_unq_no = dtl.col_pick_unq_no
-        and   dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no
-        and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
-        and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+                , case when  mgnt.WHS_DVSN = 'W02' and  mgnt.col_dvsn = 'C002' then reqdtl.unit_amt else dtl.unit_amt  end as 'pickDtlInfo.unit_amt'
+                , date_format(mgnt.col_req_dt,'%Y.%m.%d') as col_req_dt
+        from 	pick_info_mgnt mgnt
+        join pick_dtl_ptcl dtl on mgnt.col_pick_unq_no = dtl.col_pick_unq_no
+        join rtn_odr_dtl_ptcl ptcl on dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no and dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
+        join rtn_odr_base_info base on ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+        left outer join rtn_req_dtl_ptcl reqdtl on ptcl.rtn_req_unq_no = reqdtl.rtn_req_unq_no and  ptcl.rtn_req_dtl_no = reqdtl.rtn_req_dtl_no
+        where 1=1
         and   mgnt.brand_id = #{sBrandId}
         and   mgnt.col_sch_dt between #{fromDt} and #{toDt}
         and   mgnt.pick_st_cd = 'PICK0'
@@ -787,7 +786,8 @@
             , 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'
+            , dtl.unit as 'pickDtlInfo.unit'
+            , dtl.unit_amt as 'pickDtlInfo.unit_amt'
             , nvl(ptcl.rtn_req_qty,0) as  'pickDtlInfo.rtn_req_qty'   , nvl(dtl.rodr_qty,0) as 'pickDtlInfo.rodr_qty'
             , nvl(dtl.col_req_qty,0) as 'pickDtlInfo.col_req_qty'
             , date_format(mgnt.col_req_dt,'%Y%m%d') as col_req_dt
@@ -801,14 +801,13 @@
             , dtl.rtn_podr_unq_no as 'pickDtlInfo.rtn_podr_unq_no', dtl.rtn_podr_dtl_no as 'pickDtlInfo.rtn_podr_dtl_no'
             , ptcl.rtn_req_unq_no as  'pickDtlInfo.rtn_req_unq_no', ptcl.rtn_req_dtl_no as  'pickDtlInfo.rtn_req_dtl_no'
             , mgnt.whs_dvsn, mgnt.col_dvsn
+            , reqptcl.unit_amt as 'pickDtlInfo.req_unit_amt' , reqptcl.unit_amt * dtl.col_req_qty as 'pickDtlInfo.req_rtn_amt'
         from   pick_info_mgnt mgnt
-                ,pick_dtl_ptcl dtl
-                ,rtn_odr_dtl_ptcl ptcl
-                ,rtn_odr_base_info base
-        where mgnt.col_pick_unq_no = dtl.col_pick_unq_no
-        and   dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no
-        and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
-        and   ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+               join pick_dtl_ptcl dtl on mgnt.col_pick_unq_no = dtl.col_pick_unq_no
+               join rtn_odr_dtl_ptcl ptcl on dtl.rtn_podr_unq_no = ptcl.rtn_podr_unq_no and   dtl.rtn_podr_dtl_no = ptcl.rtn_podr_dtl_no
+               join rtn_odr_base_info base on  ptcl.rtn_podr_unq_no = base.rtn_podr_unq_no
+               left outer join rtn_req_dtl_ptcl reqptcl on ptcl.rtn_req_unq_no = reqptcl.rtn_req_unq_no and ptcl.rtn_req_dtl_no = reqptcl.rtn_req_dtl_no
+        where 1 = 1
         and   mgnt.brand_id = #{brandId}
         and   mgnt.whs_id = #{whsId}
         and    concat(mgnt.col_pick_unq_no, dtl.col_pick_dtl_no) in
@@ -860,6 +859,8 @@
             update pick_dtl_ptcl
             set    sys_chg_id = #{userId}
                 , sys_chg_dttm = now()
+                , col_qty = #{item.colQty}
+                , col_amt = #{item.colAmt}
                 , pick_dtl_st_cd = #{item.pickDtlStCd}
             where col_pick_unq_no = #{item.colPickUnqNo}
             and   col_pick_dtl_no = #{item.colPickDtlNo}

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

@@ -91,7 +91,8 @@
 
 
         <select id="selectPoRtnDtlSaveInfo" resultType="com.oqpo.api.entity.rtnmng.RtnOdrDtlPtclEntity">
-            select ptcl.item_id, ptcl.item_nm,  ptcl.unit, ptcl.unit_amt, bunit.spply_id, ptcl.rtn_qty
+            select ptcl.item_id, ptcl.item_nm,  ptcl.unit, ptcl.unit_amt, bunit.spply_id, ptcl.rtn_qty,
+                   bunit.unit_amt as spply_unit_amt
             from  rtn_req_dtl_ptcl ptcl
               join rtn_req_base_info base on ptcl.rtn_req_unq_no = base.rtn_req_unq_no
               join brand_item_unit_info bunit on ptcl.brand_unit_unq_no = bunit.brand_unit_unq_no
@@ -389,9 +390,13 @@
             ,bitem.spply_id,  case when base.store_id is null or base.store_id = '' then 'C002' else  case when item.store_deli_type = '10' then 'C001' else 'C002' end   end as 'col_dvsn'
             ,base.col_req_dt , base.store_id, base.rtn_whs_id, base.rtn_location
             ,base.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'
-            ,bitem.unit as 'rtnOdrDtlInfo.unit' , ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt', ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_qty', ptcl.rtn_dvsn as 'rtnOdrDtlInfo.rtn_dvsn'
-            , ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_amt',  ptcl.rtn_rsn_dvsn as 'rtnOdrDtlInfo.rtn_rsn_dvsn', ptcl.rtn_rsn as 'rtnOdrDtlInfo.rtn_rsn',  ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
+            ,bitem.unit as 'rtnOdrDtlInfo.unit'
+            , bitem.unit_amt as 'rtnOdrDtlInfo.spply_unit_amt'
+            , ptcl.unit_amt as 'rtnOdrDtlInfo.unit_amt'
+            , ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_amt'
             , ptcl.rtn_amt as 'rtnOdrDtlInfo.rtn_odr_amt'
+            , ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_qty', ptcl.rtn_dvsn as 'rtnOdrDtlInfo.rtn_dvsn'
+            ,  ptcl.rtn_rsn_dvsn as 'rtnOdrDtlInfo.rtn_rsn_dvsn', ptcl.rtn_rsn as 'rtnOdrDtlInfo.rtn_rsn',  ptcl.rtn_qty as 'rtnOdrDtlInfo.rtn_odr_qty'
         from rtn_req_base_info base
             , rtn_req_dtl_ptcl ptcl
             , brand_base_info brand