Просмотр исходного кода

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

yhl88 лет назад: 2
Родитель
Сommit
632541d667

+ 1 - 1
src/main/webapp/app/pomng/POMNG05010.html

@@ -46,7 +46,7 @@
46 46
 											<button type="button" id="ITP_BTN_POMNG05010_DELETE_SPPLY_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
47 47
 										</div>
48 48
 										<div class="col-xs-2 itp_ip itp_noMar">
49
-											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" />
49
+											<input type="text" id="ITP_FORM_POMNG05010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="매장/창고" readonly/>
50 50
 											<input type="hidden" id="ITP_FORM_POMNG05010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"  />
51 51
 										</div>
52 52
 										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">

Разница между файлами не показана из-за своего большого размера
+ 1 - 1
src/main/webapp/bootstrap/dist/css/bootstrap.min.css


+ 2 - 2
src/main/webapp/css/style.css

@@ -126,8 +126,8 @@ a, button {outline:none !important; text-decoration:none !important;}
126 126
 #ITP_HEADER .itp_logo {margin:0; padding:0; color:#337ab7; float:left; width:30px;}
127 127
 #ITP_HEADER .itp_logo img{width:30px;}
128 128
 #ITP_HEADER .itp_txt_brand {float:left; margin:1px; padding:0 4px; color:#fff; font-size:18px; text-decoration:none;}
129
-#ITP_HEADER .itp_sch_brand {margin:0 4px; padding:0; color:#337ab7; float:left; width:30px;}
130
-#ITP_HEADER .itp_sch_brand button{width:33px;}
129
+#ITP_HEADER .itp_sch_brand {margin:0 4px; padding:0; color:#337ab7; float:left; width:90px;}
130
+#ITP_HEADER .itp_sch_brand button{width:90px; border:1px solid #000;}
131 131
 #ITP_HEADER .itp_menu {float:left; border:1px solid #ddd; line-height: 26px; background:#eee;margin:4px; border-radius: 2px; padding:0 4px;}
132 132
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
133 133
 #ITP_HEADER .itp_out {float:left; border:1px solid #000; line-height: 27px; background:#666; margin:4px; border-radius: 2px; padding:0 4px;}

+ 1 - 2
src/main/webapp/main.html

@@ -62,8 +62,7 @@
62 62
 					<!--<span class="itp_logo"><img src="/oqpo-view/images/favicon.ico" alt="로고"></span>-->
63 63
 					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_TIMEOUT"></span>
64 64
 					<span class="itp_txt_brand" id="ITP_TXT_MAIN_SHR_BRAND"></span>
65
-					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button></span>
66
-					<span class="itp_menu"><a href="javascript:void(0)" class="">메뉴안내</a></span>
65
+					<span class="itp_sch_brand"><button type="button" id="ITP_BTN_MAIN_SHR_AFFL" class="btn btn-success btn-sm SEB">가맹점검색</button></span>
67 66
 					<span class="itp_out"><a href="javascript:void(0)" class="ITP_BTN_LOGOUT">로그아웃</a></span>
68 67
 				</div>
69 68
 			</div>

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

@@ -156,7 +156,7 @@
156 156
 				<div class="line">
157 157
 					<label>반품요청금액</label>
158 158
 					<div class="line_right">
159
-						<div class="fnRtnReqAmt">0원</div>
159
+						<div class="fnRtnReqAmtTot">0원</div>
160 160
 					</div>
161 161
 				</div>
162 162
 				<div class="line">
@@ -201,7 +201,7 @@
201 201
 						</div>
202 202
 						<div class="right">
203 203
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
204
-							<div class="num fnRtnReqQty">1</div>
204
+							<div class="num fnRtnQty">1</div>
205 205
 							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
206 206
 						</div>
207 207
 					</li>
@@ -217,16 +217,16 @@
217 217
 	<div id="ITP_POP_MRTNMNG02010_REQ_AREA" class="popup mobile-pop-close" style="display: none;">
218 218
 		<div class="pop">
219 219
 			<div class="pop_line">
220
-				<label>품요청일 &nbsp;&nbsp;:</label>
220
+				<label>품요청일 &nbsp;&nbsp;:</label>
221 221
 				<div class="fnPopDlvReqDt"></div>
222 222
 			</div>
223 223
 			<div class="pop_line">
224 224
 				<label>품목수&nbsp;&nbsp; :</label>
