juney лет назад: 2
Родитель
Сommit
e5ecfcd683

+ 1 - 1
src/main/webapp/js/app/loanmng/ITP_LOANMNG02010.js

@@ -341,7 +341,7 @@ let listObj = {
341 341
 			// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))		
342 342
 			var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
343 343
 				
344
-			var args = {'payTpCd': loanDvsn == 'LD01' ? '10' : '30', 
344
+			var args = {'payTpCd': loanDvsn === 'LD01' ? '10' : '30',
345 345
 				'brandId': $('#ITP_FORM_LOANMNG02010_SEARCH_BRAND_ID').val(), 
346 346
 				'storeId': $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_ID').val() }; 
347 347
 			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');

+ 79 - 71
src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -3,6 +3,7 @@
3 3
 		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
4 4
 			<input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
5 5
 			<input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
6
+			<input type="hidden" id="ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN" name="loanDvsn" value="">
6 7
 		  <div class="content">
7 8
 			<div class="line">
8 9
 			  <label>매장선텍</label>
@@ -98,87 +99,94 @@
98 99
 		  </div>
99 100
 	  </form>
100 101
 	</div>
101
-	<div id="ITP_AJAX_MLOANMNG02010_VIEW_CONTAINER" style="display: none;">
102
-	  <form id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH" class="form-horizontal" onsubmit="return false;">
103
-		<input type="hidden" id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH_BRAND_ID" name="sbrandId" value="">
104
-		<input type="hidden" id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH_STORE_ID" name="sstoreId" value="">
105
-		  <div class="content">
106
-			<div class="line" style="height:100px;">
107
-			  <label class="pay_label">수발주 선불(충전)을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여<br> PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.</label>
108
-			</div>
109
-			<div class="list_line">
110
-				<div class="list_label">
111
-					<label>주문번호</label>
112
-				</div>
113
-				<div class="list_info">
114
-					<div class="pay_info fnPoOrdNo"></div>
115
-				</div>
116
-			</div>
117
-			<div class="list_line">
118
-				<div class="list_label">
119
-					<label>구매자명</label>
120
-				</div>
121
-				<div class="list_info">
122
-					<div class="pay_info fnOrdNm"></div>
102
+	<div id="ITP_AJAX_MLOANMNG02010_PAY_CONTAINER" style="display: none;">
103
+		<form id="ITP_FORM_MLOANMNG02010_PAY" class="form-horizontal" onsubmit="return false;">
104
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_BRAND_ID" name="brandId" value="">
105
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_STORE_ID" name="storeId" value="">
106
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_PO_ORD_NO" name="poOrdNo" value="">
107
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_ORD_NM" name="ordNm" value="">
108
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_GOODS_NM" name="goodsNm" value="">
109
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_MALL_ID" name="mallId" value="">
110
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_MOBILE_URL" name="kicc_action_mobile_url" value="">
111
+			<input type="hidden" id="ITP_FORM_MLOANMNG02010_PAY_JS_URL" name="kicc_javascript_url" value="">
112
+			<div class="content">
113
+				<div class="line" style="height:100px;">
114
+					<label class="pay_label">수발주 선불(충전)을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여<br> PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.</label>
123 115
 				</div>
124
-			</div>
125
-			<div class="list_line">
126
-				<div class="list_label">
127
-					<label>상품명</label>
116
+				<div class="list_line">
117
+					<div class="list_label">
118
+						<label>주문번호</label>
119
+					</div>
120
+					<div class="list_info">
121
+						<div class="pay_info fnPoOrdNo"></div>
122
+					</div>
128 123
 				</div>
129
-				<div class="list_info">
130
-					<div class="pay_info fnGoodsNm"></div>
124
+				<div class="list_line">
125
+					<div class="list_label">
126
+						<label>구매자명</label>
127
+					</div>
128
+					<div class="list_info">
129
+						<div class="pay_info fnOrdNm"></div>
130
+					</div>
131 131
 				</div>
132
-			</div>
133
-			<div class="list_line">
134
-				<div class="list_label">
135
-					<label>결제금액 *</label>
132
+				<div class="list_line">
133
+					<div class="list_label">
134
+						<label>상품명</label>
135
+					</div>
136
+					<div class="list_info">
137
+						<div class="pay_info fnGoodsNm"></div>
138
+					</div>
136 139
 				</div>
137
-				<div class="list_info" style="padding-top:10px;">
138
-					<input id="ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT" name="goodsAmt" type="text" data-check-required="empty">
140
+				<div class="list_line">
141
+					<div class="list_label">
142
+						<label>결제금액 *</label>
143
+					</div>
144
+					<div class="list_info" style="padding-top:10px;">
145
+						<div class="pay_info fnItemNm"></div>
146
+						<input id="ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT" name="goodsAmt" type="text" readonly>
147
+					</div>
139 148
 				</div>
140
-			</div>
141
-			  <div class="list_line">
142
-				  <div class="list_label">
143
-					  <label>결제방법 *</label>
144
-				  </div>
145
-				  <div class="list_info mail" style="padding-top:10px;">
146
-					  <select id="ITP_FORM_MLOANMNG02010_VIEW_PAY_METHOD" name="payMethod">
147
-						  <option value="11">신용카드</option>
148
-						  <option value="21">계좌이체</option>
149
-					  </select>
150
-				  </div>
151
-			  </div>
152
-			<div class="list_line">
153
-				<div class="list_label">
154
-					<label>휴대전화번호 *</label>
149
+				<div class="list_line">
150
+					<div class="list_label">
151
+						<label>결제방법 *</label>
152
+					</div>
153
+					<div class="list_info mail" style="padding-top:10px;">
154
+						<select id="ITP_FORM_MLOANMNG02010_PAY_PAY_METHOD" name="payMethod">
155
+							<option value="11">신용카드</option>
156
+							<option value="21">계좌이체</option>
157
+						</select>
158
+					</div>
155 159
 				</div>
156
-				<div class="list_info" style="padding-top:10px;">
157
-					<input id="ITP_FORM_MLOANMNG02010_VIEW_MBL_NO" name="mblNo" type="text" data-check-required="empty">
160
+				<div class="list_line">
161
+					<div class="list_label">
162
+						<label>휴대전화번호 *</label>
163
+					</div>
164
+					<div class="list_info" style="padding-top:10px;">
165
+						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_TEL" name="ordTel" type="text" data-check-required="empty">
166
+					</div>
158 167
 				</div>
159
-			</div>
160
-			<div class="list_line border">
161
-				<div class="list_label border">
162
-					<label>E-mail</label>
168
+				<div class="list_line border">
169
+					<div class="list_label border">
170
+						<label>E-mail</label>
171
+					</div>
172
+					<div class="list_info mail" style="padding-top:10px;">
173
+						<input id="ITP_FORM_MLOANMNG02010_PAY_ORD_EMAIL" name="ordEmail" class="" type="hidden">
174
+						<input id="ITP_FORM_MLOANMNG02010_PAY_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
175
+						<span>@</span>
176
+						<input id="ITP_FORM_MLOANMNG02010_PAY_EMAIL_NM" name="emailNm" class="" type="text" data-check-required="empty">
177
+						<select name="emailCd" id="ITP_FORM_MLOANMNG02010_PAY_EMAIL_CD" data-select-code="EMAIL_CD">
178
+							<option value="">선택</option>
179
+						</select>
180
+					</div>
163 181
 				</div>
164
-				<div class="list_info mail" style="padding-top:10px;">
165
-					<input id="ITP_FORM_MLOANMNG02010_PAY_PAY_ORD_EMAIL" name="ordEmail" class="" type="hidden">
166
-					<input id="ITP_FORM_MLOANMNG02010_VIEW_PAY_EMAIL_ID" name="emailId" class="" type="text" data-check-required="empty">
167
-					<span>@</span>
168
-					<input id="ITP_FORM_MLOANMNG02010_VIEW_PAY_EMAIL_NM" name="emailNm" class="" type="text" data-check-required="empty">
169
-					<select name="emailCd" id="ITP_FORM_MLOANMNG02010_VIEW_EMAIL_CD" data-select-code="EMAIL_CD">
170
-						<option value="">선택</option>
171
-					</select>
182
+				<div class="line">
183
+					<div class="search" style="margin-top:40px;">
184
+						<button id="ITP_BTN_MLOANMNG02010_PAY_REQ" class="col_3 btn-primary btn-sm ">결제요청</button>
185
+						<button id="ITP_BTN_MLOANMNG02010_PAY_CANCEL" class="col_3 btn-gray btn-sm CLB">취소</button>
186
+					</div>
172 187
 				</div>
173 188
 			</div>
174
-			<div class="line">
175
-			  <div class="search" style="margin-top:40px;">
176
-			  	<button id="ITP_BTN_MLOANMNG02010_VIEW_PAY_REQ" class="col_3 btn-primary btn-sm ">결제요청</button>
177
-  				<button id="ITP_BTN_MLOANMNG02010_VIEW_CANCEL_LIST" class="col_3 btn-gray btn-sm CLB">취소</button>
178
-			  </div>
179
-			</div>
180
-		  </div>	
181
-	  </form>
189
+		</form>
182 190
 	</div>
183 191
 	<div id="ITP_MOBILE_JS"></div>
184 192
 	<div id="ITP_POP_MLOANMNG02010_STORE_AREA" class="popup2 mobile-pop-close" style="display: none;">

+ 21 - 21
src/main/webapp/mobile/app/mpomng/MPOMNG02010.html

@@ -1,21 +1,21 @@
1 1
 <section id="ITP_MOBILE_MPOMNG02010">
2
-  <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
2
+  <div id="ITP_AJAX_MPOMNG02010_LIST_CONTAINER" style="display: none;">
3 3
     <div class="content">
4
-      <form id="ITP_FORM_MPOMNG02010_VIEW_SEARCH" class="form-horizontal" onsubmit="return false;">
5
-        <input type="hidden" id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_BRAND_ID" name="sbrandId" value="">
6
-        <input type="hidden" id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_STORE_ID" name="sstoreId" value="">
4
+      <form id="ITP_FORM_MPOMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
5
+        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
6
+        <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
7 7
         <div class="line">
8 8
           <label>구매요청일</label>
9 9
         <div class="input-group date_to date">
10
-          <input type="date" id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
10
+          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
11 11
           <div class="at">~</div>
12
-          <input type="date" id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_TO_DT" name="toDt" pattern="\d{4}.\d{2}.\d{2}">
12
+          <input type="date" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT" name="toDt" pattern="\d{4}.\d{2}.\d{2}">
13 13
         </div>
14 14
       </div>
15 15
       <div class="line">
16 16
         <label>구매요청상태</label>
17 17
         <div class="line_right">
18
-          <select id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_PCH_REQ_ST_CD" data-select-code="PCH_REQ_ST_CD" class="stcd" name="spchReqStCd">
18
+          <select id="ITP_FORM_MPOMNG02010_LIST_SEARCH_PCH_REQ_ST_CD" data-select-code="PCH_REQ_ST_CD" class="stcd" name="spchReqStCd">
19 19
             <option value="">상태</option>
20 20
           </select>
21 21
         </div>
@@ -24,18 +24,18 @@
24 24
         <label>납품장소</label>
25 25
         <div class="search_wrap">
26 26
 	        <div class="float_left">
27
-	          <input id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
28
-              <input type="hidden" id="ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_ID" name="swhsId" value="">
27
+	          <input id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM" class="" name="swhsNm" type="text" placeholder="납품창고" readonly>
28
+              <input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" value="">
29 29
 	        </div>
30 30
 	        <div class="float_left_btn">
31
-	          <button id="ITP_BTN_MPOMNG02010_VIEW_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
32
-	          <button id="ITP_BTN_MPOMNG02010_VIEW_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
31
+	          <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
32
+	          <button id="ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
33 33
 	        </div>
34 34
         </div>
35 35
       </div>
36 36
       <div class="line" style="height:50px;">
37 37
         <div class="search">
38
-          <button id="ITP_BTN_MPOMNG02010_VIEW_SEARCH" class="btn-primary btn-sm ADB">검색</button>
38
+          <button id="ITP_BTN_MPOMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">검색</button>
39 39
         </div>
40 40
       </div>
41 41
       <div class="table_header">
@@ -99,7 +99,7 @@
99 99
       </div>
100 100
     </div>
101 101
   </div>
102
-  <div id="ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER" style="display: none;">
102
+  <div id="ITP_AJAX_MPOMNG02010_VIEW_CONTAINER" style="display: none;">
103 103
     <div class="content">
104 104
       <div class="line">
105 105
         <label>납기요청일</label>
@@ -129,9 +129,9 @@
129 129
         <h1>>구매 품목</h1>
130 130
       </div>
131 131
     </div>
132
-    <div id="ITP_LIST_MPOMNG02010_DETAIL_AREA" class="scroll_area row-2">
133
-      <ul id="ITP_LIST_MPOMNG02010_DETAIL_ROWS" class="panel-group"></ul>
134
-      <div id="ITP_LIST_MPOMNG02010_DETAIL_ROWCOPY" style="display:none;">
132
+    <div id="ITP_LIST_MPOMNG02010_VIEW_AREA" class="scroll_area row-2">
133
+      <ul id="ITP_LIST_MPOMNG02010_VIEW_ROWS" class="panel-group"></ul>
134
+      <div id="ITP_LIST_MPOMNG02010_VIEW_ROWCOPY" style="display:none;">
135 135
         <li class="list-row">
136 136
           <div class="left_info">
137 137
             <div class="thick">
@@ -151,7 +151,7 @@
151 151
       </div>
152 152
     </div>
153 153
     <div class="button_bar">
154
-      <button id="ITP_BTN_MPOMNG02010_DETAIL_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
154
+      <button id="ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
155 155
     </div>
156 156
   </div>
157 157
   <div id="ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER" style="display: none;">
@@ -257,6 +257,7 @@
257 257
       </div>
258 258
     </div>
259 259
   </div>
260
+  <div id="ITP_MOBILE_JS"></div>
260 261
   <div id="ITP_POP_MPOMNG02010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
261 262
     <div class="pop">
262 263
       <div class="header">
@@ -281,10 +282,10 @@
281 282
       <div id="ITP_LIST_MPOMNG02010_POP_WHS_AREA" class="popup_scroll">
282 283
         <ul id="ITP_LIST_MPOMNG02010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
283 284
         <div id="ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY" style="display:none;">
284
-          <li>
285
+          <li class="list-row">
285 286
             <div class="scroll_left">
286
-              <div class="fnWhsNm">브랜드 창고 명A</div>
287
-              <div class="fnLocationNm">(상세위치내용)</div>
287
+              <div class="fnWhsNm"></div>
288
+              <div class="fnLocationNm"></div>
288 289
             </div>
289 290
             <div class="scroll_right">
290 291
               <button id="ITP_BTN_MPOMNG02010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
@@ -346,5 +347,4 @@
346 347
       </div>
347 348
     </div>
348 349
   </div>
349
-  <div id="ITP_MOBILE_JS"></div>
350 350
 </section>

+ 74 - 74
src/main/webapp/mobile/app/mpomng/MPOMNG05010.html

@@ -1,78 +1,4 @@
1 1
 <section id="ITP_MOBILE_MPOMNG05010">
2
-	<div id="ITP_POP_MPOMNG05010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
3
-		<div class="pop">
4
-			<div class="header">
5
-				<div class="header_left">
6
-					<label>> 공급업체</label>
7
-				</div>
8
-				<div class="header_right">
9
-					<button type="button" id="ITP_BTN_MPOMNG05010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
10
-				</div>
11
-			</div>
12
-			<div class="search_bar">
13
-				<form id="ITP_FORM_MPOMNG05010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
14
-					<input type="hidden" id="ITP_FORM_MPOMNG05010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
15
-					<input type="hidden" id="ITP_FORM_MPOMNG05010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
16
-					<input id="ITP_FORM_MPOMNG05010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
17
-					<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
18
-				</form>
19
-			</div>
20
-			<div class="search_bar">
21
-				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
22
-			</div>
23
-			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
24
-				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
25
-				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
26
-					<li class="list-row">
27
-						<div class="scroll_left">
28
-							<div class="fnSpplyNm">공급업체 명A</div>
29
-							<div class="fnStNm">($)</div>
30
-						</div>
31
-						<div class="scroll_right">
32
-							<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
33
-						</div>
34
-					</li>
35
-				</div>
36
-			</div>
37
-		</div>
38
-	</div>
39
-	<div id="ITP_POP_MPOMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
40
-		<div class="pop">
41
-			<div class="header">
42
-				<div class="header_left">
43
-					<label>> 납품장소</label>
44
-				</div>
45
-				<div class="header_right">
46
-					<button type="button" id="ITP_BTN_MPOMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
47
-				</div>
48
-			</div>
49
-			<div class="search_bar">
50
-				<form id="ITP_FORM_MPOMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
51
-					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
52
-					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
53
-					<input id="ITP_FORM_MPOMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
54
-					<button id="ITP_BTN_MPOMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
55
-				</form>
56
-			</div>
57
-			<div class="search_bar">
58
-				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
59
-			</div>
60
-			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
61
-				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
62
-				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display:none;">
63
-					<li class="list-row">
64
-						<div class="scroll_left">
65
-							<div class="fnWhsNm">브랜드 창고 명A</div>
66
-							<div class="fnLocationNm">(상세위치내용)</div>
67
-						</div>
68
-						<div class="scroll_right">
69
-							<button id="ITP_BTN_MPOMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
70
-						</div>
71
-					</li>
72
-				</div>
73
-			</div>
74
-		</div>
75
-	</div>
76 2
 	<div id="ITP_AJAX_MPOMNG05010_LIST_CONTAINER" >
77 3
 		<form id="ITP_FORM_MPOMNG05010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
78 4
 			<input type="hidden" id="ITP_FORM_MPOMNG0500_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -208,4 +134,78 @@
208 134
 		</form>
209 135
 	</div>
210 136
 	<div id="ITP_MOBILE_JS"></div>
137
+	<div id="ITP_POP_MPOMNG05010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
138
+		<div class="pop">
139
+			<div class="header">
140
+				<div class="header_left">
141
+					<label>> 공급업체</label>
142
+				</div>
143
+				<div class="header_right">
144
+					<button type="button" id="ITP_BTN_MPOMNG05010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
145
+				</div>
146
+			</div>
147
+			<div class="search_bar">
148
+				<form id="ITP_FORM_MPOMNG05010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
149
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
150
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
151
+					<input id="ITP_FORM_MPOMNG05010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
152
+					<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
153
+				</form>
154
+			</div>
155
+			<div class="search_bar">
156
+				<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
157
+			</div>
158
+			<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_AREA" class="popup_scroll">
159
+				<ul id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
160
+				<div id="ITP_POP_MPOMNG05010_LIST_SPPLY_ROWCOPY" style="display: none;">
161
+					<li class="list-row">
162
+						<div class="scroll_left">
163
+							<div class="fnSpplyNm">공급업체 명A</div>
164
+							<div class="fnStNm">($)</div>
165
+						</div>
166
+						<div class="scroll_right">
167
+							<button id="ITP_BTN_MPOMNG05010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
168
+						</div>
169
+					</li>
170
+				</div>
171
+			</div>
172
+		</div>
173
+	</div>
174
+	<div id="ITP_POP_MPOMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
175
+		<div class="pop">
176
+			<div class="header">
177
+				<div class="header_left">
178
+					<label>> 납품장소</label>
179
+				</div>
180
+				<div class="header_right">
181
+					<button type="button" id="ITP_BTN_MPOMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
182
+				</div>
183
+			</div>
184
+			<div class="search_bar">
185
+				<form id="ITP_FORM_MPOMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
186
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
187
+					<input type="hidden" id="ITP_FORM_MPOMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
188
+					<input id="ITP_FORM_MPOMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
189
+					<button id="ITP_BTN_MPOMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
190
+				</form>
191
+			</div>
192
+			<div class="search_bar">
193
+				<button id="ITP_BTN_MPOMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
194
+			</div>
195
+			<div id="ITP_LIST_MPOMNG05010_POP_WHS_AREA" class="popup_scroll">
196
+				<ul id="ITP_LIST_MPOMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
197
+				<div id="ITP_LIST_MPOMNG05010_POP_WHS_ROWCOPY" style="display:none;">
198
+					<li class="list-row">
199
+						<div class="scroll_left">
200
+							<div class="fnWhsNm">브랜드 창고 명A</div>
201
+							<div class="fnLocationNm">(상세위치내용)</div>
202
+						</div>
203
+						<div class="scroll_right">
204
+							<button id="ITP_BTN_MPOMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
205
+						</div>
206
+					</li>
207
+				</div>
208
+			</div>
209
+		</div>
210
+	</div>
211 211
 </section>

+ 76 - 76
src/main/webapp/mobile/app/mpomng/MPOMNG06010.html

@@ -1,78 +1,4 @@
1 1
 <section id="ITP_MOBILE_MPOMNG06010">
2
-	<div id="ITP_POP_MPOMNG06010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
3
-		<div class="pop">
4
-			<div class="header">
5
-				<div class="header_left">
6
-					<label>> 공급업체</label>
7
-				</div>
8
-				<div class="header_right">
9
-					<button type="button" id="ITP_BTN_MPOMNG06010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
10
-				</div>
11
-			</div>
12
-			<div class="search_bar">
13
-				<form id="ITP_FORM_MPOMNG06010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
14
-					<input type="hidden" id="ITP_FORM_MPOMNG06010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
15
-					<input type="hidden" id="ITP_FORM_MPOMNG06010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
16
-					<input id="ITP_FORM_MPOMNG06010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
17
-					<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
18
-				</form>
19
-			</div>
20
-			<div class="search_bar">
21
-				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
22
-			</div>
23
-			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
24
-				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
25
-				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
26
-					<li class="list-row">
27
-						<div class="scroll_left">
28
-							<div class="fnSpplyNm">공급업체 명A</div>
29
-							<div class="fnStNm">($)</div>
30
-						</div>
31
-						<div class="scroll_right">
32
-							<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
33
-						</div>
34
-					</li>
35
-				</div>
36
-			</div>
37
-		</div>
38
-	</div>
39
-	<div id="ITP_POP_MPOMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
40
-		<div class="pop">
41
-			<div class="header">
42
-				<div class="header_left">
43
-					<label>> 납품장소</label>
44
-				</div>
45
-				<div class="header_right">
46
-					<button type="button" id="ITP_BTN_MPOMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
47
-				</div>
48
-			</div>
49
-			<div class="search_bar">
50
-				<form id="ITP_FORM_MPOMNG06010_POP_WHS" class="form-horizontal" onsubmit="return false;">
51
-					<input type="hidden" id="ITP_FORM_MPOMNG06010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
52
-					<input type="hidden" id="ITP_FORM_MPOMNG06010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
53
-					<input id="ITP_FORM_MPOMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
54
-					<button id="ITP_BTN_MPOMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
55
-				</form>
56
-			</div>
57
-			<div class="search_bar">
58
-				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
59
-			</div>
60
-			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
61
-				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
62
-				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display:none;">
63
-					<li class="list-row">
64
-						<div class="scroll_left">
65
-							<div class="fnWhsNm">브랜드 창고 명A</div>
66
-							<div class="fnLocationNm">(상세위치내용)</div>
67
-						</div>
68
-						<div class="scroll_right">
69
-							<button id="ITP_BTN_MPOMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
70
-						</div>
71
-					</li>
72
-				</div>
73
-			</div>
74
-		</div>
75
-	</div>
76 2
 	<div id="ITP_AJAX_MPOMNG06010_LIST_CONTAINER" >
77 3
 		<form id="ITP_FORM_MPOMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
78 4
 			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -129,7 +55,7 @@
129 55
 					<label>품목명</label>
130 56
 					<div class="search_wrap">
131 57
 						<div class="float_left">
132
-							<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="A매장명">
58
+							<input id="ITP_FORM_MPOMNG06010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="품목명">
133 59
 						</div>
134 60
 					</div>
135 61
 				</div>
@@ -200,10 +126,84 @@
200 126
 				</div>
201 127
 			</div>
202 128
 			<div class="button_bar">
203
-				<button id="ITP_BTN_MPOMNG06010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">입고처리</button>
129
+				<button id="ITP_BTN_MPOMNG06010_LIST_SAVE" class="btn_col_6 btn-primary INPS">입고처리</button>
204 130
 				<!--<button id="ITP_BTN_MPOMNG06010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
205 131
 			</div>
206 132
 		</form>
207 133
 	</div>
208 134
 	<div id="ITP_MOBILE_JS"></div>
135
+	<div id="ITP_POP_MPOMNG06010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
136
+		<div class="pop">
137
+			<div class="header">
138
+				<div class="header_left">
139
+					<label>> 공급업체</label>
140
+				</div>
141
+				<div class="header_right">
142
+					<button type="button" id="ITP_BTN_MPOMNG06010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
143
+				</div>
144
+			</div>
145
+			<div class="search_bar">
146
+				<form id="ITP_FORM_MPOMNG06010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
147
+					<input type="hidden" id="ITP_FORM_MPOMNG06010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
148
+					<input type="hidden" id="ITP_FORM_MPOMNG06010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
149
+					<input id="ITP_FORM_MPOMNG06010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
150
+					<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
151
+				</form>
152
+			</div>
153
+			<div class="search_bar">
154
+				<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
155
+			</div>
156
+			<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_AREA" class="popup_scroll">
157
+				<ul id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
158
+				<div id="ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY" style="display: none;">
159
+					<li class="list-row">
160
+						<div class="scroll_left">
161
+							<div class="fnSpplyNm">공급업체 명A</div>
162
+							<div class="fnStNm">($)</div>
163
+						</div>
164
+						<div class="scroll_right">
165
+							<button id="ITP_BTN_MPOMNG06010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
166
+						</div>
167
+					</li>
168
+				</div>
169
+			</div>
170
+		</div>
171
+	</div>
172
+	<div id="ITP_POP_MPOMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
173
+		<div class="pop">
174
+			<div class="header">
175
+				<div class="header_left">
176
+					<label>> 납품장소</label>
177
+				</div>
178
+				<div class="header_right">
179
+					<button type="button" id="ITP_BTN_MPOMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
180
+				</div>
181
+			</div>
182
+			<div class="search_bar">
183
+				<form id="ITP_FORM_MPOMNG06010_POP_WHS" class="form-horizontal" onsubmit="return false;">
184
+					<input type="hidden" id="ITP_FORM_MPOMNG06010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
185
+					<input type="hidden" id="ITP_FORM_MPOMNG06010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
186
+					<input id="ITP_FORM_MPOMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
187
+					<button id="ITP_BTN_MPOMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
188
+				</form>
189
+			</div>
190
+			<div class="search_bar">
191
+				<button id="ITP_BTN_MPOMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
192
+			</div>
193
+			<div id="ITP_LIST_MPOMNG06010_POP_WHS_AREA" class="popup_scroll">
194
+				<ul id="ITP_LIST_MPOMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
195
+				<div id="ITP_LIST_MPOMNG06010_POP_WHS_ROWCOPY" style="display:none;">
196
+					<li class="list-row">
197
+						<div class="scroll_left">
198
+							<div class="fnWhsNm">브랜드 창고 명A</div>
199
+							<div class="fnLocationNm">(상세위치내용)</div>
200
+						</div>
201
+						<div class="scroll_right">
202
+							<button id="ITP_BTN_MPOMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
203
+						</div>
204
+					</li>
205
+				</div>
206
+			</div>
207
+		</div>
208
+	</div>
209 209
 </section>

+ 74 - 74
src/main/webapp/mobile/app/mpomng/MPOMNG07010.html

@@ -1,78 +1,4 @@
1 1
 <section id="ITP_MOBILE_MPOMNG07010">
2
-	<div id="ITP_POP_MPOMNG07010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
3
-		<div class="pop">
4
-			<div class="header">
5
-				<div class="header_left">
6
-					<label>> 공급업체</label>
7
-				</div>
8
-				<div class="header_right">
9
-					<button type="button" id="ITP_BTN_MPOMNG07010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
10
-				</div>
11
-			</div>
12
-			<div class="search_bar">
13
-				<form id="ITP_FORM_MPOMNG07010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
14
-					<input type="hidden" id="ITP_FORM_MPOMNG07010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
15
-					<input type="hidden" id="ITP_FORM_MPOMNG07010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
16
-					<input id="ITP_FORM_MPOMNG07010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
17
-					<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
18
-				</form>
19
-			</div>
20
-			<div class="search_bar">
21
-				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
22
-			</div>
23
-			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
24
-				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
25
-				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
26
-					<li class="list-row">
27
-						<div class="scroll_left">
28
-							<div class="fnSpplyNm">공급업체 명A</div>
29
-							<div class="fnStNm">($)</div>
30
-						</div>
31
-						<div class="scroll_right">
32
-							<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
33
-						</div>
34
-					</li>
35
-				</div>
36
-			</div>
37
-		</div>
38
-	</div>
39
-	<div id="ITP_POP_MPOMNG07010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
40
-		<div class="pop">
41
-			<div class="header">
42
-				<div class="header_left">
43
-					<label>> 납품장소</label>
44
-				</div>
45
-				<div class="header_right">
46
-					<button type="button" id="ITP_BTN_MPOMNG07010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
47
-				</div>
48
-			</div>
49
-			<div class="search_bar">
50
-				<form id="ITP_FORM_MPOMNG07010_POP_WHS" class="form-horizontal" onsubmit="return false;">
51
-					<input type="hidden" id="ITP_FORM_MPOMNG07010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
52
-					<input type="hidden" id="ITP_FORM_MPOMNG07010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
53
-					<input id="ITP_FORM_MPOMNG07010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
54
-					<button id="ITP_BTN_MPOMNG07010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
55
-				</form>
56
-			</div>
57
-			<div class="search_bar">
58
-				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
59
-			</div>
60
-			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
61
-				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
62
-				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display:none;">
63
-					<li class="list-row">
64
-						<div class="scroll_left">
65
-							<div class="fnWhsNm">브랜드 창고 명A</div>
66
-							<div class="fnLocationNm">(상세위치내용)</div>
67
-						</div>
68
-						<div class="scroll_right">
69
-							<button id="ITP_BTN_MPOMNG07010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
70
-						</div>
71
-					</li>
72
-				</div>
73
-			</div>
74
-		</div>
75
-	</div>
76 2
 	<div id="ITP_AJAX_MPOMNG07010_LIST_CONTAINER" >
77 3
 		<form id="ITP_FORM_MPOMNG07010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
78 4
 			<input type="hidden" id="ITP_FORM_MPOMNG07010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -196,4 +122,78 @@
196 122
     </form>
197 123
   </div>
198 124
 	<div id="ITP_MOBILE_JS"></div>
125
+	<div id="ITP_POP_MPOMNG07010_SPPLY_AREA" class="popup2 mobile-pop-close" style="display: none;">
126
+		<div class="pop">
127
+			<div class="header">
128
+				<div class="header_left">
129
+					<label>> 공급업체</label>
130
+				</div>
131
+				<div class="header_right">
132
+					<button type="button" id="ITP_BTN_MPOMNG07010_POP_SPPLY_CLOSE"><img src="../img/close.png"></button>
133
+				</div>
134
+			</div>
135
+			<div class="search_bar">
136
+				<form id="ITP_FORM_MPOMNG07010_POP_SPPLY_SEARCH" class="form-horizontal" onsubmit="return false;">
137
+					<input type="hidden" id="ITP_FORM_MPOMNG07010_POP_SPPLY_ITEM_BRAND_ID" name="sbrandId" value="">
138
+					<input type="hidden" id="ITP_FORM_MPOMNG07010_PO_PSPPLY_ITEM_STORE_ID" name="sstoreId" value="">
139
+					<input id="ITP_FORM_MPOMNG07010_POP_SPPLY_KEYWORD" type="text" name="sspplyNm" placeholder="공급업체명">
140
+					<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_SEARCH"><img src="../img/search.png"></button>
141
+				</form>
142
+			</div>
143
+			<div class="search_bar">
144
+				<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_NM" class="btn_blue">공급업체▼</button>
145
+			</div>
146
+			<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_AREA" class="popup_scroll">
147
+				<ul id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWS" class="panel-group itp_nav"></ul>
148
+				<div id="ITP_POP_MPOMNG07010_LIST_SPPLY_ROWCOPY" style="display: none;">
149
+					<li class="list-row">
150
+						<div class="scroll_left">
151
+							<div class="fnSpplyNm">공급업체 명A</div>
152
+							<div class="fnStNm">($)</div>
153
+						</div>
154
+						<div class="scroll_right">
155
+							<button id="ITP_BTN_MPOMNG07010_POP_SPPLY_CHOICE" class="fnSpplyId" data-item-key="">선택</button>
156
+						</div>
157
+					</li>
158
+				</div>
159
+			</div>
160
+		</div>
161
+	</div>
162
+	<div id="ITP_POP_MPOMNG07010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
163
+		<div class="pop">
164
+			<div class="header">
165
+				<div class="header_left">
166
+					<label>> 납품장소</label>
167
+				</div>
168
+				<div class="header_right">
169
+					<button type="button" id="ITP_BTN_MPOMNG07010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
170
+				</div>
171
+			</div>
172
+			<div class="search_bar">
173
+				<form id="ITP_FORM_MPOMNG07010_POP_WHS" class="form-horizontal" onsubmit="return false;">
174
+					<input type="hidden" id="ITP_FORM_MPOMNG07010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
175
+					<input type="hidden" id="ITP_FORM_MPOMNG07010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
176
+					<input id="ITP_FORM_MPOMNG07010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
177
+					<button id="ITP_BTN_MPOMNG07010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
178
+				</form>
179
+			</div>
180
+			<div class="search_bar">
181
+				<button id="ITP_BTN_MPOMNG07010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
182
+			</div>
183
+			<div id="ITP_LIST_MPOMNG07010_POP_WHS_AREA" class="popup_scroll">
184
+				<ul id="ITP_LIST_MPOMNG07010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
185
+				<div id="ITP_LIST_MPOMNG07010_POP_WHS_ROWCOPY" style="display:none;">
186
+					<li class="list-row">
187
+						<div class="scroll_left">
188
+							<div class="fnWhsNm">브랜드 창고 명A</div>
189
+							<div class="fnLocationNm">(상세위치내용)</div>
190
+						</div>
191
+						<div class="scroll_right">
192
+							<button id="ITP_BTN_MPOMNG07010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
193
+						</div>
194
+					</li>
195
+				</div>
196
+			</div>
197
+		</div>
198
+	</div>
199 199
 </section>

+ 74 - 75
src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -1,4 +1,78 @@
1 1
 <section id="ITP_MOBILE_MRTNMNG01010">
2
+	<div id="ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER">
3
+		<form id="ITP_FORM_MRTNMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
4
+			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
5
+			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_BRAND_ID" name="brandId" value="">
6
+			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_STORE_ID" name="storeId" value="">
7
+			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_DVSN" name="whsDvsn" value="">
8
+			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
9
+			<div class="content">
10
+				<div class="line">
11
+					<label>반품요청일</label>
12
+					<input id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="date" data-check-required="empty" type="date" placeholder="">
13
+				</div>
14
+				<div class="line">
15
+					<label>반품요청금액</label>
16
+					<div class="line_right">
17
+						<div class="fnRtnReqAmt">0원</div>
18
+					</div>
19
+				</div>
20
+				<div class="line">
21
+					<label>빈품장소</label>
22
+					<div class="search_nm">
23
+						<div class="float_left">
24
+							<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
25
+							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
26
+							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
27
+						</div>
28
+						<div class="float_left_btn">
29
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
30
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
31
+						</div>
32
+					</div>
33
+				</div>
34
+				<div class="line">
35
+					<div class="table_header">
36
+						<h1>>빈품 품목</h1>
37
+						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
38
+						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
39
+					</div>
40
+				</div>
41
+			</div>
42
+			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-1-1">
43
+				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="panel-group"></ul>
44
+				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display:none;">
45
+					<li class="row_2">
46
+						<div class="left_info">
47
+							<div class="check_box"><!-- class 변경 -->
48
+								<div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
49
+							</div>
50
+							<div class="thick">
51
+								<div class="fnItemNm">품목명</div>
52
+								<div>-</div>
53
+								<div class="fnUnit">EA</div>
54
+							</div>
55
+							<div class="thick">
56
+								<label class="space0">구매가 :</label>
57
+								<div class="fnUnitAmt">1,120,000</div>
58
+							</div>
59
+						</div>
60
+						<div class="right">
61
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
62
+							<div class="num fnPchReqQty">1</div>
63
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
64
+						</div>
65
+					</li>
66
+				</div>
67
+			</div>
68
+			<div class="button_bar">
69
+				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-primary REQ">빈품요청</button>
70
+				<button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-gray TSA">임시저장</button>
71
+				<button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
72
+			</div>
73
+		</form>
74
+	</div>
75
+	<div id="ITP_MOBILE_JS"></div>
2 76
 	<div id="ITP_POP_MRTNMNG01010_RTN_AREA" class="popup mobile-pop-close" style="display: none;">
3 77
 		<div class="pop">
4 78
 			<div class="pop_line">
@@ -106,79 +180,4 @@
106 180
 			</div>
107 181
 		</div>
108 182
 	</div>
109
-
110
-	<div id="ITP_AJAX_MRTNMNG01010_VIEW_CONTAINER">
111
-		<form id="ITP_FORM_MRTNMNG01010_DETAIL" class="form-horizontal" onsubmit="return false;">
112
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_VIEW_CD" name="viewCd" value="C">
113
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_BRAND_ID" name="brandId" value="">
114
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_STORE_ID" name="storeId" value="">
115
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_DVSN" name="whsDvsn" value="">
116
-			<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
117
-			<div class="content">
118
-				<div class="line">
119
-					<label>반품요청일</label>
120
-					<input id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="date" data-check-required="empty" type="date" placeholder="">
121
-				</div>
122
-				<div class="line">
123
-					<label>반품요청금액</label>
124
-					<div class="line_right">
125
-						<div class="fnRtnReqAmt">0원</div>
126
-					</div>
127
-				</div>
128
-				<div class="line">
129
-					<label>빈품장소</label>
130
-					<div class="search_nm">
131
-						<div class="float_left">
132
-							<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
133
-							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
134
-							<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
135
-						</div>
136
-						<div class="float_left_btn">
137
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MRTNMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
138
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
139
-						</div>
140
-					</div>
141
-				</div>
142
-				<div class="line">
143
-					<div class="table_header">
144
-						<h1>>빈품 품목</h1>
145
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
146
-						<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
147
-					</div>
148
-				</div>
149
-			</div>
150
-			<div id="ITP_LIST_MRTNMNG01010_ITEM_AREA" class="scroll_area row-1-1">
151
-				<ul id="ITP_LIST_MRTNMNG01010_DETAIL_ROWS" class="panel-group"></ul>
152
-				<div id="ITP_LIST_MRTNMNG01010_DETAIL_ROWCOPY" style="display:none;">
153
-					<li class="row_2">
154
-						<div class="left_info">
155
-							<div class="check_box"><!-- class 변경 -->
156
-								<div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
157
-							</div>
158
-							<div class="thick">
159
-								<div class="fnItemNm">품목명</div>
160
-								<div>-</div>
161
-								<div class="fnUnit">EA</div>
162
-							</div>
163
-							<div class="thick">
164
-								<label class="space0">구매가 :</label>
165
-								<div class="fnUnitAmt">1,120,000</div>
166
-							</div>
167
-						</div>
168
-						<div class="right">
169
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
170
-							<div class="num fnPchReqQty">1</div>
171
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
172
-						</div>
173
-					</li>
174
-				</div>
175
-			</div>
176
-			<div class="button_bar">
177
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_RTN_ORDER" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-primary REQ">빈품요청</button>
178
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_TEMP_SAVE" data-call-popup="ITP_POP_MRTNMNG01010_RTN_AREA" class="col_3 btn-gray TSA">임시저장</button>
179
-				<button id="ITP_BTN_MRTNMNG01010_DETAIL_CANCEL" class="col_3 btn-gray CLB">취소</button>
180
-			</div>
181
-		</form>
182
-	</div>
183
-	<div id="ITP_MOBILE_JS"></div>
184 183
 </section>

+ 25 - 32
src/main/webapp/mobile/app/mrtnmng/MRTNMNG02010.html

@@ -5,7 +5,7 @@
5 5
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
6 6
 				<input type="hidden" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
7 7
 				<div class="line">
8
-					<label>구매요청일</label>
8
+					<label>반품요청일</label>
9 9
 					<div class="input-group date_to date">
10 10
 						<input type="date" id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_FROM_DT" name="fromDt" pattern="\d{4}.\d{2}.\d{2}">
11 11
 						<div class="at">~</div>
@@ -13,7 +13,7 @@
13 13
 					</div>
14 14
 				</div>
15 15
 				<div class="line">
16
-					<label>구매요청상태</label>
16
+					<label>반품요청상태</label>
17 17
 					<div class="line_right">
18 18
 						<select id="ITP_FORM_MRTNMNG02010_LIST_SEARCH_RTN_REQ_ST_CD" data-select-code="RTN_REQ_ST_CD" class="stcd" name="srtnReqStCd">
19 19
 							<option value="">상태</option>
@@ -52,8 +52,8 @@
52 52
 							<label>반품요청일 </label>
53 53
 							<span>:</span>
54 54
 							<div class="history">
55
-								<div class="fnRtnReqDt">2022.10.01</div>
56
-								(<div class="fnRtnReqMgrNm">홍길동 점주</div>)
55
+								<div class="fnRtnReqDt"></div>
56
+								(<div class="fnRtnReqMgrNm"></div>)
57 57
 							</div>
58 58
 						</div>
59 59
 					</div>
@@ -63,14 +63,14 @@
63 63
 								<label>반품상태</label>
64 64
 								<span>:</span>
65 65
 								<div class="history">
66
-									<div class="fnRtnReqStNm">대기</div>
66
+									<div class="fnRtnReqStNm"></div>
67 67
 								</div>
68 68
 							</div>
69 69
 							<div class="half">
70 70
 								<label>수거장소명 </label>
71 71
 								<span>:</span>
72 72
 								<div class="history">
73
-									<div class="fnRtnWhsNm">A매장내</div>
73
+									<div class="fnRtnWhsNm"></div>
74 74
 								</div>
75 75
 							</div>
76 76
 						</div>
@@ -80,7 +80,7 @@
80 80
 							<label style="width: 127px;">반품요청 정보</label>
81 81
 							<span>:</span>
82 82
 							<div class="history">
83
-								<div class="fnRtnReqItemQty">품목수(3)</div>
83
+								<div class="fnRtnReqItemQty"></div>
84 84
 								<i>- </i>
85 85
 								<div class="fnRtnReqAmt"></div> 원
86 86
 							</div>
@@ -101,13 +101,13 @@
101 101
 			<div class="line">
102 102
 				<label>반품요청금액</label>
103 103
 				<div class="line_right">
104
-					<div class="fnRtnReqAmt">424,000원</div>
104
+					<div class="fnRtnReqAmt"></div>
105 105
 				</div>
106 106
 			</div>
107 107
 			<div class="line">
108 108
 				<label>반품장소</label>
109 109
 				<div class="line_right">
110
-					<div class="fnWhsNm">A매장내</div>
110
+					<div class="fnRtnWhsNm"></div>
111 111
 				</div>
112 112
 			</div>
113 113
 			<div class="table_header">
@@ -122,15 +122,15 @@
122 122
 						<div class="thick">
123 123
 							<div class="fnItemNm">품목명</div>
124 124
 							<div>-</div>
125
-							<div class="fnUnit">2EA</div>
125
+							<div class="fnUnit"></div>
126 126
 						</div>
127 127
 						<div class="thick">
128 128
 							<label class="space0">반품가 :</label>
129
-							<div class="fnRtnReqAmt">1,120,000</div>
129
+							<div class="fnRtnAmt"></div>
130 130
 						</div>
131 131
 					</div>
132 132
 					<div class="right">
133
-						<div class="fnRtnReqQty">2</div>
133
+						<div class="fnRtnQty"></div>
134 134
 					</div>
135 135
 				</li>
136 136
 			</div>
@@ -144,35 +144,28 @@
144 144
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_VIEW_CD" name="viewCd" value="U">
145 145
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_BRAND_ID" name="brandId" value="">
146 146
 			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_STORE_ID" name="storeId" value="">
147
-			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOAN_DVSN" name="loanDvsn" value="">
148
-			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
149
-			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_DVSN" name="pchReqDvsn" value="">
150
-			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
151
-			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_ST_CD" name="pchReqStCd" value="">
147
+			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_UNQ_NO" name="rtnReqUnqNo" value="">
148
+			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_DVSN" name="whsDvsn" value="">
149
+			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID" name="rtnReqMgrId" value="">
150
+			<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_ST_CD" name="rtnReqStCd" value="">
152 151
 			<div class="content">
153 152
 				<div class="line">
154
-					<label>납기요청일</label>
155
-					<input id="ITP_FORM_MRTNMNG02010_MODIFY_DLV_REQ_DT" name="dlvReqDt" class="date fnDlvReqDt" data-check-required="empty" type="date" placeholder="">
153
+					<label>반품요청일</label>
154
+					<input id="ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT" name="colReqDt" class="date fnColReqDt" data-check-required="empty" type="date" placeholder="">
156 155
 				</div>
157 156
 				<div class="line">
158
-					<label>구매요청금액</label>
157
+					<label>반품요청금액</label>
159 158
 					<div class="line_right">
160
-						<div class="fnRtnReqTotalAmt">0원</div>
159
+						<div class="fnRtnReqAmt">0원</div>
161 160
 					</div>
162 161
 				</div>
163 162
 				<div class="line">
164
-					<label>구매가능금액</label>
165
-					<div class="line_right">
166
-						<div class="fnOrdUseAmt">0원</div>
167
-					</div>
168
-				</div>
169
-				<div class="line">
170
-					<label>납품장소</label>
163
+					<label>반품장소</label>
171 164
 					<div class="search_nm">
172 165
 						<div class="float_left">
173
-							<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
174
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="whsId" value="" />
175
-							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="location" value="" />
166
+							<input type="text" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" placeholder="매장명" readonly />
167
+							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
168
+							<input type="hidden" id="ITP_FORM_MRTNMNG02010_MODIFY_LOCATION" class="form-control itp_input" name="rtnLocation" value="" />
176 169
 						</div>
177 170
 						<div class="float_left_btn">
178 171
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -182,7 +175,7 @@
182 175
 				</div>
183 176
 				<div class="line">
184 177
 					<div class="table_header">
185
-						<h1>>구매 품목</h1>
178
+						<h1>>반품 품목</h1>
186 179
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW" class="btn-primary btn-sm ADB">품목삭제</button>
187 180
 						<button type="button" id="ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW" class="btn-primary btn-sm ADB">품목추가</button>
188 181
 					</div>

+ 35 - 18
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG01010.html

@@ -45,32 +45,44 @@
45 45
 			  <button type="button" id="ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MSTOCKMNG01010_STCK_AREA">재고처리</button>
46 46
 			</div>
47 47
 		  </div>
48
-			<div id="ITP_POP_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
48
+			<div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA" class="scroll_area row-2">
49 49
 			  <ul id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS" class="panel-group"></ul>
50 50
 			  <div id="ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY" style="display:none;">
51 51
 				<li class="history_list list-row">
52 52
 				  <div>
53 53
 					<div class="left">
54 54
 					  <div class="nomal">
55
-						<label>품목번호 &nbsp;:</label>
55
+						<label>창고번호 &nbsp;:</label>
56 56
 						<div>
57
-						  <div class="fnItemNo">adsf1234</div>
57
+						  <div class="fnWhsId"></div>
58 58
 						</div>
59
-						<label>품목명&nbsp;:</label>
59
+						<label>창고명&nbsp;:</label>
60 60
 						<div>
61
-						  <div class="fnItemNm">원두커피</div>
61
+						  <div class="fnWhsNm"></div>
62 62
 						</div>
63 63
 					  </div>
64 64
 					</div>
65
+					  <div class="left">
66
+						  <div class="nomal">
67
+							  <label>품목번호 &nbsp;:</label>
68
+							  <div>
69
+								  <div class="fnItemId"></div>
70
+							  </div>
71
+							  <label>품목명&nbsp;:</label>
72
+							  <div>
73
+								  <div class="fnItemNm"></div>
74
+							  </div>
75
+						  </div>
76
+					  </div>
65 77
 					<div class="left">
66 78
 					  <div class="nomal">
67 79
 						<label>단위 &nbsp;:</label>
68 80
 						<div>
69
-						  <div class="fnUnit">Kg</div>
81
+						  <div class="fnUnit"></div>
70 82
 						</div>
71 83
 						<label>단위수량&nbsp;:</label>
72 84
 						<div>
73
-						  <div class="fnUnitQty">20 Kg</div>
85
+						  <div class="fnUnitQty"></div>
74 86
 						</div>
75 87
 					  </div>
76 88
 					</div>
@@ -78,11 +90,11 @@
78 90
 					  <div class="nomal">
79 91
 						<label>현재고수량 &nbsp;:</label>
80 92
 						<div class="col_5 fn">
81
-						  <div class="col_5 fnStckQty">100Kg</div>
93
+						  <div class="col_5 fnStckQty"></div>
82 94
 						</div>
83 95
 						<label>적정재고수량&nbsp;:</label>
84 96
 						<div class="fn">
85
-						  <div class="fnStckQty">50Kg</div>
97
+						  <div class="fnPrpStckQty"></div>
86 98
 						</div>
87 99
 					  </div>
88 100
 					</div>
@@ -90,11 +102,11 @@
90 102
 					  <div class="nomal">
91 103
 						<label>안전재고비율 &nbsp;:</label>
92 104
 						<div class="col_5 fn">
93
-						  <div class="col_5 fn">40%</div>
105
+						  <div class="col_5 fnSftStckRt"></div>
94 106
 						</div>
95 107
 						<label class="col_0">Location&nbsp;:</label>
96 108
 						<div class="fn">
97
-						  <div class="fnWhsDvsn">매장내</div>
109
+						  <div class="fnLocationNm"></div>
98 110
 						</div>
99 111
 					  </div>
100 112
 					</div>
@@ -152,6 +164,11 @@
152 164
 					<button type="button" id="ITP_BTN_MSTOCKMNG01010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
153 165
 				</div>
154 166
 			</div>
167
+			<form id="ITP_FORM_MSTOCKMNG01010_POP" class="form-horizontal" onsubmit="return false;">
168
+				<input type="hidden" id="ITP_FORM_MLOANMNG01010_POP_BRAND_ID" name="brandId" value="">
169
+				<input type="hidden" id="ITP_FORM_MLOANMNG01010_POP_ITEM_ID" name="itemId" value="">
170
+				<input type="hidden" id="ITP_FORM_MLOANMNG01010_POP_SOURCE_LOCATION" name="sourceLocation" value="">
171
+				<input type="hidden" id="ITP_FORM_MLOANMNG01010_POP_SOURCE_WHS_ID" name="sourceWhsId" value="">
155 172
 			<div style="margin-top:10px;">
156 173
 				<div class="list_line">
157 174
 					<div class="list_label">
@@ -190,7 +207,7 @@
190 207
 						<label>현재고</label>
191 208
 					</div>
192 209
 					<div class="list_info">
193
-						<div class="pay_info fnStck">100개</div>
210
+						<div class="pay_info fnStckQty">100개</div>
194 211
 					</div>
195 212
 				</div>
196 213
 				<div class="list_line border">
@@ -198,7 +215,7 @@
198 215
 						<label>관리등급</label>
199 216
 					</div>
200 217
 					<div class="list_info">
201
-						<div class="pay_info fnMgnt"></div>
218
+						<div class="pay_info fnMgntLevel"></div>
202 219
 					</div>
203 220
 				</div>
204 221
 				<div class="list_line" style="margin-top:30px;">
@@ -206,7 +223,7 @@
206 223
 					<label>창고선택</label>
207 224
 				</div>
208 225
 			 	  <div class="line_right">
209
-					<select name="whsNm" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM" data-check-required="empty">
226
+					<select name="targetWhsId" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM">
210 227
 					  <option value=""></option>
211 228
 					</select>
212 229
 				  </div>
@@ -216,7 +233,7 @@
216 233
 				  		<label>Location</label>
217 234
 					</div>
218 235
 				  <div class="line_right">
219
-					<select name="location" id="ITP_FORM_MSTOCKMNG01010_POP_LOCATION" data-check-required="empty">
236
+					<select name="targetLocation" id="ITP_FORM_MSTOCKMNG01010_POP_LOCATION">
220 237
 					  <option value=""></option>
221 238
 					</select>
222 239
 				  </div>
@@ -226,15 +243,15 @@
226 243
 						<label>이동 수량</label>
227 244
 					</div>
228 245
 					<div class="line_right">
229
-						<input id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" data-check-required="empty" >
246
+						<input name="moveQty" id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" placeholder="0" data-check-required="empty" data-key-up="number">
230 247
 					</div>
231 248
 				</div>
232 249
 			    <div class="search">
233 250
 	 				<div class="left">
234
-	 					<button id="ITP_BTN_MSTOCKMNG01010_POP_PAY_REQ_CANCEL" class="col_3 btn-danger btn-sm CLB">취소</button>
251
+	 					<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_CANCEL" class="col_3 btn-danger btn-sm CLB">취소</button>
235 252
 	 				</div>
236 253
 					<div class="right">				  		
237
-			  			<button id="ITP_BTN_MSTOCKMNG01010_POP_PAY_REQ" class="col_3 btn-primary btn-sm ">저장</button>
254
+			  			<button id="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_REQ" class="col_3 btn-primary btn-sm ">저장</button>
238 255
 					</div>			  		
239 256
 			    </div>
240 257
 			</div>

+ 1 - 1
src/main/webapp/mobile/app/mstockmng/MSTOCKMNG02010.html

@@ -49,7 +49,7 @@
49 49
 					  <div class="nomal">
50 50
 						<label>품목번호 &nbsp;:</label>
51 51
 						<div>
52
-						  <div class="fnItemNo">adsf1234</div>
52
+						  <div class="fnItemId">adsf1234</div>
53 53
 						</div>
54 54
 						<label>품목명&nbsp;:</label>
55 55
 						<div>

+ 14 - 14
src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -37,26 +37,26 @@
37 37
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
38 38
 							
39 39
 								<div class="form-group">
40
-									<label class="col-xs-2 itp_lb">주문번호</label>
41
-									<div class="col-xs-10 itp_ip fnPoOrdNo"></div>									
40
+									<label class="col-xs-3 itp_lb">주문번호</label>
41
+									<div class="col-xs-9 itp_ip fnPoOrdNo"></div>
42 42
 								</div>
43 43
 								<div class="form-group">
44
-									<label class="col-xs-2 itp_lb">구매자명</label>
45
-									<div class="col-xs-10 itp_ip fnOrdNm"></div>									
44
+									<label class="col-xs-3 itp_lb">구매자명</label>
45
+									<div class="col-xs-9 itp_ip fnOrdNm"></div>
46 46
 								</div>
47 47
 								<div class="form-group">
48
-									<label class="col-xs-2 itp_lb">상품명</label>
49
-									<div class="col-xs-10 itp_ip fnGoodsNm"></div>									
48
+									<label class="col-xs-3 itp_lb">상품명</label>
49
+									<div class="col-xs-9 itp_ip fnGoodsNm"></div>
50 50
 								</div>
51 51
 								<div class="form-group">
52
-									<label class="col-xs-2 itp_lb">결제금액*</label>
53
-									<div class="col-xs-10 itp_ip">
54
-									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" />
52
+									<label class="col-xs-3 itp_lb">결제금액*</label>
53
+									<div class="col-xs-9 itp_ip">
54
+									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="form-control itp_input" name="goodsAmt" data-key-up="number" />
55 55
 									</div>									
56 56
 								</div>
57 57
 								<div class="form-group">
58
-									<label class="col-xs-2 itp_lb">결제방법*</label>
59
-									<div class="col-xs-10 itp_ip">
58
+									<label class="col-xs-3 itp_lb">결제방법*</label>
59
+									<div class="col-xs-9 itp_ip">
60 60
 										<div class="col-xs-5 itp_ip">
61 61
 											<select id="ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD" class="form-control itp_input" name="payMethod">
62 62
 												<option value="11">신용카드</option>
@@ -66,9 +66,9 @@
66 66
 									</div>									
67 67
 								</div>								
68 68
 								<div class="form-group">
69
-									<label class="col-xs-2 itp_lb">휴대폰번호*</label>
70
-									<div class="col-xs-10 itp_ip">
71
-									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" placeholder="010-0000-0000" />
69
+									<label class="col-xs-4 itp_lb">휴대폰번호*</label>
70
+									<div class="col-xs-8 itp_ip">
71
+									<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL" class="form-control itp_input" name="ordTel" data-key-up="tel" placeholder="010-0000-0000" maxlength="13" />
72 72
 									</div>
73 73
 								</div>
74 74
 								<div class="form-group">

+ 88 - 7
src/main/webapp/mobile/js/app/mloanmng/ITP_MLOANMNG02010.js

@@ -61,11 +61,11 @@ let mobPageObj = {
61 61
 			$('button[id^="ITP_BTN_MLOANMNG02010_LIST"]').on('click', function() {
62 62
 				var id = $(this).attr('id');
63 63
 				switch (id) {
64
-					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE'	: mobPopObj.popStoreNm.init(); 		break;
65
-					case 'ITP_BTN_MLOANMNG02010_LIST_DELETE_RTN_PLACE'	: mobPopObj.popStoreNm.delete(); 	break;
66
-					case 'ITP_BTN_MLOANMNG02010_LIST_PAY'				: mobContentObj.list.payment();		break;
67
-					case 'ITP_BTN_MLOANMNG02010_LIST_ADD'				: mobContentObj.list.add();			break;
68
-					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH'			: mobContentObj.list.search();		break;
64
+					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH_RTN_PLACE'	: mobPopObj.popStoreNm.init(); 			break;
65
+					case 'ITP_BTN_MLOANMNG02010_LIST_DELETE_RTN_PLACE'	: mobPopObj.popStoreNm.delete(); 		break;
66
+					case 'ITP_BTN_MLOANMNG02010_LIST_PAY'				: mobContentObj.list.payment.view();		break;
67
+					case 'ITP_BTN_MLOANMNG02010_LIST_ADD'				: mobContentObj.list.add();				break;
68
+					case 'ITP_BTN_MLOANMNG02010_LIST_SEARCH'			: mobContentObj.list.search();			break;
69 69
 				}
70 70
 				return false;
71 71
 			});
@@ -201,8 +201,88 @@ let mobContentObj = {
201 201
 			console.log(JSON.stringify(param));
202 202
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
203 203
 		},
204
-		payment: function() {
205
-			console.log('payment');
204
+		payment: {
205
+			view: function() {
206
+				var storeId = $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val();
207
+				if(storeId.length < 1) {
208
+					alert('신규입금 처리를 위한 매장을 선택하세요.');
209
+					return;
210
+				}
211
+				if(CommonObj.isApp) {
212
+					mobPageObj.switchScreen(PAGE_MODE_PAY);
213
+					this.load();
214
+				} else {
215
+					this.popup();
216
+				}
217
+			},
218
+			load: function() {
219
+				var callbackFn = function(result) {
220
+					console.log(result);
221
+					var id = '#ITP_AJAX_MLOANMNG02010_PAY_CONTAINER';
222
+					$(id).find('.fnPoOrdNo').text(result.poOrdNo);
223
+					$(id).find('.fnOrdNm').text(result.ordNm);
224
+					$(id).find('.fnGoodsNm').text(result.goodsNm);
225
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_PO_ORD_NO').val(result.poOrdNo);
226
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_NM').val(result.ordNm);
227
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_NM').val(result.goodsNm);
228
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MALL_ID').val(result.mallId);
229
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MOBILE_URL').val(result.kicc_action_mobile_url);
230
+					$(id).find('#ITP_FORM_MLOANMNG02010_PAY_JS_URL').val(result.kicc_javascript_url);
231
+					if(result.ordEmail) {
232
+						var email = result.ordEmail.split('@');
233
+						if(email.length === 2) {
234
+							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_EMAIL').val(email);
235
+							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_EMAIL_ID').val(email[0]);
236
+							$(id).find('#ITP_FORM_MLOANMNG02010_PAY_EMAIL_NM').val(email[1]);
237
+						}
238
+					}
239
+				};
240
+				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
241
+				var param = $('#ITP_FORM_MLOANMNG02010_VIEW').serializeObject();
242
+				fn_ajax_call(EASYPAY_PAYMENT_CREATE, JSON.stringify(param), callbackFn, 'POST');
243
+			},
244
+			popup: function() {
245
+				// 결제 팝업 결과
246
+				var popFn = function(rowDataPop) {
247
+					console.log(JSON.stringify(rowDataPop));
248
+					listObj.grid.search();
249
+				};
250
+				// 결제 팝업
251
+				// 결제타입코드 : 10(선불(충전)), 20(후불(결제)), 30(후불(선결제))
252
+				var loanDvsn = $('#ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val();
253
+				var args = {
254
+					'payTpCd': loanDvsn == 'LD01' ? '10' : '30',
255
+					'brandId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
256
+					'storeId': $('#ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val()
257
+				};
258
+				fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'M');
259
+			},
260
+			request: function() {
261
+				var param = $('#ITP_FORM_MLOANMNG02010_PAY').serializeObject();
262
+				console.log(param);
263
+				location.replace('app:payment:' + JSON.stringify(param));
264
+			},
265
+			payResult: function(result) {
266
+				console.log(result);
267
+			},
268
+			cancel: function() {
269
+				$(id).find('.fnPoOrdNo').text('');
270
+				$(id).find('.fnOrdNm').text('');
271
+				$(id).find('.fnGoodsNm').text('');
272
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_PO_ORD_NO').val('');
273
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_ORD_NM').val('');
274
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_NM').val('');
275
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_GOODS_AMT').val('');
276
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MALL_ID').val('');
277
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_MOBILE_URL').val('');
278
+				$(id).find('#ITP_FORM_MLOANMNG02010_PAY_JS_URL').val('');
279
+				mobPageObj.switchScreen(PAGE_MODE_VIEW);
280
+			}
281
+		},
282
+		payRequest: function() {
283
+			location.replace('app:payment');
284
+		},
285
+		payCancel: function() {
206 286
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
207 287
 		},
208 288
 		add: function() {
@@ -326,6 +406,7 @@ let mobPopObj = {
326 406
 				if(storeId === item.storeId) {
327 407
 					$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID').val(item.storeId);
328 408
 					$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_NM').val(item.storeNm);
409
+					$('#ITP_FORM_MLOANMNG02010_LIST_SEARCH #ITP_FORM_LOANMNG02010_SEARCH_STORE_LOAN_DVSN').val(item.loanDvsn);
329 410
 					_this.close();
330 411
 					return false;
331 412
 				}

+ 36 - 36
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG02010.js

@@ -41,8 +41,8 @@ let mobPageObj = {
41 41
 			});
42 42
 
43 43
 			// 조회일자 지정
44
-			$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
45
-			$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
44
+			$('#ITP_FORM_MPOMNG02010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
45
+			$('#ITP_FORM_MPOMNG02010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
46 46
 		},
47 47
 		info: function() {
48 48
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -56,20 +56,20 @@ let mobPageObj = {
56 56
 			this.button();
57 57
 		},
58 58
 		button: function() {
59
-			$('button[id^="ITP_BTN_MPOMNG02010_VIEW"]').on('click', function() {
59
+			$('button[id^="ITP_BTN_MPOMNG02010_LIST"]').on('click', function() {
60 60
 				var id = $(this).attr('id');
61 61
 				switch (id) {
62
-					case 'ITP_BTN_MPOMNG02010_VIEW_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_LIST); 		break;
63
-					case 'ITP_BTN_MPOMNG02010_VIEW_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_LIST); 	break;
64
-					case 'ITP_BTN_MPOMNG02010_VIEW_SEARCH'			: mobContentObj.list.search();					break;
62
+					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_LIST); 		break;
63
+					case 'ITP_BTN_MPOMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_LIST); 	break;
64
+					case 'ITP_BTN_MPOMNG02010_LIST_SEARCH'			: mobContentObj.list.search();					break;
65 65
 				}
66 66
 				return false;
67 67
 			});
68 68
 
69
-			$('button[id^="ITP_BTN_MPOMNG02010_DETAIL"]').on('click', function() {
69
+			$('button[id^="ITP_BTN_MPOMNG02010_VIEW"]').on('click', function() {
70 70
 				var id = $(this).attr('id');
71 71
 				switch (id) {
72
-					case 'ITP_BTN_MPOMNG02010_DETAIL_CANCEL_LIST'		: mobContentObj.detail.cancel();	break;
72
+					case 'ITP_BTN_MPOMNG02010_VIEW_CANCEL_LIST'		: mobContentObj.detail.cancel();	break;
73 73
 				}
74 74
 				return false;
75 75
 			});
@@ -102,10 +102,10 @@ let mobPageObj = {
102 102
 			$(this).hide();
103 103
 		});
104 104
 		if(mode === VIEW_MODE_LIST) {
105
-			$('#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER').show();
105
+			$('#ITP_AJAX_MPOMNG02010_LIST_CONTAINER').show();
106 106
 			this.moreView(true);
107 107
 		} else if(mode === VIEW_MODE_DETAIL) {
108
-			$('#ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER').show();
108
+			$('#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER').show();
109 109
 			this.moreView(false);
110 110
 		} else if(mode === VIEW_MODE_MODIFY) {
111 111
 			$('#ITP_AJAX_MPOMNG02010_MODIFY_CONTAINER').show();
@@ -174,7 +174,7 @@ let mobContentObj = {
174 174
 				});
175 175
 			};
176 176
 			var errFn = function() { _this.isSearch = false;};
177
-			const param = $('#ITP_FORM_MPOMNG02010_VIEW_SEARCH').serializeObject();
177
+			const param = $('#ITP_FORM_MPOMNG02010_LIST_SEARCH').serializeObject();
178 178
 			param.gridPage = ++this.listPage;
179 179
 			param.gridSize = this.listSize;
180 180
 			param.fromDt = CommonObj.onlyNumber(param.fromDt);
@@ -208,14 +208,14 @@ let mobContentObj = {
208 208
 		},
209 209
 		view: function(result) {
210 210
 			var _this = this;
211
-			var id = '#ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER';
211
+			var id = '#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER';
212 212
 			$(id).find('.fnDlvReqDt').text(result.dlvReqDt);
213 213
 			$(id).find('.fnPchReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
214 214
 			$(id).find('.fnLocationNm').text(result.locationNm);
215 215
 			$(id).find('.fnPchApprNm').text('(' + result.pchApprNm + ')' + CommonObj.currency.add(result.pchApprAmt));
216 216
 			$.each(result.pchReqDtlList, function (i, item) {
217
-				$('#ITP_LIST_MPOMNG02010_DETAIL_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_DETAIL_ROWCOPY').html());
218
-				var $li = $('#ITP_LIST_MPOMNG02010_DETAIL_AREA .panel-group > .list-row:last');
217
+				$('#ITP_LIST_MPOMNG02010_VIEW_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_VIEW_ROWCOPY').html());
218
+				var $li = $('#ITP_LIST_MPOMNG02010_VIEW_AREA .panel-group > .list-row:last');
219 219
 				$li.find('.fnItemNm').text(item.itemNm);
220 220
 				$li.find('.fnUnit').text(item.pchReqQty + item.unit);
221 221
 				$li.find('.fnPchReqAmt').text(CommonObj.comma.set(item.pchReqAmt));
@@ -225,12 +225,12 @@ let mobContentObj = {
225 225
 		},
226 226
 		cancel: function () {
227 227
 			this.rows.length = 0;
228
-			var id = '#ITP_AJAX_MPOMNG02010_DETAIL_CONTAINER';
228
+			var id = '#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER';
229 229
 			$(id).find('.fnDlvReqDt').text('');
230 230
 			$(id).find('.fnPchReqTotalAmt').text('');
231 231
 			$(id).find('.fnLocationNm').text('');
232 232
 			$(id).find('.fnPchApprNm').text('');
233
-			$('#ITP_LIST_MPOMNG02010_DETAIL_AREA .panel-group').empty();
233
+			$('#ITP_LIST_MPOMNG02010_VIEW_AREA .panel-group').empty();
234 234
 			mobPageObj.switchScreen(VIEW_MODE_LIST);
235 235
 		}
236 236
 	},
@@ -345,7 +345,7 @@ let mobContentObj = {
345 345
 					var amt = item.unitAmt;
346 346
 					reqAmt += Number(qty) * amt;
347 347
 				});
348
-				$('#ITP_AJAX_MPOMNG02010_VIEW_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
348
+				$('#ITP_AJAX_MPOMNG02010_LIST_CONTAINER').find('.fnPchReqAmtTot').text(CommonObj.currency.add(reqAmt));
349 349
 			}
350 350
 		},
351 351
 		cancel: function () {
@@ -463,10 +463,22 @@ let mobPopObj = {
463 463
 			this.rows = gridRows;
464 464
 			$.each(gridRows, function (i, item) {
465 465
 				$('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MPOMNG02010_POP_WHS_ROWCOPY').html());
466
-				var $li = $('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group > .row_2:last');
466
+				var $li = $('#ITP_LIST_MPOMNG02010_POP_WHS_AREA .panel-group > .list-row:last');
467
+				$li.find('.fnWhsId').data('whs-id', item.whsId);
467 468
 				$li.find('.fnWhsNm').text(item.whsNm);
468 469
 				$li.find('.fnLocationNm').text(item.locationNm);
469
-				$li.find('.fnWhsId').data('whs-id', item.whsId);
470
+			});
471
+		},
472
+		action: function() {
473
+			var _this = this;
474
+			$('#ITP_LIST_MPOMNG02010_POP_WHS_AREA button[id^="ITP_BTN_MPOMNG02010_POP"]').off('click').on('click', function() {
475
+				var id = $(this).attr('id');
476
+				switch (id) {
477
+					case 'ITP_BTN_MPOMNG02010_POP_WHS_SEARCH'	: _this.search();				break;
478
+					case 'ITP_BTN_MPOMNG02010_POP_WHS_CHOICE'	: _this.choice($(this)); 		break;
479
+					case 'ITP_BTN_MPOMNG02010_POP_WHS_CLOSE'	: mobPopObj.hide(_this.popId);	break;
480
+				}
481
+				return false;
470 482
 			});
471 483
 		},
472 484
 		choice: function(elem) {
@@ -475,8 +487,8 @@ let mobPopObj = {
475 487
 			$.each(this.rows, function (i, item) {
476 488
 				if(whsId === item.whsId) {
477 489
 					if(_this.mode === VIEW_MODE_LIST) {
478
-						$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH #ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_ID').val(item.whsId);
479
-						$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH #ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_NM').val(item.whsNm);
490
+						$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID').val(item.whsId);
491
+						$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM').val(item.whsNm);
480 492
 					} else if(_this.mode === VIEW_MODE_MODIFY) {
481 493
 						$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_ID').val(item.whsId);
482 494
 						$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').val(item.whsNm);
@@ -487,22 +499,10 @@ let mobPopObj = {
487 499
 				}
488 500
 			});
489 501
 		},
490
-		action: function() {
491
-			var _this = this;
492
-			$('button[id^="ITP_BTN_MPOMNG02010_POP"]').off('click').on('click', function() {
493
-				var id = $(this).attr('id');
494
-				switch (id) {
495
-					case 'ITP_BTN_MPOMNG02010_POP_WHS_SEARCH'	: _this.search();				break;
496
-					case 'ITP_BTN_MPOMNG02010_POP_WHS_CHOICE'	: _this.choice($(this)); 		break;
497
-					case 'ITP_BTN_MPOMNG02010_POP_WHS_CLOSE'	: mobPopObj.hide(_this.popId);	break;
498
-				}
499
-				return false;
500
-			});
501
-		},
502 502
 		delete: function(mode) {
503 503
 			if(mode === VIEW_MODE_LIST) {
504
-				$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH #ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_ID').val('');
505
-				$('#ITP_FORM_MPOMNG02010_VIEW_SEARCH #ITP_FORM_MPOMNG02010_VIEW_SEARCH_WHS_NM').val('');
504
+				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_ID').val('');
505
+				$('#ITP_FORM_MPOMNG02010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_WHS_NM').val('');
506 506
 			} else if(mode === VIEW_MODE_MODIFY) {
507 507
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_ID').val('');
508 508
 				$('#ITP_FORM_MPOMNG02010_MODIFY #ITP_FORM_MPOMNG02010_MODIFY_WHS_NM').val('');
@@ -543,7 +543,7 @@ let mobPopObj = {
543 543
 
544 544
 			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
545 545
 				var ordUseAmt = $('#ITP_FORM_MPOMNG02010_MODIFY .fnOrdUseAmt').text();
546
-				var pchReqTotalAmt = $('#ITP_FORM_MPOMNG02010_DETAIL .fnPchReqTotalAmt').text();
546
+				var pchReqTotalAmt = $('#ITP_FORM_MPOMNG02010_VIEW .fnPchReqTotalAmt').text();
547 547
 
548 548
 				if (parseInt(CommonObj.onlyNumber(ordUseAmt)) < parseInt(CommonObj.onlyNumber(pchReqTotalAmt))) {
549 549
 					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);

+ 76 - 16
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG06010.js

@@ -51,12 +51,12 @@ let mobPageObj = {
51 51
 			$('button[id^="ITP_BTN_MPOMNG06010_LIST"]').on('click', function() {
52 52
 				var id = $(this).attr('id');
53 53
 				switch (id) {
54
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init('WHS'); 		break;
55
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete('WHS'); 	break;
56
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM'	: mobPopObj.popWhsNm.init('RTN_WHS'); 	break;
57
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM'	: mobPopObj.popWhsNm.delete('RTN_WHS'); break;
54
+					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH_SPPLY_NM'		: mobPopObj.popSpply.init(); 	break;
55
+					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_SPPLY_NM'		: mobPopObj.popSpply.delete(); break;
56
+					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(); 		break;
57
+					case 'ITP_BTN_MPOMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(); 	break;
58 58
 					case 'ITP_BTN_MPOMNG06010_LIST_SEARCH'				: mobContentObj.list.search();	break;
59
-					case 'ITP_BTN_MPOMNG06010_LIST_MODIFY'				: mobContentObj.list.save();	break;
59
+					case 'ITP_BTN_MPOMNG06010_LIST_SAVE'				: mobContentObj.list.save();	break;
60 60
 				}
61 61
 				return false;
62 62
 			});
@@ -110,6 +110,7 @@ let mobContentObj = {
110 110
 		},
111 111
 		search: function() {
112 112
 			var formId = '#ITP_FORM_MPOMNG06010_LIST_SEARCH';
113
+			itp_fn_form_clear_validate(null, formId);
113 114
 			if (itp_fn_form_event.isValid(formId)) {
114 115
 				this.listPage = 0;
115 116
 				this.totPage = 0;
@@ -185,6 +186,70 @@ let mobContentObj = {
185 186
 };
186 187
 
187 188
 let mobPopObj = {
189
+	popSpply: {
190
+		popId: 'ITP_POP_MPOMNG06010_SPPLY_AREA',
191
+		rows: [],
192
+		init: function() {
193
+			this.rows.length = 0;
194
+			mobPopObj.show(this.popId);
195
+			this.search();
196
+			this.action();
197
+		},
198
+		search: function() {
199
+			var _this = this;
200
+			$('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group').empty();
201
+			var callbackFn = function(result) {
202
+				console.log(result);
203
+				_this.view(result.gridRows);
204
+			};
205
+			let param = $('#ITP_FORM_MPOMNG06010_POP_SPPLY_SEARCH').serializeObject();
206
+			fn_ajax_call(API_POP_SPPLY_LIST, JSON.stringify(param), callbackFn, 'POST');
207
+		},
208
+		view: function(gridRows) {
209
+			this.rows = gridRows;
210
+			$.each(gridRows, function (i, item) {
211
+				$('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group').append($('#ITP_POP_MPOMNG06010_LIST_SPPLY_ROWCOPY').html());
212
+				var $li = $('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group > .list-row:last');
213
+				$li.find('.fnSpplyNm').text(item.spplyNm);
214
+				$li.find('.fnStNm').text($li.find('.fnStNm').text().replace('$', item.stNm));
215
+				$li.find('.fnSpplyId').data('item-key', item.spplyId);
216
+			});
217
+		},
218
+		choice: function(elem) {
219
+			var _this = this;
220
+			var spplyId = $(elem).data('item-key');
221
+			$.each(this.rows, function (i, item) {
222
+				if(spplyId === item.spplyId) {
223
+					$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_ID').val(item.spplyId);
224
+					$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_NM').val(item.spplyNm);
225
+					_this.close();
226
+					return false;
227
+				}
228
+			});
229
+		},
230
+		action: function() {
231
+			var _this = this;
232
+			$('button[id^="ITP_BTN_MPOMNG06010_POP_SPPLY"]').off('click').on('click', function() {
233
+				var id = $(this).attr('id');
234
+				switch (id) {
235
+					case 'ITP_BTN_MPOMNG06010_POP_SPPLY_SEARCH'	: _this.search();			break;
236
+					case 'ITP_BTN_MPOMNG06010_POP_SPPLY_CHOICE'	: _this.choice($(this));	break;
237
+					case 'ITP_BTN_MPOMNG06010_POP_SPPLY_CLOSE'	: _this.close(); 			break;
238
+				}
239
+				return false;
240
+			});
241
+		},
242
+		delete: function() {
243
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_ID').val('');
244
+			$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_SPPLY_NM').val('');
245
+		},
246
+		close: function() {
247
+			this.rows.length = 0;
248
+			$('#ITP_POP_MPOMNG06010_LIST_SPPLY_AREA .panel-group').empty();
249
+			$('#ITP_FORM_MPOMNG06010_POP_SPPLY_SEARCH #ITP_FORM_MPOMNG06010_POP_SPPLY_KEYWORD').val('');
250
+			mobPopObj.hide(this.popId);
251
+		}
252
+	},
188 253
 	popWhsNm: {
189 254
 		popId: 'ITP_POP_MPOMNG06010_WHS_AREA',
190 255
 		rows: [],
@@ -219,13 +284,8 @@ let mobPopObj = {
219 284
 			var whsId = $(elem).data('whs-id');
220 285
 			$.each(this.rows, function (i, item) {
221 286
 				if(whsId === item.whsId) {
222
-					if(_this.popMode === 'RTN_WHS') {
223
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val(item.whsId);
224
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val(item.whsNm);
225
-					} else {
226
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val(item.whsId);
227
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val(item.whsNm);
228
-					}
287
+					$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_ID').val(item.whsId);
288
+					$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MPOMNG06010_LIST_SEARCH_WHS_NM').val(item.whsNm);
229 289
 					_this.close();
230 290
 					return false;
231 291
 				}
@@ -245,11 +305,11 @@ let mobPopObj = {
245 305
 		},
246 306
 		delete: function() {
247 307
 			if(_this.popMode === 'RTN_WHS') {
248
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val('');
249
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val('');
308
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val('');
309
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val('');
250 310
 			} else {
251
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
252
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
311
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
312
+				$('#ITP_FORM_MPOMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
253 313
 			}
254 314
 		},
255 315
 		close: function() {

+ 2 - 2
src/main/webapp/mobile/js/app/mpomng/ITP_MPOMNG07010.js

@@ -139,8 +139,8 @@ let mobContentObj = {
139 139
 					$li.find('.fnSpplyNm').text(item.spplyNm);
140 140
 					$li.find('.fnWhsNm').text(item.whsNm);
141 141
 					$li.find('.fnItemNm').text(item.itemNm);
142
-					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty));
143
-					$li.find('.fnDlvQty').text(CommonObj.comma.set(item.dlvQty));
142
+					$li.find('.fnPodrQty').text(CommonObj.comma.set(item.podrQty) + item.unit);
143
+					$li.find('.fnWhsQty').text(CommonObj.comma.set(item.dlvQty) + item.unit);
144 144
 					_this.rows.push(item);
145 145
 				});
146 146
 			};

+ 34 - 26
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG01010.js

@@ -15,8 +15,8 @@ const ID_ITP_POP_MRTNMNG01010_REQ_AREA 		= "ITP_POP_MRTNMNG01010_REQ_AREA";
15 15
 const ID_ITP_POP_MRTNMNG01010_WHS_AREA 		= "ITP_POP_MRTNMNG01010_WHS_AREA";
16 16
 const ID_ITP_POP_MRTNMNG01010_ITEM_AREA 	= "ITP_POP_MRTNMNG01010_ITEM_AREA";
17 17
 
18
-const RTN_REQ_ST_CD_TEMP_SAVE		="PR00";
19
-const RTN_REQ_ST_CD_REQUEST_SAVE	="PR20";
18
+const RTN_REQ_ST_CD_TEMP_SAVE		="RR00";
19
+const RTN_REQ_ST_CD_REQUEST_SAVE	="RR20";
20 20
 
21 21
 let mobPageObj = {
22 22
 	isPrevPage: false,
@@ -51,10 +51,10 @@ let mobPageObj = {
51 51
 				} else {
52 52
 					var id = $(this).attr('id');
53 53
 					switch (id) {
54
-						case 'ITP_BTN_MRTNMNG01010_DETAIL_DELROW'		: mobContObj.list.delRow(); 		break;
54
+						case 'ITP_BTN_MRTNMNG01010_DETAIL_DELROW'			: mobContObj.list.delRow(); 		break;
55 55
 						case 'ITP_BTN_MRTNMNG01010_DETAIL_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
56 56
 						case 'ITP_BTN_MRTNMNG01010_DETAIL_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete();		break;
57
-						case 'ITP_BTN_MRTNMNG01010_DETAIL_CANCEL'		: mobContObj.cancel();				break;
57
+						case 'ITP_BTN_MRTNMNG01010_DETAIL_CANCEL'			: mobContObj.cancel();				break;
58 58
 					}
59 59
 				}
60 60
 				return false;
@@ -89,8 +89,8 @@ let mobContObj = {
89 89
 				_this.initPchReq = result;
90 90
 				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_BRAND_ID').val(result.brandId);
91 91
 				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_STORE_ID').val(result.storeId);
92
-				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_LOCATION').val(result.rtnLocation);
93
-				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_WHS_ID').val(result.rtnWhsId);
92
+				// $('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_WHS_ID').val(result.rtnWhsId);
93
+				// $('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_LOCATION').val(result.rtnLocation);
94 94
 				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_WHS_DVSN').val(result.whsDvsn);
95 95
 			};
96 96
 			const param = {brandId:fn_make_user_info.get('brandId'), storeId:fn_make_user_info.get('storeId')};
@@ -164,7 +164,7 @@ let mobContObj = {
164 164
 				var amt = item.unitAmt;
165 165
 				reqAmt += Number(qty) * amt;
166 166
 			});
167
-			$('#ITP_AJAX_MRTNMNG01010_VIEW_CONTAINER').find('.fnRtnReqAmt').text(CommonObj.currency.add(reqAmt));
167
+			$('#ITP_AJAX_MRTNMNG01010_DETAIL_CONTAINER').find('.fnRtnReqAmt').text(CommonObj.currency.add(reqAmt));
168 168
 		}
169 169
 	},
170 170
 	cancel: function () {
@@ -174,11 +174,13 @@ let mobContObj = {
174 174
 
175 175
 let mobPopObj = {
176 176
 	init: function(popId, parentId) {
177
+		console.log(popId);
177 178
 		switch (popId) {
178
-			case 'ITP_POP_MRTNMNG01010_REQ_AREA'		: this.popReqConfirm.init(parentId); 	break;
179
+			case 'ITP_POP_MRTNMNG01010_RTN_AREA'		: this.popReqConfirm.init(parentId); 	break;
179 180
 			case 'ITP_POP_MRTNMNG01010_WHS_AREA'		: this.popWhsNm.init(); 				break;
180
-			case 'ITP_POP_MRTNMNG01010_ITEM_AREA'	: this.popItem.init();					break;
181
+			case 'ITP_POP_MRTNMNG01010_ITEM_AREA'		: this.popItem.init();					break;
181 182
 		}
183
+		$('#' + popId).show();
182 184
 	},
183 185
 	popItem: {
184 186
 		// rows: null,
@@ -306,6 +308,7 @@ let mobPopObj = {
306 308
 			this.action();
307 309
 		},
308 310
 		view: function() {
311
+			console.log(this.rtnReqStCd);
309 312
 			if(this.rtnReqStCd === RTN_REQ_ST_CD_REQUEST_SAVE) {
310 313
 				$('#ITP_POP_MRTNMNG01010_RTN_AREA .msg_save').text('빈품요청 하시겠습니까?');
311 314
 			} else {
@@ -314,31 +317,38 @@ let mobPopObj = {
314 317
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnReqDt').text($('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT').val());
315 318
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnItemQty').text(CommonObj.currency.add(mobContObj.list.rows.length, '개'));
316 319
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA .fnRtnAmt').text(CommonObj.currency.add($('#ITP_FORM_MRTNMNG01010_DETAIL .fnRtnReqAmt').text()));
320
+			$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_REQ_ST_CD').val(this.rtnReqStCd);
317 321
 		},
318 322
 		action: function() {
319 323
 			var _this = this;
320 324
 			$('#ITP_POP_MRTNMNG01010_RTN_AREA button[id="ITP_BTN_MRTNMNG01010_POP_RTN_CONFIRM"]').off('click').on('click', function() {
321
-				$('#ITP_FORM_MRTNMNG01010_DETAIL #ITP_FORM_MRTNMNG01010_DETAIL_RTN_RTN_ST_CD').val(_this.rtnReqStCd);
322 325
 				_this.save('#ITP_FORM_MRTNMNG01010_DETAIL');
323 326
 			});
324 327
 		},
325 328
 		save: function(formId) {
326 329
 			let param = $(formId).serializeObject();
327
-
328
-			if (param.loanDvsn !== 'LD03' && this.rtnReqStCd === RTN_REQ_ST_CD_REQUEST_SAVE ) {
329
-				var pchActAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text();
330
-				var pchReqAtm = $('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text();
331
-
332
-				if (parseInt(pchActAtm) < parseInt(pchReqAtm)) {
333
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
334
-					return;
335
-				}
336
-			}
337
-
338
-			$.each(mobContObj.list.rows, function(index, item) {
339
-				item['viewCd'] = 'C';
330
+			var gridInsertData = [];
331
+			$.each(mobContObj.list.rows, function(index, row) {
332
+				var item = {};
333
+				item['viewCd'] 			= 'C';
334
+				item['brandUnitUnqNo']	= row.brandUnitUnqNo;
335
+				item['itemId']			= row.itemId;
336
+				item['itemNm']			= row.itemNm;
337
+				item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.pchReqQty);
338
+				item['rtnDvsn']			= row.rtnDvsn;
339
+				item['rtnQty']			= row.pchReqQty;
340
+				item['rtnReqDtlNo']		= row.rtnReqDtlNo;
341
+				item['rtnReqUnqNo']		= row.rtnReqUnqNo;
342
+				item['rtnRsn']			= row.rtnRsn;
343
+				item['rtnRsnDvsn']		= row.rtnRsnDvsn;
344
+				item['spplyId']			= row.spplyId;
345
+				item['storeUnitUnqNo']	= row.storeUnitUnqNo;
346
+				item['unit']			= row.unit;
347
+				item['unitAmt']			= row.unitAmt;
348
+				item['unitGubun']		= row.unitGubun;
349
+				gridInsertData.push(item);
340 350
 			});
341
-			param.gridInsertData = mobContObj.list.rows;
351
+			param.gridInsertData = gridInsertData;
342 352
 			param['colReqDt'] = param.colReqDt.replace(/[^0-9]/g, "");
343 353
 			console.log(JSON.stringify(param));
344 354
 			var saveFn = function (result) {
@@ -360,11 +370,9 @@ let mobPopObj = {
360 370
 			var formId = '#ITP_FORM_MRTNMNG01010_DETAIL';
361 371
 			itp_fn_form_clear_validate(null, formId);
362 372
 			if (itp_fn_form_event.isValid(formId)) {
363
-				$('#' + popId).show();
364 373
 				mobPopObj.init(popId, parentId);
365 374
 			}
366 375
 		} else {
367
-			$('#' + popId).show();
368 376
 			mobPopObj.init(popId, parentId);
369 377
 		}
370 378
 	},

+ 58 - 56
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -12,8 +12,8 @@ const API_MOBILE_SAVE 				= '/api/rtnmng/save-rtnReq';		// 저장
12 12
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
13 13
 const API_POP_ITEM_LIST 			= '/api/item/pop-grid-list';
14 14
 
15
-const PCH_REQ_ST_CD_TEMP_SAVE		="PR00";
16
-const PCH_REQ_ST_CD_REQUEST_SAVE	="PR20";
15
+const RTN_REQ_ST_CD_TEMP_SAVE		="RR00";
16
+const RTN_REQ_ST_CD_REQUEST_SAVE	="RR20";
17 17
 
18 18
 const VIEW_MODE_LIST				= "LIST";
19 19
 const VIEW_MODE_DETAIL				= "DETAIL";
@@ -77,22 +77,30 @@ let mobPageObj = {
77 77
 			$('button[id^="ITP_BTN_MRTNMNG02010_MODIFY"]').on('click', function() {
78 78
 				var id = $(this).attr('id');
79 79
 				switch (id) {
80
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init(VIEW_MODE_MODIFY); 	break;
81
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete(VIEW_MODE_MODIFY); 	break;
80
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(VIEW_MODE_MODIFY); 	break;
81
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(VIEW_MODE_MODIFY); 	break;
82 82
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_ADD_ROW'			: mobPopObj.popItem.init();						break;
83 83
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_DEL_ROW'			: mobContentObj.modify.list.detachRow();		break;
84 84
 					case 'ITP_BTN_MRTNMNG02010_MODIFY_CANCEL'			: mobContentObj.modify.cancel();				break;
85
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER'			: mobPopObj.popReqConfirm.init(PCH_REQ_ST_CD_REQUEST_SAVE);	break;
86
-					case 'ITP_BTN_MRTNMNG02010_MODIFY_TEMP_SAVE'			: mobPopObj.popReqConfirm.init(PCH_REQ_ST_CD_TEMP_SAVE);	break;
85
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_REQ_ORDER'		: mobPopObj.popReqConfirm.init(RTN_REQ_ST_CD_REQUEST_SAVE);	break;
86
+					case 'ITP_BTN_MRTNMNG02010_MODIFY_TEMP_SAVE'		: mobPopObj.popReqConfirm.init(RTN_REQ_ST_CD_TEMP_SAVE);	break;
87 87
 				}
88 88
 				return false;
89 89
 			});
90 90
 
91
-			$(document).on('click', '#ITP_LIST_MRTNMNG02010_MODIFY_ROWS li button', function() {
92
-				if($(this).hasClass('DETAIL_ITEM_PLUS')) {
91
+			$(document).on('click', '#ITP_LIST_MRTNMNG02010_LIST_ROWS li', function() {
92
+				var index = $(this).index();
93
+				var item = mobContentObj.list.rows[index];
94
+				(item.rtnReqStCd === RTN_REQ_ST_CD_TEMP_SAVE) ? mobContentObj.modify.init(item) : mobContentObj.detail.init(item);
95
+			});
96
+
97
+			$(document).on('click', '#ITP_LIST_MRTNMNG02010_MODIFY_ROWS li', function(e) {
98
+				var index = $(this).index();
99
+				if($(e.target).hasClass('DETAIL_ITEM_PLUS')) {
93 100
 					mobContentObj.modify.list.actPlus($(this));
94
-				} else if($(this).hasClass('DETAIL_ITEM_MINUS')) {
101
+				} else if($(e.target).hasClass('DETAIL_ITEM_MINUS')) {
95 102
 					mobContentObj.modify.list.actMinus($(this));
103
+				} else {
96 104
 				}
97 105
 			});
98 106
 		}
@@ -144,7 +152,6 @@ let mobContentObj = {
144 152
 		init: function() {
145 153
 			mobPageObj.switchScreen(VIEW_MODE_LIST);
146 154
 			this.search();
147
-			this.action();
148 155
 		},
149 156
 		search: function() {
150 157
 			this.listPage = 0;
@@ -181,14 +188,6 @@ let mobContentObj = {
181 188
 			param.toDt = CommonObj.onlyNumber(param.toDt);
182 189
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
183 190
 		},
184
-		action: function () {
185
-			var _this = this;
186
-			$(document).on('click', '#ITP_LIST_MRTNMNG02010_LIST_ROWS li', function() {
187
-				var index = $(this).index();
188
-				var item = _this.rows[index];
189
-				(item.pchReqStCd === PCH_REQ_ST_CD_TEMP_SAVE) ? mobContentObj.modify.init(item) : mobContentObj.detail.init(item);
190
-			});
191
-		}
192 191
 	},
193 192
 	detail: {
194 193
 		rows: [],
@@ -200,26 +199,25 @@ let mobContentObj = {
200 199
 			var _this = this;
201 200
 			var callbackFn = function(result) {
202 201
 				console.log(result);
203
-				_this.rows = result.pchReqDtlList;
204 202
 				_this.view(result);
205 203
 			};
206
-			const param = {'brandId':fn_make_user_info.get('brandId'), 'pchReqUnqNo': item.pchReqUnqNo};
204
+			const param = {'brandId':fn_make_user_info.get('brandId'), 'rtnReqUnqNo': item.rtnReqUnqNo};
207 205
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
208 206
 		},
209 207
 		view: function(result) {
210 208
 			var _this = this;
211 209
 			var id = '#ITP_AJAX_MRTNMNG02010_DETAIL_CONTAINER';
212
-			$(id).find('.fnDlvReqDt').text(result.dlvReqDt);
213
-			$(id).find('.fnRtnReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
214
-			$(id).find('.fnLocationNm').text(result.locationNm);
210
+			$(id).find('.fnRtnReqDt').text(result.rtnReqDt);
211
+			$(id).find('.fnRtnReqAmt').text(CommonObj.currency.add(result.rtnReqAmt));
212
+			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
215 213
 			$(id).find('.fnRtnApprNm').text('(' + result.pchApprNm + ')' + CommonObj.currency.add(result.pchApprAmt));
216
-			$.each(result.pchReqDtlList, function (i, item) {
214
+			$.each(result.rtnReqDtlList, function (i, item) {
217 215
 				$('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group').append($('#ITP_LIST_MRTNMNG02010_DETAIL_ROWCOPY').html());
218 216
 				var $li = $('#ITP_LIST_MRTNMNG02010_DETAIL_AREA .panel-group > .list-row:last');
219 217
 				$li.find('.fnItemNm').text(item.itemNm);
220
-				$li.find('.fnUnit').text(item.pchReqQty + item.unit);
221
-				$li.find('.fnRtnReqAmt').text(CommonObj.comma.set(item.pchReqAmt));
222
-				$li.find('.fnRtnReqQty').text(CommonObj.currency.add(item.pchReqQty, ''));
218
+				$li.find('.fnUnit').text(item.unit);
219
+				$li.find('.fnRtnAmt').text(CommonObj.comma.set(item.rtnAmt));
220
+				$li.find('.fnRtnQty').text(CommonObj.currency.add(item.rtnQty, ''));
223 221
 				_this.rows.push(item);
224 222
 			});
225 223
 		},
@@ -246,23 +244,22 @@ let mobContentObj = {
246 244
 				console.log(result);
247 245
 				_this.view(result);
248 246
 			};
249
-			const param = {'brandId':fn_make_user_info.get('brandId'), 'pchReqUnqNo': item.pchReqUnqNo};
247
+			const param = {'brandId':fn_make_user_info.get('brandId'), 'rtnReqUnqNo': item.rtnReqUnqNo};
250 248
 			fn_ajax_call(API_MOBILE_INFO, param, callbackFn, 'GET');
251 249
 		},
252 250
 		view: function(result) {
253 251
 			var _this = this;
254 252
 			var id = '#ITP_AJAX_MRTNMNG02010_MODIFY_CONTAINER';
255
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_DLV_REQ_DT').val(result.dlvReqDt.replace(/\./g, "-"));
253
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val(result.colReqDt.replace(/\./g, "-"));
256 254
 			$(id).find('.fnRtnReqTotalAmt').text(CommonObj.currency.add(result.pchReqTotalAmt));
257 255
 			$(id).find('.fnOrdUseAmt').text(CommonObj.currency.add(result.ordUseAmt));
258
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOAN_DVSN').val(result.loanDvsn);
259
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOAN_MGNT_UNQ_NO').val(result.loanMgntUnqNo);
260
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_UNQ_NO').val(result.pchReqUnqNo);
261
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_DVSN').val(result.pchReqDvsn);
262
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM').val(result.whsNm);
263
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID').val(result.whsId);
264
-			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOCATION').val(result.location);
265
-			_this.list.init(result.pchReqDtlList);
256
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_UNQ_NO').val(result.rtnReqUnqNo);
257
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_DVSN').val(result.whsDvsn);
258
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_RTN_REQ_MGR_ID').val(result.rtnReqMgrId);
259
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM').val(result.rtnWhsNm);
260
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID').val(result.rtnWhsId);
261
+			$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOCATION').val(result.rtnLocation);
262
+			_this.list.init(result.rtnReqDtlList);
266 263
 		},
267 264
 		list: {
268 265
 			rows: [],
@@ -300,8 +297,8 @@ let mobContentObj = {
300 297
 						}
301 298
 					});
302 299
 					if(!isExist) {
303
-						_this.rows.push(item);
304 300
 						append();
301
+						_this.rows.push(item);
305 302
 					}
306 303
 				};
307 304
 				fnChkExist();
@@ -521,12 +518,12 @@ let mobPopObj = {
521 518
 			this.action();
522 519
 		},
523 520
 		view: function() {
524
-			if(this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE) {
525
-				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('구매요청 하시겠습니까?');
521
+			if(this.pchReqStCd === RTN_REQ_ST_CD_REQUEST_SAVE) {
522
+				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('반품요청 하시겠습니까?');
526 523
 			} else {
527 524
 				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
528 525
 			}
529
-			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_DLV_REQ_DT').val());
526
+			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val());
530 527
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
531 528
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MRTNMNG02010_MODIFY .fnRtnReqTotalAmt').text()));
532 529
 		},
@@ -539,23 +536,27 @@ let mobPopObj = {
539 536
 		},
540 537
 		save: function(formId) {
541 538
 			var _this = this;
542
-			let param = $(formId).serializeObject();
543
-
544
-			if (param.loanDvsn !== 'LD03' && this.pchReqStCd === PCH_REQ_ST_CD_REQUEST_SAVE ) {
545
-				var ordUseAmt = $('#ITP_FORM_MRTNMNG02010_MODIFY .fnOrdUseAmt').text();
546
-				var pchReqTotalAmt = $('#ITP_FORM_MRTNMNG02010_DETAIL .fnRtnReqTotalAmt').text();
547
-
548
-				if (parseInt(CommonObj.onlyNumber(ordUseAmt)) < parseInt(CommonObj.onlyNumber(pchReqTotalAmt))) {
549
-					alert(ITP_MSG_LOCALE.message.ajax.lackReqAmt);
550
-					return;
551
-				}
552
-			}
553
-
554 539
 			var gridInsertData = [];
555 540
 			var gridUpdateData = [];
556 541
 			var gridDeleteData = [];
557
-			$.each(mobContentObj.modify.list.rows, function(index, item) {
558
-				item['pchReqUnqNo'] = param.pchReqUnqNo;
542
+			$.each(mobContentObj.modify.list.rows, function(index, row) {
543
+				var item = {};
544
+				item['viewCd'] 			= 'C';
545
+				item['brandUnitUnqNo']	= row.brandUnitUnqNo;
546
+				item['itemId']			= row.itemId;
547
+				item['itemNm']			= row.itemNm;
548
+				item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.pchReqQty);
549
+				item['rtnDvsn']			= row.rtnDvsn;
550
+				item['rtnQty']			= row.pchReqQty;
551
+				item['rtnReqDtlNo']		= row.rtnReqDtlNo;
552
+				item['rtnReqUnqNo']		= row.rtnReqUnqNo;
553
+				item['rtnRsn']			= row.rtnRsn;
554
+				item['rtnRsnDvsn']		= row.rtnRsnDvsn;
555
+				item['spplyId']			= row.spplyId;
556
+				item['storeUnitUnqNo']	= row.storeUnitUnqNo;
557
+				item['unit']			= row.unit;
558
+				item['unitAmt']			= row.unitAmt;
559
+				item['unitGubun']		= row.unitGubun;
559 560
 				if(item.viewCd === 'R' || item.viewCd === 'C' ) {
560 561
 					item['viewCd'] = 'C';
561 562
 					gridInsertData.push(item);
@@ -565,7 +566,8 @@ let mobPopObj = {
565 566
 					gridDeleteData.push(item);
566 567
 				}
567 568
 			});
568
-			param['dlvReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
569
+			let param = $(formId).serializeObject();
570
+			param['rtnReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
569 571
 			param.gridInsertData = gridInsertData;
570 572
 			param.gridUpdateData = gridUpdateData;
571 573
 			param.gridDeleteData = gridDeleteData;

+ 117 - 14
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG01010.js

@@ -6,9 +6,10 @@ require(['config'], function() {
6 6
 });
7 7
 
8 8
 /*API URL*/
9
-const API_MOBILE_GRID_LIST 			= '/api/stock/cdd/detail-grid-list';	// 목록
10
-const API_MOBILE_INFO 				= '/api/stock/cdd/info-cdd';			// 상세
11
-const API_MOBILE_SAVE 				= '/api/stock/cdd/save-stock-cdd';		// 저장
9
+const API_MOBILE_GRID_LIST 			= '/api/stock/mng/detail-grid-list';	// 목록
10
+const API_MOBILE_INFO 				= '/api/stock/mng/info-stock';			// 상세
11
+const API_MOBILE_SAVE 				= '/api/stock/mng/proc-stock';			// 저장
12
+const API_MOBILE_HISTORY			= '/api/stock/mng/hist-grid-list';		// 이력
12 13
 const API_MOBILE_WHS_GRID_LIST 		= '/api/whs/mng/detail-grid-list';
13 14
 const API_MOBILE_LOCATION_LIST 		= '/api/whs/mng/location-grid-list';
14 15
 const API_POP_SEARCH_LIST			= '/api/store/pop-grid-list';
@@ -46,6 +47,7 @@ let mobPageObj = {
46 47
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
47 48
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_DETELE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
48 49
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH'			: mobContentObj.list.search();		break;
50
+					case 'ITP_BTN_MSTOCKMNG01010_LIST_ADD_STCK'			: mobContentObj.list.procStck(); 	break;
49 51
 				}
50 52
 				return false;
51 53
 			});
@@ -65,7 +67,7 @@ let mobPageObj = {
65 67
 
66 68
 			$(document).on('click', '#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS li', function() {
67 69
 				var item = mobContentObj.list.rows[$(this).index()];
68
-				mobContentObj.view.init(item);
70
+				mobContentObj.list.choice(item);
69 71
 			});
70 72
 
71 73
 			$(document).on('click', '#ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS li button', function() {
@@ -114,6 +116,7 @@ let mobContentObj = {
114 116
 		totPage: 0,
115 117
 		isSearch: false,
116 118
 		rows: [],
119
+		item: null,
117 120
 		init: function() {
118 121
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
119 122
 			// this.search();
@@ -136,7 +139,16 @@ let mobContentObj = {
136 139
 				$.each(result.gridRows, function (i, item) {
137 140
 					$('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY').html());
138 141
 					var $li = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group > .list-row:last');
139
-					$li.find('.fnStoreNm').text(item.storeNm);
142
+					$li.find('.fnWhsId').text(item.whsId);
143
+					$li.find('.fnWhsNm').text(item.whsNm);
144
+					$li.find('.fnItemId').text(item.itemId);
145
+					$li.find('.fnItemNm').text(item.itemNm);
146
+					$li.find('.fnUnit').text(item.unit);
147
+					$li.find('.fnUnitQty').text(item.unitQty);
148
+					$li.find('.fnStckQty').text(item.stckQty);
149
+					$li.find('.fnPrpStckQty').text(item.prpStckQty);
150
+					$li.find('.fnSftStckRt').text(item.sftStckRt);
151
+					$li.find('.fnLocationNm').text(item.locationNm);
140 152
 					_this.rows.push(item);
141 153
 				});
142 154
 			};
@@ -152,30 +164,37 @@ let mobContentObj = {
152 164
 			const brandIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_BRAND_ID').val();
153 165
 			const storeIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_ID').val();
154 166
 			const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
155
-
156 167
 			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), function(result) {
157
-				console.log(result);
158 168
 				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM');
159 169
 				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_WHS_NM');
160
-
161 170
 				if(result.gridRecords > 0) {
162 171
 					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').trigger('change');
163 172
 				}
164 173
 			}, 'POST');
165 174
 		},
166 175
 		locationList: function() {
176
+			var _this = this;
167 177
 			const brandIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_BRAND_ID').val();
168 178
 			const storeIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_ID').val();
169 179
 			const whsIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val();
170 180
 			const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
171
-			console.log(JSON.stringify(param));
172
-
173 181
 			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), function(result) {
174
-
175 182
 				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION');
176
-				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_LOCATION');
177
-
183
+				// fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_LOCATION');
184
+				if(result.gridRecords > 0) {
185
+					_this.search();
186
+				}
178 187
 			}, 'POST');
188
+		},
189
+		choice: function(item) {
190
+			this.item = item;
191
+		},
192
+		procStck: function() {
193
+			if(!this.item) {
194
+				alert(ITP_MSG_LOCALE.message.ajax.noData);
195
+				return;
196
+			}
197
+			mobPopObj.popProcStck.init(this.item);
179 198
 		}
180 199
 	},
181 200
 	view: {
@@ -308,9 +327,93 @@ let mobPopObj = {
308 327
 			mobPopObj.hide(this.popId);
309 328
 		}
310 329
 	},
330
+	popProcStck: {
331
+		item: null,
332
+		popId: 'ITP_POP_MSTOCKMNG01010_ITEM_AREA',
333
+		init: function(item) {
334
+			this.item = item;
335
+			this.reset();
336
+			this.action();
337
+			this.view();
338
+			mobPopObj.show(this.popId);
339
+		},
340
+		view: function() {
341
+			console.log(this.item);
342
+			var id = '#' + this.popId;
343
+			$(id).find('.fnWhsNm').text(this.item.whsNm);
344
+			$(id).find('.fnLocation').text(this.item.locationNm);
345
+			$(id).find('.fnItemNm').text(this.item.itemNm);
346
+			$(id).find('.fnStckQty').text(CommonObj.currency.add(this.item.stckQty, '개'));
347
+			$(id).find('.fnWhsNm').text(this.item.whsNm);
348
+			$(id).find('.fnMgntLevel').text(this.item.mgntLevel);
349
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_BRAND_ID').val(this.item.brandId);
350
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_ITEM_ID').val(this.item.itemId);
351
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_SOURCE_LOCATION').val(this.item.location);
352
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_SOURCE_WHS_ID').val(this.item.whsId);
353
+			$("#ITP_FORM_MSTOCKMNG01010_POP_WHS_NM option:eq(0)").prop("selected", true);
354
+			$('select[id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM"]').trigger('change');
355
+		},
356
+		action: function() {
357
+			var _this = this;
358
+			$('button[id^="ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK"]').off('click').on('click', function() {
359
+				var id = $(this).attr('id');
360
+				switch (id) {
361
+					case 'ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_REQ'			: _this.procStck();	break;
362
+					case 'ITP_BTN_MSTOCKMNG01010_POP_PROC_STCK_CANCEL'		: _this.cancel(); 	break;
363
+				}
364
+				return false;
365
+			});
366
+			$('select[id^="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM"]').off('change').on('change', function() {
367
+				_this.locationList();
368
+			});
369
+			itp_fn_form_event.onKeyup('#ITP_FORM_MSTOCKMNG01010_POP');
370
+		},
371
+		locationList: function(mode) {
372
+			const brandIdVal = $('#ITP_FORM_MLOANMNG01010_POP_BRAND_ID').val();
373
+			const storeIdVal = $('#ITP_FORM_MLOANMNG01010_POP_STORE_ID').val();
374
+			const whsIdVal = $('#ITP_FORM_MSTOCKMNG01010_POP_WHS_NM').val();
375
+			const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
376
+			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), function(result) {
377
+				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_LOCATION');
378
+			}, 'POST');
379
+		},
380
+		procStck: function() {
381
+			var _this = this;
382
+			var qty = $('#ITP_POP_MSTOCKMNG01010_ITEM_AREA #ITP_FORM_MSTOCKMNG01010_POP_QTY').val();
383
+			if(qty.length < 1 || qty === '0') {
384
+				alert('이동 수량을 입력하세요.');
385
+				return;
386
+			}
387
+			if(qty > this.item.stckQty) {
388
+				alert('재고 수량을 초과하여 입력할 수 없습니다.');
389
+				return;
390
+			}
391
+			var param = $('#ITP_FORM_MSTOCKMNG01010_POP').serializeObject();
392
+			console.log(JSON.stringify(param));
393
+			fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), function() {
394
+				_this.cancel();
395
+				mobContentObj.list.search();
396
+			}, 'POST');
397
+		},
398
+		reset: function() {
399
+			var id = '#' + this.popId;
400
+			$(id).find('.fnWhsNm').text('');
401
+			$(id).find('.fnLocation').text('');
402
+			$(id).find('.fnItemNm').text('');
403
+			$(id).find('.fnStckQty').text('');
404
+			$(id).find('.fnWhsNm').text('');
405
+			$(id).find('.fnMgntLevel').text('');
406
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_BRAND_ID').val('');
407
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_ITEM_ID').val('');
408
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_SOURCE_LOCATION').val('');
409
+			$(id).find('#ITP_FORM_MLOANMNG01010_POP_SOURCE_WHS_ID').val('');
410
+		},
411
+		cancel: function() {
412
+			mobPopObj.hide(this.popId);
413
+		}
414
+	},
311 415
 	show: function(popId) {
312 416
 		$('button[id$="_CLOSE"]').off('click').on('click', function() {
313
-			console.log($(this).attr('id'));
314 417
 			if($(this).hasClass('btn-pop-close')) {
315 418
 				mobPopObj.hide(popId);
316 419
 			}

+ 1 - 1
src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -49,7 +49,7 @@ var popPageObj = {
49 49
 				$('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_ID').val() + '@' + $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL_NM').val()
50 50
 			);
51 51
 		});
52
-
52
+		itp_fn_form_event.onKeyup('#ITP_FORM_PO_PAYMENT_POPUP');
53 53
 	}, 	
54 54
 	view: function() {
55 55
 		$('#ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD').val(popPageObj.args.payTpCd);