창고 팝업 구분자 정의함...

src/main/webapp/app/popup/biz/BIZPOP_WHS_LOCATION.html

@@ -4,9 +4,10 @@
 			<form id="ITP_FORM_BIZPOP_WHS_LOCATION">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_BRAND_ID" name="sbrandId" value="">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_STORE_ID" name="sstoreId" value="">
+				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_WHS_DVSN" name="swhsDvsn" value="">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-					<h5 class="modal-title">납품장소 검색</h5>
+					<h5 class="modal-title">창고 검색</h5>
 				</div>
 				<div class="modal-body">
 					<div class="itp_form fix">

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

@@ -230,12 +230,12 @@ let listObj = {
 	},
 	action: function () {
 		var _this = this;
-		// 납품장소 조회 버튼 클릭
+		// 출하창고 조회 버튼 클릭
 		$('#ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_NM').on('click', function() {
 			console.log("=================================");
 			_this.popup('S');
 		});
-		// 납품장소 텍스트 삭제 버튼 클릭
+		// 출하창고 텍스트 삭제 버튼 클릭
 		$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').on('click', function() {
 			console.log("=================================");
 			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val('');
@@ -243,7 +243,7 @@ let listObj = {
 			
 		});
 		
-		// 수정 화면에서의 납품장소 조회 버튼 클릭
+		// 납품장소 조회 버튼 클릭
 		$('#ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM').on('click', function() {
 			console.log("=================================");
 			_this.popup('W');
@@ -265,7 +265,18 @@ let listObj = {
 			popFn = this.callback.whs;
 		}
 		
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		var whsDvsn = "";
+		
+		if (arg == "S") {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		const key = {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, key, 'S');
 		
 	},

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

@@ -405,12 +405,22 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn ;
+		
 		if(keyword == 'shmtWhs') {
 			popFn = this.callback.shmtWhs;
 		} else if(keyword == 'whs'){
 			popFn = this.callback.whs;
 		}
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
+		var whsDvsn = "";
+		if(keyword == 'shmtWhs') {
+			whsDvsn = "W01";
+		} else if(keyword == 'whs'){
+			whsDvsn = "W02";
+		}
+		
+		
+		const key = {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, key, 'S');
 		
 	},

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

@@ -406,7 +406,7 @@ let listObj = {
 	popup: function() {
 		// 팝업
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 	},
 	callback: {

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

@@ -232,7 +232,7 @@ let pageObj = {
 			popFn = this.callback.searWhs;
 		} 
 		
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
 		if (arg == "SW" ) {
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		} 

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

@@ -127,7 +127,15 @@ let pageObj = {
 	popup: function () {
 		// 팝업
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
+		var whsDvsn = "";
+		if (fn_make_user_info.get('storeId') == '' ) {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		const key = {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, key, 'S');
 		
 	},

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

@@ -329,7 +329,15 @@ let pageObj = {
 			popFn = this.callback.modify;
 		}
 		
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		var whsDvsn = "";
+		if (fn_make_user_info.get('storeId') == '' ) {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		
+		const key = {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, key, 'S');
 		
 	},

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

@@ -443,12 +443,13 @@ let pageObj = {
 		
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 		if (arg == "SW" ) {
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+			const keya = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, keya, 'S');
 		} else if (arg == "SS" || arg == "NS" ) {
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if (arg == "SHW" || arg == "NHW") {
-			const key1 = {brandId:fn_make_user_info.get('brandId')};
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
+			const keyb = {brandId:fn_make_user_info.get('brandId'),storeId:"", whsDvsn:"W01"};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, keyb, 'S');
 		} else if (arg == "REJ" ) {
 			/* 선택ROW가져오기 */
 			const rowKey = $(POMNG03010_GRID_ID).getGridParam('selrow');

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

@@ -408,11 +408,13 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
 		if(keyword === 'spply'){
+			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'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},
 	callback: {

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

@@ -334,11 +334,13 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		// const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		 
 		if(keyword === 'spply'){
-			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			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'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},
 	callback: {

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

@@ -19,6 +19,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 
 	$('#ITP_FORM_BIZPOP_WHS_LOCATION_BRAND_ID').val(fn_make_user_info.get('brandId'));
 	$('#ITP_FORM_BIZPOP_WHS_LOCATION_STORE_ID').val(fn_make_user_info.get('storeId'));
+	$('#ITP_FORM_BIZPOP_WHS_LOCATION_WHS_DVSN').val(args.whsDvsn);
 
 	
 	$('#ITP_BIZPOP_WHS_LOCATION').one('shown.bs.modal', function(e) {