225
-				<div class="fnItemQty"></div>
225
+				<div class="fnItemQty"></div>
226 226
 			</div>
227 227
 			<div class="pop_line">
228 228
 				<label>구매금액 &nbsp;&nbsp;:</label>
229
-				<div class="fnOrdAmt">원</div>
229
+				<div class="fnRtnTotalAmt"></div>
230 230
 			</div>
231 231
 			<label class="pop_label msg_save">구매요청 하시겠습니까?</label>
232 232
 			<div class="popup_btn">
@@ -313,7 +313,7 @@
313 313
 						</div>
314 314
 						<div class="right">
315 315
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_MINUS" class="POP_ITEM_MINUS">-</button>
316
-							<div class="num fnRtnReqQty">1</div>
316
+							<div class="num fnRtnQty">1</div>
317 317
 							<button id="ITP_BTN_MRTNMNG02010_POP_ITEM_PLUS" class="POP_ITEM_PLUS">+</button>
318 318
 						</div>
319 319
 						<div class="add">

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

@@ -7,14 +7,15 @@
7 7
 			<div class="line">
8 8
 			  <label>재고실사일자</label>
9 9
 			  <div class="line_right">
10
-				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="sDt" class="date" type="date">
10
+				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="sDt" class="date" type="date" data-check-required="empty">
11 11
 			  </div>
12 12
 			</div>
13 13
 			<div class="line">
14 14
 			  <label>창고선택</label>
15 15
 			  <div class="search_wrap">
16 16
 				  <div class="float_left">
17
-					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="창고명">
17
+					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="창고명" data-check-required="empty" readonly>
18
+					  <input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" type="hidden">
18 19
 				  </div>
19 20
 				  <div class="float_left_btn">
20 21
 					  <button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -25,7 +26,7 @@
25 26
 			<div class="line">
26 27
 			  <label>Location</label>
27 28
 			  <div class="line_right">
28
-				<select name="whsDvsn" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION">
29
+				<select name="slocation" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty">
29 30
 				  <option value=""></option>
30 31
 				</select>
31 32
 			  </div>
@@ -142,4 +143,48 @@
142 143
 			</div>
143 144
 		</div>
144 145
 	</div>
146
+	<div id="ITP_POP_MSTOCKMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
147
+		<div class="pop">
148
+			<div class="header">
149
+				<div class="header_left">
150
+					<label>> 품목 검색</label>
151
+				</div>
152
+				<div class="header_right">
153
+					<button type="button" id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
154
+				</div>
155
+			</div>
156
+			<form id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM" class="form-horizontal" onsubmit="return false;">
157
+				<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM_BRAND_ID" name="sbrandId" value="">
158
+				<input type="hidden" id="ITP_FORM_MSTOCKMNG02010_POPUP_ITEM_STORE_ID" name="sstoreId" value="">
159
+				<div class="search_item_bar">
160
+					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_ST_CD" data-select-code="ST_CD" name="sitemStCd"></select>
161
+					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_GUBUN" data-select-code="ITEM_GUBUN" name="sitemGubun"></select>
162
+					<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_TYPE" data-select-code="ITEM_TYPE" name="sitemType"></select>
163
+					<input id="ITP_FORM_MSTOCKMNG02010_POP_ITEM_KEYWORD" name="sitemNm" type="text" placeholder="품목명/품목번호" />
164
+				</div>
165
+				<div class="search_btn_bar">
166
+					<div class="btn_right">
167
+						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_SEARCH" class="btn-primary"><img src="../img/w_search.png">조회</button>
168
+						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CHECK" class="btn-green"><img src="../img/w_check.png">선택</button>
169
+					</div>
170
+				</div>	
171
+			<table border="1">
172
+				<tbody>
173
+				<th><input type="checkbox"checked></th>
174
+				<th>품목번호</th>
175
+				<th>품목명</th>
176
+				<th>단위</th>
177
+				<th>현재고수량</th>
178
+				<tr>
179
+					<td><input type="checkbox"checked></td>
180
+					<td>212212121212121</td>
181
+					<td>테스트 품목명 3</td>
182
+					<td>ㅁㄴㅇ</td>
183
+					<td>ㄻㄴㅇ</td>
184
+				</tr>
185
+				</tbody>
186
+			</table>
187
+			</form>
188
+		</div>
189
+	</div>
145 190
   </section>

+ 11 - 1
src/main/webapp/mobile/css/style.css

