구매결재관련 수정 조치함

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

@@ -2409,39 +2409,48 @@ function itp_fn_modal_confirm(msg, fn, args) {
 	}
 };
 // 구매요청확인
-function itp_fn_modal_confirm_req1(msg, fn, args) {
+function itp_fn_modal_confirm_req1(param, fn, args) {
 	$('#ITP_MODAL_PR_ALERT_CANCEL').show();
 	$('#ITP_MODAL_PR_ALERT').modal('show');
-	$('#ITP_MODAL_PR_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_PR_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_PR_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_PR_ALERT').find('.fnPchReqAmt').html(param.dlvReqAmt + " 원");
+	
 	if (fn !== undefined || typeof fn !== 'undefined') {
+		console.log("config button");
 		$('#ITP_MODAL_PR_ALERT_CONFIRM').off('click');
 		$('#ITP_MODAL_PR_ALERT_CONFIRM').on('click', function() {
+			console.log("config button function");
 			fn.callBack(args);
 			$('#ITP_MODAL_PR_ALERT').modal('hide');
 		});
 	}
 };
 //선불매장결제확인
-function itp_fn_modal_confirm_req2(msg, fn, args) {
-	$('#ITP_MODAL_ADV_ALERT_CANCEL').show();
+function itp_fn_modal_confirm_req2(param, fn, args) {
+	$('#ITP_MODAL_ALERT_ADV_CANCEL').show();
 	$('#ITP_MODAL_ADV_ALERT').modal('show');
-	$('#ITP_MODAL_ADV_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_ADV_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_ADV_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_ADV_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_ADV_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_ALERT_ADV_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_ADV_CONFIRM').on('click', function() {
 			fn.callBack(args);
 			$('#ITP_MODAL_ADV_ALERT').modal('hide');
 		});
 	}
 };
 //구매한도부족알림
-function itp_fn_modal_confirm_req3(msg, fn, args) {
-	$('#ITP_MODAL_LM_ALERT_CANCEL').show();
+function itp_fn_modal_confirm_req3(param, fn, args) {
+	$('#ITP_MODAL_ALERT_LM_CANCEL').show();
 	$('#ITP_MODAL_LM_ALERT').modal('show');
-	$('#ITP_MODAL_LM_ALERT').find('.itp_alert_txt').html(msg);
+	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqDt').html(param.dlvReqDt);
+	$('#ITP_MODAL_LM_ALERT').find('.fnItemcnt').html(param.itemcnt + " 개");
+	$('#ITP_MODAL_LM_ALERT').find('.fnDlvReqAmt').html(param.dlvReqAmt + " 원");
 	if (fn !== undefined || typeof fn !== 'undefined') {
-		$('#ITP_MODAL_LM_ALERT_CONFIRM').off('click');
-		$('#ITP_MODAL_LM_ALERT_CONFIRM').on('click', function() {
+		$('#ITP_MODAL_ALERT_LM_CONFIRM').off('click');
+		$('#ITP_MODAL_ALERT_LM_CONFIRM').on('click', function() {
 			fn.callBack(args);
 			$('#ITP_MODAL_LM_ALERT').modal('hide');
 		});

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

@@ -347,8 +347,11 @@ let createObj = {
 			var dlvReqDt = $('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').val();
 			var itemcnt  = $(POMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
 			var dlvReqAmt = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
+			
 			var reqMsg = "";
 			
+			var apprArg = {};
+			
 			//정산 타입이 무정산이면 스킵
 			var apprTypeCd = "Y" // Y 정상결재, NP 선불, NA 후불   
 			
@@ -363,6 +366,8 @@ let createObj = {
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
 					
 					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
+						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
+						console.log(dlvReqAmt);
 						if (loanDvsn == 'LD01') {
 							apprTypeCd = 'NP';
 						} else {
@@ -407,12 +412,25 @@ let createObj = {
 				if (chkQtyYn == "Y") return;
 				
 				if (arg == 'PR20') {
-					console.log(apprTypeCd);
+					
+					apprArg.dlvReqDt = dlvReqDt;
+					apprArg.itemcnt = itemcnt;
+					apprArg.dlvReqAmt = dlvReqAmt;
+					
+					console.log("-----------------------");
+					console.log(dlvReqAmt, apprArg.dlvReqAmt);
+					
 					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);	
+						
+						var prIngFn =  {
+							callBack: function(args) {
+									createObj.button.saveLastReq(arg);
+								}
+							};
+						itp_fn_modal_confirm_req1(apprArg, prIngFn, arg);
+							
 					} else // 금액 부족시 
-						createObj.button.saveApprReq(arg,apprTypeCd);
+						createObj.button.saveApprReq(apprArg,apprTypeCd, arg);
 					} 
 					
 				} else {
@@ -456,16 +474,16 @@ let createObj = {
 						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
 					}
 				};
-			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
+			itp_fn_modal_confirm_req1(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
 		},
-		saveApprReq: function(arg, apprTypeCd) {
+		saveApprReq: function(param, apprTypeCd, arg) {
 			var apprFn =  {
-				callBack: function(args,apprTypeCd) {
+				callBack: function(args) {
 						// 결재금액이 부족하여 결재란으로 이동처리
 						var popFn = function(rowDataPop) {
 							// 결재 성공시 승인처리함 
 							console.log(rowDataPop);
-							createObj.button.saveReq(arg);
+							createObj.button.saveLastReq(arg);
 						};			
 						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
 						// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
@@ -486,11 +504,46 @@ let createObj = {
 				};
 			
 			if (apprTypeCd == 'NP') {  // 선불
-				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
+				itp_fn_modal_confirm_req2(param, apprFn, arg);
 			} else { //후불
-				itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, apprFn, null);
+				itp_fn_modal_confirm_req3(param, apprFn, arg);
 			}
-		}	
+		},
+		saveLastReq: function(arg) {
+			const formId = '#ITP_FORM_POMNG01010_DETAIL';
+			
+			$(formId).val(arg);
+			let gridInsertData = [];
+			let gridUpdateData = [];
+			let gridDeleteData = [];
+			
+			const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+			
+			$.each(rowData, function(key, value) {
+				if (value.viewCd !== 'R') {
+					if (value.viewCd === 'C') {
+						gridInsertData.push(value);
+					} else if (value.viewCd === 'U') {
+						gridUpdateData.push(value);
+					} else if (value.viewCd === 'D') {
+						gridDeleteData.push(value);
+					}
+				}
+			});
+			
+			//if (chkQtyYn == "Y") return;
+			
+			let param = $(formId).serializeObject();
+			param.gridInsertData = gridInsertData;
+			param.gridUpdateData = gridUpdateData;
+			param.gridDeleteData = gridDeleteData;
+			console.log(JSON.stringify(param));
+			var searhFn = function() {
+				createObj.newinit();
+			};
+			fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
+				
+		},	
 			
 	},
 	load: function() {

src/main/webapp/main.html

@@ -347,17 +347,17 @@
 								<div class="itp_alt_box">
 									<label>납품요청일</label>
 									<span>:</span>
-									<div class="fnDlvReqDt">2022.12.11</div>
+									<div class="fnDlvReqDt"></div>
 								</div>
 								<div class="itp_alt_box">
 									<label>품목수</label>
 									<span>:</span>
-									<div class="fnItemcnt">2개</div>
+									<div class="fnItemcnt"></div>
 								</div>
 								<div class="itp_alt_box">
-									<label>구매금액</label>
+									<label>추가결재금액</label>
 									<span>:</span>
-									<div class="fnDlvReqAmt">424,000원</div>
+									<div class="fnDlvReqAmt"></div>
 								</div>
 								<label style="margin:10px 0;">선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>결재를 하시겠습니까?</label>
 							</div>
@@ -386,7 +386,7 @@
 									<div class="fnItemcnt"></div>
 								</div>
 								<div class="itp_alt_box">
-									<label>구매금액</label>
+									<label>추가결재금액</label>
 									<span>:</span>
 									<div class="fnDlvReqAmt"></div>
 								</div>