납품서 팝업 수정

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

@@ -2,10 +2,12 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
+				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
 				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT" name="toDt" value="">
 				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value=""> -->
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="brandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO" name="dlvSttmtUnqNo" value="">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -139,7 +141,7 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnPoAddr"></div>
+											<div class="col-xs-12 itp_in fnDlvQty"></div>
 										</div>
 									</div>
 								</div>	

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -222,8 +222,8 @@ let pageObj = {
 		$('#ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM').on('click', function() {
 			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM').val('');
 			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID').val('');
-			
 		});
+	
 	},
 	popup: function (arg) {
 		var popFn ;
@@ -247,13 +247,6 @@ let pageObj = {
 			}
 			
 		},
-		searNWhs: function(rowDataPop) {
-			if(rowDataPop) {
-				$('#ITP_FORM_ORDMNG03010_NDETAIL_WHS_NM').val(rowDataPop.whsNm + " - " + rowDataPop.locationNm);
-				$('#ITP_FORM_ORDMNG03010_NDETAIL_WHS_ID').val(rowDataPop.whsId);
-				$('#ITP_FORM_ORDMNG03010_NDETAIL_LOCATION').val(rowDataPop.location);
-			}
-		},
 		poRej: function(rowDataPop) {
 			if(rowDataPop) {
 				console.log(rowDataPop);
@@ -261,8 +254,6 @@ let pageObj = {
 				if (rowDataPop.retVal == "Y") {
 				  modifyObj.button.rejectSave(rowDataPop);
 				}
-				
-				
 			}
 		}
 		
@@ -279,7 +270,7 @@ let pageObj = {
 							$(this).on('click', function() {
 									switch (id) {
 											case 'ITP_BTN_ORDMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
-											case 'ITP_BTN_ORDMNG03010_POPUP'			: listObj.button.create(); 		break;	// 신규등록 버튼
+											case 'ITP_BTN_ORDMNG03010_POPUP'			: listObj.button.create(); 		break;	// 납품서출력
 											case 'ITP_BTN_ORDMNG03010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
 											case 'ITP_BTN_ORDMNG03010_CANCELLIST'		: createObj.button.cancel(); 	break;	// 취소/목록 버튼
 											case 'ITP_BTN_ORDMNG03010_DELETE'			: 								break;	// 삭제 버튼
@@ -369,36 +360,51 @@ let listObj = {
 			this.grid.init();
 	},
 	itp_ORDMNG03010_search: false,
+	
 	button: {
 			search: function() {
 					listObj.itp_ORDMNG03010_search = true;
+					console.log(1);
 					let param = $('#ITP_FORM_ORDMNG03010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
-					param.gridPage = $.jgrid.defaults.page;
+					param.gridPage = $.jgrid.defaults.pageITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM;
 					$(ORDMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 			},
+			
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
 						// 팝업
-						var popFn = (result) => {
-							console.log(result);
+//						var popFn = this.callback.deliPrt;
+
+						const rowKey = $(ORDMNG03010_GRID_ID).getGridParam('selrow');
+						if (!rowKey) {
+							return;
+						}
+						
+						var selectedIds = $(ORDMNG03010_GRID_ID).getGridParam('selarrrow');
+						
+						if(selectedIds.length > 1) { // 1개만 선택
+						   alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;
+							return;
+						} 
+						
+						var selRowData ;
+						
+						for (var i=selectedIds.length-1; i>=0; i--) {
+							selRowData = $(ORDMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
 						}
-					    var selectedIds = $(ORDMNG03010_GRID_ID).getGridParam('selarrrow');
-					    console.log(selectedIds);
-					    if(selectedIds.length !== 1) {
-					    	return;
-					    }
-						var param = {
-							'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo,
-							'fromDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').val(),
-							'toDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').val()
-						};
-						console.log(param);
-						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', popFn, param, 'S');
+						console.log(selRowData);
+						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.selRowData};
+						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', key, 'S');
 					}
 			}
 			
 	},
+//	callback: {
+//		deliPrt: function(rowDataPop) {
+//			console.log(1);
+//		}
+//	},
 	empty: {
 			init: function() {
 					var _this = this;

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

@@ -8,22 +8,27 @@ require(['config'], function() {
 
 let ITP_POP_GRID_LIST = '/api/pomng/inoutmng/info-inv';
 let ITP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
-function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
+
+
+
+function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
-	
-	let itp_BIZPOP_DLV_STTMT_PRN_param = {};
+	data: [];
+	let itp_BIZPOP_DLV_STTMT_PRN_param = args;
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
 	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
 	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
 	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
+	console.log(args);
+
 	let viewObj = {
 		init: function (param) {
 			this.load(param);
 		},
 		load: function(param) {
-			fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'GET');
+			fn_ajax_call(ITP_POP_INFO_INV, param, this.callback, 'POST');
 		},
 		callback: function (result) {
 			console.log(result);
@@ -43,7 +48,8 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
 			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
 			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
-
+			
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
 			
 		},	
 	};
@@ -52,9 +58,12 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 	console.log(infoParam);
 	viewObj.init(infoParam);
 	
+//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
+//	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
 	
 	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(fn_make_user_info.get('dlvSttmtUnqNo'));
+	
 	if(args) {
 		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
 		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
@@ -163,11 +172,10 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 		postData: JSON.stringify(param),
 		url: DOMAIN + ITP_POP_GRID_LIST,
 		pager: THIS_GIRD_PAGER,
-		multiselect: true,
+		
 		loadComplete: function(data) {
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
-					//여기에 데이터
-			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.invPoInfoList, false);
+			//여기 데이터 
+			itp_fn_grid_load_complete(colModel,THIS_GIRD_ID.jqGrid,data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.invDtlInfoList, false);
 	    },
 	    loadError: function(jqXHR, textStatus, errorThrown) {
 	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);