수정

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

@@ -27,23 +27,6 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar" style="width:9.6%;"></div>
-										<div class="col-xs-4 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_PCH_PODR_UNQ_NO" class="form-control itp_input" name="spchPodrUnqNo" placeholder="발주번호" />
-										</div>
-									</div>
-									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-2 itp_ip itp_noMar">
-											<div class="input-group">
-											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
-											<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
-												<span class="input-group-btn">
-													<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
-												</span>
-											</div>
-										</div>	
-										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
-											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<div class="input-group">
 											<input type="text" id="ITP_FORM_POMNG07010_DETAIL_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
@@ -56,6 +39,25 @@
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:10%;">
 											<button type="button" id="ITP_BTN_POMNG07010_SEARCH_WHS_ID" class="btn btn-success	 btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 										</div>
+									</div>
+									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
+										<div class="brandSearchCond">
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<div class="input-group">
+												<input type="text" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_NM" class="form-control itp_input" name="sspplyNm" placeholder="공급업체" readonly/>
+												<input type="hidden" id="ITP_FORM_POMNG07010_DETAIL_SPPLY_ID" class="form-control itp_input" name="sspplyId" />
+													<span class="input-group-btn">
+														<button id="ITP_BTN_POMNG07010_DELETE_SPPLY_ID" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+													</span>
+												</div>
+											</div>	
+											<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
+												<button type="button" id="ITP_BTN_POMNG07010_SEARCH_SPPLY_ID" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											</div>
+										</div>
+										<div class="col-xs-4 itp_ip itp_noMar">
+											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_PCH_PODR_UNQ_NO" class="form-control itp_input" name="spchPodrUnqNo" placeholder="발주번호" />
+										</div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_POMNG07010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 										</div>

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

@@ -181,6 +181,11 @@ let pageObj = {
 			$('#ITP_FORM_POMNG07010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
 			
 			$('#ITP_BTN_POMNG07010_EXCEL').show();
+			
+			if (fn_make_user_info.get('storeId') != '') {
+				$('.brandSearchCond').hide();	
+			}
+			
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(POMNG07010_GRID_ID, POMNG07010_GRID_LIST, 'lg');
@@ -358,7 +363,13 @@ let listObj = {
 			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			var whsdvsn = "W01";
+			if (fn_make_user_info.get('storeId') != '') {
+				whsdvsn = "W02";
+			}
+			
+			
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:whsdvsn};
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},

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

@@ -208,7 +208,10 @@ let pageObj = {
 			fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG04010_DETAIL_WHS_ST_CD', true, '선택');
 
 			// 조회일자 지정
-			$('#ITP_TAB_STOCKMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
+			$('#ITP_TAB_STOCKMNG04010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);		
+			
+			
+			$('#ITP_FORM_STOCKMNG04010_WHS_DVSN').val("W01");
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(STOCKMNG04010_GRID_ID, STOCKMNG04010_GRID_LIST, 'lg');
@@ -531,11 +534,23 @@ let modifyObj = {
 	},
 	button: {
 		modify: function (param) {
+			var storeId = $('#ITP_FORM_STOCKMNG04010_VIEW_STORE_ID').val();
+			if (storeId != '') {
+				console.log(fn_make_user_info.get('storeId'));
+				if (fn_make_user_info.get('storeId') != storeId) {
+					alert("매장 창고는 매장담당자만 수정 가능합니다.");
+					return;
+				}
+			}
+			
 			itp_fn_form_clear_validate(null, '#ITP_FORM_STOCKMNG04010_DETAIL');
 			const brandIdVal = $('#ITP_FORM_STOCKMNG04010_VIEW_BRAND_ID').val();
 			const whsIdVal = $('#ITP_FORM_STOCKMNG04010_VIEW_WHS_ID').val();
 			const key = {brandId: brandIdVal, whsId: whsIdVal, storeId: '', viewCd: 'R'};
 			var param = $.param(key);
+			
+			console.log(param);
+			
 			modifyObj.load(param);
 		}
 	},