반품현황

src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -15,7 +15,9 @@
 								<form id="ITP_FORM_RTNMNG06010_SEARCH" class="form-horizontal">
 									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SBRAND_ID" name="sbrandId" value="">
 									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSTORE_ID" name="sstoreId" value="">
-									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID" name="sspplyId" value="">	<!-- 공급업체 -->
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID" name="sspplyId" value="">		<!-- 공급업체 -->
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID" name="srtnWhsId" value="">	<!-- 수거창고 -->
+									<input type="hidden" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID" name="swhsId" value="">			<!-- 반품입고창고 -->
 								
 									<div class="form-group">
 										<div class="col-xs-1 itp_ip itp_noMar" style="width:10.7%;">
@@ -31,26 +33,27 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											
-										</div>
-										<div class="col-xs-5 itp_ip itp_noMar">
-											
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고창고" readonly="readonly" />
 										</div>
+										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM" class="btn btn-primary btn-sm SEB" 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">
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" />
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM" class="form-control itp_input" placeholder="공급업체" readonly="readonly" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_STORE_NM" class="form-control itp_input" name="sStoreNm" placeholder="매장/창고" />
+											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="매장/창고" readonly="readonly" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
-											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_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_RTNMNG06010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-primary btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-5 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG06010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />

src/main/webapp/js/app/rtnmng/ITP_RTNMNG06010.js

