marseyes пре 2 година
родитељ
комит
b794b58a07

+ 2 - 6
src/main/webapp/app/stockmng/STOCKMNG01010.html

@@ -19,14 +19,10 @@
19 19
 									<div class="form-group">
20 20
 										<div class="col-xs-10">
21 21
 											<div class="col-xs-2 itp_ip itp_noMar">
22
-												<select id="ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId">
23
-													<option value="">창고</option>											
24
-												</select>	
22
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"></select>	
25 23
 											</div>
26 24
 											<div class="col-xs-3 itp_ip itp_noMar">
27
-												<select id="ITP_FORM_STOCKMNG01010_SEARCH_LOCATION" class="form-control itp_input" name="slocation">
28
-													<option value="">판매용/B품/폐기품</option>											
29
-												</select>										
25
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_LOCATION" class="form-control itp_input" name="slocation"></select>										
30 26
 											</div>
31 27
 										</div>
32 28
 									</div>

+ 6 - 80
src/main/webapp/js/app/config.js

@@ -633,14 +633,13 @@ function fn_make_select_store(options, select_id, all_show_yn, all_name, all_val
633 633
 	}
634 634
 	$.each(options, function(key, value) {
635 635
 		$('<option/>', {
636
-            'value': value.storeNo,	// 매장번호
637
-            'data-sale-store-no': value.saleStoreNo,	// 판매매장번호
636
+            'value': value.storeId,	// 매장번호
638 637
             'text': value.storeNm	// 매장명
639 638
         }).appendTo($select_id);
640 639
 	});
641 640
 };
642 641
 
643
-function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포스 셀렉트 박스 만들기
642
+function fn_make_select_whs(options, select_id, all_show_yn, all_name) { //창고 셀렉트 박스 만들기
644 643
 	$select_id = $('#' + select_id);
645 644
 	$select_id.empty();
646 645
 	if(all_show_yn == true) {
@@ -648,67 +647,8 @@ function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포
648 647
 	}
649 648
 	$.each(options, function(key, value) {
650 649
 		$('<option/>', {
651
-            'value': value.posNo,	// 포스번호
652
-            'text': value.posNo		// 포스명
653
-        }).appendTo($select_id);
654
-	});
655
-};
656
-
657
-function fn_make_select_van(options, select_id, all_show_yn, all_name) { //매장 셀렉트 박스 만들기
658
-	$select_id = $('#' + select_id);
659
-	$select_id.empty();
660
-	if(all_show_yn == true) {
661
-		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
662
-	}
663
-	$.each(options, function(key, value) {
664
-		$('<option/>', {
665
-            'value': value.vanCd,	// VAN코드
666
-            'text': value.vanNm		// VAN명
667
-        }).appendTo($select_id);
668
-	});
669
-};
670
-
671
-function fn_make_select_class(options, select_id, all_show_yn, all_name) { //카테고리 셀렉트 박스 만들기
672
-	$select_id = $('#' + select_id);
673
-	$select_id.empty();
674
-	if(all_show_yn == true) {
675
-		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
676
-	}
677
-	if(options == null) {
678
-		return;
679
-	}
680
-	$.each(options, function(key, value) {
681
-		$('<option/>', {
682
-            'value': value.classCd,	
683
-            'text': value.classNm	
684
-        }).appendTo($select_id);
685
-	});
686
-};
687
-
688
-function fn_make_select_corner(options, select_id, all_show_yn, all_name) { //코너 셀렉트 박스 만들기
689
-	$select_id = $('#' + select_id);
690
-	$select_id.empty();
691
-	if(all_show_yn == true) {
692
-		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
693
-	}
694
-	$.each(options, function(key, value) {
695
-		$('<option/>', {
696
-            'value': value.cornerCd,	
697
-            'text': value.cornerNm	
698
-        }).appendTo($select_id);
699
-	});
700
-};
701
-
702
-function fn_make_select_workplace(options, select_id, all_show_yn, all_name) { //사업장 셀렉트 박스 만들기
703
-	$select_id = $('#' + select_id);
704
-	$select_id.empty();
705
-	if(all_show_yn == true) {
706
-		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
707
-	}
708
-	$.each(options, function(key, value) {
709
-		$('<option/>', {
710
-            'value': value.wkpeNo,	// 사업장번호
711
-            'text': value.wkpeNm	// 사업장명
650
+            'value': value.whsId,	// 창고아이디
651
+            'text': value.whsNm		// 창고명
712 652
         }).appendTo($select_id);
713 653
 	});
714 654
 };
