Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/app/pomng/POMNG01010.html

@@ -20,13 +20,14 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
 					
 								<section class="itp_form_sec">
 									<div class="itp_form_in border-top">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-4 itp_in fnBrandNm"></div>
+												<div class="col-xs-10 itp_in fnBrandNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">구매요청번호</label>
 											<div class="col-xs-4 itp_ip ">

src/main/webapp/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -35,6 +35,8 @@
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_WEB_URL" name="kiccActionWebUrl" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="" />
+								
 							
 								<div class="form-group shot">
 									<label class="col-xs-2 itp_lb shot">주문번호</label>
@@ -80,9 +82,11 @@
 							<form name="frm_pay" id="frm_pay" method="post" action="">
 							<input type="hidden" id="poOrdNo" name="poOrdNo" value="" />
 							<input type="hidden" id="payTpCd" name="payTpCd" value="" />
+							
 							<input type="hidden" id="sttlMgntUnqNo" name="sttlMgntUnqNo" value="" />
 							<input type="hidden" id="brandId" name="brandId" value="" />
 							<input type="hidden" id="storeId" name="storeId" value="" />
+							<input type="hidden" id="pchReqUnqNo" name="pchReqUnqNo" value="" />
 							
 							<input type="hidden" id="kiccActionWebUrl" 		name="kiccActionWebUrl"			value="">
 							<input type="hidden" id="kiccActionMobileUrl" 	name="kiccActionMobileUrl"		value="">

src/main/webapp/js/app/config.js

@@ -2408,6 +2408,7 @@ function itp_fn_modal_confirm(msg, fn, args) {
 		});
 	}
 };
+// 구매요청확인
 function itp_fn_modal_confirm_req1(msg, fn, args) {
 	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
 	$('#ITP_MODAL_PR_ALERT').modal('show');
@@ -2420,6 +2421,7 @@ function itp_fn_modal_confirm_req1(msg, fn, args) {
 		});
 	}
 };
+//선불매장결제확인
 function itp_fn_modal_confirm_req2(msg, fn, args) {
 	$('#ITP_MODAL_ADV_ALERT_CANCEL').show();
 	$('#ITP_MODAL_ADV_ALERT').modal('show');
@@ -2432,6 +2434,7 @@ function itp_fn_modal_confirm_req2(msg, fn, args) {
 		});
 	}
 };
