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

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

@@ -59,7 +59,7 @@ const gridColModel = {
 			index: 'SHMT_REQ_ST_CD', name: 'shmtReqStCd',
 			label: ITP_MSG_LOCALE.label.shmtReqStCd,			// 출하상태코드
 			minwidth: 120,
-			width: '10', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_PODR_DTL_ST_CD}
 		},
@@ -87,14 +87,14 @@ const gridColModel = {
 		{
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty,				// 출하수량
-			width: '8', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'SHMT_AMT', name: 'shmtAmt',
 			label: ITP_MSG_LOCALE.label.shmtAmt,				// 출하금액
-			width: '8', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -102,28 +102,28 @@ const gridColModel = {
 		{
 			index: 'WHS_QTY', name: 'whsQty',
 			label: ITP_MSG_LOCALE.label.whsQty,					// 입고수량
-			width: '8', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_AMT', name: 'whsAmt',
 			label: ITP_MSG_LOCALE.label.whsAmt,					// 입고금액
-			width: '8', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
 			label: ITP_MSG_LOCALE.label.whsCnfmNm,				// 입고확인자
-			width: '10', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'center',
 			minwidth: 100,
 			sortable: false, hidden: false
 		},
 		{
 			index: 'WHS_DT', name: 'whsDt',
 			label: ITP_MSG_LOCALE.label.whsDt,					// 입고일
-			width: '10', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			minwidth: 100,
 			sortable: false, hidden: false
 		},

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

@@ -72,7 +72,7 @@ const gridColModel = {
 		{
 			index: 'SHMT_REQ_ST_CD', name: 'colCmdDtlStCd',
 			label: ITP_MSG_LOCALE.label.colCmdDtlStCd,			// 수거지시상태
-			width: '7', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COL_CMD_DTL_ST_CD}
 		},
@@ -100,21 +100,21 @@ const gridColModel = {
 		{
 			index: 'SHMT_QTY', name: 'rtnQty',
 			label: ITP_MSG_LOCALE.label.rtnQty,				// 반품발주수량
-			width: '7', fixed: false, align: 'right',
+			width: '14', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_QTY', name: 'colQty',
 			label: ITP_MSG_LOCALE.label.colQty,				// 수거수량
-			width: '7', fixed: false, align: 'right',
+			width: '14', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'SHMT_AMT', name: 'colAmt',
 			label: ITP_MSG_LOCALE.label.colAmt,				// 수거금액
-			width: '8', fixed: false, align: 'right',
+			width: '14', fixed: false, align: 'right',
 			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }

src/main/webapp/js/app/main.js

@@ -14,13 +14,20 @@ let MAIN_CHART_SFT_STCK_CHART = '/api/main/chart/sft-stck-chart';
 let MAIN_CHART_DELI_CHART = '/api/main/chart/deli-chart';
 
 var chartCnt=0;
+function loadJS(url, implementationCode ) {
+	var scriptTag = document.createElement('script');
+	scriptTag.src = url;
+	scriptTag.onload = implementationCode;
+	scriptTag.onreadystatechange = implementationCode;
+	document.head.appendChild(scriptTag);
+};
 
 require(['config'], function() {
 	require([
 		'jquery', 
 		'jquery.bootstrap.fileUpload' //파일 업로드가 있는 페이지에서 로딩
 	], function($) {
-		
+		 
 		setTimeout(function() {
 			// 시간지정
 			// $('#ITP_FORM_MAIN_NOTICE_SEARCH_SCH_DT').val(itp_fn_date_format(new Date(), 2));
@@ -134,7 +141,16 @@ require(['config'], function() {
 				$('#ITP_MAIN_GRAPH_AREA').css('grid-template-columns','1fr 1fr 1fr');
 			}	
 
-		}, 300);		
+		}, 300);
+		
+		loadJS('./js/cpexcel.js', function() {
+			loadJS('./js/xlsx.js', function() {
+				if(XLSX.version!=='0.18.5') {
+					make_xlsx_lib(XLSX);
+				}
+				console.log("xxxxxx xlsx xxxxxx", XLSX);
+			});
+		});
 	});
 });
 

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

@@ -360,43 +360,50 @@ let modifyObj = {
 			listObj.grid.search();
 		},
 		save: function() {
-			const formId = '#ITP_FORM_ORDMNG02010_DETAIL';
-			itp_fn_form_clear_validate(null, formId);
-			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();
-			for (var i = 0; i < rowData.length; i++) {
-				rowData[i].podrQty = Number(rowData[i].podrQty);
-				rowData[i].shmtQty = Number(rowData[i].shmtQty);
-			}
 			
-			var now = new Date();
-			var today = now.getFullYear() +
-							"." + (now.getMonth()+1 > 9 ? (now.getMonth()+1).toString() : "0" + (now.getMonth()+1).toString()) +
-							"." + (now.getDate() > 9 ? now.getDate().toString() : "0" + now.getDate().toString());
+			$('body').trigger('click');
 			
+			const formId = '#ITP_FORM_ORDMNG02010_DETAIL';
+			itp_fn_form_clear_validate(null, formId);
 			
-			var dlvReqDt = $('#ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val();
-			if (today > dlvReqDt) {
-				alert("납품요청일은 오늘 이후이어야 합니다.");
-				return;
-			}	
+			if (itp_fn_form_event.isValid(formId)) {
 			
-			var modalFn = {
-				callBack: (args) => {
-					param.gridInsertData = rowData;
-					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');
+				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)
 				}
-			};
-			itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
+				let param = $(formId).serializeObject();
+				const rowData = $(ORDMNG02010_DETAIL_GRID_ID).getRowData();
+				for (var i = 0; i < rowData.length; i++) {
+					rowData[i].podrQty = Number(rowData[i].podrQty);
+					rowData[i].shmtQty = Number(rowData[i].shmtQty);
+				}
+				
+				var now = new Date();
+				var today = now.getFullYear() +
+								"." + (now.getMonth()+1 > 9 ? (now.getMonth()+1).toString() : "0" + (now.getMonth()+1).toString()) +
+								"." + (now.getDate() > 9 ? now.getDate().toString() : "0" + now.getDate().toString());
+				
+				
+				var dlvReqDt = $('#ITP_FORM_ORDMNG02010_DETAIL_DLV_SCH_DT').val();
+				if (today > dlvReqDt) {
+					alert("납품예정일은 오늘 이후이어야 합니다.");
+					return;
+				}	
+				
+				var modalFn = {
+					callBack: (args) => {
+						param.gridInsertData = rowData;
+						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');
+					}
+				};
+				itp_fn_modal_confirm('납품서 생성 하시겠습니까?', modalFn);
+			}
 		},
 		recal: function() {
 			var ids = $(ORDMNG02010_DETAIL_GRID_ID).getDataIDs();

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

@@ -62,8 +62,8 @@ const gridColModel = {
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm,
 			width: '8', fixed: false, align: 'left',
-			sortable: true, editable: false, edittype: 'text',
-			editrules: { required: true }
+			sortable: false, editable: false, edittype: 'text',
+			editrules: { required: true }, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
@@ -83,9 +83,8 @@ const gridColModel = {
 			label: '반품수량', classes: 'input_color',
 			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
-			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"}, 
-			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' },
-			editoptions: {maxlength: 10}
+			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10}, 
+			formatter:'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' },
 		},
 		{
 			index: 'RTN_AMT', name: 'rtnAmt',

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

@@ -26,8 +26,8 @@ const gridColModel = {
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: '브랜드', 
-			width: '10', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			width: '13', fixed: false, align: 'left',
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'RTN_PODR_UNQ_NO', name: 'rtnPodrUnqNo',
@@ -44,64 +44,59 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, 			// 품목번호
-			minwidth:140,
-			width: '8', fixed: false, align: 'center',
+			width: '16', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, 			// 품목명
-			minwidth:120,
-			width: '8', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			width: '12', fixed: false, align: 'left',
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'RODR_QTY', name: 'rodrQty',
 			label: '반품발주수량', 
-			minwidth:140,
-			width: '5', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'COL_REQ_QTY', name: 'colReqQty',
 			label: '수거요청수량', 
-			minwidth:140,
-			width: '5', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'COL_QTY', name: 'colQty',
 			label: '수거수량', 
-			minwidth:100,
-			width: '5', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false, 
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'COL_AMT', name: 'colAmt',
 			label: '수거금액', 
-			width: '8', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			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
+			width: '14', fixed: false, align: 'left',
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'COL_SCH_DT', name: 'colSchDt',
 			label: '수거예정일', 
-			width: '8', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'PICK_MGR_NM', name: 'pickMgrNm',
 			label: '수거담당자명', 
-			width: '8', fixed: false, align: 'left',
+			width: '11', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{

src/main/webapp/js/app/salesmng/ITP_SALESMNG02010.js

@@ -41,13 +41,13 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목번호",
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
 		},		
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: "품목명",
-			width: '15', fixed: false, align: 'left',
+			width: '12', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},		
 		{

src/main/webapp/js/app/settmng/ITP_SETTMNG01010.js

@@ -121,14 +121,14 @@ const gridColModel = {
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: "단가",
-			width: '7', fixed: false, align: 'right',
+			width: '12', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: "발주수량",
-			width: '7', fixed: false, align: 'right',
+			width: '13', fixed: false, align: 'right',
 			minwidth: 80,
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -136,7 +136,7 @@ const gridColModel = {
 		{
 			index: 'DLV_QTY', name: 'dlvQty',
 			label: "납품수량",
-			width: '7', fixed: false, align: 'right',
+			width: '13', fixed: false, align: 'right',
 			minwidth: 80,
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -144,7 +144,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_QTY', name: 'whsColQty',
 			label: "입고/수거수량",
-			width: '10', fixed: false, align: 'right',
+			width: '13', fixed: false, align: 'right',
 			minwidth: 100,
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -159,8 +159,7 @@ const gridColModel = {
 		{
 			index: 'WHS_COL_AMT', name: 'whsColAmt',
 			label: "입고/수거금액",
-			width: '10', fixed: false, align: 'right',
-			minwidth: 100,
+			width: '13', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
@@ -173,20 +172,19 @@ const gridColModel = {
 		{
 			index: 'STTL_DVSN_NM', name: 'sttlDvsnNm',
 			label: "정산구분",
-			width: '8', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'PODR_UNQ_NO', name: 'podrUnqNo',
 			label: "발주번호",
-			width: '8', fixed: false, align: 'center',
-			minwidth: 140,
+			width: '16', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'PODR_DTL_NO', name: 'podrDtlNo',
 			label: "발주항번",
-			width: '7', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		}	
 	],

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -709,6 +709,37 @@ let modifyObj = {
 };
 
 /*신규화면 Object*/
+function fn_grid_new(option) {
+	var options = $.extend({
+		mtype: 'POST',
+		multiselect: false,
+		rownumbers: true,
+		ondblClickRow: null,
+		loadBeforeSend: function(jqXHR) {
+			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+		},
+		loadError: function(jqXHR, textStatus, errorThrown) {
+			itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
+		}
+	}, option); 
+	$(options.gridId).jqGrid({
+		colModel: options.colModel,
+		postData: JSON.stringify(options.param),
+		mtype: options.mtype,
+		url: options.url, 
+		rowNum: 10000,
+		multiselect: options.multiselect, 
+		loadBeforeSend: options.loadBeforeSend,
+		onCellSelect: options.onCellSelect,
+		ondblClickRow: options.ondblClickRow,
+		loadComplete: options.loadComplete,
+		loadError: options.loadError,
+		gridComplete: function () {
+			$(STINFO06010_DETAIL_GRID_ID+'View').html("전체: "+$(options.gridId).getGridParam('records')+'건')
+		}
+	});
+}
+
 let createObj = {
 	init: function (param) {
 		pageObj.switchScreen('ADD');
@@ -825,7 +856,7 @@ let createObj = {
 					itp_fn_grid_paging(STINFO06010_GRID_ID, action, param);
 				}
 			};
-			itp_fn_grid_make_remote(option);
+			fn_grid_new(option);
 		},
 		clearData : function() {
 			$(STINFO06010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
@@ -846,6 +877,10 @@ let createObj = {
 				$('#ITP_FORM_STINFO06010_DETAIL_STORE_ID').val(rowDataPop[0].storeId);
 				$('#ITP_FORM_STINFO06010_DETAIL_STORE_NM').val(rowDataPop[0].storeNm);
 			}
+			// 강제로 팝업 창닫기 실행
+			setTimeout(function() {
+				$('#ITP_BIZPOP_BRAND_STORE').modal('hide');
+			}, 500);
 		};
 		fn_call_popup('biz', 'BIZPOP_BRAND_STORE', '#ITP_ASIDE', popFn, null, 'S');
 	},

src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -45,14 +45,14 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
 			width: '10', fixed: false, align: 'center',
 			minwidth: 120,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
 			width: '10', fixed: false, align: 'left',
 			minwidth: 100,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'WHS_ID', name: 'whsId',
@@ -66,20 +66,19 @@ const gridColModel = {
 			label: "창고명", 
 			width: '13', fixed: false, align: 'left',
 			minwidth: 120,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location명", 
 			width: '10', fixed: false, align: 'left',
 			minwidth: 140,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: "품목번호", 
-			width: '11', fixed: false, align: 'center',
-			minwidth: 180,
+			width: '15', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -98,23 +97,21 @@ const gridColModel = {
 		{
 			index: 'STCK_QTY', name: 'stckQty',
 			label: "현재고수량", 
-			width: '8', fixed: false, align: 'right',
-			minwidth: 100,
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
 			label: "적정재고수량", 
-			width: '9', fixed: false, align: 'right',
-			minwidth: 100,
+			width: '12', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
 			label: "안전재고비율(%)", 
-			width: '11', fixed: false, align: 'right',
+			width: '10', fixed: false, align: 'right',
 			minwidth: 120,
 			sortable: false, hidden: false
 		},

src/main/webapp/js/app/stockmng/ITP_STOCKMNG02010.js

@@ -72,7 +72,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
@@ -90,13 +90,13 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location", 
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},		
 		{
 			index: 'CDD_MGR_NM', name: 'cddMgrNm',
@@ -135,7 +135,7 @@ const gridColModel = {
 			label: "브랜드",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'WHS_ID', name: 'whsId',
@@ -149,14 +149,14 @@ const gridColModel = {
 			label: "창고명",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
@@ -170,28 +170,30 @@ const gridColModel = {
 			label: "품목명",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: "단위",
-			width: '8', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'COM_EXST_QTY', name: 'comExstQty',
 			label: "현재고수량",
-			width: '8', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false},
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'CDD_QTY', name: 'cddQty',
 			label: "실사수량",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false},
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		}
 	],
 	detail: [
@@ -204,7 +206,7 @@ const gridColModel = {
 		{
 			index: 'NORMAL_YN', name: 'normalYn',
 			label: "정상여부",
-			width: '5', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			minwidth: 100,
 			editrules: {required: false}
@@ -214,28 +216,28 @@ const gridColModel = {
 			label: "에러메시지",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: "브랜드",
 			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'WHS_ID', name: 'whsId',
 			label: "창고번호",
-			width: '10', fixed: false, align: 'center',
+			width: '8', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명",
-			width: '10', fixed: false, align: 'left',
+			width: '11', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
@@ -243,7 +245,7 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'left',
 			sortable: false, editable: false, edittype: 'text',
 			minwidth: 100,
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
@@ -257,30 +259,32 @@ const gridColModel = {
 			label: "품목명",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false}, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: "단위",
-			width: '8', fixed: false, align: 'center',
+			width: '5', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'STCK_QTY', name: 'stckQty',
 			label: "현재고수량",
-			width: '8', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: false}
+			editrules: {required: false},
+			formatter: 'integer', formatoptions: {thousandsSeparator: ','}
 		},
 		{
 			index: 'CDD_QTY', name: 'cddQty',
 			label: "실사수량",
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			classes: 'input_color',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false},
-			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"}
+			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');", maxlength: 10},
+			formatter:'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' },
 		}
 	]
 };

src/main/webapp/js/app/stockmng/ITP_STOCKMNG03010.js

@@ -51,7 +51,7 @@ const gridColModel = {
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
 			width: '10', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
@@ -69,13 +69,13 @@ const gridColModel = {
 			index: 'WHS_NM', name: 'whsNm',
 			label: "창고명", 
 			width: '13', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
 			label: "Location명", 
 			width: '10', fixed: false, align: 'left',
-			sortable: false, hidden: false
+			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
@@ -99,7 +99,7 @@ const gridColModel = {
 			index: 'PRP_STCK_QTY', name: 'prpStckQty',
 			label: "적정재고수량", 
 			classes: 'input_color',
-			width: '8', fixed: false, align: 'right',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false},
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"},
@@ -109,7 +109,7 @@ const gridColModel = {
 			index: 'SFT_STCK_RT', name: 'sftStckRt',
 			label: "안전재고비율(%)", 
 			classes: 'input_color',
-			width: '10', fixed: false, align: 'right',
+			width: '9', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: false},
 			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');"}

src/main/webapp/main.html

@@ -39,7 +39,6 @@
 	</script>
 
 	<script src="./js/app/properties.js"></script>
-	<script src="./js/cpexcel.js"></script>
 	<script src="./js/require.min.js" data-main="./js/app/config.js"></script>
 
 	<style>
@@ -844,8 +843,6 @@
 		</footer>
 		
 		<aside id="ITP_ASIDE"></aside>	 
-	</div> 
-	
-	<script src="./js/xlsx.js"></script>
+	</div>  
 </body>
 </html>

src/main/webapp/mobile/app/main.html

@@ -110,22 +110,48 @@
 				<div class="itp_note_header">
 					<h1>> 공지사항</h1>
 				</div>
+				<div id="ITP_MODAL_NOTE_INFO" class="itp_note_popup modal itp_modal" style="display:block">
+					<div class="popup_note">
+						<div class="header">
+							<div class="header_left">
+								<label>매장</label>
+							</div>
+							<div class="header_right">
+								<button type="button" id="ITP_BTN_MAIN_POP_NOTE_CLOSE"><img src="../img/close.png"></button>
+							</div>
+						</div>
+						<div class="itp_pop_note_area">
+							<div class="itp_note_title">
+								<label>공지제목</label>
+								<span>:</span>
+								<div class="fnNoteNm">fasdddddddddddddddddddddddddddddddddddd</div>
+							</div>
+							<div class="itp_pop_note_content">
+								<div class="fnNote">fasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasdfasd</div>
+							</div>
+						</div>
+					</div>
+				</div>
 				<div class="itp_note_bar" style="display: none;">
 					<h1>등록된 게시물이 없습니다.</h1>
 				</div>
-				<div class="itp_note_bar" style="display: block;">
-					<li>
-						<div class="itp_note_info">
-							<label>공지제목</label>
-							<span>:</span>
-							<div class="under fnNoteTitle">공지제목 테스트 ㅁㄴㅇㄻㄴㅇㄻ</div>
-						</div>
-						<div class="itp_note_info">
-							<label>공지일</label>
-							<span>:</span>
-							<div class="fnNoteDt">2020.20.20</div>
+				<div class="itp_note_bar">
+					<ul id="ITP_NOTE_ROW" class="mb_0 panel-group itp_nav">
+						<div id="ITP_NOTE_ROWCOPY" style="display: block;">
+							<li>
+								<div class="itp_note_info">
+									<label>공지제목</label>
+									<span>:</span>
+									<div class="under fnNoteTitle">공지제목 테스트 ㅁㄴㅇㄻㄴㅇㄻ</div>
+								</div>
+								<div class="itp_note_info">
+									<label>공지일</label>
+									<span>:</span>
+									<div class="fnNoteDt">2020.20.20</div>
+								</div>
+							</li>
 						</div>
-					</li>
+					</ul>
 				</div>
 				<div class="itp_note_header">
 					<h1>> 운영정보</h1>

src/main/webapp/mobile/css/style.css

@@ -672,7 +672,26 @@ button.close {-webkit-appearance: none; padding: 0; cursor: pointer; background:
 #ITP_MAIN_CONTAINER .itp_oper_info_area .itp_oper_info div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align: right; width:calc(100% - 114px);}
 #ITP_MAIN_CONTAINER .itp_graph_area {width:98%; height:300px; border:1px solid #aaa; margin:5px 1%;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header {width:220px; margin:5px;}
-#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt;}
+#ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header label {width:80px; font-size:14pt; text-align:left;}
 #ITP_MAIN_CONTAINER .itp_graph_area .itp_graph_header select {}
 #ITP_MAIN_CONTAINER #ITP_GRAPH_INFO {height:265px;}
+/* 공지사항 팝업추가 */
+.itp_note_popup {position: absolute; top:46px; width: 100%; height: calc(100vh - 49px); background: rgba(200, 200,200, 0.8); z-index: 11;}
+.itp_note_popup .popup_note {position:relative; top:20px; width:96%; margin:0 2%;}
+.itp_note_popup .popup_note .header {position: relative; height: 40px; background: #f0831e; color:#eee; border: 1px solid #000; border-top-right-radius: 10px; border-top-left-radius: 10px;}
+.itp_note_popup .popup_note .header .header_left {padding-top: 12px;}
+.itp_note_popup .popup_note .header .header_left label {font-size: 16px; font-weight:100;} 
+.itp_note_popup .popup_note .header .header_right {float: right; padding-right: 10px; position:relative; top:-44px;}
+.itp_note_popup .popup_note .header .header_right button {border: none; background: transparent; margin:3px -5px;}
+.itp_note_popup .popup_note .header .header_right button img {width:22px;}
+.itp_note_popup .popup_note .itp_pop_note_area {background:#fff; height:70vh; border:1px solid #000; border-top:none;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title { display:flex; padding:10px; width:85%; height:45px;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title label {width:60px; font-size:12pt;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title span {width:10px;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_note_title div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left; width:calc(100% - 70px);}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_pop_note_content {border:1px solid #aaa; width:98%; height:calc(100% - 60px); margin:0 1%; padding:8px;}
+.itp_note_popup .popup_note .itp_pop_note_area .itp_pop_note_content div {height:100%; word-break:break-all;}
+
+
+