납품서생성 진행-3

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

@@ -70,7 +70,9 @@
 											<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 fnPchPodrUnqNo"></div>
+											<div class="col-xs-4 itp_ip fnPchPodrUnqNo">
+												<input type="hidden" id="ITP_FORM_ORDMNG02010_DETAIL_PCH_PODR_UNQ_NO" name="pchPodrUnqNo" value=""/>
+											</div>
 										</div>
 									</div>
 									<div class="itp_form_in">	
@@ -95,7 +97,7 @@
 											<div class="input-daterange input-group date">
 												<div class="col-xs-4 itp_ip">
 													<div class="col-xs-7 itp_in">
-														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" class="form-control itp_input" name="dlvSchDt" value="">
+														<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT" data-check-required="empty" class="form-control itp_input" name="dlvSchDt" value="">
 													</div>
 												</div>
 											</div>											
@@ -108,13 +110,13 @@
 											<label class="col-xs-2 itp_lb">납품담당자 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM" class="form-control itp_input" name="dlvMgrNm" />
+													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM" data-check-required="empty" class="form-control itp_input" name="dlvMgrNm" />
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">납품담당자연락처 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO" data-key-up="tel" class="form-control itp_input" name="dlvMgrTelNo" value=""/>
+													<input type="text" id="ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO" data-check-required="empty" data-key-up="tel" class="form-control itp_input" name="dlvMgrTelNo" value=""/>
 												</div>
 											</div>
 										</div>

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

@@ -191,23 +191,7 @@ let pageObj = {
             $('#ITP_FORM_ORDMNG02010_SEARCH #ITP_FORM_ORDMNG02010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
             $('#ITP_BTN_ORDMNG02010_SEARCH_WHS_ID').show();
             $('#ITP_BTN_ORDMNG02010_DELETE_WHS_ID').show();
-		}/* else if(mode == 'ADD') { // 등록
-			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE']);
-
-			$('#ITP_FORM_ORDMNG02010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
-				$(this).attr('id') === 'ITP_FORM_ORDMNG02010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
-				if(elem.type === 'select') {
-					$(this).val('').prop('selected', true);
-				}
-			});
-
-			$('#ITP_FORM_ORDMNG02010_DETAIL_USER_ID').removeAttr('readonly');
-			$('#ITP_FORM_ORDMNG02010_DETAIL_DUP').removeAttr('disabled');
-			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID option').remove();
-			$('#ITP_FORM_ORDMNG02010_DETAIL_SEARCH_AFFL_SHOP').show();
-			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').show();
-		}*/ else if(mode === 'MODIFY') { // 수정
+		} else if(mode === 'MODIFY') { // 수정
 			$('#ITP_AJAX_ORDMNG02010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_CANCELLIST', '#ITP_BTN_ORDMNG02010_SAVE', '#ITP_BTN_ORDMNG02010_RESET_PW']);
 			$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
@@ -220,10 +204,7 @@ let pageObj = {
 			$('#ITP_FORM_ORDMNG02010_DETAIL_DELETE_AFFL_SHOP').hide();
 			$('#ITP_BTN_ORDMNG02010_CANCELLIST').show();
             $('#ITP_BTN_ORDMNG02010_SAVE').show();
-		} /*else if(mode === 'VIEW') { // 보기
-			$('#ITP_AJAX_ORDMNG02010_VIEW_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_ORDMNG02010_MODIFY', '#ITP_BTN_ORDMNG02010_CANCELLIST']);
-		}*/
+		}
 	}
 };
 
