Selaa lähdekoodia

발주관리-구매요청생성 무한매장 처리 테스트

yhl88 2 vuotta sitten
vanhempi
commit
2a934feca3
1 muutettua tiedostoa jossa 77 lisäystä ja 69 poistoa
  1. 77 69
      src/main/webapp/js/app/pomng/ITP_POMNG01010.js

+ 77 - 69
src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -347,7 +347,6 @@ let createObj = {
347 347
 			var dlvReqDt = $('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').val();
348 348
 			var itemcnt  = $(POMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
349 349
 			var dlvReqAmt = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
350
-			
351 350
 			var apprArg = {};
352 351
 			
353 352
 			//정산 타입이 무정산이면 스킵
@@ -363,9 +362,13 @@ let createObj = {
363 362
 					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
364 363
 					var mallId = $('#ITP_FORM_POMNG01010_DETAIL_MALL_ID').val();
365 364
 					
366
-					
367
-					
368
-					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
365
+					let pchActAtmNum;
366
+					if(pchActAtm == '0' || pchActAtm == 0 || pchActAtm == Infinity || pchActAtm == 'Infinity') {
367
+						pchActAtmNum = 'Infinity';
368
+					} else {
369
+						pchActAtmNum = pchActAtm
370
+					}
371
+					if (parseFloat(pchActAtmNum) < parseFloat(pchReqAtm)) {
369 372
 						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
370 373
 						
371 374
 						if (mallId == '') {
@@ -390,8 +393,8 @@ let createObj = {
390 393
 				// 품목대상 정보 확인 필요
391 394
 				var records = $(POMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
392 395
 				if (records == 0) {
393
-						alert( "요청할 품목내역이 없습니다.");
394
-						return ;
396
+					alert( "요청할 품목내역이 없습니다.");
397
+					return ;
395 398
 				}
396 399
 				
397 400
 				
@@ -447,78 +450,77 @@ let createObj = {
447 450
 			
448 451
 			var saveFn = {
449 452
 				callBack: function(args) {
450
-						$(formId).val(arg);
451
-						let gridInsertData = [];
452
-						let gridUpdateData = [];
453
-						let gridDeleteData = [];
454
-						
455
-						const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
456
-						
457
-						$.each(rowData, function(key, value) {
458
-							if (value.viewCd !== 'R') {
459
-								if (value.viewCd === 'C') {
460
-									gridInsertData.push(value);
461
-								} else if (value.viewCd === 'U') {
462
-									gridUpdateData.push(value);
463
-								} else if (value.viewCd === 'D') {
464
-									gridDeleteData.push(value);
465
-								}
453
+					$(formId).val(arg);
454
+					let gridInsertData = [];
455
+					let gridUpdateData = [];
456
+					let gridDeleteData = [];
457
+					
458
+					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
459
+					
460
+					$.each(rowData, function(key, value) {
461
+						if (value.viewCd !== 'R') {
462
+							if (value.viewCd === 'C') {
463
+								gridInsertData.push(value);
464
+							} else if (value.viewCd === 'U') {
465
+								gridUpdateData.push(value);
466
+							} else if (value.viewCd === 'D') {
467
+								gridDeleteData.push(value);
466 468
 							}
467
-						});
468
-						
469
-						//if (chkQtyYn == "Y") return;
470
-						
471
-						let param = $(formId).serializeObject();
472
-						param.gridInsertData = gridInsertData;
473
-						param.gridUpdateData = gridUpdateData;
474
-						param.gridDeleteData = gridDeleteData;
475
-						console.log(JSON.stringify(param));
476
-						var searhFn = function() {
477
-							createObj.newinit();
478
-						};
479
-						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
480
-					}
481
-				};
482
-			itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
469
+						}
470
+					});
471
+					
472
+					//if (chkQtyYn == "Y") return;
473
+					
474
+					let param = $(formId).serializeObject();
475
+					param.gridInsertData = gridInsertData;
476
+					param.gridUpdateData = gridUpdateData;
477
+					param.gridDeleteData = gridDeleteData;
478
+					console.log(JSON.stringify(param));
479
+					var searhFn = function() {
480
+						createObj.newinit();
481
+					};
482
+					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
483
+				}
484
+			};
485
+		itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveFn, null);
483 486
 		},
484 487
 		saveApprReq: function(param, apprTypeCd, arg) {
485 488
 			
486 489
 			var apprFn =  {
487 490
 				callBack: function(args) {
488 491
 						// 결재금액이 부족하여 결재란으로 이동처리
489
-						var popFn = function(rowDataPop) {
490
-							// 결재 성공시 승인처리함 
491
-							createObj.button.saveLastReq(arg);
492
-						};			
493
-						// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
494
-						// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
495
-						// 구매요청 번호 전달 - 
496
-						//var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
497
-						var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(),"","");
498
-						var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
499
-						
500
-						
501
-						var args = {'payTpCd': '40',
502
-						'brandId':   fn_make_user_info.get('brandId'), 
503
-						'storeId':   fn_make_user_info.get('storeId'),
504
-						'prchReqUnqNo': $('ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(),
505
-						'goodsAmt':  pchReqAtm-pchActAtm}; 
506
-						
507
-						fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
508
-					}
509
-				};
492
+					var popFn = function(rowDataPop) {
493
+						// 결재 성공시 승인처리함 
494
+						createObj.button.saveLastReq(arg);
495
+					};			
496
+					// 결제 팝업 : LD01(선불(충전)), LD02(후불(신용))
497
+					// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
498
+					// 구매요청 번호 전달 - 
499
+					//var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
500
+					var pchActAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(),"","");
501
+					var pchReqAtm = itp_fn_currency_unfmatter($('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(),"","");
502
+					
503
+					
504
+					var args = {'payTpCd': '40',
505
+					'brandId':   fn_make_user_info.get('brandId'), 
506
+					'storeId':   fn_make_user_info.get('storeId'),
507
+					'prchReqUnqNo': $('ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(),
508
+					'goodsAmt':  pchReqAtm-pchActAtm}; 
509
+					
510
+					fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
511
+				}
512
+			};
510 513
 				
511 514
 			var apprNFn =  {
512 515
 				callBack: function(args) {
513 516
 						// 임시저장 처리한다.
514
-						arg = 'PR00';
515
-						$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
516
-						
517
-						createObj.button.saveLastReq(arg);
518
-					}
519
-				};
520
-			
521
-			//console.log(apprTypeCd) ;
517
+					arg = 'PR00';
518
+					$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
519
+					
520
+					createObj.button.saveLastReq(arg);
521
+				}
522
+			};
523
+						//console.log(apprTypeCd) ;
522 524
 			if (apprTypeCd == 'NP') {  // 선불
523 525
 				itp_fn_modal_confirm_req2(param, apprFn, arg);
524 526
 			} else if (apprTypeCd == 'NA') { //후불
@@ -571,7 +573,7 @@ let createObj = {
571 573
 		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
572 574
 	},
573 575
 	callback: function(result) {
574
-
576
+		console.log(result);
575 577
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_VIEW_CD').val('C');
576 578
 
577 579
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_BRAND_ID').val(result.brandId);
@@ -590,7 +592,13 @@ let createObj = {
590 592
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
591 593
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
592 594
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
593
-		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(itp_fn_number_comma(result.ordUseAmt));		
595
+		var pchActAmt
596
+		if(result.ordUseAmt == 'Infinity' || result.ordUseAmt == Infinity || result.ordUseAmt == 0){
597
+			pchActAmt = 0;
598
+		} else {
599
+			pchActAmt = result.ordUseAmt
600
+		}
601
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(itp_fn_number_comma(pchActAmt));		
594 602
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqUnqNo').text(result.pchReqUnqNo);
595 603
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
596 604