반품요청 개발중

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

@@ -5,6 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><strong>반품 요청</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_RTNMNG01010_REQ" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;요청&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_RTNMNG01010_TEMP_SAVE" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;임시저장&nbsp;&nbsp;</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -13,6 +14,15 @@
 						<div class="col-xs-12">
 							<form id="ITP_FORM_RTNMNG01010_DETAIL" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_BRAND_ID" name="brandId" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_STORE_ID" name="storeId" value="">
+								
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_REQ_DEPT" name="reqDept" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_AUTH_TP_CD" name="authTpCd" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_WHS_DVSN" name="whsDvsn" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
+								<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_REQ_UNQ_NO" name="rtnReqUnqNo" value="">								
+								
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">반품요청정보</h4>
 									<div class="itp_form_in">	
@@ -20,19 +30,24 @@
 											<label class="col-xs-2 itp_lb">브랜드 *</label>
 											<div class="col-xs-4 itp_ip fnBrandNm"></div>
 											<label class="col-xs-2 itp_lb">반품번호</label>
-											<div class="col-xs-4 itp_ip fnPchReqUnqNo">(자동생성)</div>
+											<div class="col-xs-4 itp_ip fnRtnReqUnqNo">(자동생성)</div>
 										</div>
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">반품장소</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_DLV_PLACE" class="form-control itp_input" name="dlvPlace" placeholder="매장/창고" />
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM" data-check-required="empty" class="form-control itp_input" name="rtnWhsNm" value="" />
+													<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
+												</div>
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="rtnLocationNm" value="" />
+													<input type="hidden" id="ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
 												</div>
-												<div class="col-xs-4 itp_in" style="padding-left:3px">
-													<button type="button" id="ITP_BTN_RTNMNG01010_DETAIL_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_RTNMNG01010_DETAIL_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
+													<button type="button" id="ITP_FORM_RTNMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SEB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_FORM_RTNMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm UPB SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 											</div>
 											<label class="col-xs-2 itp_lb">수거요청일</label>

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

@@ -25,6 +25,10 @@ const RTNMNG01010_DETAIL_GRID_EMPTY = '#ITP_RTNMNG01010_DETAIL_jqGridEmpty';  //
 
 let RTNMNG01010_DETAIL_GRID_LAST_ROW_ID;
 
+/* 공통코드 리스트 */
+let ITP_COMMON_CD_RTN_DVSN = fn_make_common_cd_list(CODE_LIST, 'RTN_DVSN', false);
+let ITP_COMMON_CD_RTN_RSN_DVSN = fn_make_common_cd_list(CODE_LIST, 'RTN_RSN_DVSN', false);
+
 /*API URL*/
 let API_DETAIL_INIT_INFO = '/api/rtnmng/init-rtnReq'
 let API_DETAIL_SAVE = '/api/rtnmng/save-rtnReq';
@@ -38,17 +42,29 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
+		{
+			index: 'RTN_REQ_UNQ_NO', name: 'rtnReqUnqNo',
+			label: '반품요청번호',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		},
+		{
+			index: 'RTN_REQ_DTL_NO', name: 'rtnReqDtlNo',
+			label: '반품요청상세번호',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId,
-			width: '20', fixed: false, align: 'center',
+			width: '15', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: { required: true }
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,
-			width: '30', fixed: false, align: 'center',
+			width: '25', fixed: false, align: 'center',
 			sortable: true, editable: false, edittype: 'text',
 			editrules: { required: true }
 		},
@@ -66,21 +82,48 @@ const gridColModel = {
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'PCH_REQ_QTY', name: 'pchReqQty',
-			label: ITP_MSG_LOCALE.label.pchReqQty, //수량
+			index: 'RTN_QTY', name: 'rtnQty',
+			label: '반품수량', //수량
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: { number:true }, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
-			label: ITP_MSG_LOCALE.label.pchReqAmt,
+			index: 'RTN_AMT', name: 'rtnAmt',
+			label: '반품예상금액',
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},		
+		{
+			index: 'RTN_DVSN', name: 'rtnDvsn',
+			label: '반품구분',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: true, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_RTN_DVSN},
+			editrules: {required: true}
+		},
+		{
+			index: 'RTN_RSN_DVSN', name: 'rtnRsnDvsn',
+			label: '사유구분',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: true, formatter: 'select', edittype: 'select',
+			editoptions: {value: ITP_COMMON_CD_RTN_RSN_DVSN},
+			editrules: {required: true}
+		},
+		{
+			index: 'RTN_RSN', name: 'rtnRsn',
+			label: '반품사유', 
+			width: '15', fixed: false, align: 'right',
+			sortable: false, editable: true, edittype: 'text'
+		},
+		{
+			index: 'SPPLY_ID', name: 'spplyId',
+			label: '공급사아이디',
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text', hidden: true
 		},
