Browse Source

재고관리, 재고실사 - 매장 관련 수정

marseyes 2 years ago
parent
commit
f4be91ea25

+ 1 - 0
src/main/webapp/app/popup/biz/BIZPOP_PO_STOCK_PROC.html

@@ -11,6 +11,7 @@
11
 						<div class="form-horizontal">
11
 						<div class="form-horizontal">
12
 							<form id="ITP_FORM_PO_STOCK_PROC_POPUP">
12
 							<form id="ITP_FORM_PO_STOCK_PROC_POPUP">
13
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID" name="brandId" value="">
13
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID" name="brandId" value="">
14
+								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_STORE_ID" name="storeId" value="">
14
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID" name="sourceWhsId" value="">
15
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID" name="sourceWhsId" value="">
15
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION" name="sourceLocation" value="">
16
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION" name="sourceLocation" value="">
16
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID" name="itemId" value="">
17
 								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID" name="itemId" value="">

+ 5 - 2
src/main/webapp/js/app/popup/biz/ITP_BIZPOP_PO_STOCK_PROC.js

@@ -41,6 +41,7 @@ var popPageObj = {
41
 	fnStockInfoCallback: function(result) {
41
 	fnStockInfoCallback: function(result) {
42
 		// alert(JSON.stringify(result))
42
 		// alert(JSON.stringify(result))
43
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val(result.brandId);
43
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val(result.brandId);
44
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_STORE_ID').val(popPageObj.args.storeId);
44
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID').val(result.whsId);
45
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID').val(result.whsId);
45
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION').val(result.location);
46
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION').val(result.location);
46
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID').val(result.itemId);
47
 		$('#ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID').val(result.itemId);
@@ -87,7 +88,8 @@ var popPageObj = {
87
 	}, 
88
 	}, 
88
 	fnWhsList: function(fnCall) {
89
 	fnWhsList: function(fnCall) {
89
 		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
90
 		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
90
-		const param = {sbrandId: brandIdVal, pagingYn: false};
91
+		const storeIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_STORE_ID').val();
92
+		const param = {sbrandId: brandIdVal,sstoreId: storeIdVal, pagingYn: false};
91
 		
93
 		
92
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
94
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
93
 			
95
 			
@@ -99,8 +101,9 @@ var popPageObj = {
99
 	}, 
101
 	}, 
100
 	fnLocationList: function(fnCall) {
102
 	fnLocationList: function(fnCall) {
101
 		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
103
 		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
104
+		const storeIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_STORE_ID').val();
102
 		const whsIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').val();	
105
 		const whsIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').val();	
103
-		const param = {brandId: brandIdVal, whsId: whsIdVal, pagingYn: false};
106
+		const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
104
 		
107
 		
105
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
108
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
106
 			
109
 			

+ 8 - 4
src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -138,6 +138,7 @@ let pageObj = {
138
 			
138
 			
139
 			// 브랜드ID 지정
139
 			// 브랜드ID 지정
140
 			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
140
 			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
141
+			$('#ITP_FORM_STOCKMNG01010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
141
 			
142
 			
142
 			pageObj.fnWhsList(function() {
143
 			pageObj.fnWhsList(function() {
143
 				pageObj.fnLocationList();
144
 				pageObj.fnLocationList();
@@ -205,7 +206,8 @@ let pageObj = {
205
 	}, 
206
 	}, 
206
 	fnWhsList: function(fnCall) {
207
 	fnWhsList: function(fnCall) {
207
 		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
208
 		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
208
-		const param = {sbrandId: brandIdVal, pagingYn: false};
209
+		const storeIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_STORE_ID').val();	
210
+		const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
209
 		
211
 		
210
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
212
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
211
 			
213
 			
@@ -216,9 +218,10 @@ let pageObj = {
216
 		}, 'POST');
218
 		}, 'POST');
217
 	}, 
219
 	}, 
218
 	fnLocationList: function(fnCall) {
220
 	fnLocationList: function(fnCall) {
219
-		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
221
+		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();
222
+		const storeIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_STORE_ID').val();	
220
 		const whsIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID').val();	
223
 		const whsIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID').val();	
221
-		const param = {brandId: brandIdVal, whsId: whsIdVal, pagingYn: false};
224
+		const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
222
 		
225
 		
223
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
226
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
224
 			
227
 			
@@ -258,11 +261,12 @@ let listObj = {
258
 		    	return;
261
 		    	return;
259
 			}
262
 			}
260
 			var brandId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).brandId;
263
 			var brandId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).brandId;
264
+			var storeIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_STORE_ID').val();
261
 			var whsId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).whsId;
265
 			var whsId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).whsId;
262
 			var location = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).location;
266
 			var location = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).location;
263
 			var itemId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).itemId;
267
 			var itemId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).itemId;
264
 			
268
 			
265
-			var args = {'brandId': brandId, 'whsId': whsId, 'location': location, 'itemId': itemId};			
269
+			var args = {'brandId': brandId, 'storeId': storeIdVal, 'whsId': whsId, 'location': location, 'itemId': itemId};			
266
 			fn_call_popup('biz', 'BIZPOP_PO_STOCK_PROC', '#ITP_ASIDE', function() {
270
 			fn_call_popup('biz', 'BIZPOP_PO_STOCK_PROC', '#ITP_ASIDE', function() {
267
 				listObj.button.search(); // 조회
271
 				listObj.button.search(); // 조회
268
 			}, args, 'S');
272
 			}, args, 'S');

+ 6 - 3
src/main/webapp/js/app/stockmng/ITP_STOCKMNG02010.js

@@ -305,6 +305,7 @@ let pageObj = {
305
 			// 브랜드ID 지정
305
 			// 브랜드ID 지정
306
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
306
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
307
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM').val(fn_make_user_info.get('brandNm'));
307
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM').val(fn_make_user_info.get('brandNm'));
308
+			$('#ITP_FORM_STOCKMNG02010_SEARCH_STORE_ID').val(fn_make_user_info.get('storeId'));
308
 			
309
 			
309
 			pageObj.fnWhsList(function() {
310
 			pageObj.fnWhsList(function() {
310
 				pageObj.fnLocationList();
311
 				pageObj.fnLocationList();
@@ -428,7 +429,8 @@ let pageObj = {
428
 	}, 
429
 	}, 
429
 	fnWhsList: function(fnCall) {
430
 	fnWhsList: function(fnCall) {
430
 		const brandIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val();	
431
 		const brandIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val();	
431
-		const param = {sbrandId: brandIdVal, pagingYn: false};
432
+		const storeIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_STORE_ID').val();	
433
+		const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
432
 		
434
 		
433
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
435
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
434
 			
436
 			
@@ -440,9 +442,10 @@ let pageObj = {
440
 		}, 'POST');
442
 		}, 'POST');
441
 	}, 
443
 	}, 
442
 	fnLocationList: function(fnCall) {
444
 	fnLocationList: function(fnCall) {
443
-		const brandIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val();	
445
+		const brandIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val();
446
+		const storeIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_STORE_ID').val();	
444
 		const whsIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_WHS_ID').val();	
447
 		const whsIdVal = $('#ITP_FORM_STOCKMNG02010_SEARCH_WHS_ID').val();	
445
-		const param = {brandId: brandIdVal, whsId: whsIdVal, pagingYn: false};
448
+		const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
446
 		
449
 		
447
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
450
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
448
 			
451