소스 원복처리

src/main/webapp/app/pomng/POMNG01010.html

@@ -18,7 +18,8 @@
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
 								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
-								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_pchReqDvsn" name="pchReqDvsn" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
+								<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">구매요청정보</h4>
@@ -56,22 +57,22 @@
 									</div>
 									<div class="itp_form_in">	
 										<div class="form-group">
-											<label class="col-xs-2 itp_lb">납기요청일</label>
+											<label class="col-xs-2 itp_lb">납기요청일 *</label>
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-4 itp_in">
 														<div class="input-daterange input-group date">
-															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
+															<input type="text" id="ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT" data-check-required="empty" class="form-control itp_input" name="dlvReqDt" value="">
 														</div>
 													</div>
 												</div>
-											<label class="col-xs-2 itp_lb">납품장소</label>
+											<label class="col-xs-2 itp_lb">납품장소 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_WHS_NM" data-check-required="empty" class="form-control itp_input" name="whsNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
 												</div>
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" class="form-control itp_input" name="locationNm" value="" />
+													<input type="text" id="ITP_FORM_POMNG01010_DETAIL_LOCATION_NM" data-check-required="empty" class="form-control itp_input" name="locationNm" value="" />
 													<input type="hidden" id="ITP_FORM_POMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
 												</div>
 												<div class="col-xs-1 itp_in" style="width:23%; padding:0px;">
@@ -97,7 +98,7 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">비고</label>
 											<div class="col-xs-10 itp_ip">
-												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="fnNote" value="" />
+												<input type="text" id="ITP_FORM_POMNG01010_DETAIL_NOTE" class="form-control itp_input" name="note" value="" />
 											</div>
 										</div>
 									</div>

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

@@ -156,6 +156,7 @@ let pageObj = {
 				$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val(rowDataPop.locationNm);
 				$('#ITP_FORM_POMNG01010_DETAIL_LOCATION').val(rowDataPop.location);
 			}
+			
 		}
 	},
 	itp_POMNG01010_param: {},  // ==>dwkim 
@@ -178,20 +179,17 @@ let pageObj = {
 			});
 
 			// 조회일자 지정
+			//var now = new Date(date.getDate() + 5);
 			var now = new Date();
-			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('dlvReqDt', new Date(now.setDate(now.getDate() + 5)));
+			$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
+			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
+			
+			
 			
 			//납품장소 필드 readonly
 			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
 			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
