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

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

@@ -138,7 +138,7 @@
 
 	<div id="ITP_CONTAINER" class="fix">
 		<div class="itp_mobile_contents"> 
-			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display: block;">
+			<div id="ITP_MAIN_CONTAINER" class="itp_main_box" style="display: none;">
 				<div class="itp_note_header">
 					<h1>> 공지사항</h1>
 				</div>				
@@ -349,7 +349,9 @@
 			</div>
 		</div>
 	</footer>
-	<aside id="ITP_ASIDE"></aside>
+	<aside id="ITP_ASIDE">
+	
+	</aside>
 	<section>
 		<div id="ITP_POP_NOTICE" class="popup2 mobile-pop-close" style="display: none;">
 			<div class="pop" style="height:380px;">

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

@@ -111,6 +111,7 @@
 								<label class="">입고수량</label>
 								<span>:</span>
 								<div class="auto fnWhsQty"></div>
+								<input type="hidden" id="ITP_FORM_MPOMNG06010_WHS_QTY" name="whsQty" />
 								<button id="ITP_BTN_MPOMNG06010_WHS_QTY" class="btn-m-orange" name="whsQty">입력</button>
 							</div>
 						</div>

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

@@ -112,7 +112,7 @@
 								<label class="col_6">수거수량</label>
 								<span>:</span>
 								<div class="auto fnColQty">1</div>
-								<button id="ITP_BTN_MPOMNG06010_WHS_QTY" class="btn-m-orange" name="colQty">입력</button>
+								<button id="ITP_BTN_MRTNMNG05010_COL_QTY" class="btn-m-orange" name="colQty">입력</button>
 							</div>
 						</div>
 					</li>

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_WHS_QTY.html

@@ -0,0 +1,65 @@
+<div id="ITP_BIZPOP_PO_WHS_QTY" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h5 class="modal-title">입고처리</h5>
+			</div>
+			<div class="modal-body">
+				<div class="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_PO_WHS_QTY_POPUP" target="_PAYMENT_FRAME" action="">
+								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_PAY_TP_CD" name="payTpCd" value="" />
+								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_BRAND_ID" name="brandId" value="" />
+								<input type="hidden" id="ITP_FORM_PO_WHS_QTY_POPUP_BRAND_NM" name="brandNm" value="" />
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목번호</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemNo"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목명</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemNm"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="itp_lb shot">납품수량</label>
+									</div>
+									<div class="info_box">
+										<div class="fnDlvQty"></div>
+									</div>
+								</div>
+								<div class="line border">
+									<div class="label_box">
+										<label class="itp_lb">입고수량</label>
+									</div>
+									<div class="info_box">
+			              				<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_MINUS">-</button>
+										<input type="text" id="ITP_FORM_PO_WHS_QTY_POPUP" class="itp_input" name="whsQty" />
+										<button id="ITP_BTN_PO_WHS_QTY_POPUP_ITEM_PLUS">+</button>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<div class="pop_btn_bar">
+					<button type="button" id="ITP_BTN_PO_WHS_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_PO_WHS_QTY_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="ITP_POPUP_KICC_JS"></div>
+	<div id="ITP_POPUP_JS"></div>
+</div>

src/main/webapp/mobile/app/popup/biz/BIZPOP_RT_COL_QTY.html

@@ -0,0 +1,65 @@
+<div id="ITP_BIZPOP_PO_COL_QTY" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+				<h5 class="modal-title">반품처리</h5>
+			</div>
+			<div class="modal-body">
+				<div class="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_PO_COL_QTY_POPUP" target="_PAYMENT_FRAME" action="">
+								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_PAY_TP_CD" name="payTpCd" value="" />
+								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_BRAND_ID" name="brandId" value="" />
+								<input type="hidden" id="ITP_FORM_PO_COL_QTY_POPUP_BRAND_NM" name="brandNm" value="" />
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목번호</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemNo"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="shot">품목명</label>
+									</div>
+									<div class="info_box">
+										<div class="fnItemNm"></div>
+									</div>
+								</div>
+								<div class="line shot">
+									<div class="label_box">
+										<label class="itp_lb shot">수거요청수량</label>
+									</div>
+									<div class="info_box">
+										<div class="fnColReqQty"></div>
+									</div>
+								</div>
+								<div class="line border">
+									<div class="label_box">
+										<label class="itp_lb">수거수량</label>
+									</div>
+									<div class="info_box">
+			              				<button id="ITP_BTN_PO_COL_QTY_POPUP_ITEM_MINUS">-</button>
+										<input type="text" id="ITP_FORM_PO_COL_QTY_POPUP" class="itp_input" name="colQty" />
+										<button id="ITP_BTN_PO_COL_QTY_POPUP_ITEM_PLUS">+</button>
+									</div>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<div class="pop_btn_bar">
+					<button type="button" id="ITP_BTN_PO_COL_QTY_CONFIRM_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;확인&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_PO_COL_QTY_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="ITP_POPUP_KICC_JS"></div>
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -655,6 +655,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .modal-dialog .line .label_box label {font-size:14px; font-weight:100;}
 .modal-dialog .line .info_box {width: calc(100% - 100px); padding:10px; display:flex;}
 .modal-dialog .line .info_box .email {width:30%;}
+.modal-dialog .line .info_box button {position:relative; padding:0; height:27px; width:40px; top:-4px; font-size:14pt; border:1px solid #aaa; border-radius:4px; margin:0 3px;}
 .modal-dialog .line .info_box input{position:relative; top:-4px; width:100%; height:27px; margin:0;}
 .modal-dialog .line .info_box select{position:relative; top:-4px; width:100%; height:27px;}
 .modal-dialog .line .info_box div{text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:100%; text-align:left; font-size:14px; font-weight:100;}

src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -130,6 +130,7 @@ let mobContObj = {
 					$li.find('.fnWhsAmt').text(CommonObj.currency.add(item.whsAmt));
 					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
 					$li.find('.fnWhsQty').val(item.whsQty);
+					$('button[id="ITP_BTN_MPOMNG06010_WHS_QTY"]')[$li.index()].addEventListener('click', function() { _this.inputQty(this); });
 					mobContObj.list.rows.push(item);
 				});
 			};
@@ -137,6 +138,9 @@ let mobContObj = {
 			param.gridPage = mobContObj.list.listPage;
 			param.gridSize = mobile_list_size;
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
+		},
+		inputQty: function() {
+
 		},
 		save: function() {
 			var _this = this;

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_WHS_QTY.js

@@ -0,0 +1,23 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+const API_MOBILE_SAVE 		= '/api/pomng/inoutmng/save-warehouse';				// 저장
+
+var popPageObj = {
+	init: function () {
+		this.button();
+		this.change();
+		this.view();
+	},
+	button: function() {
+	}, 
+	change: function() {
+	}, 	
+	view: function() {
+	}
+};