@@ -721,22 +661,8 @@ function fn_make_select_location(options, select_id, all_show_yn, all_name) { //
721 661
 	}
722 662
 	$.each(options, function(key, value) {
723 663
 		$('<option/>', {
724
-            'value': value.lctnNo,	// 위치번호
725
-            'text': value.lctnNm	// 위치명
726
-        }).appendTo($select_id);
727
-	});
728
-};
729
-
730
-function fn_make_select_category(options, select_id, all_show_yn, all_name) { //카테고리 셀렉트 박스 만들기
731
-	$select_id = $('#' + select_id);
732
-	$select_id.empty();
733
-	if(all_show_yn == true) {
734
-		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
735
-	}
736
-	$.each(options, function(key, value) {
737
-		$('<option/>', {
738
-            'value': value.cateNo,	// 카테고리번호
739
-            'text': value.cateNm	// 카테고리명
664
+            'value': value.location,	// 로케이션
665
+            'text': value.locationNm	// 로케이션명
740 666
         }).appendTo($select_id);
741 667
 	});
742 668
 };

+ 31 - 2
src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -24,6 +24,8 @@ let STOCKMNG01010_DETAIL_GRID_LAST_ROW_ID;
24 24
 /*API URL*/
25 25
 let STOCK_MNG_DETAIL_GRID_LIST = '/api/stock/mng/detail-grid-list';
26 26
 let WHS_MNG_ADD_WHS = '/api/whs/mng/add-whs';
27
+let WHS_MNG_DETAIL_GRID_LIST = '/api/whs/mng/detail-grid-list';
28
+let WHS_MNG_LOCATION_GRID_LIST = '/api/whs/mng/location-grid-list';
27 29
 
28 30
 /*화면 Grid ColModel*/
29 31
 const gridColModel = {
@@ -112,10 +114,12 @@ let pageObj = {
112 114
 			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
113 115
 			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(data.brandId);
114 116
 			
117
+			pageObj.fnWhsList(function() {
118
+				pageObj.fnLocationList();
119
+			}); // 창고리스트
120
+			
115 121
 			// 공통코드 표시
116 122
 			// fn_make_select(CODE_LIST, 'WHS_DVSN', 'ITP_FORM_STOCKMNG01010_WHS_DVSN');			
117
-			// fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG01010_WHS_ST_CD');
118
-			// fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG01010_DETAIL_WHS_ST_CD', true, '선택');
119 123
 
120 124
 			// 조회일자 지정
121 125
 			$('#ITP_TAB_STOCKMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
@@ -158,6 +162,31 @@ let pageObj = {
158 162
 
159 163
 			$('#ITP_AJAX_STOCKMNG01010_LIST_CONTAINER').show();
160 164
 		}
165
+	}, 
166
+	fnWhsList: function(fnCall) {
167
+		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
168
+		const param = {sbrandId: brandIdVal, pagingYn: false};
169
+		
170
+		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
171
+			
172
+			fn_make_select_whs(result.gridRows, 'ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID');
173
+			
174
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
175
+					
176
+		}, 'POST');
177
+	}, 
178
+	fnLocationList: function(fnCall) {
179
+		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
180
+		const whsIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID').val();	
181
+		const param = {brandId: brandIdVal, whsId: whsIdVal, pagingYn: false};
182
+		
183
+		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
184
+			
185
+			fn_make_select_location(result.gridRows, 'ITP_FORM_STOCKMNG01010_SEARCH_LOCATION');
186
+			
187
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
188
+					
189
+		}, 'POST');
161 190
 	}
162 191
 };
163 192