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

src/main/webapp/app/inoutmng/INOUTMNG02010.html

@@ -27,26 +27,30 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG02010_SEARCH_SHMT_WHS_ID" class="form-control itp_input" name="sShmtWhsId">
-												<option value="A">출하창고</option>											
-											</select>
+											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출하창고" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID" class="form-control itp_input" name="sshmtWhsId" />
 										</div>
+										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG02010_SEARCH_SHMT_REQ_ST_CD" data-select-code="SHMT_DTL_ST_CD" class="form-control itp_input" name="sShmtReqStCd">
-												<option value="A">출하상태</option>											
+											<select id="ITP_FORM_INOUTMNG02010_SEARCH_SHMT_REQ_ST_CD" data-select-code="SHMT_DTL_ST_CD" class="form-control itp_input" name="sshmtReqStCd">
+												<option value="">출하상태</option>											
 											</select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_STORE_NM" class="form-control itp_input" name="sStoreNm" placeholder="매장" />
+											<input type="text" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="swhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
-											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_STORE_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_INOUTMNG02010_DELETE_STORE_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_INOUTMNG02010_DELETE_WHS_ID" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />
+											<input type="text" id="ITP_FORM_INOUTMNG02010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>
 									</div>
 								</form>

src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -7,11 +7,6 @@
 					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_ORDMNG03010_POPUP" class="btn btn-primary btn-sm IVP" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;납품서출력&nbsp;&nbsp;</button>
 				</div>
-				<div style="top:0px; text-align:center; font-size:20px;">
-					<span style="text-decoration:underline; font-weight:600;">테스트공급업체</span>
-					<button type="button" id="ITP_BTN_ORDMNG03010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-					<button type="button" id="ITP_BTN_ORDMNG03010_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
-				</div>
 			</div>
 			<div class="itp_det_in">
 				<div id="ITP_AJAX_ORDMNG03010_LIST_CONTAINER">

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

@@ -136,7 +136,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 fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvSttmtUnqNo"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -113,7 +113,46 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		}
-	]
+	],
+	view: [
+		{
+			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+			label: ITP_MSG_LOCALE.label.pchPodrUnqNo,			// 발주번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId,					// 품목번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm,					// 품목명
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PODR_QTY', name: 'podrQty',
+			label: ITP_MSG_LOCALE.label.podrQty,				// 발주수량
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'DLV_QTY', name: 'dlvQty',
+			label: ITP_MSG_LOCALE.label.dlvQty,					// 납품수량
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'EXPRY_DATE', name: 'expryDate',
+			label: ITP_MSG_LOCALE.label.expryDate,				// 발주번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	],
+	detail: []
 }
 
 
@@ -187,9 +226,11 @@ let pageObj = {
             $('#ITP_AJAX_INOUTMNG02010_LIST_CONTAINER').show();
             $('#ITP_FORM_INOUTMNG02010_SEARCH #ITP_FORM_INOUTMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
             $('#ITP_BTN_INOUTMNG02010_PRINT').show();
-            $('#ITP_BTN_INOUTMNG02010_SRH').show();
-            $('#ITP_BTN_INOUTMNG02010_SEARCH_STORE_ID').show();
-            $('#ITP_BTN_INOUTMNG02010_DELETE_STORE_ID').show();
+            $('#ITP_BTN_INOUTMNG02010_SRH').show();            
+            $('#ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID').show();
+            $('#ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM').show();
+            $('#ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID').show();
+            $('#ITP_BTN_INOUTMNG02010_DELETE_WHS_ID').show();
             
         } /*else if(mode == 'ADD') { // 등록
             $('#ITP_AJAX_INOUTMNG02010_DETAIL_CONTAINER').show();
@@ -236,10 +277,10 @@ let pageObj = {
 			$('#ITP_FORM_INOUTMNG02010_DETAIL .itp_form_change').hide();
 
             $('#ITP_FORM_INOUTMNG02010_DETAIL #ITP_FORM_INOUTMNG02010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
-        } /*else if(mode == 'VIEW') { // 보기
+        } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_INOUTMNG02010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_INOUTMNG02010_MODIFY', '#ITP_BTN_INOUTMNG02010_CANCELLIST']);
-        }*/
+        }
     }
 };
 
