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

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

@@ -31,25 +31,21 @@
 								<div class="form-group">
 									<label class="col-xs-2 itp_lb sw">현재고</label>
 									<div class="col-xs-4 col_3 itp_ip fnStckQty" style="text-align: right;"></div>
-									<label class="col-xs-2 itp_lb sw">관리등급</label>
-									<div class="col-xs-4 col_3 itp_ip"></div>
-								</div>
-								<div class="form-group">
 									<label class="col-xs-2 itp_lb sw">이동창고선택</label>
 									<div class="col-xs-4 col_3 itp_ip">
 										<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
 									</div>
-									<label class="col-xs-2 itp_lb sw">> 로케이션</label>
-									<div class="col-xs-4 col_3 itp_ip">
-										<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
-									</div>
 								</div>
-								<div class="form-group border colspan">
-									<label class="col-xs-2 itp_lb colspan sw">이동수량</label>
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb 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" data-key-up="comma" style="text-align: right;" maxlength="10"/>
-									</div>									
-								</div>								
+									</div>	
+									<label class="col-xs-2 itp_lb sw">로케이션</label>
+									<div class="col-xs-4 col_3 itp_ip">
+										<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
+									</div>
+								</div> 						
 							</form>
 						</div>
 					</div>

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

@@ -64,7 +64,7 @@ var popPageObj = {
 		const formId = '#ITP_FORM_PO_STOCK_PROC_POPUP';
 		itp_fn_form_clear_validate(null, formId);
 		
-		var vali_moveQty = itp_fn_form_validate(formId, formId + '_MOVE_QTY', ['empty','number'], undefined);
+		var vali_moveQty = itp_fn_form_validate(formId, formId + '_MOVE_QTY', ['empty','num'], undefined);
 		
 		if (vali_moveQty) {			
 			// 창고 & 로케이션 비교
@@ -73,8 +73,10 @@ var popPageObj = {
 				itp_fn_modal_alert_ajax('동일한 로케이션으로 재고처리를 할 수 없습니다.');
 				return;
 			}
-			var stckQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP .fnStckQty').text());
-			var moveQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY').val());
+			var q1=$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnStckQty').text().replace(/[^0-9]/g, ''), 
+			 	q2=$('#ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY').val();
+			var stckQty = Number(q1);
+			var moveQty = Number(q2);
 			if(moveQty > stckQty) {
 				itp_fn_modal_alert_ajax('이동수량은 현재고수량 이하로 입력하세요.');
 				return;

src/main/webapp/mobile/css/style.css

@@ -404,25 +404,25 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:15px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
-.detail_content .detail_header {width: 330px; height: 50px; margin:0; left:50%; position:relative; transform:translateX(-50%);}
+.detail_content .detail_header {width: 330px; height: 30px; margin:0; left:50%; position:relative; transform:translateX(-50%);}
 .detail_content .detail_header .detail_logo {float: left; margin-top:7px;}
 .detail_content .detail_header .detail_logo img {width: 35px; margin-left: 10px;}
-.detail_content .detail_header .detail_ok {float: left; margin-top:10px;}
-.detail_content .detail_header .detail_ok label {margin-left: 72px; font-size: 14pt; font-weight: 700;}
-.detail_content .detail_confirmation {height: 190px; margin-top:5px;}
-.detail_content .detail_confirmation .detail_col {left:50%; position:relative; transform:translateX(-50%); float: left; width: 330px; height:20px; margin-bottom:11px; display: flex;}
-.detail_content .detail_confirmation .detail_col label{font-size: 12pt; font-weight: 700; float: left; width: auto; text-align: left; min-width:78px;}
-.detail_content .detail_confirmation .detail_col i{font-size: 12pt; font-style:normal; width: 1%; text-align: right; margin-right: 10px;}
-.detail_content .detail_confirmation .detail_col div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; font-size: 12pt; width: 210px; text-align: left;}
-.detail_content .detail_company_info {width: 330px;left: 50%; position: relative; transform: translateX(-50%); height:150px; margin-top:5px;}
-.detail_content .detail_company_info label{font-size: 11pt; font-weight: 600; width: auto; text-align:left;}
+.detail_content .detail_header .detail_ok {float: left; margin-top:5px;}
+.detail_content .detail_header .detail_ok label {margin-left: 72px; font-size: 12pt; font-weight: 700;}
+.detail_content .detail_confirmation {height: 120px; margin-top:5px;}
+.detail_content .detail_confirmation .detail_col {left:50%; position:relative; transform:translateX(-50%); float: left; width: 330px; height:20px; display: flex;}
+.detail_content .detail_confirmation .detail_col label{font-size: 10pt; font-weight: 700; float: left; width: auto; text-align: left; min-width:78px;}
+.detail_content .detail_confirmation .detail_col i{font-size: 10pt; font-style:normal; width: 1%; text-align: right; margin-right: 10px;}
+.detail_content .detail_confirmation .detail_col div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; font-size: 10pt; flex: 1; text-align: left;}
+.detail_content .detail_company_info {width: 330px;left: 50%; position: relative; transform: translateX(-50%); height:100px;}
+.detail_content .detail_company_info label{font-size: 10pt; font-weight: 600; width: auto; text-align:left;}
 .detail_content .detail_company_info .weight {width:50px; margin:0 auto;}
-.detail_content .detail_company_info .weight label{font-size: 13pt; font-weight: 700;}
-.detail_content .detail_company_info div{font-size: 11pt; width:120px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left;}
-.detail_content .detail_company_info .info_left {width: 165px; height: 150px; float: left;}
-.detail_content .detail_company_info .info_left .company_info {width: 100%; float: left; display: flex; margin-left: 0px; margin-top:3px;}
-.detail_content .table_header {margin-top: 6px; width: 100%; height: 36px;}
-.detail_content .table_header h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.detail_content .detail_company_info .weight label{font-size: 12pt; font-weight: 700; margin:0;}
+.detail_content .detail_company_info div{font-size: 10pt; width:120px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; text-align:left;}
+.detail_content .detail_company_info .info_left {width: 165px; height: 100px; float: left;}
+.detail_content .detail_company_info .info_left .company_info {width: 100%; height:17px; float: left; display: flex; margin-left: 0px;}
+.detail_content .table_header {width: 100%; height: 22px;}
+.detail_content .table_header h1 {margin-left: 15px; margin-top:5px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
 .detail_content .table_header button {float: right; width: 68px; height:26px; font-size: 12px; font-weight: 100; padding:0px; margin: 4px 12px 6px 0; border-radius:15px;}
 
 /* select.stcd {