@@ -24,109 +24,87 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},
 		{
-			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
-			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, 		// 발주번호
+			index: 'BRAND_NM', name: 'brandNm',
+			label: '브랜드', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
-			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, 		// 발주항번
-			width: '5', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
-		{
-			index: 'DLV_STTMT_UNQ_NO', name: 'dlvSttmtUnqNo',
-			label: ITP_MSG_LOCALE.label.dlvSttmtUnqNo, 		// 납품번호
+			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
+			label: '반품발주번호', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'DLV_STTMT_DTL_NO', name: 'dlvSttmtDtlNo',
-			label: ITP_MSG_LOCALE.label.dlvSttmtDtlNo, 		// 납품항번
-			width: '5', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
-		{
-			index: 'PODR_QTY', name: 'podrQty',
-			label: ITP_MSG_LOCALE.label.podrQty, 			// 발주수량
+			index: 'RTN_PODR_DTL_NO', name: 'rtnPodrDtlNo',
+			label: '항번', 
 			width: '5', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'DLV_QTY', name: 'dlvQty',
-			label: ITP_MSG_LOCALE.label.dlvQty, 			// 납품수량
-			width: '5', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
-		{
-			index: 'WHS_QTY', name: 'whsQty',
-			label: ITP_MSG_LOCALE.label.whsQty, 			// 입고수량
-			width: '5', fixed: false, align: 'center',
-			sortable: false, hidden: false
-		},
-		{
-			index: 'DIV_REQ_DT', name: 'dlvReqDt',
-			label: ITP_MSG_LOCALE.label.dlvReqDt, 			// 납품요청일
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
-		
 		{
-			index: 'DLV_SCH_DT', name: 'dlvSchDt',
-			label: ITP_MSG_LOCALE.label.dlvSchDt, 			// 납품예정일
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'DLV_CMPLT_DT', name: 'dlvCmpltDt',
-			label: ITP_MSG_LOCALE.label.dlvCmpltDt, 		// 납품일자
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			index: 'RODR_QTY', name: 'rodrQty',
+			label: '반품발주수량', 
+			width: '5', fixed: false, align: 'center',
+			sortable: false, hidden: false, 
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
-			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
-			label: ITP_MSG_LOCALE.label.whsCnfmNm, 			// 입고확인자
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			index: 'COL_REQ_QTY', name: 'colReqQty',
+			label: '수거요청수량', 
+			width: '5', fixed: false, align: 'center',
+			sortable: false, hidden: false, 
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
-			index: 'DLV_MGR_NM', name: 'dlvMgrNm',
-			label: ITP_MSG_LOCALE.label.dlvMgrNm, 			// 납품자명
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			index: 'COL_QTY', name: 'colQty',
+			label: '수거수량', 
+			width: '5', fixed: false, align: 'center',
+			sortable: false, hidden: false, 
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
-			index: 'DLV_MGR_TEL_NO', name: 'dlvMgrTelNo',
-			label: ITP_MSG_LOCALE.label.dlvMgrTelNo, 		// 납품자전화번호
+			index: 'COL_AMT', name: 'colAmt',
+			label: '수거금액', 
 			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false,
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
+		}, 
+		{
+			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
+			label: '수거창고', 
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_ID', name: 'itemId',
-			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
+			index: 'COL_SCH_DT', name: 'colSchDt',
+			label: '수거예정일', 
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'ITEM_NM', name: 'itemNm',
-			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
+			index: 'PICK_MGR_NM', name: 'pickMgrNm',
+			label: '수거담당자명', 
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'UNIT', name: 'unit',
-			label: ITP_MSG_LOCALE.label.unit, 				// 기본단위
-			width: '5', fixed: false, align: 'center',
+			index: 'PICK_MGR_TEL_NO', name: 'pickMgrTelNo',
+			label: '수거담당자전화번호', 
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
-		},
-		{
-			index: 'WHS_AMT', name: 'whsAmt',
-			label: ITP_MSG_LOCALE.label.whsAmt, 			// 입고금액
-			width: '8', fixed: false, align: 'center',
-			sortable: false, hidden: false,
-			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
-		}
+		}		
 	],
 	view: [],
 	detail: []
@@ -213,7 +191,6 @@ let pageObj = {
     }
 }
 
-
 /*목록화면 Object*/
 let listObj = {
 	init: function() {
@@ -275,18 +252,6 @@ let listObj = {
             	url: DOMAIN + API_POMNG_INOUTMNG_WAREHOUSE_GRID_LIST,
             	pager: RTNMNG06010_GRID_PAGER,
             	rownumbers: false,
-            	/*onCellSelect: function(rowId, cellIdx, cellValue) {
-                    var cm = $(this).jqGrid('getGridParam', 'colModel');
-                    var colNm = cm[cellIdx].name;
-                    if (colNm === 'pchPodrUnqNo') {
-                        const pchPodrUnqNoVal = $(this).jqGrid('getCell', rowId, 'pchPodrUnqNo');
-                        const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
-                        const spplyIdVal = LOGIN_USER_INFO.spplyId;
-                        const key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal, spplyId: spplyIdVal};
-                        var param = $.param(key);
-                        viewObj.init(param);
-                    }
-				},*/
 				loadComplete: function(data) {
 					console.log(data);
                     itp_fn_grid_load_complete(data, RTNMNG06010_GRID_ID, true, 'number', 'RTNMNG06010', listObj.itp_RTNMNG06010_search, listObj.empty, true, data.gridRecords, true);
@@ -314,53 +279,62 @@ let listObj = {
 	action: function() {
 		var _this = this;
 		// 공급업체 조회 버튼 클릭
-		$('#ITP_BTN_RTNMNG06010_SEARCH_SPPLY_ID').on('click', function() {
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SSPPLY_NM').on('click', function() {
 			_this.popup('spply');
 		});
 		// 공급업체 텍스트 삭제 버튼 클릭
-		$('#ITP_BTN_RTNMNG06010_DELETE_SPPLY_ID').on('click', function() {
-			$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_NM').val('');
-			$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_ID').val('');
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SSPPLY_NM').on('click', function() {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM').val('');
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID').val('');
 		});
 		
 		// 매장/창고 조회 버튼 클릭
-		$('#ITP_BTN_RTNMNG06010_SEARCH_WHS_ID').on('click', function() {
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SWHS_NM').on('click', function() {
 			_this.popup('whs');
 		});
 		// 매장/창고 텍스트 삭제 버튼 클릭
-		$('#ITP_BTN_RTNMNG06010_DELETE_WHS_ID').on('click', function() {
-			$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_NM').val('');
-			$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_ID').val('');
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SWHS_NM').on('click', function() {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val('');
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val('');
+		});
+		
+		// 매장/창고 조회 버튼 클릭
+		$('#ITP_BTN_RTNMNG06010_SEARCH_POP_SRTN_WHS_NM').on('click', function() {
+			_this.popup('rwhs');
+		});
+		// 매장/창고 텍스트 삭제 버튼 클릭
+		$('#ITP_BTN_RTNMNG06010_SEARCH_DEL_SRTN_WHS_NM').on('click', function() {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM').val('');
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID').val('');
 		});
 	},
-	popup: function(keyword) {
-		var popFn = this.callback.create;
-		 
+	popup: function(keyword) {		 
 		if(keyword === 'spply'){
+			var popFn = this.callback.supply;			
 			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
+			var popFn = this.callback.whs;
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
+		} else if(keyword === 'rwhs'){
+			var popFn = this.callback.rwhs;
 			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},
 	callback: {
-		create: function(rowDataPop) {
-			console.log(rowDataPop);
-			console.log(Array.isArray(rowDataPop));
-			if(rowDataPop.hasOwnProperty('whsId') == false) {
-				console.log(rowDataPop.spplyId);
-				$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_NM').val(rowDataPop.spplyNm);
-				$('#ITP_FORM_RTNMNG06010_DETAIL_SPPLY_ID').val(rowDataPop.spplyId);
-				//console.log(rowDataPop[0].storeId);
-				//$('#ITP_FORM_RTNMNG06010_DETAIL_STORE_NM').val(rowDataPop[0].storeNm);
-				//$('#ITP_FORM_RTNMNG06010_DETAIL_STORE_ID').val(rowDataPop[0].storeId);
-			} else {
-				console.log(rowDataPop);
-				console.log(rowDataPop.whsId);
-				$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
-				$('#ITP_FORM_RTNMNG06010_DETAIL_WHS_ID').val(rowDataPop.whsId);
-			}
+		supply: function(rowDataPop) {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_NM').val(rowDataPop.spplyNm);
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SSPPLY_ID').val(rowDataPop.spplyId);
+		},
+		whs: function(rowDataPop) {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
+		}, 
+		rwhs: function(rowDataPop) {
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_NM').val(rowDataPop.whsNm);
+			$('#ITP_FORM_RTNMNG06010_SEARCH_SRTN_WHS_ID').val(rowDataPop.whsId);
 		}
 	}
 }