테스트 진행후 수정 (창고 관리부분)

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

@@ -798,9 +798,14 @@ public class ColOdrService extends CommonService {
                     searchList.add(procData);
                 }
 
+                String storeWhsUseYn = "Y";
                 //로그인 사용자 정보
                 UserMngEntity uEntity = userMngMapper.selectGroupUserInfo(userId);
 
+                // 창고사용여부 값 가져오기
+                StoreBaseInfoEntity whsUseInfo = storeBaseInfoMapper.selectStoreLoanInfo(uEntity.getBrandId(), uEntity.getStoreId());
+                storeWhsUseYn = whsUseInfo.getWhsUseYn();
+
                 List<RtnProcInfoPtclEntity> rtnProcInfoPtclList = new ArrayList<RtnProcInfoPtclEntity>();
                 List<StckMgntBaseInfoEntity> stckMgntBaseInfoList = new ArrayList<StckMgntBaseInfoEntity>();
                 List<StckMgntDtlHistEntity> stckMgntDtlHistList= new ArrayList<StckMgntDtlHistEntity>();
@@ -879,28 +884,30 @@ public class ColOdrService extends CommonService {
                                 //본사수거 .
                                 // 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);
+                                if ("Y".toString().equals(storeWhsUseYn)) {
+                                    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();

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

@@ -952,9 +952,15 @@ public class ShmtOdrService extends CommonService {
                 // loan_mgnt_unq_no 매장납품일 경우
                 //selectStoreLoanMgntUnqNo
                 String loanMgntUnqNo = "";
+                String storeWhsUseYn = "Y";
                 long loanAmt = 0 ; // 여신차감할 금액 (사용금액 - 여신차감금액,   잔액금액 - 여신차감금액)
                 if (!"".equals(saveWarehouseProcRequest.getStoreId())) {
                     loanMgntUnqNo = storeBaseInfoMapper.selectStoreLoanMgntUnqNo(saveWarehouseProcRequest.getStoreId());
+
+                    // 창고사용여부 값 가져오기
+                    StoreBaseInfoEntity whsUseInfo = storeBaseInfoMapper.selectStoreLoanInfo(saveWarehouseProcRequest.getBrandId(), saveWarehouseProcRequest.getStoreId());
+                    storeWhsUseYn = whsUseInfo.getWhsUseYn();
+
                 }
 
                 // 우선 입고수량과 납품수량 비교를 처리함
@@ -1013,31 +1019,34 @@ public class ShmtOdrService extends CommonService {
                             //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());
-                            smbaseInfoEntity.setUnit(whsProcData.getUnit());
-                            wareGridUpdateData.add(smbaseInfoEntity);
-
-                            // 만약 해당 창고의 품목이 없을 경우 insert
-
-
-                            // 재고 이력정보 등록
-                            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);
+                            //if (!"".equals(saveWarehouseProcRequest.getStoreId())) {
+                            if ("Y".toString().equals(storeWhsUseYn)) {
+                                StckMgntBaseInfoEntity smbaseInfoEntity = new StckMgntBaseInfoEntity();
+                                smbaseInfoEntity.setBrandId(saveWarehouseProcRequest.getBrandId());
+                                smbaseInfoEntity.setWhsId(saveWarehouseProcRequest.getWhsId());
+                                smbaseInfoEntity.setLocation(whsProcData.getLocation());
+                                smbaseInfoEntity.setItemId(whsProcData.getItemId());
+                                smbaseInfoEntity.setStckQty(whsProcData.getWhsQty());
+                                smbaseInfoEntity.setUnit(whsProcData.getUnit());
+                                wareGridUpdateData.add(smbaseInfoEntity);
+
+                                // 만약 해당 창고의 품목이 없을 경우 insert
+
+
+                                // 재고 이력정보 등록
+                                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);
+                            }
 
                             //targetList
                             // 부족입고수량에 대해 원 출하창고 재고 원복

src/main/java/com/oqpo/api/service/stinfo/StoreBaseInfoService.java

@@ -242,17 +242,17 @@ public class StoreBaseInfoService extends CommonService {
                 saveWhsInfo.setAddr1(entity.getAddr1());
                 saveWhsInfo.setAddr2(entity.getAddr2());
                 saveWhsInfo.setStoreId(entity.getStoreId());
-                if ("N".equals(entity.getWhsUseYn())) {
+                //if ("N".equals(entity.getWhsUseYn())) {
+                //    saveWhsInfo.setWhsStCd("W003");
+                //} else {
+                if ("ST01".equals(entity.getStoreStCd())) {
+                    saveWhsInfo.setWhsStCd("W001");
+                } else if ("ST03".equals(entity.getStoreStCd())) {
                     saveWhsInfo.setWhsStCd("W003");
-                } else {
-                    if ("ST01".equals(entity.getStoreStCd())) {
-                        saveWhsInfo.setWhsStCd("W001");
-                    } else if ("ST03".equals(entity.getStoreStCd())) {
-                        saveWhsInfo.setWhsStCd("W003");
-                    } else {   //ST02
-                        saveWhsInfo.setWhsStCd("W002");
-                    }
+                } else {   //ST02
+                    saveWhsInfo.setWhsStCd("W002");
                 }
+                //}
 
                 //창고 로케이션 정보
                 WhsMgntBaseLocEntity locEntity = new WhsMgntBaseLocEntity();

src/main/resources/mybatis/sqlmaps/stockmng/WhsMng.xml

@@ -260,7 +260,7 @@
                 locInfo.stck_dvsn as 'locationInfo.stck_dvsn', fn_code_nm('STCK_DVSN', locInfo.stck_dvsn) as 'locationInfo.stck_dvsn_nm'
         from  whs_mgnt_base_info whsInfo
         left outer join whs_mgnt_base_loc locInfo on whsInfo.brand_id = locInfo.brand_id and whsInfo.whs_id = locInfo.whs_id and locInfo.loc_st_cd = 'LOC001'
-        where whsInfo.whs_st_cd = 'W001'
+        where 1=1 -- whsInfo.whs_st_cd = 'W001'
         and   whsInfo.brand_id = #{sBrandId}
         <if test="sWhsDvsn != null and sWhsDvsn != ''">
         and   whsInfo.whs_dvsn = #{sWhsDvsn}