@@ -248,7 +289,7 @@ let pageObj = {
 let listObj = {
 	init: function() {
 		this.grid.init();
-		//this.action();
+		this.action();
 	},
 	itp_INOUTMNG02010_param: {},
 	itp_INOUTMNG02010_search: false,
@@ -308,6 +349,7 @@ let listObj = {
             	url: DOMAIN + API_POMNG_INOUTMNG_OUTSEARCH_GRID_LIST,
             	pager: INOUTMNG02010_GRID_PAGER,
 				multiselect: true,
+				multiboxonly : false,
 				rownumbers: false,/*
             	onCellSelect: function(rowId, cellIdx, cellValue) {
                     var cm = $(this).jqGrid('getGridParam', 'colModel');
@@ -339,7 +381,54 @@ let listObj = {
 		unload: function() {
 			$.jgrid.gridUnload(INOUTMNG02010_GRID_ID);
 		}
+	},
+	action: function() {
+		var _this = this;
+		// 출하창고 조회 버튼 클릭
+		$('#ITP_BTN_INOUTMNG02010_SEARCH_SHMT_WHS_ID').on('click', function() {
+			_this.popup('shmtWhs');
+		});
+		// 출하창고 텍스트 삭제 버튼 클릭
+		$('#ITP_BTN_INOUTMNG02010_DELETE_SHMT_WHS_NM').on('click', function() {
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID').val('');
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM').val('');
+		});
+		// 매장/창고 조회 버튼 클릭
+		$('#ITP_BTN_INOUTMNG02010_SEARCH_WHS_ID').on('click', function() {
+			_this.popup('whs');
+		});
+		// 매장/창고 텍스트 삭제 버튼 클릭
+		$('#ITP_BTN_INOUTMNG02010_DELETE_WHS_ID').on('click', function() {
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM').val('');
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID').val('');
+		});
+	},
+	popup: function(keyword) {
+		var popFn ;
+		if(keyword == 'shmtWhs') {
+			popFn = this.callback.shmtWhs;
+		} else if(keyword == 'whs'){
+			popFn = this.callback.whs;
+		}
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		
+	},
+	callback: {
+		shmtWhs: function(rowDataPop) {
+			console.log(rowDataPop);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_ID').val(rowDataPop.whsId);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_SHMT_WHS_NM').val(rowDataPop.whsNm);
+			
+		},
+		whs: function(rowDataPop) {
+			console.log(rowDataPop);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_ID').val(rowDataPop.whsId);
+			$('#ITP_FORM_INOUTMNG02010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
+		}
 	}
 }
 
+
+
 console.log(CODE_LIST);

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

@@ -46,7 +46,7 @@ const gridColModel = {
 			{
 				index: 'DLV_STTMT_NO', name: 'dlvSttmtUnqNo',
 				label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, //납품서번호
-				width: '10', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -94,7 +94,7 @@ const gridColModel = {
 			{
 				index: 'SALE_ITEM_YN', name: 'dlvQty',
 				label: ITP_MSG_LOCALE.label.dlvQty, //납품수량
-				width: '10', fixed: false, align: 'center',
+				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{

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

@@ -408,11 +408,11 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		// const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 		if(keyword === 'spply'){
-			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		}
 	},
 	callback: {

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

@@ -12,34 +12,38 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 	// 공통코드
 	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
 	
-	console.log(args);
-	
 	let itp_BIZPOP_DLV_STTMT_PRN_param = {};
 	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';
+	let viewObj = {
+		init: function (param) {
+			this.load(param);
+		},
+		load: function(param) {
+			fn_ajax_call(FRCOMP_POP_INFO_INV, param, this.callback, 'GET');
+		},
+		callback: function (result) {
+			console.log(result);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(args.dlvSttmtUnqNo);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(args.dlvRegDt);
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').text(args.dlvMgrTelNo);
+			var divMgrTelNo = "(" + args.divMgrTelNo + ")";
+			
+			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
+			var zipNo = "(" + args.zipNo + ")";
+		},	
+	};
 	
-//	fn_ajax_call(FRCOMP_POP_GRID_LIST, args, function(result) {
-//		
-//	$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(args.dlvRegDt);
-//	$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').text(args.dlvMgrTelNo);
-//	var divMgrTelNo = "(" + args.divMgrTelNo + ")";
-//	
-//	$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
-//	var zipNo = "(" + args.zipNo + ")";
-//	
-//	}, 'GET');
-	
-	
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
 	
 	$('#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'));
 	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);
+		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
 	}
 	
 	$('#ITP_BIZPOP_DLV_STTMT_PRN').one('shown.bs.modal', function(e) {