-			// form alert message 주입
-			/*
-			$('input[data-alert-required="ONLYCHK"]').each(function() {
-				if($(this).data('alert-msg') === 'address') {
-					$(this).data('alert-msg', ITP_MSG_LOCALE.message.form.emptyAddr);
-				}
-			});
-			*/
+			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG01010_DETAIL_GRID_ID, POMNG01010_DETAIL_GRID_LIST, 'lg');
@@ -212,8 +210,8 @@ let pageObj = {
 				var id = $(this).attr('id');
 				$(this).on('click', function() {
 					switch (id) {
-						case 'ITP_BTN_POMNG01010_SRH': modifyObj.button.save(); break;	// 구매요청
-						case 'ITP_BTN_POMNG01010_NEWREG': modifyObj.button.newReg(); break;	// 임시저장
+						case 'ITP_BTN_POMNG01010_SRH': createObj.button.save("PR20"); break;	// 구매요청
+						case 'ITP_BTN_POMNG01010_NEWREG': createObj.button.save("PR00"); break;	// 임시저장
 						case 'ITP_BTN_POMNG01010_DETAIL_ADDROW': pageObj.grid.button.addRow(); break;	// 품목추가
 						case 'ITP_BTN_POMNG01010_DETAIL_DELROW': pageObj.grid.button.delRow(); break;	// 품목삭제
 					}
@@ -244,12 +242,10 @@ let pageObj = {
 					var exists = '';
 					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
 					$.each(rowData, function(key, value) {
-						//exists = exists + value.itemId + ';';
 						exists = exists + value.brandUnitUnqNo + ';';
 					});
 
 					$.each(rowDataPop, function(key, value) {
-						// if (exists.indexOf(value.itemId) < 0 && value.podrPssblDvsn == 'PO01') {
 						if (exists.indexOf(value.brandUnitUnqNo) < 0 && value.podrPssblDvsn == 'PO01') {
 							value['viewCd'] = "C";
 							$(POMNG01010_DETAIL_GRID_ID).jqGrid('addRowData', value.brandUnitUnqNo, value, 'last');
@@ -263,7 +259,7 @@ let pageObj = {
 			delRow: function() {
 				itp_fn_grid_del_row(POMNG01010_DETAIL_GRID_ID);
 				// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
-				this.load.recal();  //==>dwkim 왜 호출이 안될까요
+				pageObj.grid.recal();  //==>dwkim 왜 호출이 안될까요
 			}
 		},
 		load: function(gridData) {  // ==>dwkim  오픈시 데이타 가져오는 부분 넣으면 되는건지 여부 gird가 아님
@@ -321,56 +317,85 @@ let createObj = {
 		//let param = 'brandId=' + LOGIN_USER_INFO.brandId + "&spplyId=" + LOGIN_USER_INFO.spplyId;
 		this.load();
 	},
+	newinit: function() {
+		$('#ITP_FORM_POMNG01010_DETAIL_BRAND_ID').val(fn_make_user_info.get('brandId'));
+		$('#ITP_FORM_POMNG01010_DETAIL_STORE_ID').val(fn_make_user_info.get('storeId'));
+		$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_NM').val('');
+		$('#ITP_FORM_POMNG01010_DETAIL_NOTE').val('');
+		var now = new Date();
+		$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
+		$('#ITP_FORM_POMNG01010_DETAIL_DLV_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')};
+		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
+	},
 	button: {
-		save: function() {
+		save: function(arg) {
 			const formId = '#ITP_FORM_POMNG01010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
+			$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
+			
+			//정산 타입이 무정산이면 스킵
+			var loanDvsn = $('#ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val();
+			
+			if (loanDvsn != 'LD03' && arg == 'PR20' ) {
+				var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
+				var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
+				
+				if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
+					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
+					return;
+				}
+			}            
 
-			// if (vali_cmpyCd && vali_cmpyStatCd && vali_cmpyTypeCd && vali_cmpyNm && vali_bossNm && vali_mainTel && vali_mainEmail) {
 			if (itp_fn_form_event.isValid(formId)) {
-
-				// if($('#ITP_FORM_POMNG01010_DETAIL_CMPY_ZIPNO').val() === '' || $('#ITP_FORM_POMNG01010_DETAIL_CMPY_ADRES').val() === '') {
-				// 	itp_fn_modal_alert('주소 검색을 통해 회사 주소를 입력하세요.');
-				// 	return;
-				// }
-
-				if (ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE) {
-					itp_fn_modal_duplicate('회사코드 중복체크를 해주세요.', formId + '_AFFL_SHOP_ID');
-				} else {
-					let gridInsertData = [];
-					let gridUpdateData = [];
-					let gridDeleteData = [];
-					const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
-					const keyValue = $(formId + '_AFFL_SHOP_ID').val();
-					$.each(rowData, function(key, value) {
-						if (value.viewCd !== 'R') {
-							value.afflShopId = keyValue;
-							if (value.viewCd === 'C') {
-								gridInsertData.push(value);
-							} else if (value.viewCd === 'U') {
-								gridUpdateData.push(value);
-							} else if (value.viewCd === 'D') {
-								gridDeleteData.push(value);
+				var saveReq = {
+				callBack: function(args) {
+						$(formId).val(arg);
+						let gridInsertData = [];
+						let gridUpdateData = [];
+						let gridDeleteData = [];
+						const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
+						
+						$.each(rowData, function(key, value) {
+							if (value.viewCd !== 'R') {
+								if (value.viewCd === 'C') {
+									gridInsertData.push(value);
+								} else if (value.viewCd === 'U') {
+									gridUpdateData.push(value);
+								} else if (value.viewCd === 'D') {
+									gridDeleteData.push(value);
+								}
 							}
-						}
-					});
-
-					let param = $(formId).serializeObject();
-					param.gridInsertData = gridInsertData;
-					param.gridUpdateData = gridUpdateData;
-					param.gridDeleteData = gridDeleteData;
-					console.log(JSON.stringify(param));
-					var searhFn = function() {
-						ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
-						viewObj.init();
-					};
-					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+						});
+		
+						let param = $(formId).serializeObject();
+						param.gridInsertData = gridInsertData;
+						param.gridUpdateData = gridUpdateData;
+						param.gridDeleteData = gridDeleteData;
+						console.log(JSON.stringify(param));
+						var searhFn = function() {
+							createObj.newinit();
+						};
+						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');				
+					}
+				};
+				if (arg == 'PR20') {
+					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.reqSave, saveReq, null);
+				} else {
+					itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.tmpSave, saveReq, null);
 				}
+				
+				
+				
 			}
 		}
 	},
 	load: function() {
-		fn_ajax_call(API_DETAIL_INIT_INFO, '', this.callback, 'GET');
+		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) {
 		console.log(result);
@@ -382,12 +407,17 @@ let createObj = {
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_DVSN').val(result.loanDvsn);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_PCH_REQ_DVSN').val(result.pchReqDvsn);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_WHS_ID').val(result.whsId);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_WHS_NM').val(result.whsNm);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION').val(result.location);
+		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').val(result.locationNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqDept').text(result.reqDept);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);
+		
 
 		pageObj.grid.init();
 	}

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

@@ -141,7 +141,7 @@ function itp_fn_BIZPOP_ITEM(parentPopFn, args, returnType) {
 				label: '매장단가고유번호', //
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: true
-			},
+			},   
 			{
 				index: 'WHS_PASS_QTY', name: 'whsPassQty',
 				label: '출고가능수량', //

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

@@ -42,21 +42,11 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 	    if (!rowKey) {
 	    	return;
 	    }
-
-		var list = [];
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
-		
-		/*
-		if(selectedIds.length != 1) { // 1개만 선택
-			 itp_fn_modal_alert('하나의 창고만 선택해주세요!');
-			 return;
-		}
-		*/
+	
+		const selRow = $(THIS_GIRD_ID).getRowData(rowKey);
+		parentPopFn(selRow);
 		
-	    for (var i=selectedIds.length-1; i>=0; i--) {
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
-		}
-		parentPopFn(list);
+	
 		$('#ITP_BIZPOP_WHS_LOCATION').modal('hide'); // 팝업닫기
 	});