@@ -242,7 +223,6 @@ let listObj = {
 			let param = $('#ITP_FORM_ORDMNG02010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            console.log(1234);
             console.log(JSON.stringify(param));
             $(ORDMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
         },
@@ -307,18 +287,7 @@ let listObj = {
             	pager: ORDMNG02010_GRID_PAGER,
             	multiselect: true,
 				multiboxonly : false,
-				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 key = {pchPodrUnqNo: pchPodrUnqNoVal, brandId: brandIdVal};
-                        var param = $.param(key);
-                        modifyObj.init(param);
-                    }
-				},*/
+				rownumbers: false,
 				loadComplete: function(data) {
 					console.log(data);
                     itp_fn_grid_load_complete(data, ORDMNG02010_GRID_ID, true, 'number', 'ORDMNG02010', listObj.itp_ORDMNG02010_search, listObj.empty, true, data.gridRecords, true);
@@ -370,7 +339,6 @@ let listObj = {
 /*수정화면 Object*/
 let modifyObj = {
 	init: function(param) {
-		console.log(param);
 		this.load(param);
 	},
 	itp_ORDMNG02010_param: {},
@@ -380,38 +348,29 @@ let modifyObj = {
 			listObj.grid.search();
 		},
 		save: function() {
-			console.log(111111);
 			const formId = '#ITP_FORM_ORDMNG02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			console.log(22222);
 			itp_fn_grid_save_rows(ORDMNG02010_DETAIL_GRID_ID);
 			let gridInsertData = [];
 			for(var i=0; i<$(ORDMNG02010_DETAIL_GRID_ID).getGridParam('reccount'); i++) {
 				$(ORDMNG02010_DETAIL_GRID_ID).jqGrid('saveCell', i+1, 2)
 			}
+			let param = $(formId).serializeObject();
 			const rowData = $(ORDMNG02010_DETAIL_GRID_ID).getRowData();
-			console.log(rowData);
-			const keyValue = $(formId + '_BRAND_ID').val();
-			$.each(rowData, function(key, value) {
-				if (value.viewCd != 'R') {
-						value.userId = keyValue;
-					if (value.viewCd == 'C') {
-						gridInsertData.push(value);
-					}
-				}
-			});
+			for (var i = 0; i < rowData.length; i++) {
+				rowData[i].podrQty = Number(rowData[i].podrQty);
+				rowData[i].shmtQty = Number(rowData[i].shmtQty);
+			}
+			
 			var modalFn = {
 				callBack: (args) => {
-					console.log(444444444);
-					let param = $(formId).serializeObject();
-					param.gridInsertData = gridInsertData;
-					console.log(5555);
+					param.gridInsertData = rowData;
 					console.log(param);
 					var searhFn = function () {
 						ITP_FORM_OPER03010_DETAIL_IS_WRITING = false;
 						listObj.grid.search();
 					}
-					//fn_ajax_call(API_POMNG_INOUTMNG_SAVE_SPPLY_INV, JSON.stringify(param), searhFn, 'POST');
+					fn_ajax_call(API_POMNG_INOUTMNG_SAVE_SPPLY_INV, JSON.stringify(param), searhFn, 'POST');
 				}
 			};
 			itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
@@ -444,13 +403,13 @@ let modifyObj = {
 		console.log(result);
 		pageObj.switchScreen('MODIFY');
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnBrandNm').text(result.brandNm);										// 브랜드
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품서생성일자
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPchPodrUnqNo').text(result.invPoInfoList[0].pchPodrUnqNo);			// 발주번호		
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품서생성일자
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnPodrTotalAmt').text(result.podrTotalAmt);							// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnWhsNm').text(result.whsNm);											// 발주총금액
 		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDeliTelNo').text(result.deliTelNo);									// 납품장소연락처
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val(result.dlvSchDt);			// 납품예정일
-		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvRegDt);									// 납품요청일
+		$('#ITP_FORM_ORDMNG02010_DETAIL .fnDlvRegDt').text(result.dlvReqDt);									// 납품요청일
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_NM').val(result.dlvMgrNm);			// 납품담당자
 		$('#ITP_FORM_ORDMNG02010_DETAIL #ITP_FORM_ORDMNG02010_DETAIL_DLV_MGR_TEL_NO').val(result.dlvMgrTelNo);	// 납품담당자연락처
 
@@ -462,11 +421,11 @@ let modifyObj = {
     			selRowData = $(ORDMNG02010_DETAIL_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
     		}
     		let podrQty = selRowData.podrQty;
-    		if(value > podrQty) {
-    			console.log(podrQty);
+    		if(Number(value) > Number(podrQty)) {
 				return [false, '발주수량 이하 값 입력'];
+			} else if (Number(value) < 0) {
+				return [false, '음수 입력 불가'];
 			} else {
-				console.log(podrQty);
 				return [true, ''];
 			}
 		};		
@@ -479,13 +438,11 @@ let modifyObj = {
     		}
     		let expryYn = selRowData.expryYn;
     		if (expryYn !== 'Y' && value.length > 0) {
-				console.log(expryYn);
 				return [false, '유통기한여부 N'];
 			} else {
-				console.log(expryYn);0
 				return [true, ''];
 			}
-		}		
+		};
 		modifyObj.grid.init('MODIFY', result.invPoInfoList);		
 	},
 	grid: {
@@ -504,6 +461,12 @@ let modifyObj = {
 			var option = {
 				gridId: _this.gridId,
 				colModel: [
+					{
+						index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+						label: ITP_MSG_LOCALE.label.pchPodrUnqNo,
+						width: '10', fixed: false, align: 'center',
+						sortable: false, hidden: true
+					},
 					{
 						index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
 						label: ITP_MSG_LOCALE.label.pchPodrDtlNo,  		//발주항번
@@ -557,14 +520,14 @@ let modifyObj = {
 						index: 'EXPRY_DATE', name: 'expryDate',
 						label: ITP_MSG_LOCALE.label.expryDate,  		//유통기한일자
 						width: '20', fixed: false, align: 'center',
-						sortable: false, hidden: false, /*edittype: 'text',*/
+						sortable: false, hidden: false, 
 						editable: true, sorttype: 'date',
 				        editoptions: {dataInit: function(e) {$(e).datepicker(ITP_DATE_LANGUAGE);}},
 				        editrules: {custom: true, custom_func: isExpryDate}
 					},
 					{
-						index: 'REMARK', name: 'remark',
-						label: ITP_MSG_LOCALE.label.remark,  			//비고
+						index: 'REMARK', name: 'deliDesc',				//API 비고 키
+						label: ITP_MSG_LOCALE.label.remark,  			//locale-ko 비고 값
 						width: '20', fixed: false, align: 'center',
 						sortable: false, hidden: false, edittype: 'text',
 						editable: true
@@ -586,12 +549,5 @@ let modifyObj = {
 		unload: function() {
 			$.jgrid.gridUnload(this.gridId);
 		}
-	}/*,
-	changeRows: function(gridRows) {
-		var modifyRows = [];
-		var chkColums = ['podrQty', 'expryDate', 'remark'];
-		$.each(this.rows, function(index, item) {
-			var row = gridRows[index];
-		});
-	}*/
+	}
 };