Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

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

@@ -28,7 +28,7 @@
 									<label class="col-xs-2 itp_lb sw">품목명</label>
 									<div class="col-xs-4 col_3 itp_ip fnItemNm"></div>
 								</div>
-								<div class="form-group border">
+								<div class="form-group">
 									<label class="col-xs-2 itp_lb sw">현재고</label>
 									<div class="col-xs-4 col_3 itp_ip fnStckQty"></div>
 									<label class="col-xs-2 itp_lb sw">관리등급</label>
@@ -44,7 +44,7 @@
 									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
 									</div>
 								</div>
-								<div class="form-group colspan">
+								<div class="form-group border colspan">
 									<label class="col-xs-2 itp_lb colspan sw">이동수량</label>
 									<div class="col-xs-4 col_3 itp_ip">
 									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');"/>

src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -141,7 +141,7 @@
 				    </div>
 				    <div class="itp_table fix">
 					    <div class="itp_table_head fix" style="background:#fff;">
-					        <h4 class="itp_table_tit">Location 정보</h4>
+					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					        <div class="pull-right itp_cicon">
 					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
 					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon"></i>&nbsp;&nbsp;행삭제&nbsp;&nbsp;</button>									
@@ -202,7 +202,7 @@
 				    </div>
 				    <div class="itp_table fix">
 					    <div class="itp_table_head fix" style="background:#fff;">
-					        <h4 class="itp_table_tit">Location 정보</h4>
+					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04010_VIEW_jqGrid_list" class="itp_tb_list">
 					        <table id="ITP_STOCKMNG04010_VIEW_jqGrid"></table>

src/main/webapp/app/stockmng/STOCKMNG04011.html

@@ -105,7 +105,7 @@
 				    </div>
 				    <div class="itp_table fix">
 					    <div class="itp_table_head fix" style="background:#f5f5f5;">
-					        <h4 class="itp_table_tit">Location 정보</h4>
+					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					        <div class="pull-right itp_cicon">
 					            <button type="button" id="ITP_BTN_STOCKMNG04011_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
 					            <button type="button" id="ITP_BTN_STOCKMNG04011_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon"></i>&nbsp;&nbsp;행삭제&nbsp;&nbsp;</button>									
@@ -182,7 +182,7 @@
 				    </div>
 				    <div class="itp_table fix">
 					    <div class="itp_table_head fix" style="background:#f5f5f5;">
-					        <h4 class="itp_table_tit">Location 정보</h4>
+					        <h4 class="itp_table_tit">로케이션 정보</h4>
 					    </div>
 					    <div id="ITP_STOCKMNG04011_VIEW_jqGrid_list" class="itp_tb_list">
 					        <div id="ITP_STOCKMNG04011_VIEW_jqGridView" class="itp_views fix"></div>

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -165,7 +165,7 @@ const gridColModel = {
 			sortable: true, editable: true, edittype: 'text',
 			classes: 'input_color',
 			editrules: {required: true},
-			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');",  maxlength: 20},
+			editoptions: {"onKeyup": "this.value=this.value.replace(/[^0-9]/g,'');",  maxlength: 10},
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{

src/main/webapp/mobile/app/main.html

@@ -358,8 +358,8 @@
 						<button type="button" class="btn-pop-close"><img src="../img/close.png"></button>
 					</div>
 				</div>
-				<div id="ITP_POP_NOTICE_AREA" style="position:relative; top:-40px;">
-					<div class="itp_notify_row">
+				<div id="ITP_POP_NOTICE_AREA">
+					<div class="itp_notify_row" style="width:85%;">
 						<label class="noti_label">공지제목</label>
 						<span>:</span>
 						<div class="fnNoteNm noti_text"></div>