-
 		{
 			index: 'BRAND_UNIT_UNQ_NO', name: 'brandUnitUnqNo',
 			label: ITP_MSG_LOCALE.label.brandUnitUnqNo,
@@ -117,10 +160,10 @@ let pageObj = {
 		});
 		// 납품장소 텍스트 삭제 버튼 클릭
 		$('#ITP_FORM_RTNMNG01010_DELETE_WHS_NM').on('click', function() {
-			$('#ITP_FORM_RTNMNG01010_DETAIL_WHS_NM').val('');
-			$('#ITP_FORM_RTNMNG01010_DETAIL_WHS_ID').val('');
-			$('#ITP_FORM_RTNMNG01010_DETAIL_LOCATION_NM').val('');
-			$('#ITP_FORM_RTNMNG01010_DETAIL_LOCATION').val('');
+			$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM').val('');
+			$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID').val('');
+			$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION_NM').val('');
+			$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION').val('');
 			
 		});
 	},
@@ -143,12 +186,11 @@ let pageObj = {
 		create: function(rowDataPop) {
 			console.log(rowDataPop);
 			if(rowDataPop) {
-				$('#ITP_FORM_RTNMNG01010_DETAIL_WHS_NM').val(rowDataPop.whsNm);
-				$('#ITP_FORM_RTNMNG01010_DETAIL_WHS_ID').val(rowDataPop.whsId);
-				$('#ITP_FORM_RTNMNG01010_DETAIL_LOCATION_NM').val(rowDataPop.locationNm);
-				$('#ITP_FORM_RTNMNG01010_DETAIL_LOCATION').val(rowDataPop.location);
-			}
-			
+				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID').val(rowDataPop.whsId);
+				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION_NM').val(rowDataPop.locationNm);
+				$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION').val(rowDataPop.location);
+			}			
 		}
 	},
 	itp_RTNMNG01010_param: {},  // ==>dwkim 
