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

src/main/webapp/login.html

@@ -15,6 +15,7 @@
 	<link rel="shortcut icon" type="image/png" href="./images/favicon.ico"/>
 	<link rel="stylesheet" href="./bootstrap/dist/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="./css/style.css" />
+	<link rel='stylesheet' href='//cdn.jsdelivr.net/npm/font-kopub@1.0/kopubdotum.min.css'>
 
 	<script>
 		const VIEW_PAGE = 'LOGIN'; //config.js 에서 로그인 페이지 인지 아닌지 확인하기 위한 변수

src/main/webapp/mobile/app/easypay/oqpo/mobile_order_res_submit.jsp

@@ -68,6 +68,7 @@ System.out.println("sp_res_cd ===> " + request.getParameter("sp_res_cd"));
         // <!--선불카드-->
         document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
 
+        console.log("res_cd ===> " + res_cd);
         if( res_cd == "0000" )
         {
             location.replace('app:pay:result:' + JSON.stringify(serialize()));

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

@@ -50,7 +50,7 @@
       </div>
       <div class="login_page">
         <div class="input_area">
-          <input type="text" id="ITP_FORM_LOGIN_USER_ID" required value="BRD221100002">
+          <input type="text" id="ITP_FORM_LOGIN_USER_ID" required>
           <label for="ITP_FORM_LOGIN_USER_ID">아이디</label>
           <div class="itp_del_btn">
 	          <button type="button" id="ITP_FORM_DEL_LOGIN_USER_ID">

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

@@ -10,6 +10,7 @@
 	<link rel="stylesheet" href="../../bootstrap/dist/css/bootstrap.min.css" />
 	<link rel="stylesheet" href="../../bootstrap-datepicker/css/bootstrap-datepicker3.css" />
 	<link rel="stylesheet" href="../css/style.css?2011221">
+	<link rel='stylesheet' href='//cdn.jsdelivr.net/npm/font-kopub@1.0/kopubdotum.min.css'>
 
 	<script>
 		const ITP_SYSTEM_ADMIN_YN = 'Y';

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

@@ -24,7 +24,7 @@
 			  <div class="line">
 				  <label>한도금액</label>
 				  <div class="line_right">
-					  <div class="fnLimitAmt">0원</div>
+					  <div class="fnLimitAmt"></div>
 				  </div>
 			  </div>
 			  <div class="line">
@@ -36,19 +36,19 @@
 			  <div class="line">
 				  <label>가용한도금액</label>
 				  <div class="line_right">
-					  <div class="fnPosbLimitAmt">0원</div>
+					  <div class="fnPosbLimitAmt"></div>
 				  </div>
 			  </div>
 			  <div class="line">
 				  <label>가수금</label>
 				  <div class="line_right">
-					  <div class="fnTmpRcvAcctTotal">0원</div>
+					  <div class="fnTmpRcvAcctTotal"></div>
 				  </div>
 			  </div>
 			  <div class="line">
 				  <label>사용금액</label>
 				  <div class="line_right">
-					  <div class="fnUseAmtTotal">0원</div>
+					  <div class="fnUseAmtTotal"></div>
 				  </div>
 			  </div>
 			<div class="line top3">
@@ -78,7 +78,7 @@
 		  </div>
 			<div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_AREA" class="scroll_area row-14">
 			  <ul id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: block;">
+			  <div id="ITP_LIST_MLOANMNG01011_VIEW_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list4 list-row">
 				  <div>
 					<div class="detail_line">

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

@@ -46,7 +46,7 @@
 		  </div>
 			<div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_AREA" class="scroll_area row-13">
 			  <ul id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWS" class="mb_0 panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: block;">
+			  <div id="ITP_LIST_MLOANMNG03010_LIST_ITEM_ROWCOPY" style="display: none;">
 				<li class="history_list4" style="padding-top:3px;">
 				  <div class="left">
 					<div class="nomal">
@@ -83,7 +83,7 @@
 					  </div>
 					  <label class="sub_info">정산금액&nbsp;:</label>
 					  <div class="history">
-						<div class="fnSttlAmt"></div>
+						<div class="fnSttlReqAmt"></div>
 					  </div>
 					</div>
 				  </div>
@@ -92,7 +92,7 @@
 							<label class="history_label">정산확정일 </label>
 							<span>:</span>
 							<div class="history">
-								<div class="fnSttlDt"></div>
+								<div class="fnSttlReqDt"></div>
 							</div>
 							<label class="sub_info">미납금액&nbsp;:</label>
 							<div class="history">
@@ -128,37 +128,37 @@
 			<div class="line">
 			  <label>매장명</label>
 			  <div class="line_right">
-			  	<div class="fnStoreNm">a 매장명</div>
+			  	<div class="fnStoreNm"></div>
 			  </div>      
 			</div>
 			<div class="line">
 			  <label>정산일자</label>
 			  <div class="line_right">
-			  	<div class="fnSttlDt">2022.10.10</div>
+			  	<div class="fnSttlDt"></div>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>정산상태</label>
 			  <div class="line_right">
-  			  	<div class="fnSttlStCd">정산요청</div>
+  			  	<div class="fnSttlStNm"></div>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>정산금액</label>
 			  <div class="line_right">
-			  	<div class="fnSttlAmt">2,000,000원</div>
+			  	<div class="fnSttlReqAmt"></div>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>잔액</label>
 			  <div class="line_right">
-			  	<div class="fnBal">1,000,000원</div>
+			  	<div class="fnUseAmtTotal"></div>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>정산등록일자</label>
 			  <div class="line_right">
-			  	<div class="fnSttlRegDt">2022.10.10</div>
+			  	<div class="fnSttlReqDt"></div>
 			  </div>
 			</div>
 			<div class="table_header">
@@ -175,11 +175,11 @@
 						<label class="col_3">품목아이디 </label>
 						<span>:</span>
 						<div class="space2">
-						  <div class="fnItemId">asdfasdfassd</div>
+						  <div class="fnItemId"></div>
 						</div>
 						<label class="sub_info">품목명&nbsp;:</label>
 						<div class="space2">
-						  <div class="fnItemNm">fasdfasdfad</div>
+						  <div class="fnItemNm"></div>
 						</div>
 					  </div>
 					</div>
@@ -188,11 +188,11 @@
 						<label class="col_3">단가</label>
 						<span>:</span>
 						<div class="space2">
-						  <div class="fnUnitAmt">52525525</div>
+						  <div class="fnUnitAmt"></div>
 						</div>
 						<label class="sub_info">단위&nbsp;:</label>
 						<div class="space2">
-						  <div class="fnUnit">25252asd</div>
+						  <div class="fnUnit"></div>
 						</div>
 					  </div>
 					</div>
@@ -201,11 +201,11 @@
 						<label>발주(납품)수량</label>
 						<span>:</span>
 						<div>
-						  <div class="fnPodrQyt">1212</div>
+						  <div class="fnPodrQyt"></div>
 						</div>
 						<label class="sub_info">입고(수거)일자&nbsp;:</label>
 						<div>
-						  <div class="fnWhsColDt">2022.20.20</div>
+						  <div class="fnWhsColDt"></div>
 						</div>
 					  </div>
 					</div>
@@ -214,11 +214,11 @@
 						<label>입고(수거)수량</label>
 						<span>:</span>
 						<div>
-						  <div class="fnWhsColQty">1212</div>
+						  <div class="fnWhsColQty"></div>
 						</div>
 						<label class="sub_info">입고(수거)금액&nbsp;:</label>
 						<div class="fn">
-						  <div class="fnWhsColAmt">2020.10.10</div>
+						  <div class="fnWhsColAmt"></div>
 						</div>
 					  </div>
 					</div>

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

@@ -13,7 +13,7 @@
 				<div class="line mt5">
 					<label>반품요청일</label>
 					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
-				</div>
+				</div> 
 				<div class="line">
 					<label>반품요청금액</label>
 					<div class="float_left">
@@ -68,7 +68,7 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-orange REQ">빈품요청</button>
+				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-m-orange REQ">반품요청</button>
 				<button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-w-gray TSA">임시저장</button>
 				<button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
 			</div>
@@ -179,8 +179,9 @@
 				                 <div class="amt fnUnitAmt">12,000,000</div>
 			                 </div>
                         </div>
-                        <div class="scroll_right">
-                            <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
+                       <div class="scroll_right">
+                        	<input id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" type="checkbox">
+                            <!-- <button id="ITP_BTN_MRTNMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button> -->
                         </div>
 						<div class="right">
 							<button id="ITP_BTN_MRTNMNG01010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>

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

@@ -1,46 +1,8 @@
 <section id="ITP_MOBILE_MRTNMNG04010">
-	<div id="ITP_POP_MRTNMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop">
-			<div class="header">
-				<div class="header_left">
-					<label>납품장소</label>
-				</div>
-				<div class="header_right">
-					<button type="button" id="ITP_BTN_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
-				</div>
-			</div>
-			<div class="search_bar">
-				<form id="ITP_FORM_MRTNMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
-					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
-					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
-					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
-				</form>
-			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
-			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:;">
-					<li class="list-row row_2">
-						<div class="scroll_left">
-							<div class="con_2 fnWhsNm"></div>
-							<div class="con_2 sub fnLocationNm"></div>
-						</div>
-						<div class="scroll_right">
-							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
-						</div>
-					</li>
-				</div>
-			</div>
-		</div>
-	</div>
 	<div id="ITP_AJAX_MRTNMNG04010_LIST_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MRTNMNG04010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
-			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_IDX" name="sidx" value="0">
 			<div class="content">
 				<div class="line header">
 				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
@@ -223,4 +185,41 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MRTNMNG04010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>납품장소</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MRTNMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
+			</div>
+			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">
+					<li class="list-row row_2">
+						<div class="scroll_left">
+							<div class="con_2 fnWhsNm"></div>
+							<div class="con_2 sub fnLocationNm"></div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
 </section>

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

@@ -25,8 +25,8 @@
 				<div class="line">
 					<label>반품입고장소</label>
 					<div class="float_left">
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
-						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
 						</div>
@@ -67,7 +67,7 @@
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
 					<li class="history_list2">
 						<div class="left">
 							<div class="nomal">

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

@@ -3,7 +3,7 @@
 		<form id="ITP_FORM_MRTNMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
-			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_IDX" name="sidx" value="0">
+			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_ID" name="sspplyId" value="">
 			<div class="content">
 				<div class="line header">
 				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품현황</div>
@@ -25,7 +25,7 @@
 				<div class="line top3">
 					<label>반품입고장소</label>
 					<div class="float_left">
-						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
+						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" placeholder="매장명" readonly>
 						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -151,7 +151,7 @@
 			</div>
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>

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

@@ -169,6 +169,7 @@
 			</div>
 			<form id="ITP_FORM_MSTOCKMNG01010_POP" class="form-horizontal" onsubmit="return false;">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_BRAND_ID" name="brandId" value="">
+				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_STORE_ID" name="storeId" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_ITEM_ID" name="itemId" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_LOCATION" name="sourceLocation" value="">
 				<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_POP_SOURCE_WHS_ID" name="sourceWhsId" value="">
@@ -178,7 +179,7 @@
 						<label>창고명</label>
 					</div>
 					<div class="list_info">
-						<div class="pay_info fnWhsNm">fasdfsafsf</div>
+						<div class="pay_info fnWhsNm"></div>
 					</div>
 				</div>
 				<div class="list_line">

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

@@ -17,6 +17,7 @@
 			  <label>창고선택</label>
 			  <div class="float_left">
 				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="swhsNm" type="text" placeholder="A창고명">
+				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" type="hidden">
 				<div class="itp_input_btn">		
 					<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 				</div>
@@ -57,7 +58,7 @@
 						<label class="col_3">품목번호</label>
 						<span>:</span>
 						<div>
-						  <div class="fnItemId"></div>
+						  <div class="fnItemId" data-normal-yn="Y"></div>
 						</div>
 						<label class="col_0">품목명&nbsp;:</label>
 						<div>
@@ -74,7 +75,7 @@
 						</div>
 						<label class="col_0">단위수량&nbsp;:</label>
 						<div>
-						  <div class="fnUnitQty"></div>
+						  <div class="fnCddQty"></div>
 						</div>
 					  </div>
 					</div>

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

@@ -0,0 +1,20 @@
+<section id="ITP_MOBILE_SETTING01010">
+    <div class="upgrade">
+      <div class="info">
+        <h1>새로운 버전이 출시 되었어요!</h1>
+        <h2>'다음에' 선택시 앱이 종료됩니다</h2>
+      </div>
+      <div class="btn">
+        <div class="info_btn1">
+          <button>다음에</button>
+        </div>
+        <div class="info_btn2">
+          <button>업그레이드</button>
+        </div>
+      </div>
+    </div>
+    <div class="brand_name">
+      <h4>OderQueen</h4>
+    </div>
+  <div id="ITP_MOBILE_JS"></div>
+  </section>

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

@@ -1,12 +1,16 @@
-@font-face {
+/* @font-face {
+    font-family: 'GmarketSansMedium';
+    src: url("../main/webapp/mobile/fonts/KoPubWorld Dotum Medium.ttf") format('woff');
+} */
+/* @font-face {
     font-family: 'GmarketSansMedium';
     src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
     font-weight: normal;
     font-style: normal;
-}
-* {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
+} */
+* {margin: 0; padding: 0;letter-spacing: -1px; box-sizing: border-box; text-align: center; font-family: 'KoPub Dotum', 'serif'; list-style: none;}
 section {}
-body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'GmarketSansMedium';
+body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'KoPub Dotum';
 	overflow:scroll-y; 
 	-webkit-overflow-scrolling:touch;}
 body .login {position:fixed;}
@@ -96,7 +100,9 @@ section .popup2 .pop .popup_scroll li .scroll_left .mg_0 div {margin:0; padding:
 section .popup2 .pop .popup_scroll li .scroll_left .sub{font-size:14px; color:gray;}
 section .popup2 .pop .popup_scroll li .scroll_left .amt{font-size:14px; color:#b88278;}
 section .popup2 .pop .popup_scroll li .scroll_right {float: right;}
+section .popup2 .pop .popup_scroll li .scroll_right input[type=checkbox]{margin:18px 11px 0 11px;}
 section .popup2 .pop .popup_scroll li .scroll_right button {width: 50px; height: 38px; padding: 0; background:#8f9fc6; border:1px solid #cacfe3; color:#eee; border-radius: 10px; font-size: 14px; margin:16px 10px;}
+section .popup2 .pop .popup_scroll li .scroll_right button:hover {background:#708cd1;}
 section .popup2 .pop .popup_scroll li .right {position: relative; display: flex; font-size: 1.6rem; font-weight: 700; float: right; top:16px; height:38px;}
 section .popup2 .pop .popup_scroll li .right button {padding: 5px; font-size: 22px; width:24px;}
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
@@ -111,6 +117,8 @@ section .popup2 .list_line .mail select {width:30%;}
 section .popup2 .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
 section .popup_scroll li .right .num {padding:8px 12px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
 section .popup_scroll li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
+section .popup_scroll li .right button:hover {background:#FCD5C1;}
+section .popup_scroll li .right button:checked {background:#ccc;}
 section .popup2 .list_line .line_right {float:right; width:70%;}
 section .popup2 .list_line .line_right select {width:200px; float:right; height:27px; margin-top:6px;}
 section .popup2 .list_line .line_right input {width:200px; float:right;}
@@ -140,8 +148,10 @@ section .popup3 .pop .header .header_right button img {width:30px; height:30px;}
 /* 버튼 */
 button {background-color: #fff; padding: 10px;}
 button.btn-primary  {color: #fff; background-color: #8f9fc6; border: 1px solid #cacfe3;}
+button.btn-primary:active{background-color: #708cd1;}
 button.btn-yellow   {color: #fff; background-color: #f9c03c; border: 1px solid #cacfe3;}
-button.btn-orange	{color: #fff; background-color: #f0831e; border: 1px solid #cacfe3;}
+button.btn-m-orange	{color: #fff; background-color: #f0831e; border: 1px solid #cacfe3;}
+button.btn-m-orange:hover {border:3px solid #f0831e !important; background-color: #fff; color:#B7B8B8;}
 button.btn-gray     {color: #fff; background-color: #a89d9c; border: 1px solid #cacfe3;}
 button.btn-danger   {color: #fff; background-color: #c8989d; border: 1px solid #cacfe3;}
 button.btn-green	{color: #fff; background-color: #5cb85c; border: 1px solid #cacfe3;}
@@ -172,6 +182,7 @@ body.eee {height: 700px; background: #eee;}
 #ITP_LOGIN {
     transform: translateX(-50%);
     max-width: 500px;
+    height:100%;
     left: 50%;
     position: fixed;}
 #ITP_LOGIN .login_popup {position: relative; width: 350px; text-align: center;}
@@ -241,8 +252,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
 #ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 120px); height:49px; display:inline-flex;}
-#ITP_WRAPPER header .header_wrap .name_info .bn {text-overflow:ellipsis; padding-top:0; text-align:right; width:115%; font-size:18px;}
-#ITP_WRAPPER header .header_wrap .name_info div {text-overflow:ellipsis; padding-left:3px; padding-top:2px; text-align:left; width: 85%; font-size: 15px; color:#fff; margin-top:14px;}
+#ITP_WRAPPER header .header_wrap .name_info .bn {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-top:0; text-align:right; width:115%; height:22px; font-size:18px;}
+#ITP_WRAPPER header .header_wrap .name_info div {text-overflow:ellipsis; overflow:hidden; white-space:nowrap; padding-left:3px; padding-top:2px; text-align:left; width: 85%; font-size: 15px; color:#fff; margin-top:14px;}
 
 #ITP_WRAPPER header .header_wrap .logout {float: right; width: 40px;}
 #ITP_WRAPPER header .header_wrap .logout button {margin-top: 15px; margin-right:20px; padding:0; width: 20px; height: 20px; border:none; font-size: 0.8rem;background: transparent;}
@@ -363,9 +374,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail select {width:30%; height:27px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:15px;}
 .content .table_header {margin-top: 6px; width: 100%; height: 36px;}
-.content .table_header h1 {margin-left: 15px; margin-top:16px; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_header h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
 .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;}
-
 .detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_header {width: 100%; height: 80px; padding-top:65px}
 .detail_content .detail_header .detail_logo {float: left;}
@@ -399,7 +409,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar {width: 100%; height: 47px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
 .button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
 .button_bar button.btn-gray {border-radius: 0px; background-color: #858076; color: #eee;}
+.button_bar button.btn-gray:active {border:3px solid #858076; background-color: #fff; color:#B7B8B8;}
 .button_bar button.btn-w-gray{border-radius: 0px; background-color: #b6b8b8; color: #eee;}
+.button_bar button.btn-w-gray:active{border:3px solid #b6b8b8; background-color: #fff; color:#B7B8B8;}
+
 .button_bar button.btn {height: 120px;}
 .button_bar button.btn_col_3 {width: 35%;}
 .button_bar button.btn_col_6 {width: 65%;}
@@ -408,8 +421,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .button_bar button.col_12 {font-weight:100; width: 100%; height: 40px; font-size: 16px;}
 
 /* scroll_area 조정 */
-.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; bottom: 30px; overflow: auto; background: #fff;}
-
+.scroll_area {position: relative; top:0; width: 100%; height: 456px;border-bottom:2px solid #000; margin-bottom:47px; overflow: auto; background: #fff;}
+.scroll_area ul {display:grid;}
 
 
 .col-4{width:35% !important;}
@@ -419,19 +432,20 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area ul.mb_0 {margin-bottom:0 !important;}
 .scroll_area .itp_non_data {margin:35% auto;}
-.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
 
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
+.scroll_area li.check {background:#E6EFF4;}
 .scroll_area li.list-row {display: inline-flex; height:76px;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
 .scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
-.scroll_area li .left_info div {display: inline-block; font-size:14px;}
-.scroll_area li .left_info span {font-size: 14px;}
-.scroll_area li .left_info label{font-size: 14px; font-weight:100; margin-left:10px;}
+.scroll_area li .left_info div {display: inline-block; font-size:14pt;}
+.scroll_area li .left_info span {font-size: 14pt;}
+.scroll_area li .left_info label{font-size: 14pt; font-weight:100; margin-left:10px;}
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
-.scroll_area li .left_info .thick {float:left; margin-top: 2px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
+.scroll_area li .left_info .thick {float:left; margin-top: 6px; font-size: 18px; text-align: left; width: 200px; height:20px; font-weight: 100;}
 .scroll_area li .left_info .thick .itp_item {color:gray;}
-.scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14px;}
+.scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:14pt;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left_info .history input{width: 150px;}
@@ -499,10 +513,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal div{display: inline-flex; font-weight: 700; font-size: 15px;}
 .scroll_area li .left .nomal .col_5{min-width:50px;}
 
-.scroll_area li .right {margin: 12px 10px 0 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
-.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+.scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right .num {padding:6px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff;}
 .scroll_area li .right .fnnum {margin:10px 30px;}
 .scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
+.scroll_area li .right button:hover {background:#FCD5C1;}
 
 /* ITP_FOOTER */
 #ITP_FOOTER .itp_modal {z-index:10000;}
@@ -558,7 +573,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 @media screen and (max-height: 720px) {
 	#ITP_LOGIN {position:fixed; top:80px; max-width: 500px; margin: 0 auto;}
 	.bg_gray {position:relative; top:-90px;}
-	.scroll_area {height: 400px;}
+	.scroll_area {height: 58vh;}
 	section .popup2 .pop .popup_scroll {height: 65%;}
 	}
 @media screen and (max-height: 550px) {

src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG03010.js

@@ -49,6 +49,8 @@ let mobPageObj = {
 				$('#ITP_FORM_MLOANMNG03010_LIST_SEARCH #ITP_BTN_MLOANMNG03010_LIST_SEARCH_STORE_NM').hide();
 				$('#ITP_FORM_MLOANMNG03010_LIST_SEARCH #ITP_BTN_MLOANMNG03010_LIST_DELETE_STORE_NM').hide();
 			}
+
+			CommonObj.btnPay('#ITP_BTN_MLOANMNG03010_VIEW_PAYMENT');
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -178,8 +180,8 @@ let mobContentObj = {
 					$li.find('.fnSttlMgntUnqNo').text(item.sttlMgntUnqNo);
 					$li.find('.fnSttlStNm').text(item.sttlStNm);
 					$li.find('.fnSttlReqDt').text(item.sttlReqDt);
-					$li.find('.fnSttlAmt').text(CommonObj.currency.add(item.sttlAmt));
-					$li.find('.fnSttlDt').text(item.sttlDt);
+					$li.find('.fnSttlReqAmt').text(CommonObj.currency.add(item.sttlReqAmt));
+					$li.find('.fnSttlReqDt').text(CommonObj.nullToString(item.sttlReqDt));
 					$li.find('.fnUnpaidAmt').text(CommonObj.currency.add(item.unpaidAmt));
 					$li.find('.fnUseAmtTotal').text(CommonObj.currency.add(item.useAmtTotal));
 					_this.rows.push(item);
@@ -188,9 +190,7 @@ let mobContentObj = {
 			var errFn = function() { _this.isSearch = false;};
 			const param = $('#ITP_FORM_MLOANMNG03010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
-			param.gridSize = this.listSize
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
-			param.toDt = CommonObj.onlyNumber(param.toDt);
+			param.gridSize = this.listSize;
 			// console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		}
@@ -218,8 +218,9 @@ let mobContentObj = {
 			$(id).find('.fnLoanDvsnNm').text(result.loanDvsnNm);
 			$(id).find('.fnSttlStNm').text(result.sttlStNm);
 			$(id).find('.fnSttlReqDt').text(result.sttlReqDt);
-			$(id).find('.fnSttlAmt').text(CommonObj.currency.add(result.sttlAmt));
-			$(id).find('.fnSttlDt').text(result.sttlDt);
+			$(id).find('.fnSttlReqAmt').text(CommonObj.currency.add(result.sttlReqAmt));
+			$(id).find('.fnUseAmtTotal').text(CommonObj.currency.add(result.useAmtTotal));
+			$(id).find('.fnSttlReqDt').text(result.sttlReqDt);
 			$('#ITP_FORM_MLOANMNG03010_VIEW #ITP_FORM_MLOANMNG03010_VIEW_STORE_ID').val(result.storeId);
 			$('#ITP_FORM_MLOANMNG03010_VIEW #ITP_FORM_MLOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 			$('#ITP_FORM_MLOANMNG03010_VIEW #ITP_FORM_MLOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt);

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

@@ -369,28 +369,28 @@ let mobPopObj = {
 					$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
 				} else {
 					if (Number(ordUseAmt) < Number(pchReqAmtTot)) { // 요청금액이 가능금액보다 클 경우
-						if($('#ITP_FORM_MPOMNG01010_DETAIL #ITP_FORM_MPOMNG01010_DETAIL_MALL_ID').val() === '') {	// PG 정보 없음
-							this.saveMode = 3;
-							if(loanDvsn === 'LD01') {	// 선불매장
-								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
-							} else if(loanDvsn === 'LD02') { // 후불매장
-								popMsg = 	'구매한도가 부족합니다.<br>' +
-									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
-							}
-							$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
-						} else {
+						if(CommonObj.isPayPossible()) {	// PG 정보 여부
 							if(loanDvsn === 'LD01') {	// 선불매장
 								this.saveMode = 4;
 								popMsg = 	'선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>' +
-											'결재를 하시겠습니까?';
+									'결재를 하시겠습니까?';
 								$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
 							} else if(loanDvsn === 'LD02') { // 후불매장
 								this.saveMode = 5;
 								popMsg = 	'구매한도가 부족합니다.<br>' +
-											'선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>' +
-											'결재를 하시겠습니까?';
+									'선결재를 하신 후에 구매요청을 하시기 바랍니다.<br>' +
+									'결재를 하시겠습니까?';
 								$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('결제');
 							}
+						} else {
+							this.saveMode = 3;
+							if(loanDvsn === 'LD01') {	// 선불매장
+								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
+							} else if(loanDvsn === 'LD02') { // 후불매장
+								popMsg = 	'구매한도가 부족합니다.<br>' +
+									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
+							}
+							$('#ITP_POP_MPOMNG01010_REQ_AREA #ITP_BTN_MPOMNG01010_POP_REQ_CONFIRM').text('확인');
 						}
 					} else {
 						this.saveMode = 2;

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

@@ -570,16 +570,7 @@ let mobPopObj = {
 					$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
 				} else {
 					if (Number(ordUseAmt) < Number(pchReqAmtTot)) { // 요청금액이 가능금액보다 클 경우
-						if($('#ITP_FORM_MPOMNG02010_DETAIL #ITP_FORM_MPOMNG02010_DETAIL_MALL_ID').val() === '') {	// PG 정보 없음
-							this.saveMode = 3;
-							if(loanDvsn === 'LD01') {	// 선불매장
-								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
-							} else if(loanDvsn === 'LD02') { // 후불매장
-								popMsg = 	'구매한도가 부족합니다.<br>' +
-									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
-							}
-							$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
-						} else {
+						if(CommonObj.isPayPossible()) {	// PG 정보 여부
 							if(loanDvsn === 'LD01') {	// 선불매장
 								this.saveMode = 4;
 								popMsg = 	'선불매장이므로 결재를 하셔야 구매요청이 진행이 됩니다.<br>' +
@@ -592,6 +583,15 @@ let mobPopObj = {
 									'결재를 하시겠습니까?';
 								$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('결제');
 							}
+						} else {
+							this.saveMode = 3;
+							if(loanDvsn === 'LD01') {	// 선불매장
+								popMsg = 	'선불매장이므로 입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야  구매요청을 하실 수 있습니다.';
+							} else if(loanDvsn === 'LD02') { // 후불매장
+								popMsg = 	'구매한도가 부족합니다.<br>' +
+									'선입금을 하시고, 입금등록 후 브랜드에서 승인이 되어야 구매요청을  하실 수 있습니다.\n';
+							}
+							$('#ITP_POP_MPOMNG02010_REQ_AREA #ITP_BTN_MPOMNG02010_POP_REQ_CONFIRM').text('확인');
 						}
 					} else {
 						this.saveMode = 2;

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG04010.js

@@ -143,7 +143,7 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .history_list:last');
+					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .history_list7:last');
 					$li.find('.fnRtnOdrRegDt').text(item.rtnOdrRegDt);
 					$li.find('.fnColDvsnNm').text(item.colDvsnNm);
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
@@ -190,7 +190,7 @@ let mobContentObj = {
 			$(id).find('.fnWhsNm').text(result.whsNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .list-row2:last');
+				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .history_list5:last');
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnOdrQty, item.unit));
 				$li.find('.fnRtnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));
@@ -198,11 +198,16 @@ let mobContentObj = {
 			});
 		},
 		rtnPoCancel: function() {
-			if(confirm('반품 취소하시겠습니까?')) {
-				const param = {'brandId': fn_make_user_info.get('brandId'), 'rtnPodrUnqNo': this.rtnPodrUnqNo};
-				console.log(param);
-				fn_ajax_call(API_MOBILE_CANCEL, JSON.stringify(param), function() { mobContentObj.view.cancel(true) }, 'POST');
-			}
+			var modalFn = {
+				callBack: () => {
+					const param = {'brandId': fn_make_user_info.get('brandId'), 'rtnPodrUnqNo': this.rtnPodrUnqNo};
+					var searhFn = function () {
+						mobContentObj.list.init();
+					};
+					fn_ajax_call(API_RTNMNG_RTN_CANCEL_RTNPO, JSON.stringify(param), searhFn, 'POST');
+				}
+			};
+			itp_fn_modal_confirm('반품발주를 취소 하시겠습니까?', modalFn);
 		},
 		cancel: function (isSearch) {
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
@@ -300,11 +305,7 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG04010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			param.swhsDvsn = CommonObj.schWhsDvsn(true);
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG05010.js

@@ -151,36 +151,76 @@ let mobContentObj = {
 		},
 		save: function() {
 			var _this = this;
+			var chkQtyYn1 = true;
+			var chkQtyYn2 = true;
+			var chkQtyYn3 = true;
 			var gridInsertData = [];
+			var swhsId = "";
+			var srtnWhsId = "";
+			var storeId = "";
 			$('#ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS li').each(function(index) {
 				var whsQty = $(this).find('input[name="whsQty"]').val();
 				if(whsQty !== '') {
+					if(Number(whsQty) > _this.rows[index].colReqQty) {
+						chkQtyYn1 = false;
+						return false;
+					}
+					if (swhsId !== "" && swhsId !== _this.rows[index].whsId) {
+						chkQtyYn2 = false;
+						return false;
+					}
+					if (srtnWhsId !== "" && srtnWhsId !== _this.rows[index].rtnWhsId) {
+						chkQtyYn3 = false;
+						return false;
+					}
 					var item = {
 						'dlvSttmtDtlNo'	: _this.rows[index].dlvSttmtDtlNo,
 						'dlvSttmtUnqNo'	: _this.rows[index].dlvSttmtUnqNo,
 						'itemId'		: _this.rows[index].itemId,
 						'whsQty'		: whsQty
 					};
+					swhsId = value.whsId;
+					srtnWhsId = value.rtnWhsId;
+					storeId = value.storeId;
 					gridInsertData.push(item);
 				}
 			});
-			if(gridInsertData.length > 0) {
-				var modalFn = {
-					callBack: (args) => {
-						let param = {};
-						param['viewCd'] = 'C';
-						param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID').val();
-						param['storeId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID').val();
-						param['whsId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val();
-						param['gridInsertData'] = gridInsertData;
-						console.log(JSON.stringify(param));
-						var saveFn = function () {
-						};
-						fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
-					}
-				};
-				itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
+
+			if (chkQtyYn1 === false) {
+				itp_fn_modal_alert("수거요청수량보다 수거수량이 더 많습니다.");
+				return;
+			}
+			if (chkQtyYn2 === false) {
+				itp_fn_modal_alert("서로 다른 반품입고창고 품목은 처리할 수 없습니다.");
+				return;
+			}
+			if (chkQtyYn3 === false) {
+				itp_fn_modal_alert("서로 다른 수거창고 품목은 처리할 수 없습니다.");
+				return;
+			}
+
+			if (gridInsertData.length === 0) {
+				itp_fn_modal_alert("반품처리할 품목이 없습니다.");
+				return ;
 			}
+
+			var modalFn = {
+				callBack: (args) => {
+					let param = {};
+					param['viewCd'] = 'C';
+					param['whsId'] = swhsId;
+					param['rtnWhsId'] = srtnWhsId;
+					param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID').val();
+					param['storeId'] = storeId;
+					param['gridInsertData'] = gridInsertData;
+					console.log(JSON.stringify(param));
+					var saveFn = function () {
+						_this.search();
+					};
+					fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
+				}
+			};
+			itp_fn_modal_confirm('반품처리 하시겠습니까?', modalFn);
 		}
 	}
 };
@@ -204,11 +244,7 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG05010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			param.swhsDvsn = CommonObj.schWhsDvsn();
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {

src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG06010.js

@@ -118,11 +118,7 @@ let mobContentObj = {
 			// this.search();
 		},
 		search: function() {
-			if($('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val().length < 1) {
-				alert('수거창고를 지정해주세요!');
-				return;
-			}
-			var formId = '#ITP_FORM_MRTNMNG05010_LIST_SEARCH';
+			var formId = '#ITP_FORM_MRTNMNG06010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
 				this.listPage = 0;
@@ -157,8 +153,6 @@ let mobContentObj = {
 			const param = $('#ITP_FORM_MRTNMNG06010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
 			param.gridSize = this.listSize;
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
-			param.toDt = CommonObj.onlyNumber(param.toDt);
 			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		}
@@ -248,18 +242,15 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG06010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			// param.swhsDvsn = (fn_make_user_info.get('authTpCd') === '50') ? 'W02' : '';
+			param.swhsDvsn = CommonObj.schWhsDvsn(true);
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group > .row_2:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG01010.js

@@ -164,7 +164,7 @@ let mobContentObj = {
 		},
 		procStck: function() {
 			if(!this.item) {
-				alert(ITP_MSG_LOCALE.message.ajax.noData);
+				itp_fn_modal_alert(ITP_MSG_LOCALE.message.ajax.noData);
 				return;
 			}
 			mobPopObj.popProcStck.init(this.item);
@@ -325,8 +325,7 @@ let mobPopObj = {
 			$(id).find('#ITP_FORM_MSTOCKMNG01010_POP_ITEM_ID').val(this.item.itemId);
 			$(id).find('#ITP_FORM_MSTOCKMNG01010_POP_SOURCE_LOCATION').val(this.item.location);
 			$(id).find('#ITP_FORM_MSTOCKMNG01010_POP_SOURCE_WHS_ID').val(this.item.whsId);
-			$("#ITP_FORM_MSTOCKMNG01010_POP_WHS_NM option:eq(0)").prop("selected", true);
-			$('select[id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM"]').trigger('change');
+			this.whsList();
 		},
 		action: function() {
 			var _this = this;
@@ -343,7 +342,18 @@ let mobPopObj = {
 			});
 			itp_fn_form_event.onKeyup('#ITP_FORM_MSTOCKMNG01010_POP');
 		},
-		locationList: function(mode) {
+		whsList: function() {
+			var _this = this;
+			const brandIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_BRAND_ID').val();
+			const storeIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_STORE_ID').val();
+			const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
+
+			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), function(result) {
+				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_WHS_NM');
+				_this.locationList();
+			}, 'POST');
+		},
+		locationList: function() {
 			const brandIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_BRAND_ID').val();
 			const storeIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_STORE_ID').val();
 			const whsIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_WHS_NM').val();
@@ -356,11 +366,11 @@ let mobPopObj = {
 			var _this = this;
 			var qty = $('#ITP_POP_MSTOCKMNG01010_ITEM_AREA #ITP_FORM_MSTOCKMNG01010_POP_QTY').val();
 			if(qty.length < 1 || qty === '0') {
-				alert('이동 수량을 입력하세요.');
+				itp_fn_modal_alert('이동 수량을 입력하세요.');
 				return;
 			}
 			if(qty > this.item.stckQty) {
-				alert('재고 수량을 초과하여 입력할 수 없습니다.');
+				itp_fn_modal_alert('재고 수량을 초과하여 입력할 수 없습니다.');
 				return;
 			}
 			var param = $('#ITP_FORM_MSTOCKMNG01010_POP').serializeObject();

src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -71,9 +71,6 @@ let mobPageObj = {
 				}
 			});
 
-			$('select[id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID"]').on('change', function() {
-				mobContentObj.list.locationList();
-			});
 		}
 	},
 	switchScreen: function(mode) {
@@ -126,14 +123,16 @@ let mobContentObj = {
 		itemAdd: function(rows) {
 			var _this = this;
 			$.each(rows, function(index, item) {
-				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
+				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
+				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS > .history_list5:last');
 				$li.find('.fnItemId').text(item.itemId);
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnUnit').text(item.unit);
-				$li.find('.fnUnitQty').text(item.unitQty);
+				$li.find('.fnCddQty').text(item.cddQty);
 				$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
 				item['cddQty'] = 1;
+				item['normalYn'] = (item.itemId && item.itemId !== '') ? 'Y' : 'N';
+				console.log(item);
 				_this.rows.push(item);
 			});
 		},
@@ -148,7 +147,7 @@ let mobContentObj = {
 			var $div = $(elem).siblings('div');
 			var num = Number($div.text());
 			if(num <= 1) {
-				alert('주문수량을 확인하세요.');
+				itp_fn_modal_alert('주문수량을 확인하세요.');
 			} else {
 				var index = $div.parents('li').index();
 				$($div).text((num - 1).toString());
@@ -160,26 +159,32 @@ let mobContentObj = {
 			itp_fn_form_clear_validate(null, formId);
 		},
 		save: function() {
+			if($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS').children().length === 0) {
+				itp_fn_modal_alert(ITP_MSG_LOCALE.message.grid.noData);
+				return;
+			}
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
+				var normalYnCheck = true;
 				let gridInsertData = [];
-				// var normalYnCheck = true;
 				$.each(this.rows, function(key, value) {
-					// if (value.normalYn === 'N') {
-					// 	normalYnCheck = false;
-					// }
+					if (value.normalYn === 'N') {
+						normalYnCheck = false;
+					}
 					gridInsertData.push({
 						'cddQty': value.cddQty,
 						'itemId': value.itemId
 					});
 				});
-				// if(!normalYnCheck) {
-				// 	alert('정상여부 값이 N인 데이터가 있습니다.\n품목번호를 확인하세요.');
-				// 	return;
-				// }
+				if(!normalYnCheck) {
+					itp_fn_modal_alert_ajax('정상여부 값이 N인 데이터가 있습니다.\n품목번호를 확인하세요.');
+					return;
+				}
 				let param = $(formId).serializeObject();
-				param['cddDt'] = param.cddDt.replace(/[^0-9]/g, "");
+				param['viewCd'] = 'C';
+				param.whsId = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val();
+				param.location = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val();
 				param.gridInsertData = gridInsertData;
 				console.log(JSON.stringify(param));
 				var searhFn = function() {
@@ -312,7 +317,7 @@ let mobPopObj = {
 				_this.rows = result.gridRows;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA').append($('#ITP_POP_MSTOCKMNG02010_TABLE_TR').html());
-					var $li = $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > .table_tr:last');
+					var $li = $('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > .table_body:last');
 					$li.find('.fnItemId').text(item.itemId);
 					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnUnit').text(item.unit);
@@ -335,7 +340,7 @@ let mobPopObj = {
 			});
 		},
 		checked: function(elem) {
-			var clsNm = '.table_tr';
+			var clsNm = '.table_body';
 			if($(elem).hasClass('chkAll')) {
 				$(clsNm).find('input:checkbox').prop('checked', $(elem).is(':checked'));
 			} else {

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

@@ -330,7 +330,7 @@ function f_moblie_submit() {
 	let param = $('#frm_pay').serializeObject();
 	param.reqDataList = reqDataList;
 	
-	// console.log("REQ : " + JSON.stringify(param));
+	console.log("REQ : " + JSON.stringify(param));
 		
 	fn_ajax_call(EASYPAY_PAYMENT_REQUEST, JSON.stringify(param), function(result) {
 		

src/main/webapp/mobile/js/app/setting/ITP_SETTING01010.js

@@ -0,0 +1,14 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+		mobPageObj.init();
+	});
+});
+
+var mobPageObj = {
+	init: function () {
+		console.log('upgrade popPageObj');
+	},
+
+};

src/main/webapp/mobile/js/config.js

@@ -55,6 +55,8 @@ require([
 	});
 
 	$('#ITP_MOBILE_BTN_SETTING').on('click', function() {
+		fn_make_slide_menu.loadPage('SETTING01010', MOBILE_CONTEXTPATH + '/app/setting/SETTING01010.html', null)
+		$('#ITP_MENU').toggle();
 	});
 
 	$('.ITP_BTN_NAV_CLOSE').on('click', function() {
@@ -820,6 +822,18 @@ let CommonObj = {
 	onlyNumber: function(str) {
 		return (str) ? str.replace(/[^0-9]/g, '') : str;
 	},
+	nullToString: function(value) {
+		return (value == null || value.length === 0) ? '' : value;
+	},
+	isPayPossible: function() {
+		return (fn_make_user_info.get('apprYn') === 'Y');
+	},
+	btnPay: function(id) {
+		return this.isPayPossible() ? $(id).show() : $(id).hide();
+	},
+	schWhsDvsn: function(isEmpty) {
+		return (fn_make_user_info.get('authTpCd') === '50') ? 'W02' : isEmpty ? '' : 'W01';
+	},
 	isApp: (/oqpo_android|oqpo_ios/).test(navigator.userAgent.toLowerCase())
 };