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

src/main/webapp/app/oper/OPER01010.html

@@ -2,11 +2,11 @@
 	<div class="itp_cont">
 		<article class="itp_detail">
 			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>사용자관리</strong></h2>
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i><i class="glyphicon glyphicon-chevron-right"></i> <strong>사용자관리</strong></h2>
 				<div class="pull-right itp_cicon">
-					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i>조회</button>
 					<button type="button" id="ITP_BTN_OPER01010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
-					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>신규등록</button>
 					<button type="button" id="ITP_BTN_OPER01010_DELETE" class="btn btn-danger btn-sm DEB"><i class="glyphicon "></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_OPER01010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_OPER01010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
@@ -25,8 +25,8 @@
 											<input type="text" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP_NM" class="form-control itp_input" name="safflShopNm" placeholder="가맹점" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
-											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_FORM_OPER01010_SEARCH_AFFL_SHOP" class="btn btn-orange btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_OPER01010_DELETE_AFFL_SHOP" class="btn btn-warning btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-2 itp_ip itp_noMar">
 											<select id="ITP_FORM_OPER01010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>

src/main/webapp/css/style.css

@@ -2,11 +2,16 @@
 @media print {
 	*{visibility: hidden; margin:0; paddig:0;}
 }
-
+@font-face {
+    font-family: 'GmarketSansMedium';
+    src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
 
 /* COMMON */
 html, body {width:100%; height:100%; background:#eee; overflow-y:hidden;}
-* {word-break: break-word}
+* {word-break: break-word; font-family: 'GmarketSansMedium';}
 textarea {resize:none;}
 a, button {outline:none !important; text-decoration:none !important;}
 .fix:after {content:"."; display:block; height:0; clear:both; visibility:hidden;}
@@ -83,24 +88,26 @@ a, button {outline:none !important; text-decoration:none !important;}
 .has-error.radio label, .has-error.radio-inline label {margin-bottom:0px;}
 .has-error .help-block {font-size:12px;}
 
+
 /* ITP_WRAPPER */
 #ITP_WRAPPER {width:100%; height:100%; min-width:1400px;}
 #ITP_CONTENT_WRAPPER {width:100%;}
 #ITP_OVERLAY {position:fixed; display:none; width:100%; height:100%; top:0; left:0; right:0; bottom:0; background:rgba(250,250,250,.8); z-index:1060;}
 
 /* ITP_LOGIN */
-#ITP_LOGIN {width:100%; height:100%;}
-#ITP_LOGIN .itp_head {margin-bottom:8px; letter-spacing:-1px;}
-#ITP_LOGIN .itp_bar {margin:0; padding:0; float:left; margin:0 15px 0 15px; font-size:22px;}
-#ITP_LOGIN .itp_logo {margin:0; padding:0; color:#337ab7; float:left;}
-#ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:22px;}
+#ITP_LOGIN {width:100%; height:100%; font-family: 'GmarketSansMedium'}
+#ITP_LOGIN .itp_head {margin:0 5%; letter-spacing:-1px; width:90%; height:40px; margin-bottom:50px;}
+#ITP_LOGIN .itp_bar {width:4px; height:26px; padding:0; float:left; margin:8px 7px 0 7px; font-size:27px; font-weight:100; background:#ccc;}
+#ITP_LOGIN .itp_logo {margin:0; padding:0; color:#000; font-size:39px; float:left; font-weight:700;}
+#ITP_LOGIN .itp_tit {margin:0; padding:7px 0 0 0; float:left; font-size:27px;}
 #ITP_LOGIN .itp_cont {width:100%; min-height:calc(100vh - 115px); padding:170px 20px 150px 20px; position:relative;}
-#ITP_LOGIN .itp_box_wrap {width:600px; height:365px; position:absolute; top:50%; left:50%; margin:-182px 0 0 -300px;}
-#ITP_LOGIN .itp_box {padding:20px 20px 0 20px; margin-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:0;}
+#ITP_LOGIN .itp_box_wrap {width:450px; height:600px; position:absolute; top:55%; left:50%; transform: translate(-50%, -50%);}
+#ITP_LOGIN .itp_bottom_gray {background:#eee; width:100%; height:65px; top:-65px; border-bottom-left-radius: 30px;border-bottom-right-radius: 30px;}
+#ITP_LOGIN .itp_box {padding:20px 20px 0 20px; height:580px; margin-bottom:0; border-radius:30px; box-shadow: 0px 0px 10px #666;}
 #ITP_LOGIN .itp_body {padding-bottom:0;}
 #ITP_LOGIN .itp_box .control-label {text-align:left;}
 #ITP_LOGIN .itp_box .itp_lb {padding-top:7px;}
-#ITP_LOGIN .itp_box .itp_btn {line-height:6.15; width:100%;}
+#ITP_LOGIN .itp_box .itp_btn {line-height:1.8; margin:0 5%; width:90%;}
 #ITP_LOGIN .itp_box .form-group .checkbox input[type=checkbox] {margin-top:3px;}
 #ITP_LOGIN .itp_error {padding-top:15px; color:#a94442;}
 #ITP_LOGIN .itp_no_mar {margin-bottom:0 !important;}
@@ -109,16 +116,27 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_LOGIN .itp_copyright {font-size:12px;}
 #ITP_LOGIN .itp_forgotId {width:82%;}
 #ITP_LOGIN .itp_forgotBtn {border-top-right-radius:4px; border-bottom-right-radius:4px;}
+#ITP_LOGIN .itp_login {height:50px;}
+#ITP_LOGIN .itp_find {margin-top:34px; font-weight:100; cursor:pointer;}
+#ITP_LOGIN .itp_btn_bar {margin-top:10px;}
+#ITP_LOGIN .itp_login_img {width:100%; padding:0 auto;}
+#ITP_LOGIN .itp_img{width:150px; height:150px; top:-50px; position: absolute; margin:0 33.3%;}
+#ITP_LOGIN .itp_login_input label {position:absolute; top:50%; left:27px; color:#adadad; transform:translateY(-50%); font-size: 12px; border: none; outline:none; transition: top .5s ease;}
+#ITP_LOGIN .itp_login_input {width:90%; margin:0 5%; position:relative;}
+#ITP_LOGIN .itp_login_input input {width:100%; padding:20px 10px 10px; outline:none; border-radius:7px; background:#eee;}
+#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9;}
+#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9;}
+#ITP_LOGIN .itp_login_input:not(:placeholder-shown) ~ label{top:0px; font-size:12px;}
 
 /* ITP_HEADER */
-#ITP_HEADER .itp_head {width:100%; height:36px; position:relative; line-height:36px; z-index:100;}
-#ITP_HEADER .itp_tit {margin:0; padding:0; line-height:36px; font-size:20px;}
+#ITP_HEADER .itp_head {font-family: 'GmarketSansMedium';width:100%; height:50px; position:relative; line-height:50px; z-index:100;}
+#ITP_HEADER .itp_tit {margin:0; padding:0; line-height:50px; font-size:20px;}
 #ITP_HEADER .itp_tit span {display: inline-block; vertical-align: middle}
 #ITP_HEADER .itp_lt {position:absolute; top:0px; left:10px;}
 #ITP_HEADER .itp_rt {position:absolute; top:0px; right:20px;}
 #ITP_HEADER .itp_icon {float:left; padding-top:3px; margin-right:10px;}
 #ITP_HEADER .itp_icon i {color:#fff; font-size:20px;}
-#ITP_HEADER .itp_icon i.glyphicon-home {font-size:18px;}
+#ITP_HEADER .itp_icon img.glyphicon-logo {width:30px; margin-top:-7px;}
 #ITP_HEADER .itp_icon i.glyphicon-user {font-size:18px;}
 #ITP_HEADER .itp_icon i.glyphicon-off {font-size:18px;}
 #ITP_HEADER .itp_user {float:left; font-size:16px; margin-left:15px;}
@@ -130,13 +148,13 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_HEADER .itp_sch_brand button{width:90px; border:1px solid #000;}
 #ITP_HEADER .itp_menu {float:left; border:1px solid #ddd; line-height: 26px; background:#eee;margin:4px; border-radius: 2px; padding:0 4px;}
 #ITP_HEADER .itp_menu a {color:#000; font-size:13px; text-decoration:none;}
-#ITP_HEADER .itp_out {float:left; border:1px solid #000; line-height: 27px; background:#666; margin:4px; border-radius: 2px; padding:0 4px;}
-#ITP_HEADER .itp_out a {color:#fff; font-size:13px; text-decoration:none;}
-#ITP_HEADER .itp_tabs {position:relative; z-index:100;}
+#ITP_HEADER .itp_out {width:70px; height:30px;  float:left; border:1px solid #333; line-height: 28px; background:#fff; margin-top:10px; border-radius: 10px; padding:0 4px;}
+#ITP_HEADER .itp_out a {padding:8.4px; color:#000; font-size:11px; text-decoration:none;}
+#ITP_HEADER .itp_tabs {position:relative; z-index:100; transition:all .25s ease; float:right; width:calc(100% - 240px);}
 #ITP_HEADER .itp_tabs .nav-tabs {padding:4px 4px 0 4px; background:#fff;}
-#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#333; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
+#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
 #ITP_HEADER .itp_tabs .nav-tabs > li a i.glyphicon-remove {font-size:10px; margin-left:4px; cursor:pointer;}
-#ITP_HEADER .itp_tabs .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {background:#D6E6F3; color:#000; border:1px solid #1A3E5E; border-bottom-color:transparent;}
+#ITP_HEADER .itp_tabs .nav-tabs > li.active > a, .nav-tabs > li.active > a:focus, .nav-tabs > li.active > a:hover {background:#fff; color:#666; border:1px solid #ccc; border-bottom-color:transparent; font-weight:700;}
 #ITP_HEADER .itp_tabs .nav-tabs > li > a:hover {background:#D6E6F3 !important; border:1px solid #1A3E5E; border-bottom-color:transparent; color:#000;}
 
 /* ITP_SIDEBAR */
@@ -164,7 +182,7 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li a .itp_tt {float:left;}
 
 /* ITP_CONTAINER */
-#ITP_CONTAINER {height:calc(100vh - 69px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);}
+#ITP_CONTAINER {height:calc(100vh - 69px); padding:8px; transition:all .25s ease; float:left; width:calc(100% - 240px);background:#fff;}
 #ITP_CONTAINER.itp_open_conts {padding-left:8px; width:100%;}
 #ITP_CONTAINER .itp_contents {background:#fff; height:100%;}
 #ITP_CONTAINER .itp_contents .itp_sec {height:100%;}
@@ -221,9 +239,9 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk .itp_check {float:right; margin-left:10px;}
 #ITP_CONTAINER .itp_detail {display:table-cell; vertical-align:top; height:100%;}
 
-#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 4px 0 4px; height:42px; background:#eee;}
+#ITP_CONTAINER .itp_detail .itp_det_head {padding:0 4px 0 4px; height:42px; background:#fff;}
 #ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:15px; margin:0; padding:0; line-height:42px;}
-#ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit .glyphicon {color:#337ab7; margin-right:4px;}
+#ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit .glyphicon {color:#F0831E; margin-right:4px;}
 
 #ITP_CONTAINER .itp_detail .itp_det_in {padding:15px 20px 15px 20px; height:calc(100vh - 127px); overflow-y:scroll;}
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px;}
@@ -283,7 +301,7 @@ html:lang(en) #ITP_CONTAINER .itp_detail .itp_form .itp_thumb_inline .itp_thumb_
 
 #ITP_CONTAINER .itp_detail .itp_lg_form {padding-top:10px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 {padding-left:15px; padding-right:15px; padding-bottom:15px; }
-#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#f5f5f5; padding:15px 15px 5px 10px; border-radius:4px;}
+#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:15px 15px 5px 10px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-group {margin-bottom:10px;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .form-control {font-size:13px; color:#333;}
 #ITP_CONTAINER .itp_detail .itp_lg_form .itp_lb {font-size:13px; padding-top:5px; padding-right:0; color:#333; position:relative;}

src/main/webapp/css/ui.jqgrid-bootstrap.css

@@ -1028,7 +1028,9 @@ td.menu_text {
 	background-color:inherit;
 }
 .ui-jqgrid input[type=checkbox] {width:15px; height:15px;}
+
 .ui-jqgrid .jqgrid-rownum {background:#fff !important;}
-.ui-jqgrid .jqgrid-rownum {background:#fff !important;}
+.ui-jqgrid .jqgrid-rownum:nth-child(even) {background:#f5f5f5 !important;}
 .table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}
-.table>tbody>tr.active .jqgrid-rownum {background:#f5f5f5 !important;}
+.table>tbody>tr.success .jqgrid-rownum:checked {background:#dff0d8 !important;}
+.table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important;}

src/main/webapp/js/app/main.js

@@ -54,7 +54,7 @@ var itp_fn_MAIN_NOTICE_grid = {
 				{
 					index: 'NTICE_TITL', name: 'nticeTitl',
 					label: '공지사항', //공지제목
-					width: '15', fixed: false, align: 'center',
+					width: '15', fixed: false, align: 'left',
 					sortable: false, hidden: false
 				},
 				{

src/main/webapp/js/app/oper/ITP_OPER01010.js

@@ -53,25 +53,25 @@ const gridColModel = {
 		{
 			index: 'AFFL_SHOP_NM', name: 'afflShopNm',
 			label: ITP_MSG_LOCALE.label.afflShopNm, //가맹점
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'USER_ID', name: 'userId',
 			label: ITP_MSG_LOCALE.label.userId, //사용자ID
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'USER_NM', name: 'userNm',
 			label: ITP_MSG_LOCALE.label.userName, //닉네임
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
 			sortable: false, hidden: false
 		},
 		{
@@ -427,6 +427,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
+					$("tr.jqgrow:odd").css("background", "#f5f5f5");
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER01010_GRID_ID, true, 'number', 'OPER01010', listObj.itp_OPER01010_search, _this.itp_fn_OPER01010_empty, true, data.gridRecords, true);
 					var ids = $(OPER01010_GRID_ID).getDataIDs();

src/main/webapp/login.html

@@ -30,39 +30,36 @@
 		<div class="itp_cont">
 			<div class="container">
 				<div class="itp_box_wrap">
-					<div class="itp_head fix">
-						<h1 class="itp_logo">오더퀸</h1>
-						<span class="itp_bar">|</span>
-						<h2 class="text-center itp_tit">수발주시스템</h2>
+					<div class="itp_login_img">
+						<img src="/oqpo-view/images/oqpologo.png" alt="로고" id="ITP_LOGIN_BRAND_LOGO" class="itp_img" name="" >
 					</div>
 					<div class="panel panel-default itp_box">
 						<div class="panel-body itp_body">
 							<form id="command" class="form-horizontal" action="" method="post" onsubmit="return false;">
 								<input id="userId" name="userId" type="hidden" value="" />
 	        					<input id="password" name="password" type="hidden" value="" />
-
-								<div class="row">
-									<div class="col-xs-9">
-										<div class="form-group">
-											<label class="col-xs-3 itp_lb">아이디</label>
-											<div class="col-xs-9">
-												<input type="text" class="form-control" id="ITP_FORM_LOGIN_USER_ID" autofocus>
-											</div>
+								<div class="row" style="margin-top:100px;">
+									<div class="col-xs-12 itp_login_input">
+										<div class="itp_head">
+											<h1 class="itp_logo">오더퀸</h1>
+											<span class="itp_bar">&nbsp;</span>
+											<h2 class="text-center itp_tit">수발주시스템</h2>
 										</div>
+									</div>	
+									<div class="col-xs-12">
 										<div class="form-group">
-											<label class="col-xs-3 itp_lb">비밀번호</label>
-											<div class="col-xs-9">
-												<input type="password" class="form-control" id="ITP_FORM_LOGIN_USER_PW" autocomplete="off">
+											<div class="col-xs-11 itp_login_input">
+												<input type="text" class="form-control itp_login" id="ITP_FORM_LOGIN_USER_ID" autofocus required="">
+												<label>아이디</label>
 											</div>
 										</div>
 										<div class="form-group">
-											<div class="col-xs-offset-3 col-xs-9">
-												<div class="checkbox pull-left">
-													<label><input type="checkbox" id="ITP_FORM_LOGIN_SAVE_ID"> 아이디저장</label>
-												</div>
+											<div class="col-xs-11 itp_login_input">
+												<input type="password" class="form-control itp_login" id="ITP_FORM_LOGIN_USER_PW" required="" autocomplete="off">
+												<label>비밀번호</label>
 											</div>
 										</div>
-										<div class="form-group">
+										<div class="form-group" style="display: none;">
 											<div class="col-xs-offset-3 col-xs-9">
 												<p class="text-nowrap itp_error" id="ITP_FORM_LOGIN_ERROR">
 												아이디와 비밀번호를 입력하세요.
@@ -70,15 +67,21 @@
 											</div>
 										</div>
 									</div>
-									<div class="col-xs-3">
-										<button type="submit" id="login_btn" class="btn btn-primary btn-lg itp_btn">로그인</button>
+									<div class="col-xs-12 itp_btn_bar">
+										<button type="submit" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
+									</div>
+									<div class="col-xs-12 itp_login_input">
+										<div class="form-group">
+											<div class="col-xs-12 itp_find">
+												<span>아이디/비밀번호 찾기</span>
+											</div>
+										</div>
 									</div>
 								</div>
 							</form>
 						</div>
 					</div>
-					<div class="panel panel-default text-center itp_foot">본 시스템은 크롬 브라우저에 최적화 되어 있습니다.</div>
-					<div class="text-center itp_copyright">COPYRIGHT © NOORIJA Co., Ltd. ALL RIGHTS RESERVED</div>
+					<div class="col-xs-12 itp_bottom_gray"></div>
 				</div>
 			</div>
 		</div>

src/main/webapp/main.html

@@ -47,7 +47,7 @@
 
 		<!-- 상단 -->
 		<header id="ITP_HEADER">
-			<div class="itp_head bg-primary">
+			<div class="itp_head bg-orange">
 				<h1 class="text-center itp_tit">
 					<span id="ITP_TXT_MAIN_SHR_AFFL">오더퀸</span>
 					<span style="font-size: 18px; margin-top: -3px">|</span>
@@ -55,7 +55,7 @@
 				</h1>
 				<div class="itp_lt">
 					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_MENU"><i class="glyphicon glyphicon-align-justify"></i></a></span>
-					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_HOME"><i class="glyphicon glyphicon-home"></i></a></span>
+					<span class="itp_icon"><a href="javascript:void(0)" id="ITP_BTN_HOME"><img src="/oqpo-view/images/oqpo.png" alt="로고" id="ITP_LOGIN_BRAND_LOGO" class="glyphicon-logo" name="" ></a></span>
 					<span class="itp_user" id="ITP_LOGIN_USER" style="cursor: pointer;"></span>
 				</div>
 				<div class="itp_rt">

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

@@ -212,7 +212,8 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG04010_VIEW_CANCEL_LIST" class="col_12 btn-gray CLB">취소</button>
+				<button id="ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL" class="col_6 btn-gray CLB">반품취소</button>
+				<button id="ITP_BTN_MRTNMNG04010_VIEW_CANCEL_LIST" class="col_6 btn-gray CLB">목록</button>
 			</div>
 		</form>
 	</div>

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

@@ -1,49 +1,12 @@
 <section id="ITP_MOBILE_MRTNMNG05010">
-	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop">
-			<div class="header">
-				<div class="header_left">
-					<label>> 납품장소</label>
-				</div>
-				<div class="header_right">
-					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
-				</div>
-			</div>
-			<div class="search_bar">
-				<form id="ITP_FORM_MRTNMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
-					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
-					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
-					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
-				</form>
-			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
-			</div>
-			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row">
-						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
-						</div>
-						<div class="scroll_right">
-							<button id="ITP_BTN_MRTNMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
-						</div>
-					</li>
-				</div>
-			</div>
-		</div>
-	</div>
 	<div id="ITP_AJAX_MRTNMNG05010_LIST_CONTAINER" >
 		<form id="ITP_FORM_MRTNMNG05010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
-			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
-			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
-			<input type="hidden" id="ITP_FORM_MPOMNG02010_LIST_SEARCH_IDX" name="sidx" value="0">
+			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
+			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+			<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_IDX" name="sidx" value="0">
 			<div class="content">
 				<div class="line">
-					<label>반품예정일</label>
+					<label>수거예정일</label>
 					<div class="date_to">
 						<!--<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" readonly>
 						<span class="input-group-addon itp_date_to">~</span>
@@ -55,10 +18,10 @@
 					</div>
 				</div>
 				<div class="line">
-					<label>반품서번호</label>
+					<label>수거서번호</label>
 					<div class="search_wrap">
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="srtnPodrUnqNo" style="width: 262px;" type="text" placeholder="">
+							<input id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" style="width: 262px;" type="text" placeholder="">
 						</div>
 					</div>
 				</div>
@@ -163,10 +126,47 @@
 				</div>
 			</div>
 			<div class="button_bar">
-				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">입고처리</button>
+				<button id="ITP_BTN_MRTNMNG05010_LIST_MODIFY" class="btn_col_6 btn-primary INPS">반품처리</button>
 				<!--<button id="ITP_BTN_MRTNMNG05010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>-->
 			</div>
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MRTNMNG05010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>> 납품장소</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MRTNMNG05010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MRTNMNG05010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MRTNMNG05010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MRTNMNG05010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MRTNMNG05010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="search_bar">
+				<button id="ITP_BTN_MRTNMNG05010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			</div>
+			<div id="ITP_LIST_MRTNMNG05010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG05010_POP_WHS_ROWCOPY" style="display:none;">
+					<li class="list-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MRTNMNG05010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
 </section>

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

@@ -1,41 +1,4 @@
 <section id="ITP_MOBILE_MRTNMNG06010">
-	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
-		<div class="pop">
-			<div class="header">
-				<div class="header_left">
-					<label>> 납품장소</label>
-				</div>
-				<div class="header_right">
-					<button type="button" id="ITP_BTN_MRTNMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
-				</div>
-			</div>
-			<div class="search_bar">
-				<form id="ITP_FORM_MRTNMNG06010_POP_WHS" class="form-horizontal" onsubmit="return false;">
-					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
-					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
-					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
-				</form>
-			</div>
-			<div class="search_bar">
-				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
-			</div>
-			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display:none;">
-					<li class="list-row">
-						<div class="scroll_left">
-							<div class="fnWhsNm">브랜드 창고 명A</div>
-							<div class="fnLocationNm">(상세위치내용)</div>
-						</div>
-						<div class="scroll_right">
-							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
-						</div>
-					</li>
-				</div>
-			</div>
-		</div>
-	</div>
 	<div id="ITP_AJAX_MRTNMNG06010_LIST_CONTAINER" >
 		<form id="ITP_FORM_MRTNMNG06010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
@@ -54,7 +17,7 @@
 					<label>반품발주번호</label>
 					<div class="search_wrap">
 						<div class="line_right">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="srtnPodrNo" type="text">
+							<input id="ITP_FORM_MRTNMNG06010_LIST_RTN_PODR_UNQ_NO" name="scolPrckUnqNo" type="text">
 						</div>
 					</div>
 				</div>
@@ -62,7 +25,7 @@
 					<label>반품입고장소</label>
 					<div class="search_wrap">
 						<div class="float_left">
-							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="A공급업체명">
+							<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명">
 							<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						</div>
 						<div class="float_left_btn">
@@ -159,4 +122,41 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MRTNMNG06010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+		<div class="pop">
+			<div class="header">
+				<div class="header_left">
+					<label>> 납품장소</label>
+				</div>
+				<div class="header_right">
+					<button type="button" id="ITP_BTN_MRTNMNG06010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MRTNMNG06010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MRTNMNG06010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MRTNMNG06010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MRTNMNG06010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="search_bar">
+				<button id="ITP_BTN_MRTNMNG06010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			</div>
+			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display:none;">
+					<li class="list-row">
+						<div class="scroll_left">
+							<div class="fnWhsNm">브랜드 창고 명A</div>
+							<div class="fnLocationNm">(상세위치내용)</div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MRTNMNG06010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
 </section>

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

@@ -1,36 +1,40 @@
 <section id="ITP_MOBILE_MSTOCKMNG02010">
 	<div id="ITP_AJAX_MSTOCKMNG02010_LIST_CONTAINER">
 	 <form id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
-		 <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
-		 <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
+		 <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="brandId" value="">
+		 <input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="storeId" value="">
 		  <div class="content">
 			<div class="line">
 			  <label>재고실사일자</label>
 			  <div class="line_right">
-				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="sDt" class="date" type="date" data-check-required="empty">
+				<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_STCK_DT" name="cddDt" class="date" type="date" data-check-required="empty">
 			  </div>
 			</div>
 			<div class="line">
 			  <label>창고선택</label>
-			  <div class="search_wrap">
+			  <div class="search_nm">
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="창고명" data-check-required="empty" readonly>
-					  <input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID" name="swhsId" type="hidden">
+					  <input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_NM" name="whsNm" type="text" placeholder="창고명" data-check-required="empty" readonly>
+					  <input id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID" name="whsId" type="hidden">
 				  </div>
 				  <div class="float_left_btn">
 					  <button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
-					   <button id="ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
+					  <button id="ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 				  </div>
 			  </div>
 			</div>
 			<div class="line">
 			  <label>Location</label>
 			  <div class="line_right">
-				<select name="slocation" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty">
-				  <option value=""></option>
-				</select>
+				<select name="location" id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION" data-check-required="empty"></select>
 			  </div>
 			</div>
+			  <div class="line">
+				  <label>실사구분</label>
+				  <div class="line_right">
+					  <select id="ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_CDD_DVSN" data-select-code="CDD_DVSN" data-check-required="empty" name="cddDvsn"></select>
+				  </div>
+			  </div>
 			<div class="line" style="height:45px;">
 			  <div class="search">
 				<button id="ITP_BTN_MSTOCKMNG02010_LIST_SEARCH" class="btn-primary btn-sm ADB">대상 검색</button>
@@ -50,11 +54,11 @@
 					  <div class="nomal">
 						<label>품목번호 &nbsp;:</label>
 						<div>
-						  <div class="fnItemId">adsf1234</div>
+						  <div class="fnItemId"></div>
 						</div>
 						<label>품목명&nbsp;:</label>
 						<div>
-						  <div class="fnItemNm">원두커피</div>
+						  <div class="fnItemNm"></div>
 						</div>
 					  </div>
 					</div>
@@ -62,11 +66,11 @@
 					  <div class="nomal">
 						<label>단위 &nbsp;:</label>
 						<div>
-						  <div class="fnUnit">Kg</div>
+						  <div class="fnUnit"></div>
 						</div>
 						<label>단위수량&nbsp;:</label>
 						<div>
-						  <div class="fnUnitQty">20 Kg</div>
+						  <div class="fnUnitQty"></div>
 						</div>
 					  </div>
 					</div>
@@ -74,13 +78,13 @@
 					  <div class="nomal">
 						<label class="col_0">현재고수량 &nbsp;:</label>
 						<div class="fn">
-						  <div class="fnStckQty">100Kg</div>
+						  <div class="fnStckQty"></div>
 						</div>
 						<label class="col_6">실사수량&nbsp;:</label>
 						<div class="btn_bar">
-						  <button id="ITP_BTN_MSTOCKMNG02010_LIST_QTY+MINUS"><</button>
-						  <div class="fn col_0">2</div>
-						  <button id="ITP_BTN_MSTOCKMNG02010_LIST_QTY_PLUS">></button>
+						  <button class="DETAIL_ITEM_MINUS"><</button>
+						  <div class="fnCddQty col_0">1</div>
+						  <button class="DETAIL_ITEM_PLUS">></button>
 						</div>
 					  </div>
 					</div>
@@ -143,7 +147,7 @@
 			</div>
 		</div>
 	</div>
-	<div id="ITP_POP_MSTOCKMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: block;">
+	<div id="ITP_POP_MSTOCKMNG02010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
 		<div class="pop">
 			<div class="header">
 				<div class="header_left">
@@ -165,26 +169,30 @@
 				<div class="search_btn_bar">
 					<div class="btn_right">
 						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_SEARCH" class="btn-primary"><img src="../img/w_search.png">조회</button>
-						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CHECK" class="btn-green"><img src="../img/w_check.png">선택</button>
+						<button id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CHOICE" class="btn-green"><img src="../img/w_check.png">선택</button>
 					</div>
-				</div>	
-			<table border="1">
-				<tbody>
-				<th><input type="checkbox"checked></th>
+				</div>
+			</form>
+			<table id="ITP_POP_MSTOCKMNG02010_TABLE_AREA" border="1">
+				<thead>
+				<th><input type="checkbox" class="chkAll" checked></th>
 				<th>품목번호</th>
 				<th>품목명</th>
 				<th>단위</th>
 				<th>현재고수량</th>
-				<tr>
-					<td><input type="checkbox"checked></td>
-					<td>212212121212121</td>
-					<td>테스트 품목명 3</td>
-					<td>ㅁㄴㅇ</td>
-					<td>ㄻㄴㅇ</td>
-				</tr>
+				</thead>
+				<tbody>
 				</tbody>
 			</table>
-			</form>
+			<div id="ITP_POP_MSTOCKMNG02010_TABLE_TR" style="display:none;">
+				<tr>
+					<td><input type="checkbox" class="chkItem" checked></td>
+					<td class="fnItemId"></td>
+					<td class="fnItemNm"></td>
+					<td class="fnUnit"></td>
+					<td class="fnStckQty"></td>
+				</tr>
+			</div>
 		</div>
 	</div>
   </section>

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

@@ -266,11 +266,10 @@ let mobContentObj = {
 			init: function(rtnReqDtlList) {
 				var _this = this;
 				$.each(rtnReqDtlList, function (i, item) {
-					item['viewCd'] = 'U';
-					_this.attachRow(item);
+					_this.attachRow(item, 'U');
 				});
 			},
-			attachRow: function (item) {
+			attachRow: function (item, viewCd) {
 				var _this = this;
 				var append = function() {
 					$('#ITP_LIST_MRTNMNG02010_MODIFY_AREA .panel-group').append($('#ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY').html());
@@ -279,6 +278,7 @@ let mobContentObj = {
 					$li.find('.fnItemNm').text(item.itemNm);
 					$li.find('.fnRtnQty').text(item.rtnQty);
 					$li.find('.fnUnitAmt').text(CommonObj.currency.add(item.unitAmt));
+					item['viewCd'] = viewCd;
 					_this.rows.push(item);
 				};
 				var fnChkExist = function() {
@@ -427,7 +427,7 @@ let mobPopObj = {
 					var index = $(elem).closest('li').index();
 					var item = mobPopObj.popItem.rows[index];
 					item['rtnQty'] = $(elem).closest('li').find('.fnRtnQty').html();
-					mobContentObj.modify.list.attachRow(item);
+					mobContentObj.modify.list.attachRow(item, 'C');
 				}
 			}
 		},
@@ -509,15 +509,15 @@ let mobPopObj = {
 	},
 	popReqConfirm: {
 		popId: 'ITP_POP_MRTNMNG02010_REQ_AREA',
-		pchReqStCd: '',
-		init: function (pchReqStCd) {
-			this.pchReqStCd = pchReqStCd;
+		rtnReqStCd: '',
+		init: function (rtnReqStCd) {
+			this.rtnReqStCd = rtnReqStCd;
 			mobPopObj.show(this.popId);
 			this.view();
 			this.action();
 		},
 		view: function() {
-			if(this.pchReqStCd === RTN_REQ_ST_CD_REQUEST_SAVE) {
+			if(this.rtnReqStCd === RTN_REQ_ST_CD_REQUEST_SAVE) {
 				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('반품요청 하시겠습니까?');
 			} else {
 				$('#ITP_POP_MRTNMNG02010_REQ_AREA .msg_save').text('임시저장 하시겠습니까?');
@@ -529,7 +529,7 @@ let mobPopObj = {
 		action: function() {
 			var _this = this;
 			$('#ITP_POP_MRTNMNG02010_REQ_AREA button[id="ITP_BTN_MRTNMNG02010_POP_REQ_CONFIRM"]').off('click').on('click', function() {
-				$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_ST_CD').val(_this.pchReqStCd);
+				$('#ITP_FORM_MRTNMNG02010_MODIFY #ITP_FORM_MRTNMNG02010_MODIFY_PCH_REQ_ST_CD').val(_this.rtnReqStCd);
 				_this.save('#ITP_FORM_MRTNMNG02010_MODIFY');
 			});
 		},
@@ -540,7 +540,6 @@ let mobPopObj = {
 			var gridDeleteData = [];
 			$.each(mobContentObj.modify.list.rows, function(index, row) {
 				var item = {};
-				item['viewCd'] 			= 'C';
 				item['brandUnitUnqNo']	= row.brandUnitUnqNo;
 				item['itemId']			= row.itemId;
 				item['itemNm']			= row.itemNm;
@@ -556,17 +555,17 @@ let mobPopObj = {
 				item['unit']			= row.unit;
 				item['unitAmt']			= row.unitAmt;
 				item['unitGubun']		= row.unitGubun;
-				if(item.viewCd === 'R' || item.viewCd === 'C' ) {
-					item['viewCd'] = 'C';
+				if(row.viewCd === 'R' || row.viewCd === 'C' ) {
 					gridInsertData.push(item);
-				} else if(item.viewCd === 'U') {
+				} else if(row.viewCd === 'U') {
 					gridUpdateData.push(item);
-				} else if(item.viewCd === 'D') {
+				} else if(row.viewCd === 'D') {
 					gridDeleteData.push(item);
 				}
 			});
 			let param = $(formId).serializeObject();
-			param['rtnReqDt'] = param.rtnReqDt.replace(/[^0-9]/g, "");
+			param['rtnReqStCd'] = this.rtnReqStCd;
+			param['colReqDt'] = param.colReqDt.replace(/[^0-9]/g, "");
 			param.gridInsertData = gridInsertData;
 			param.gridUpdateData = gridUpdateData;
 			param.gridDeleteData = gridDeleteData;

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

@@ -8,6 +8,7 @@ require(['config'], function() {
 /*API URL*/
 const API_MOBILE_GRID_LIST 			= '/api/rtnmng/rtn/detail-grid-list';	// 목록
 const API_MOBILE_INFO 				= '/api/rtnmng/rtn/info-rtnOdr';		// 상세
+const API_MOBILE_CANCEL				= '/api/rtnmng/rtn/cancel-rtnPo';		// 취소
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
 const API_POP_ITEM_LIST 			= '/api/item/pop-grid-list';
 const API_POP_SPPLY_LIST 			= '/api/spply/pop-grid-list';
@@ -64,6 +65,7 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MRTNMNG04010_VIEW"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
+					case 'ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL'		: mobContentObj.view.rtnPoCancel();	break;
 					case 'ITP_BTN_MRTNMNG04010_VIEW_CANCEL_LIST'		: mobContentObj.view.cancel();	break;
 				}
 				return false;
@@ -162,12 +164,14 @@ let mobContentObj = {
 		}
 	},
 	view: {
+		rtnPodrUnqNo: '',
 		init: function(item) {
 			mobPageObj.switchScreen(PAGE_MODE_VIEW);
 			this.search(item);
 		},
 		search: function(item) {
 			var _this = this;
+			this.rtnPodrUnqNo = item.rtnPodrUnqNo;
 			var callbackFn = function(result) {
 				console.log(result);
 				_this.view(result);
@@ -178,6 +182,7 @@ let mobContentObj = {
 		view: function(result) {
 			var _this = this;
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
+			$('#ITP_BTN_MRTNMNG04010_VIEW_RTN_PO_CANCEL').prop('disabled', (result.rtnOdrStCd !== 'RO20'));
 			$(id).find('.fnRtnOdrRegDt').text(result.rtnOdrRegDt);
 			$(id).find('.fnRtnDodrTotalAmt').text(CommonObj.currency.add(result.rtnDodrTotalAmt));
 			$(id).find('.fnRtnWhsNm').text(result.rtnWhsNm);
@@ -194,14 +199,22 @@ let mobContentObj = {
 				$li.find('.fnColReqDt').text(item.colReqDt);
 			});
 		},
-		cancel: function () {
+		rtnPoCancel: function() {
+			if(confirm('반품 취소하시겠습니까?')) {
+				const param = {'brandId': fn_make_user_info.get('brandId'), 'rtnPodrUnqNo': this.rtnPodrUnqNo};
+				console.log(param);
+				fn_ajax_call(API_MOBILE_CANCEL, JSON.stringify(param), function() { mobContentObj.view.cancel(true) }, 'POST');
+			}
+		},
+		cancel: function (isSearch) {
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
 			$(id).find('.fnPodrDt').text('');
 			$(id).find('.fnPodrTotalAmt').text('');
 			$(id).find('.fnShmtWhsDvsnNm').text('');
 			$(id).find('.fnSpplyNm').text('');
 			$('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group').empty();
-			mobPageObj.switchScreen(PAGE_MODE_LIST);
+			this.rtnPodrUnqNo = '';
+			isSearch ? mobContentObj.list.init() : mobPageObj.switchScreen(PAGE_MODE_LIST);
 		}
 	}
 };

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

@@ -6,8 +6,8 @@ require(['config'], function() {
 });
 
 /*API URL*/
-const API_MOBILE_GRID_LIST 			= '/api/rtnmng/rtn/detail-grid-list';	// 목록
-const API_MOBILE_SAVE 				= '/api/rtnmng/rtn/save-rtnPo';			// 저장
+const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/retstock-target-grid-list';	// 목록
+const API_MOBILE_SAVE 				= 'api/rtnmng/inoutmng/save-retstock';				// 반품처리
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
 
 const PAGE_MODE_LIST				= "LIST";
@@ -109,6 +109,7 @@ let mobContentObj = {
 		},
 		search: function() {
 			var formId = '#ITP_FORM_MRTNMNG05010_LIST_SEARCH';
+			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
 				this.listPage = 0;
 				this.totPage = 0;
@@ -220,11 +221,11 @@ let mobPopObj = {
 			$.each(this.rows, function (i, item) {
 				if(whsId === item.whsId) {
 					if(_this.popMode === 'RTN_WHS') {
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val(item.whsId);
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val(item.whsNm);
+						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val(item.whsId);
+						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val(item.whsNm);
 					} else {
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val(item.whsId);
-						$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val(item.whsNm);
+						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val(item.whsId);
+						$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val(item.whsNm);
 					}
 					_this.close();
 					return false;
@@ -244,12 +245,12 @@ let mobPopObj = {
 			});
 		},
 		delete: function() {
-			if(_this.popMode === 'RTN_WHS') {
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val('');
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val('');
+			if(this.popMode === 'RTN_WHS') {
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID').val('');
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM').val('');
 			} else {
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val('');
-				$('#ITP_FORM_MRTNMNG04010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val('');
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val('');
+				$('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_NM').val('');
 			}
 		},
 		close: function() {

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

@@ -6,8 +6,8 @@ require(['config'], function() {
 });
 
 /*API URL*/
-const API_MOBILE_GRID_LIST 			= '/api/rtnmng/inoutmng/warehouse-grid-list';	// 목록
-const API_MOBILE_INFO 				= '/api/rtnmng/po/info-pchOdr';					// 상세
+const API_MOBILE_GRID_LIST 			= 'api/rtnmng/inoutmng/retstock-result-grid-list';	// 목록
+const API_MOBILE_INFO 				= '/api/rtnmng/po/info-pchOdr';						// 상세
 const API_POP_SEARCH_LIST			= '/api/whs/mng/pop-whs-search';
 const API_POP_SPPLY_LIST 			= '/api/spply/pop-grid-list';
 
@@ -51,11 +51,11 @@ let mobPageObj = {
 			$('button[id^="ITP_BTN_MRTNMNG06010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 	break;
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 	break;
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_SPPLY_NM'	: mobPopObj.popSpply.init(); 	break;
-					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_SPPLY_NM'	: mobPopObj.popSpply.delete(); 	break;
-					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH'			: mobContentObj.list.search();	break;
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_WHS_NM'		: mobPopObj.popWhsNm.init('WHS'); 		break;
+					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_WHS_NM'		: mobPopObj.popWhsNm.delete('WHS'); 			break;
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM'	: mobPopObj.popWhsNm.init('RTN_WHS'); 	break;
+					case 'ITP_BTN_MRTNMNG06010_LIST_DELETE_RTN_WHS_NM'	: mobPopObj.popWhsNm.delete('RTN_WHS'); 		break;
+					case 'ITP_BTN_MRTNMNG06010_LIST_SEARCH'				: mobContentObj.list.search();					break;
 				}
 				return false;
 			});
@@ -114,7 +114,7 @@ let mobContentObj = {
 		rows: [],
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
-			this.search();
+			// this.search();
 		},
 		search: function() {
 			this.listPage = 0;
@@ -224,7 +224,8 @@ let mobPopObj = {
 	popWhsNm: {
 		popId: 'ITP_POP_MRTNMNG06010_WHS_AREA',
 		rows: [],
-		init: function () {
+		init: function (mode) {
+			this.popMode = mode;
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
 			this.search();
@@ -255,8 +256,13 @@ let mobPopObj = {
 			var whsId = $(elem).data('whs-id');
 			$.each(this.rows, function (i, item) {
 				if(whsId === item.whsId) {
-					$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val(item.whsId);
-					$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val(item.whsNm);
+					if(_this.popMode === 'RTN_WHS') {
+						$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val(item.whsId);
+						$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val(item.whsNm);
+					} else {
+						$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val(item.whsId);
+						$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val(item.whsNm);
+					}
 					_this.close();
 					return false;
 				}
@@ -275,8 +281,13 @@ let mobPopObj = {
 			});
 		},
 		delete: function() {
-			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
-			$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
+			if(this.popMode === 'RTN_WHS') {
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID').val('');
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val('');
+			} else {
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_ID').val('');
+				$('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_WHS_NM').val('');
+			}
 		},
 		close: function() {
 			this.rows.length = 0;

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

@@ -56,22 +56,18 @@ let mobPageObj = {
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_DELETE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_SEARCH'			: mobContentObj.list.search();		break;
 					case 'ITP_BTN_MSTOCKMNG02010_LIST_BARCODE'			: mobContentObj.barcode.callApp();	break;
+					case 'ITP_BTN_MSTOCKMNG02010_LIST_SAVE'				: mobContentObj.list.save();		break;
+					case 'ITP_BTN_MSTOCKMNG02010_LIST_CANCEL_LIST'		: mobContentObj.list.cancel();		break;
 				}
 				return false;
 			});
 
-			$('button[id^="ITP_BTN_MSTOCKMNG02010_VIEW"]').on('click', function() {
-				var id = $(this).attr('id');
-				switch (id) {
-					case 'ITP_BTN_MSTOCKMNG02010_VIEW_SEARCH'		: mobContentObj.view.history.search();	break;
-					case 'ITP_BTN_MSTOCKMNG02010_VIEW_CANCEL_LIST'	: mobContentObj.view.cancel();			break;
+			$(document).on('click', '#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS li button', function() {
+				if($(this).hasClass('DETAIL_ITEM_PLUS')) {
+					mobContentObj.list.actPlus($(this));
+				} else if($(this).hasClass('DETAIL_ITEM_MINUS')) {
+					mobContentObj.list.actMinus($(this));
 				}
-				return false;
-			});
-
-			$(document).on('click', '#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS li', function() {
-				var item = mobContentObj.list.rows[$(this).index()];
-				mobContentObj.view.init(item);
 			});
 
 			$(document).on('click', '#ITP_LIST_MSTOCKMNG02010_POP_STORE_ROWS li button', function() {
@@ -126,9 +122,74 @@ let mobContentObj = {
 				mobPopObj.popItemNm.init();
 			}
 		},
+		itemAdd: function(rows) {
+			var _this = this;
+			console.log(rows);
+			$.each(rows, function(index, item) {
+				$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWCOPY').html());
+				var $li = $('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group > .list-row:last');
+				$li.find('.fnItemId').text(item.itemId);
+				$li.find('.fnItemNm').text(item.itemNm);
+				$li.find('.fnUnit').text(item.unit);
+				$li.find('.fnUnitQty').text(item.unitQty);
+				$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
+				item['cddQty'] = 1;
+				_this.rows.push(item);
+			});
+		},
+		actPlus: function(elem) {
+			var $div = $(elem).siblings('div');
+			var index = $div.parents('li').index();
+			var num = Number($div.text());
+			$($div).text((num + 1).toString());
+			this.rows[index]['cddQty'] = $($div).text();
+		},
+		actMinus: function(elem) {
+			var $div = $(elem).siblings('div');
+			var num = Number($div.text());
+			if(num <= 1) {
+				alert('주문수량을 확인하세요.');
+			} else {
+				var index = $div.parents('li').index();
+				$($div).text((num - 1).toString());
+				this.rows[index]['cddQty'] = $($div).text();
+			}
+		},
 		validClear: function() {
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
+		},
+		save: function() {
+			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
+			itp_fn_form_clear_validate(null, formId);
+			if (itp_fn_form_event.isValid(formId)) {
+				let gridInsertData = [];
+				// var normalYnCheck = true;
+				$.each(this.rows, function(key, value) {
+					// if (value.normalYn === 'N') {
+					// 	normalYnCheck = false;
+					// }
+					gridInsertData.push({
+						'cddQty': value.cddQty,
+						'itemId': value.itemId
+					});
+				});
+				// if(!normalYnCheck) {
+				// 	alert('정상여부 값이 N인 데이터가 있습니다.\n품목번호를 확인하세요.');
+				// 	return;
+				// }
+				let param = $(formId).serializeObject();
+				param['cddDt'] = param.cddDt.replace(/[^0-9]/g, "");
+				param.gridInsertData = gridInsertData;
+				console.log(JSON.stringify(param));
+				var searhFn = function() {
+					$('#ITP_LIST_MSTOCKMNG02010_LIST_ITEM_ROWS').empty();
+				};
+				fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), searhFn, 'POST');
+			}
+		},
+		cancel: function() {
+
 		}
 	},
 	barcode: {
@@ -245,6 +306,7 @@ let mobPopObj = {
 		init: function () {
 			this.rows.length = 0;
 			mobPopObj.show(this.popId);
+			this.reset();
 			this.search();
 			this.action();
 		},
@@ -254,25 +316,62 @@ let mobPopObj = {
 				console.log(result);
 				_this.rows = result.gridRows;
 				$.each(result.gridRows, function (i, item) {
-					$('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MSTOCKMNG02010_POP_ITEM_AREA .panel-group > .list-row:last');
-					$li.find('.fnItemId').text(item.itemId);
-					$li.find('.fnItemNm').text(item.itemNm);
-					$li.find('.fnUnit').text(item.unit);
-					$li.find('.fnStckQty').text(CommonObj.currency.add(item.stckQty, '개'));
+					var tr =	'<tr>' +
+								'	<td><input type="checkbox" checked></td>' +
+								'	<td class="fnItemId">' 	+ item.itemId + '</td>' +
+								'	<td class="fnItemNm">' 	+ item.itemNm + '</td>' +
+								'	<td class="fnUnit">' 	+ item.unit + '</td>' +
+								'	<td class="fnStckQty">' + CommonObj.currency.add(item.stckQty, '개') + '</td>' +
+								'</tr>';
+					$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA > tbody').append(tr);
 				});
 			};
-			var param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
+			var param = $('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM').serializeObject();
 			fn_ajax_call(API_POP_STOCK_MNG_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		action: function() {
-
+			var _this = this;
+			$('button[id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_SEARCH"]').off('click').on('click', function() {
+				_this.search();
+			});
+			$('button[id="ITP_BTN_MSTOCKMNG02010_POP_ITEM_CHOICE"]').off('click').on('click', function() {
+				_this.choice();
+			});
+			$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA input:checkbox').off('click').on('click', function() {
+				_this.checked($(this));
+			});
 		},
-		close: function() {
-			this.rows.length = 0;
-			$('#ITP_POP_MSTOCKMNG02010_LIST_ITEM_AREA .panel-group').empty();
-			$('#ITP_FORM_MSTOCKMNG02010_POP_ITEM #ITP_FORM_MSTOCKMNG02010_POP_ITEM_KEYWORD').val('');
+		checked: function(elem) {
+			var table = $(elem).closest('table');
+			if($(elem).hasClass('chkAll')) {
+				$(table).find('input:checkbox').prop('checked', $(elem).is(':checked'));
+			} else {
+				var isChkAll = true;
+				$(table).find('input:checkbox').each(function() {
+					if(!$(this).hasClass('chkAll') && !$(this).is(':checked')) {
+						isChkAll = false;
+						return false;
+					}
+				});
+				$(table).find('.chkAll').prop('checked', isChkAll);
+			}
+		},
+		choice: function() {
+			var _this = this;
+			var items = [];
+			$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA input:checkbox').each(function(i) {
+				if(!$(this).hasClass('chkAll') && $(this).is(':checked')) {
+					items.push(_this.rows[i-1]);
+				}
+			});
+			mobContentObj.list.itemAdd(items);
 			mobPopObj.hide(this.popId);
+		},
+		reset: function() {
+			this.rows.length = 0;
+			$('#ITP_FORM_MSTOCKMNG02010_POPUP_ITEM select').find('option:first').prop('selected', true);
+			$('#ITP_FORM_MSTOCKMNG02010_POP_ITEM_KEYWORD').val('');
+			$('#ITP_POP_MSTOCKMNG02010_TABLE_AREA tbody tr').remove();
 		}
 	},
 	show: function(popId) {