+//구매한도부족알림
 function itp_fn_modal_confirm_req3(msg, fn, args) {
 	$('#ITP_MODAL_LM_ALERT_CANCEL').show();
 	$('#ITP_MODAL_LM_ALERT').modal('show');

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -138,6 +138,7 @@ let pageObj = {
 		
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: whsDvsn};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		
 	},
 	callback: {
 		create: function(rowDataPop) {
@@ -349,6 +350,8 @@ let createObj = {
 			var reqMsg = "";
 			
 			//정산 타입이 무정산이면 스킵
+			var apprTypeCd = "Y" // Y 정상결재, NP 선불, NA 후불   
+			
 			var loanDvsn = $('#ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val();
 			
 			if (loanDvsn != null && loanDvsn != "") {
@@ -360,11 +363,15 @@ let createObj = {
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
 					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-						alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-						return;
+						if (loanDvsn == 'LD01') {
+							apprTypeCd = 'NP';
+						} else {
+							apprTypeCd = 'NA';
+						}
 					}
 				}    
 			}        
+			
 
 			if (itp_fn_form_event.isValid(formId)) {
 				// 품목대상 정보 확인 필요
@@ -399,7 +406,23 @@ let createObj = {
 				
 				if (chkQtyYn == "Y") return;
 				
-				var saveReq = {
+				if (arg == 'PR20') {
+					console.log(apprTypeCd);
+					if (apprTypeCd == "Y") {  // 여신 구분, 여신금액
+						reqMsg = ' 납품요청일 : ' + dlvReqDt + '<br> 품목수 : ' + itemcnt + '<br> 구매요청금액 : ' + dlvReqAmt + '<br><br>' + ITP_MSG_LOCALE.message.ajax.reqSave ;
+						itp_fn_modal_confirm(reqMsg, createObj.button.saveReq(arg), null);	
+					} else // 금액 부족시 
+						createObj.button.saveApprReq(arg,apprTypeCd);
+					} 
+					
+				} else {
+					createObj.button.saveReq(arg);
+				}
+				
+		},
+		saveReq: function(arg) {
+			const formId = '#ITP_FORM_POMNG01010_DETAIL';
+			var saveFn = {
 				callBack: function(args) {
 						$(formId).val(arg);
 						let gridInsertData = [];
@@ -420,7 +443,7 @@ let createObj = {
 							}
 						});
 						
-						if (chkQtyYn == "Y") return;
+						//if (chkQtyYn == "Y") return;
 						
 						let param = $(formId).serializeObject();
 						param.gridInsertData = gridInsertData;
@@ -433,18 +456,42 @@ let createObj = {
 						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
 					}
 				};
-				
-				if (arg == 'PR20') {
-					reqMsg = ' 납품요청일 : ' + dlvReqDt + '<br> 품목수 : ' + itemcnt + '<br> 구매요청금액 : ' + dlvReqAmt + '<br><br>' + ITP_MSG_LOCALE.message.ajax.reqSave ;
-					itp_fn_modal_confirm(reqMsg, saveReq, null);
-				} else {
-					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveReq, null);
-				}
-				
-				
-				
+			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
+		},
+		saveApprReq: function(arg, apprTypeCd) {
+			var apprFn =  {
+				callBack: function(args,apprTypeCd) {
+						// 결재금액이 부족하여 결재란으로 이동처리
+						var popFn = function(rowDataPop) {
+							// 결재 성공시 승인처리함 
+							console.log(rowDataPop);
+							createObj.button.saveReq(arg);
+						};			
+						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
+						// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
+						// 구매요청 번호 전달 - 
+						//var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
+						var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(),"","");
+						var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
+						
+						
+						var args = {'payTpCd': '40',
+						'brandId':   fn_make_user_info.get('brandId'), 
+						'storeId':   fn_make_user_info.get('storeId'),
+						'prchReqUnqNo': $('ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(),
+						'goodsAmt':  pchReqAtm-pchActAtm}; 
+						
+						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
+					}
+				};
+			
+			if (apprTypeCd == 'NP') {  // 선불
+				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
+			} else { //후불
+				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
 			}
-		}
+		}	
+			
 	},
 	load: function() {
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
@@ -469,6 +516,8 @@ let createObj = {
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(itp_fn_number_comma(result.ordUseAmt));		
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqUnqNo').text(result.pchReqUnqNo);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
 
 		pageObj.grid.init();
 	}

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -41,7 +41,7 @@ var popPageObj = {
 		$('#ITP_FORM_PO_PAYMENT_POPUP_BRAND_NM').val(fn_make_user_info.get('brandNm'));
 		$('#ITP_FORM_PO_PAYMENT_POPUP_STORE_ID').val(popPageObj.args.storeId);
 		
-		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
+		// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제)), 40(구매요청)
 		if(popPageObj.args.payTpCd == '10') {  
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('선불(충전)');
 		} else if(popPageObj.args.payTpCd == '20') {  
@@ -52,7 +52,11 @@ var popPageObj = {
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');			
 		} else if(popPageObj.args.payTpCd == '30') {  
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(선결제)');
-		}			
+		} else if(popPageObj.args.payTpCd == '40') {  
+			$('#ITP_FORM_PO_PAYMENT_POPUP_PCH_REQ_UNQ_NO').text('구매요청');
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val(popPageObj.args.goodsAmt); // 결제금액
+			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');		
+		}				
 		// 이지페이 결제 생성
 		let param = $('#ITP_FORM_PO_PAYMENT_POPUP').serializeObject();	
 		param.goodsAmt = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val() == '' ? 0 : $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();