@@ -174,7 +216,7 @@ let pageObj = {
 			//var now = new Date(date.getDate() + 5);
 			var now = new Date();
 			$('#ITP_TAB_RTNMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_RTNMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
+			$('#ITP_FORM_RTNMNG01010_DETAIL_COL_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
 			
 			//납품장소 필드 readonly
 			$('#ITP_FORM_RTNMNG01010_DETAIL_WHS_NM').attr('readonly', true);
@@ -200,8 +242,8 @@ let pageObj = {
 				var id = $(this).attr('id');
 				$(this).on('click', function() {
 					switch (id) {
-						case 'ITP_BTN_RTNMNG01010_SRH': createObj.button.save("PR20"); break;	// 구매요청
-						case 'ITP_BTN_RTNMNG01010_NEWREG': createObj.button.save("PR00"); break;	// 임시저장
+						case 'ITP_BTN_RTNMNG01010_REQ'			: createObj.button.save("RR20"); break;		// 요청
+						case 'ITP_BTN_RTNMNG01010_TEMP_SAVE'	: createObj.button.save("RR00"); break;	// 임시저장
 						case 'ITP_BTN_RTNMNG01010_DETAIL_ADDROW': pageObj.grid.button.addRow(); break;	// 품목추가
 						case 'ITP_BTN_RTNMNG01010_DETAIL_DELROW': pageObj.grid.button.delRow(); break;	// 품목삭제
 					}
@@ -242,7 +284,7 @@ let pageObj = {
 					});
 
 					$.each(rowDataPop, function(key, value) {
-						if (exists.indexOf(value.brandUnitUnqNo) < 0 && value.podrPssblDvsn == 'PO01') {
+						if (exists.indexOf(value.brandUnitUnqNo) < 0) {
 							value['viewCd'] = "C";
 							$(RTNMNG01010_DETAIL_GRID_ID).jqGrid('addRowData', value.brandUnitUnqNo, value, 'last');
 						}
@@ -324,12 +366,11 @@ let createObj = {
 	newinit: function() {
 		$('#ITP_FORM_RTNMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
 		$('#ITP_FORM_RTNMNG01010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
-		$('#ITP_FORM_RTNMNG01010_DETAIL_PCH_REQ_NM').val('');
 		$('#ITP_FORM_RTNMNG01010_DETAIL_NOTE').val('');
+		
 		var now = new Date();
 		$('#ITP_TAB_RTNMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-		$('#ITP_FORM_RTNMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
-		
+		$('#ITP_FORM_RTNMNG01010_DETAIL_COL_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
 		
 		this.load();  //==>dwkim 초기화 하여 다시 초기 데이타 가져와 뿌려줌
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
@@ -341,32 +382,15 @@ let createObj = {
 			
 			const formId = '#ITP_FORM_RTNMNG01010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			$('#ITP_FORM_RTNMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
+			$('#ITP_FORM_RTNMNG01010_DETAIL_RTN_REQ_ST_CD').val(arg);
 			
-			//정산 타입이 무정산이면 스킵
-			var loanDvsn = $('#ITP_FORM_RTNMNG01010_DETAIL_LOAN_DVSN').val();
-			
-			if (loanDvsn != null && loanDvsn != "") {
-				
-				if (loanDvsn != 'LD03' && arg == 'PR20' ) {
-					var pchActAtm = $('#ITP_FORM_RTNMNG01010_DETAIL .fnPchActAmt').text();
-					var pchReqAtm = $('#ITP_FORM_RTNMNG01010_DETAIL .fnPchReqAmt').text();
-					
-					if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
-						alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
-						return;
-					}
-				}    
-			}        
-
 			if (itp_fn_form_event.isValid(formId)) {
 				// 품목대상 정보 확인 필요
 				var records = $(RTNMNG01010_DETAIL_GRID_ID).getGridParam('reccount');
 				if (records == 0) {
-						alert( "요청할 품목내역이 없습니다.");
-						return ;
-				}
-				
+					alert( "요청할 품목내역이 없습니다.");
+					return ;
+				}				
 				
 				var saveReq = {
 				callBack: function(args) {
@@ -387,14 +411,14 @@ let createObj = {
 									gridDeleteData.push(value);
 								}
 							}
-						});
-						
+						});						
 						
 						let param = $(formId).serializeObject();
 						param.gridInsertData = gridInsertData;
 						param.gridUpdateData = gridUpdateData;
 						param.gridDeleteData = gridDeleteData;
 						console.log(JSON.stringify(param));
+						
 						var searhFn = function() {
 							createObj.newinit();
 						};
@@ -406,35 +430,27 @@ let createObj = {
 				} else {
 					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveReq, null);
 				}
-				
-				
-				
 			}
 		}
 	},
 	load: function() {
-		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')};
 		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
 	},
 	callback: function(result) {
-
 		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_VIEW_CD').val('C');
 
 		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_BRAND_ID').val(result.brandId);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_STORE_ID').val(result.storeId);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_WHS_ID').val(result.whsId);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_WHS_NM').val(result.whsNm);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_LOCATION').val(result.location);
-		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_LOCATION_NM').val(result.locationNm);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_STORE_ID').val(result.storeId);		
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_REQ_DEPT').val(result.reqDept);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_AUTH_TP_CD').val(result.authTpCd);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_WHS_DVSN').val(result.whsDvsn);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_ID').val(result.rtnWhsId);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_RTN_WHS_NM').val(result.rtnWhsNm);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION').val(result.rtnLocation);
+		$('#ITP_FORM_RTNMNG01010_DETAIL #ITP_FORM_RTNMNG01010_DETAIL_RTN_LOCATION_NM').val(result.rtnLocationNm);
+		
 		$('#ITP_FORM_RTNMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
-		$('#ITP_FORM_RTNMNG01010_DETAIL .fnPchReqDept').text(result.reqDept);
-		$('#ITP_FORM_RTNMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
-		$('#ITP_FORM_RTNMNG01010_DETAIL .fnPchReqAmt').text("0");
-		$('#ITP_FORM_RTNMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
-		$('#ITP_FORM_RTNMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);		
 
 		pageObj.grid.init();
 	}