반품발주현황 검색조건 수정

src/main/webapp/app/rtnmng/RTNMNG04010.html

@@ -37,10 +37,10 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-group">
-												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="수거창고/매장" readonly="readonly" />
+												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="수거창고/매장" readonly="readonly" />
 												<span class="input-group-btn">
-													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
-													<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+													<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 												</span>
 											</div>
 										</div>
@@ -51,12 +51,13 @@
 												<option value="A">수거구분</option>											
 											</select>
 										</div>
+										<!-- 
 										<div class="col-xs-2 itp_ip itp_noMar" style="margin-left: 5px; width: 197px;">
 											<div class="input-group">
-												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SRTN_WHS_NM" class="form-control itp_input" placeholder="반품입고 창고" readonly="readonly" />
+												<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_SWHS_NM" class="form-control itp_input" placeholder="반품입고 창고" readonly="readonly" />
 												<span class="input-group-btn">
-													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SRTN_WHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
-													<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SRTN_WHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+													<button id="ITP_BTN_RTNMNG04010_SEARCH_DEL_SWHS_NM" class="btn btn-default btn-sm UPB" type="button" style="padding:3.8px 10px;"><i class="glyphicon glyphicon-remove"></i></button>
+													<button type="button" id="ITP_BTN_RTNMNG04010_SEARCH_POP_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
 												</span>
 											</div>
 										</div>										
@@ -69,6 +70,7 @@
 												</span>
 											</div>
 										</div>
+										 -->
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_RTNMNG04010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="반품발주번호/품목번호 /품목명" />
 										</div>

src/main/webapp/js/app/rtnmng/ITP_RTNMNG04010.js

@@ -52,7 +52,7 @@ const gridColModel = {
 		},
 		{
 			index: 'RTN_WHS_NM', name: 'rtnWhsNm',
-			label: '수거처', 
+			label: '수거창고', 
 			width: '9', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},