@@ -36,7 +36,16 @@ section .popup2 .pop .search_bar button {float: right; border: none; padding-top
36 36
 section .popup2 .pop .search_bar button img {width: 30px; height: 30px;}
37 37
 section .popup2 .pop .search_bar button.search {float: none; width: 50%; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000; margin: 0 auto;}
38 38
 section .popup2 .pop .search_bar button.btn_blue {float: right; width: 100px; height: 35px; background:rgb(46, 46, 248); color: #fff; font-size: 1rem; padding: 0; border: 1px solid #000;}
39
-
39
+section .popup2 .pop .search_item_bar {width:100%; margin-top:10px;}
40
+section .popup2 .pop .search_item_bar input {width:22%; border-radius:2px;}
41
+section .popup2 .pop .search_item_bar select {width:22%;border-radius:2px;}
42
+section .popup2 .pop .search_btn_bar {width:100%; height:50px; margin-top:10px; margin-right:10px;}
43
+section .popup2 .pop .search_btn_bar .btn_right {float:right; margin-right:10px;}
44
+section .popup2 .pop .search_btn_bar .btn_right button img{width:18px; height:18px; margin-right:2px;}
45
+section .popup2 .pop .search_btn_bar .btn_right button {height:35px; padding:5px 8px; font-size:12px; border-radius:3px; border:1px solid #333;}
46
+section .popup2 .pop table{width:98%; margin:0 1%;}
47
+section .popup2 .pop table tbody th {height:50px; font-size:16px;}
48
+section .popup2 .pop table tbody input{width:15px;}
40 49
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
41 50
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
42 51
 section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
@@ -94,6 +103,7 @@ button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #
94 103
 button.btn-yellow   {color: #fff; background-color: rgb(255, 183, 0); border: 1px solid #000;font-weight: 700;}
95 104
 button.btn-gray     {color: #fff; background-color: gray; border: 1px solid #000;font-weight: 700;}
96 105
 button.btn-danger   {color: #fff; background-color: rgb(247, 76, 76); border: 1px solid #000;font-weight: 700;}
106
+button.btn-green	{color: #fff; background-color: #5cb85c; border: 1px solid #000;font-weight: 700;}
97 107
 button:hover {background: rgb(229, 248, 202); color: #000;}
98 108
 
99 109
 /* 실행,로딩 */

BIN
src/main/webapp/mobile/img/check.png


BIN
src/main/webapp/mobile/img/w_check.png


BIN
src/main/webapp/mobile/img/w_search.png


+ 26 - 28
src/main/webapp/mobile/js/app/mrtnmng/ITP_MRTNMNG02010.js

@@ -263,9 +263,9 @@ let mobContentObj = {
263 263
 		},
264 264
 		list: {
265 265
 			rows: [],
266
-			init: function(pchReqDtlList) {
266
+			init: function(rtnReqDtlList) {
267 267
 				var _this = this;
268
-				$.each(pchReqDtlList, function (i, item) {
268
+				$.each(rtnReqDtlList, function (i, item) {
269 269
 					item['viewCd'] = 'U';
270 270
 					_this.attachRow(item);
271 271
 				});
@@ -277,9 +277,9 @@ let mobContentObj = {
277 277
 					var $li = $('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .panel-group > .list-row:last');
278 278
 					$li.find('.fnBrandUnitUnqNo').val(item.brandUnitUnqNo);
279 279
 					$li.find('.fnItemNm').text(item.itemNm);
280
-					$li.find('.fnRtnReqQty').text(item.pchReqQty);
280
+					$li.find('.fnRtnQty').text(item.rtnQty);
281 281
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
282
-					_this.pchReqAmtTot();
282
+					_this.rows.push(item);
283 283
 				};
284 284
 				var fnChkExist = function() {
285 285
 					var isExist = false;
@@ -298,7 +298,7 @@ let mobContentObj = {
298 298
 					});
299 299
 					if(!isExist) {
300 300
 						append();
301
-						_this.rows.push(item);
301
+						_this.rtnReqAmtTot();
302 302
 					}
303 303
 				};
304 304
 				fnChkExist();
@@ -314,35 +314,35 @@ let mobContentObj = {
314 314
 							// _this.rows.splice(index, 1);
315 315
 						}
316 316
 					});
317
-					this.pchReqAmtTot();
317
+					this.rtnReqAmtTot();
318 318
 				}
319 319
 			},
320 320
 			actPlus: function(elem) {
321
-				var $div = $(elem).siblings('div');
322
-				var num = Number($div.text());
323
-				$($div).text((num + 1).toString());
324
-				this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
325
-				this.pchReqAmtTot();
321
+				var index = $(elem).index();
322
+				var num = Number($(elem).find('.fnRtnQty').text()) + 1;
323
+				$(elem).find('.fnRtnQty').text(num.toString());
324
+				this.rows[index]['rtnQty'] = num;
325
+				this.rtnReqAmtTot();
326 326
 			},
327 327
 			actMinus: function(elem) {
328
-				var $div = $(elem).siblings('div');
329
-				var num = Number($div.text());
330
-				if(num <= 1) {
328
+				var index = $(elem).index();
329
+				var num = Number($(elem).find('.fnRtnQty').text()) - 1;
330
+				if(num < 1) {
331 331
 					alert('주문수량을 확인하세요.');
332 332
 				} else {
333
-					$($div).text((num - 1).toString());
334
-					this.rows[$div.parents('li').index()]['pchReqQty'] = $($div).text();
335
-					this.pchReqAmtTot();
333
+					$(elem).find('.fnRtnQty').text(num.toString());
334
+					this.rows[index]['rtnQty'] = num;
335
+					this.rtnReqAmtTot();
336 336
 				}
337 337
 			},
338
-			pchReqAmtTot: function() {
338
+			rtnReqAmtTot: function() {
339 339
 				var reqAmt = 0;
340 340
 				$.each(this.rows, function(index, item) {
341
-					var qty = item.pchReqQty;
341
+					var qty = item.rtnQty;
342 342
 					var amt = item.unitAmt;
343 343
 					reqAmt += Number(qty) * amt;
344 344
 				});
345
-				$('#ITP_AJAX_MRTNMNG02010_LIST_CONTAINER').find('.fnRtnReqAmtTot').text(CommonObj.currency.add(reqAmt));
345
+				$('#ITP_FORM_MRTNMNG02010_MODIFY').find('.fnRtnReqAmtTot').text(CommonObj.currency.add(reqAmt));
346 346
 			}
347 347
 		},
348 348
 		cancel: function () {
@@ -426,7 +426,7 @@ let mobPopObj = {
426 426
 				actItemAdd: function(elem) {
427 427
 					var index = $(elem).closest('li').index();
428 428
 					var item = mobPopObj.popItem.rows[index];
429
-					item['pchReqQty'] = $(elem).closest('li').find('.fnRtnReqQty').html();
429
+					item['rtnQty'] = $(elem).closest('li').find('.fnRtnQty').html();
430 430
 					mobContentObj.modify.list.attachRow(item);
431 431
 				}
432 432
 			}
@@ -504,7 +504,6 @@ let mobPopObj = {
504 504
 				$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_ID').val('');
505 505
 				$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_WHS_NM').val('');
506 506
 				$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_LOCATION').val('');
507
-				mobPopObj.hide(ID_ITP_POP_MRTNMNG02010_WHS_AREA);
508 507
 			}
509 508
 		}
510 509
 	},
@@ -525,7 +524,7 @@ let mobPopObj = {
525 524
 			}
526 525
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnPopDlvReqDt').text($('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_COL_REQ_DT').val());
527 526
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnItemQty').text(CommonObj.currency.add(mobContentObj.modify.list.rows.length, '개'));
528
-			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnOrdAmt').text(CommonObj.currency.add($('#ITP_FORM_MRTNMNG02010_MODIFY .fnRtnReqTotalAmt').text()));
527
+			$('#ITP_POP_MRTNMNG02010_REQ_AREA .fnRtnTotalAmt').text($('#ITP_FORM_MRTNMNG02010_MODIFY .fnRtnReqAmtTot').text());
529 528
 		},
530 529
 		action: function() {
531 530
 			var _this = this;
@@ -545,9 +544,9 @@ let mobPopObj = {
545 544
 				item['brandUnitUnqNo']	= row.brandUnitUnqNo;
546 545
 				item['itemId']			= row.itemId;
547 546
 				item['itemNm']			= row.itemNm;
548
-				item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.pchReqQty);
547
+				item['rtnAmt']			= parseInt(row.unitAmt) * parseInt(row.rtnQty);
549 548
 				item['rtnDvsn']			= row.rtnDvsn;
550
-				item['rtnQty']			= row.pchReqQty;
549
+				item['rtnQty']			= row.rtnQty;
551 550
 				item['rtnReqDtlNo']		= row.rtnReqDtlNo;
552 551
 				item['rtnReqUnqNo']		= row.rtnReqUnqNo;
553 552
 				item['rtnRsn']			= row.rtnRsn;
@@ -567,7 +566,7 @@ let mobPopObj = {
567 566
 				}
568 567
 			});
569 568
 			let param = $(formId).serializeObject();
570
-			param['rtnReqDt'] = param.dlvReqDt.replace(/[^0-9]/g, "");
569
+			param['rtnReqDt'] = param.rtnReqDt.replace(/[^0-9]/g, "");
571 570
 			param.gridInsertData = gridInsertData;
572 571
 			param.gridUpdateData = gridUpdateData;
573 572
 			param.gridDeleteData = gridDeleteData;
@@ -589,7 +588,6 @@ let mobPopObj = {
589 588
 		$('#' + popId).show();
590 589
 	},
591 590
 	hide: function(popId) {
592
-		$('#' + popId).hide();
593
-		// $('#' + popId).closest('.mobile-pop-close').hide();
591
+		$('#' + popId).closest('.mobile-pop-close').hide();
594 592
 	}
595 593
 };

+ 72 - 45
src/main/webapp/mobile/js/app/mstockmng/ITP_MSTOCKMNG02010.js

@@ -8,8 +8,10 @@ require(['config'], function() {
8 8
 /*API URL*/
9 9
 const API_MOBILE_GRID_LIST 			= '/api/stock/cdd/detail-grid-list';	// 목록
10 10
 const API_MOBILE_SAVE 				= '/api/stock/cdd/save-stock-cdd';		// 저장
11
+const API_MOBILE_BARCODE			= '/api/stock/mng/info-barcode-stock';	// 바코드
11 12
 const API_MOBILE_LOCATION			= '/api/whs/mng/location-grid-list';	// 이력
12 13
 const API_POP_SEARCH_LIST			= '/api/whs/mng/detail-grid-list';
14
+const API_POP_STOCK_MNG_LIST 		= '/api/stock/mng/detail-grid-list';
13 15
 
14 16
 const PAGE_MODE_LIST				= "LIST";
15 17
 const PAGE_MODE_VIEW				= "VIEW";
@@ -53,7 +55,7 @@ let mobPageObj = {
53 55
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
54 56
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
55 57
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_SEARCH'			: mobContentObj.list.search();		break;
56
-					case 'ITP_BTN_MSTOCKMNG02010_LIST_BARCODE'			: mobContentObj.list.barcode();		break;
58
+					case 'ITP_BTN_MSTOCKMNG02010_LIST_BARCODE'			: mobContentObj.barcode.callApp();	break;
57 59
 				}
58 60
 				return false;
59 61
 			});
@@ -113,58 +115,46 @@ let mobPageObj = {
113 115
 
114 116
 let mobContentObj = {
115 117
 	list: {
116
-		listSize: 10,
117
-		listPage: 0,
118
-		totPage: 0,
119
-		isSearch: false,
120 118
 		rows: [],
121 119
 		init: function() {
122 120
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
123
-			this.search();
124 121
 		},
125 122
 		search: function() {
126
-			this.listPage = 0;
127
-			this.totPage = 0;
128
-			this.rows.length = 0;
129
-			$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS').empty();
130
-			this.load();
123
+			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
124
+			itp_fn_form_clear_validate(null, formId);
125
+			if (itp_fn_form_event.isValid(formId)) {
126
+				mobPopObj.popItemNm.init();
127
+			}
131 128
 		},
132
-		load: function() {
133
-			var _this = this;
134
-			this.isSearch = true;
135
-			var callbackFn = function(result) {
129
+		validClear: function() {
130
+			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
131
+			itp_fn_form_clear_validate(null, formId);
132
+		}
133
+	},
134
+	barcode: {
135
+		callApp: function() {
136
+			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
137
+			itp_fn_form_clear_validate(null, formId);
138
+			if (itp_fn_form_event.isValid(formId)) {
139
+				this.callbackFn('');
140
+				// location.replace('app:barcode');
141
+				// location.href = 'app:barcode';
142
+			}
143
+		},
144
+		callbackFn: function(barcode) {
145
+			var infoFn = function(result) {
136 146
 				console.log(result);
137
-				_this.isSearch = false;
138
-				_this.totPage = result.gridTotal;
139
-				$.each(result.gridRows, function (i, item) {
140
-					$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
141
-					var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
142
-					$li.find('.fnStoreNm').text(item.storeNm);
143
-					$li.find('.fnLoanDvsnNm').text(item.loanDvsnNm);
144
-					var limitAmt;
145
-					if(item.loanDvsn == 'LD01') { // 선불(충전)
146
-						limitAmt = item.chrgeLimitAmt;
147
-					} else if(item.loanDvsn == 'LD02') { // 후불(신용)
148
-						limitAmt = item.credtLimitAmt;
149
-					}
150
-					$li.find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
151
-					$li.find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt - item.useAmtTotal));
152
-					$li.find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(item.tmpRcvAcctTotal));
153
-					$li.find('.fnUseAmtTotal').text(CommonObj.currency.add(item.useAmtTotal));
154
-					$li.find('.fnUseYnNm').text(item.useYnNm);
155
-					_this.rows.push(item);
156
-				});
157 147
 			};
158
-			var errFn = function() { _this.isSearch = false;};
148
+			// const param = {
149
+			// 	'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
150
+			// 	'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
151
+			// 	'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
152
+			// 	'sBarcode': barcode
153
+			// };
154
+			// fn_ajax_call(API_MOBILE_BARCODE, param, callbackFn, 'GET');
159 155
 			const param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
160
-			param.gridPage = ++this.listPage;
161
-			param.gridSize = this.listSize
162
-			// console.log(JSON.stringify(param));
163
-			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
164
-		},
165
-		barcode: function() {
166
-			location.replace('app:barcode');
167
-			// location.href = 'app:barcode';
156
+			param['sBarcode'] = barcode;
157
+			fn_ajax_call(API_MOBILE_BARCODE, JSON.stringify(param), infoFn, 'GET');
168 158
 		}
169 159
 	}
170 160
 };
@@ -175,6 +165,7 @@ let mobPopObj = {
175 165
 		rows: [],
176 166
 		init: function () {
177 167
 			this.rows.length = 0;
168
+			mobContentObj.list.validClear();
178 169
 			mobPopObj.show(this.popId);
179 170
 			this.search();
180 171
 			this.action();
@@ -239,6 +230,7 @@ let mobPopObj = {
239 230
 		delete: function() {
240 231
 			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val('');
241 232
 			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM').val('');
233
+			$('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH select[name="slocation"] option').empty();
242 234
 		},
243 235
 		close: function() {
244 236
 			this.rows.length = 0;
@@ -247,9 +239,44 @@ let mobPopObj = {
247 239
 			mobPopObj.hide(this.popId);
248 240
 		}
249 241
 	},
242
+	popItemNm: {
243
+		popId: 'ITP_POP_MSTOCKMNG02010_ITEM_AREA',
244
+		rows: [],
245
+		init: function () {
246
+			this.rows.length = 0;
247
+			mobPopObj.show(this.popId);
248
+			this.search();
249
+			this.action();
250
+		},
251
+		search: function () {
252
+			var _this = this;
253
+			var callbackFn = function(result) {
254
+				console.log(result);
255
+				_this.rows = result.gridRows;
256
+				$.each(result.gridRows, function (i, item) {
257
+					$('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_ROWCOPY').html());
258
+					var $li = $('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_AREA .panel-group > .list-row:last');
259
+					$li.find('.fnItemId').text(item.itemId);
260
+					$li.find('.fnItemNm').text(item.itemNm);
261
+					$li.find('.fnUnit').text(item.unit);
262
+					$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
263
+				});
264
+			};
265
+			var param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
266
+			fn_ajax_call(API_POP_STOCK_MNG_LIST, JSON.stringify(param), callbackFn, 'POST');
267
+		},
268
+		action: function() {
269
+
270
+		},
271
+		close: function() {
272
+			this.rows.length = 0;
273
+			$('#ITP_POP_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').empty();
274
+			$('#ITP_FORM_MSTOCKMNG02010_POP_ITEM #ITP_FORM_MSTOCKMNG02010_POP_ITEM_KEYWORD').val('');
275
+			mobPopObj.hide(this.popId);
276
+		}
277
+	},
250 278
 	show: function(popId) {
251 279
 		$('button[id$="_CLOSE"]').off('click').on('click', function() {
252
-			console.log($(this).attr('id'));
253 280
 			if($(this).hasClass('btn-pop-close')) {
254 281
 				mobPopObj.hide(popId);
255 282
 			}