발주부분 수정 조치함

src/main/webapp/app/stockmng/STOCKMNG03010.html

@@ -66,8 +66,8 @@
 						</div>
 					</div>
 					<div class="pull-right itp_cicon itp_gird_btn">
-						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
-						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-primary btn-sm DRB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
+						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_ADDROW" class="btn btn-primary btn-sm SHOW"><i class="glyphicon "></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
+						<button type="button" id="ITP_BTN_STOCKMNG03010_DETAIL_DELROW" class="btn btn-danger btn-sm SHOW"><i class="glyphicon "></i>&nbsp;&nbsp;품목삭제&nbsp;&nbsp;</button>
 					</div>
 					<div class="itp_table fix">
 						<div id="ITP_STOCKMNG03010_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">

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

@@ -515,7 +515,7 @@ function fn_make_side_menu() {
 			}
 		}
 
-		if (tabSize > 10) {
+		if (tabSize > 15) {
 			itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noMoreTab);
 			return false;
 		}
@@ -1247,7 +1247,7 @@ function itp_fn_open_tab(param) {
 	const id = param.navId;
 	const tabSize = $('#ITP_HEADER .itp_tab_list li').size();
 
-	if (tabSize > 10) {
+	if (tabSize > 15) {
 		itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noMoreTab);
 		return false;
 	}
@@ -1284,7 +1284,7 @@ function itp_fn_open_tab_self(param, fn) {
 	const id = param.navId;
 	const tabSize = $('#ITP_HEADER .itp_tab_list li').size();
 
-	if (tabSize > 10) {
+	if (tabSize > 15) {
 		itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noMoreTab);
 		return false;
 	}

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

@@ -351,7 +351,7 @@ let pageObj = {
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(INOUTMNG01010_GRID_ID, INOUTMNG01010_GRID_LIST, 'lg');
-			listObj.empty.init();
+			//listObj.empty.init();
 			itp_fn_fire_window_resize();
 		},
 		ready: function() {
@@ -568,6 +568,7 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
+			/*
 			var _this = this;
 			this.push();
 			$(INOUTMNG01010_GRID_EMPTY).on('click', function() {
@@ -575,13 +576,17 @@ let listObj = {
 				_this.itp_INOUTMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
 				$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_INOUTMNG01010_param)}).trigger('reloadGrid');
 			});
+			*/
 		},
 		itp_INOUTMNG01010_param: {},
 		push: function() {
+			/*
 			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
 			listObj.itp_INOUTMNG01010_param = param;
+			*/
 		},
 		back: function() {
+			/*
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').val(this.itp_INOUTMNG01010_param.fromDt);
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').val(this.itp_INOUTMNG01010_param.toDt);
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val(this.itp_INOUTMNG01010_param.sshmtWhsId);
@@ -589,6 +594,7 @@ let listObj = {
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val(this.itp_INOUTMNG01010_param.swhsNm);
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val(this.itp_INOUTMNG01010_param.swhsId);
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM').val(this.itp_INOUTMNG01010_param.sItemNm);
+			*/
 		}
 	},
 	grid: {

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

@@ -88,26 +88,30 @@ const gridColModel = {
 			index: 'SHMT_QTY', name: 'shmtQty',
 			label: ITP_MSG_LOCALE.label.shmtQty,				// 출하수량
 			width: '8', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			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',
 			minwidth: 80,
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_QTY', name: 'whsQty',
 			label: ITP_MSG_LOCALE.label.whsQty,					// 입고수량
 			width: '8', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			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',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_CNFM_NM', name: 'whsCnfmNm',
@@ -167,7 +171,7 @@ let pageObj = {
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(INOUTMNG02010_GRID_ID, INOUTMNG02010_GRID_LIST, 'lg');
-			listObj.empty.init();
+			//listObj.empty.init();
 			itp_fn_fire_window_resize();
 		},
 		ready: function() {
@@ -306,6 +310,7 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
+			/*
 			var _this = this;
             this.push();
             $(INOUTMNG02010_GRID_EMPTY).on('click', function() {
@@ -313,16 +318,21 @@ let listObj = {
                 listObj.itp_INOUTMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
                 $(INOUTMNG02010_GRID_ID).setGridParam({'postData': JSON.stringify(listObj.itp_INOUTMNG02010_param)}).trigger('reloadGrid');
             });
+*/
 		},
 		push: function() {
+			/*
             let param = $('#ITP_FORM_INOUTMNG02010_SEARCH').serializeObject();
             listObj.itp_INOUTMNG02010_param = param;
             param.sidx = '0';
+*/
         },
         back: function() {
+	/*
             $('#ITP_FORM_INOUTMNG02010_SERVICE_BRAND_TYPE').val(listObj.itp_INOUTMNG02010_param.brandType);
             $('#ITP_FORM_INOUTMNG02010_SERVICE_ST_CD').val(listObj.itp_INOUTMNG02010_param.stCd);
             $('#ITP_FORM_INOUTMNG02010_SEARCH_BRAND_NM').val(listObj.itp_INOUTMNG02010_param.brandNm);
+*/
         }
 	},
 	grid: {

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

@@ -356,6 +356,18 @@ let modifyObj = {
 				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;
@@ -392,6 +404,7 @@ let modifyObj = {
 	},
 	empty: {
 		init: function() {
+			/*
             var _this = this;
             this.push();
             $(ORDMNG02010_VIEW_GRID_EMPTY).on('click', function() {
@@ -399,15 +412,20 @@ let modifyObj = {
                 modifyObj.itp_ORDMNG02010_param.gridSize = $.jgrid.defaults.rowNum;
                 $(ORDMNG02010_DETAIL_GRID_ID).setGridParam({'postData': JSON.stringify(modifyObj.itp_ORDMNG02010_param)}).trigger('reloadGrid');
             });
+*/
         },
         push: function() {
+	/*
             let param = $('#ITP_FORM_ORDMNG02010_DETAIL').serializeObject();
             modifyObj.itp_ORDMNG02010_param = param;
+*/
         },
         back: function() {
+	/*
             $('#ITP_FORM_ORDMNG02010_SERVICE_BRAND_TYPE').val(modifyObj.itp_ORDMNG02010_param.brandType);
             $('#ITP_FORM_ORDMNG02010_SERVICE_ST_CD').val(modifyObj.itp_ORDMNG02010_param.stCd);
             $('#ITP_FORM_ORDMNG02010_SEARCH_BRAND_NM').val(modifyObj.itp_ORDMNG02010_param.brandNm);
+*/
         }
 	},
 	load: function(param) {

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

@@ -342,7 +342,7 @@ let pageObj = {
 		
 		var whsDvsn = "";
 		if (fn_make_user_info.get('storeId') == '' ) {
-			whsDvsn = "W01";
+			whsDvsn = "";
 		} else {
 			whsDvsn = "W02";
 		}

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

@@ -341,7 +341,7 @@ let pageObj = {
 			
 		},
 		grid: function() {
-			listObj.empty.init();
+			//listObj.empty.init();
 			itp_fn_jqgrid_resize(POMNG03010_GRID_ID, POMNG03010_GRID_LIST, 'lg');
 		},
 		ready: function() {
@@ -875,6 +875,7 @@ let listObj = {
 	},
 	empty: {
 		init: function() {
+			/*
 			var _this = this;
 			this.push();
 			$(POMNG03010_GRID_EMPTY).on('click', function() {
@@ -882,13 +883,17 @@ let listObj = {
 				_this.itp_POMNG03010_param.gridSize = $.jgrid.defaults.rowNum;
 				$(POMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_POMNG03010_param)}).trigger('reloadGrid');
 			});
+			*/
 		},
 		itp_POMNG03010_param: {},
 		push: function() {
+			/*
 			let param = $('#ITP_FORM_POMNG03010_SEARCH').serializeObject();
 			listObj.itp_POMNG03010_param = param;
+			*/
 		},
 		back: function() {
+			/*
 			$('#ITP_FORM_POMNG03010_SEARCH_FROM_DT').val(this.itp_POMNG03010_param.fromDt);
 			$('#ITP_FORM_POMNG03010_SEARCH_TO_DT').val(this.itp_POMNG03010_param.toDt);
 			$('#ITP_FORM_POMNG03010_SEARCH_SPPLY_ID').val(this.itp_POMNG03010_param.sspplyId);
@@ -896,6 +901,7 @@ let listObj = {
 			$('#ITP_FORM_POMNG03010_SEARCH_WHS_NM').val(this.itp_POMNG03010_param.swhsNm);
 			$('#ITP_FORM_POMNG03010_SEARCH_WHS_ID').val(this.itp_POMNG03010_param.swhsId);
 			$('#ITP_FORM_POMNG03010_SEARCH_ITEM_NM').val(this.itp_POMNG03010_param.sitemNm);
+			*/
 		}
 	},
 	grid: {

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

@@ -60,7 +60,7 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'LOCATION_NM', name: 'locationNm',
+			index: 'WHS_NM', name: 'whsNm',
 			label: ITP_MSG_LOCALE.label.locationNm, 		// 입고처
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false

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

@@ -295,6 +295,7 @@ let listObj = {
 						param.dlvCnfmDocFileNo = "";
 						param.gridInsertData = gridInsertData;
 						console.log(JSON.stringify(param));
+						
 						var searhFn = function () {
 							//ITP_FORM_INOUTMNG01010_DETAIL_IS_WRITING = false;
 							listObj.button.search();

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

@@ -299,6 +299,7 @@ let listObj = {
 			fn_ajax_call(STOCK_BASE_MNG_SAVE, JSON.stringify(param), searhFn, 'POST');
 		}, 
 		addItem: function() {
+			console.log("=============");
 			var brandId = $('#ITP_FORM_STOCKMNG03010_SEARCH_BRAND_ID').val();
 			
 			var args = {'brandId': brandId};