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

src/main/webapp/app/inoutmng/INOUTMNG03010.html

@@ -81,7 +81,9 @@
 											<label class="col-xs-2 itp_lb">수거지시일 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<input type="date" id="ITP_FORM_INOUTMNG03010_VIEW_COL_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
+													<div class="input-daterange input-group date">
+														<input type="text" id="ITP_FORM_INOUTMNG03010_VIEW_COL_CMD_DT" data-check-required="empty" class="form-control itp_input" name="colDt" value="">
+													</div>
 												</div>
 											</div>
 										</div>

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

@@ -4,9 +4,9 @@
 			<div class="itp_det_head fix">
 				<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 glyphicon-search"></i>조회</button>
+					<button type="button" id="ITP_BTN_OPER01010_SRH" class="btn btn-success btn-md 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>신규등록</button>
+					<button type="button" id="ITP_BTN_OPER01010_NEWREG" class="btn btn-primary btn-md 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>
@@ -349,7 +349,6 @@
 								<button type="button" id="ITP_BTN_OPER01010_NEW_DELROW" class="btn btn-danger btn-sm DEB"><i class="glyphicon"></i>&nbsp;&nbsp;삭제&nbsp;&nbsp;</button>
 							</div>
 						</div>
-
 						<div id="ITP_OPER01010_NEW_jqGrid_list" class="itp_tb_list">
 							<div id="ITP_OPER01010_NEW_jqGridView" class="itp_views fix"></div>
 							<table id="ITP_OPER01010_NEW_jqGrid"></table>

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

@@ -25,7 +25,7 @@
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN" 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_OPER02010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>

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

@@ -24,7 +24,7 @@
 										</div>
 										<div class="col-xs-1 itp_in" style="width:8%; padding:0px;">
 											<button type="button" id="ITP_BTN_OPER06010_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_BTN_OPER06010_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_BTN_OPER06010_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_OPER06010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId"></select>

src/main/webapp/app/popup/biz/BIZPOP_COL_STTMT_PRN.html

@@ -1,24 +1,24 @@
-<div id="ITP_BIZPOP_COL_PICK_PRN" class="modal itp_modal">
+<div id="ITP_BIZPOP_COL_STTMT_PRN" class="modal itp_modal">
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
-			<form id="ITP_FORM_BIZPOP_COL_PICK_PRN">
-				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_FORM_DT" name="fromDt" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_TO_DT" name="toDt" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID" name="sbrandId" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_SPPLY_ID" name="sspplyId" value=""> -->
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID" name="brandId" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO" name="colPickUnqNo" value="">
+			<form id="ITP_FORM_BIZPOP_COL_STTMT_PRN">
+				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_FORM_DT" name="fromDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_TO_DT" name="toDt" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_SPPLY_ID" name="sspplyId" value=""> -->
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID" name="brandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO" name="colPickUnqNo" value="">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 						<h5 class="modal-title">가맹점 검색</h5>
 					</div>
-					<div id="ITP_BIZPOP_COL_PICK_PRN_PRINT_AREA" class="modal-body">
+					<div id="ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA" class="modal-body">
 						<div class="itp_form fix">
 							<div class="col-xs-12 itp_form_inline">
 								<div class="form-horizontal fix">
 									<div class="pull-right itp_cicon">
-										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_COL_PICK_PRN_BTN_PRINT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
+										<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_COL_STTMT_PRN_BTN_PRINT" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;출력&nbsp;&nbsp;</button>
 									</div>
 								</div>
 							</div>
@@ -88,25 +88,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
+											<div class="col-xs-12 itp_in fnColBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvNm"></div>
+											<div class="col-xs-12 itp_in fnColNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
+											<div class="col-xs-12 itp_in fnColOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvAddr"></div>
+											<div class="col-xs-12 itp_in fnColAddr"></div>
 										</div>
 									</div>
 								</div>	
@@ -119,35 +119,35 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
+											<div class="col-xs-12 itp_in fnRtnBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnPoNm"></div>
+											<div class="col-xs-12 itp_in fnRtnNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
+											<div class="col-xs-12 itp_in fnRtnOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnPoAddr"></div>
+											<div class="col-xs-12 itp_in fnRtnAddr"></div>
 										</div>
 									</div>
 								</div>	
 							</div>
 						</div>
-						<div id="ITP_BIZPOP_COL_PICK_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
-							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridView" class="itp_views fix"></div>
-							<table id="ITP_BIZPOP_COL_PICK_PRN_jqGrid"></table>
-							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridPager"></div>
-							<div id="ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty" class="itp_no_data"></div>
+						<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list" class="itp_tb_list" data-total-cnt="">
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_BIZPOP_COL_STTMT_PRN_jqGrid"></table>
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridPager"></div>
+							<div id="ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty" class="itp_no_data"></div>
 						</div>
 					</div>
 				</div>

src/main/webapp/css/style.css

@@ -151,8 +151,8 @@ a, button {outline:none !important; text-decoration:none !important;}
 #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:#666; padding:5px 13px 5px 15px; margin-right:4px; outline:none;}
+#ITP_HEADER .itp_tabs .nav-tabs {padding:15px 4px 0 15px; background:#fff;}
+#ITP_HEADER .itp_tabs .nav-tabs > li a {border:1px solid #ddd; background:#f5f5f5; font-size:12px; color:#666; padding:10px 13px 7px 15px; margin-right:6px; 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:#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;}
@@ -237,13 +237,13 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_CONTAINER .itp_adv_srh .form-group .date .form-control:last-child {border-top-left-radius:0px; border-bottom-left-radius:0px;}
 #ITP_CONTAINER .itp_adv_srh .form-group .itp_adv_chk {margin-top:5px;}
 #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 {display:table-cell; vertical-align:top; height:100%; padding-top:10px;}
 
-#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 {padding:0 50px 0 35px; height:42px; background:#fff;}
+#ITP_CONTAINER .itp_detail .itp_det_head .itp_det_tit {font-size:20px; margin:0; padding:0; line-height:42px;}
 #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_det_in {padding:0px 20px 15px 20px; height:calc(100vh - 127px); overflow-y:scroll;}
 #ITP_CONTAINER .itp_detail .itp_cicon {line-height:32px; height:32px;}
 #ITP_CONTAINER .itp_detail .itp_cicon .btn-default {color:#fff; background-color:rgb(109, 110, 114); border-color:rgb(109, 110, 114);}
 #ITP_CONTAINER .itp_detail .itp_cicon .itp_store {display:inline-block; vertical-align:middle; font-size:13px; margin-right:10px;}
@@ -301,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:#fff; padding:15px 15px 5px 10px; border-radius:4px;box-shadow: 0px 0px 6px #ddd;}
+#ITP_CONTAINER .itp_detail .itp_lg_form.itp_type1 .itp_srh_border {border:1px solid #ddd; background:#fff; padding:20px 20px 10px 20px; 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

@@ -1029,8 +1029,6 @@ td.menu_text {
 }
 .ui-jqgrid input[type=checkbox] {width:15px; height:15px;}
 
-.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.success .jqgrid-rownum:checked {background:#dff0d8 !important;}
-.table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important;}
+.ui-jqgrid .jqgrid-rownum {background-color: transparent !important;}
+.table>tbody>tr.active .jqgrid-rownum {background:#e8e8e8 !important; z-index:1}
+.table>tbody>tr.success .jqgrid-rownum {background:#dff0d8 !important;}

src/main/webapp/js/app/collmng/ITP_COLLMNG03010.js

@@ -89,7 +89,7 @@ const gridColModel = {
 		{
 			index: 'RTN_RSN_DVSN_NM', name: 'rtnRsnDvsnNm',
 			label: ITP_MSG_LOCALE.label.rtnRsnDvsnNm,		// 반품사유구분
-			width: '10', fixed: false, align: 'center',
+			width: '9', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -154,10 +154,10 @@ let pageObj = {
 			// 조회일자 지정	
 			var now = new Date();
 			var defaultToDate = new Date(now);
-			defaultToDate.setDate(now.getDate() + 10);
+			defaultToDate.setDate(now.getDate() + 7);
 			$('#ITP_TAB_COLLMNG03010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
-			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', '2020.10.01');
-			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', '2024.10.10');
+			$('#ITP_FORM_COLLMNG03010_SEARCH_FROM_DT').datepicker('setDate', now);
+			$('#ITP_FORM_COLLMNG03010_SEARCH_TO_DT').datepicker('setDate', defaultToDate);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(COLLMNG03010_GRID_ID, COLLMNG03010_GRID_LIST, 'lg');
@@ -199,7 +199,13 @@ let pageObj = {
             fn_show_btn_auth_array(['#ITP_BTN_COLLMNG03010_SRH', '#ITP_BTN_COLLMNG03010_NEWREG']);
             $('#ITP_AJAX_COLLMNG03010_LIST_CONTAINER').show();
             $('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));
-            $('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
+            if(fn_make_user_info.get('spplyId').length != 0){
+            	$('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
+            } else {
+            	$('#ITP_FORM_COLLMNG03010_SEARCH #ITP_FORM_COLLMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('userId'));
+            }
+            $('#ITP_BTN_COLLMNG03010_SRH').show();
+            $('#ITP_BTN_COLLMNG03010_PRINT').show();
             $('#ITP_BTN_COLLMNG03010_SEARCH_WHS_ID').show();
             $('#ITP_BTN_COLLMNG03010_DELETE_WHS_ID').show();
         }
@@ -221,7 +227,8 @@ let pageObj = {
 			selRowData = $(COLLMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);		//cell 선택
 		}
 		const key = {brandId: selRowData.brandId, colPickUnqNo: selRowData.colPickUnqNo};		// popup key 값 설정
-		fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
+		console.log(key);
+		fn_call_popup('biz', 'BIZPOP_COL_STTMT_PRN', '#ITP_ASIDE', null, key, 'S');
 	}
 };
 
@@ -240,8 +247,6 @@ let listObj = {
 			let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
             param.gridPage = $.jgrid.defaults.page;
-            param.sbrandId = 'BRD221100002';
-            param.sspplyId = 'SPY221100004';
             console.log(1234);
             console.log(JSON.stringify(param));
             $(COLLMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
@@ -260,8 +265,6 @@ let listObj = {
 		push: function() {
             let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
             listObj.itp_COLLMNG03010_param = param;
-            param.sbrandId = 'BRD221100002';
-            param.sspplyId = 'SPY221100004';
         },
         back: function() {
             $('#ITP_FORM_COLLMNG03010_SERVICE_BRAND_TYPE').val(listObj.itp_COLLMNG03010_param.brandType);
@@ -284,8 +287,6 @@ let listObj = {
 		load: function() {
             let param = $('#ITP_FORM_COLLMNG03010_SEARCH').serializeObject();
             param.gridSize = $.jgrid.defaults.rowNum;
-            param.sbrandId = 'BRD221100002';
-            param.sspplyId = 'SPY221100004';
             console.log(JSON.stringify(param));
             var option = {
             	gridId: COLLMNG03010_GRID_ID,

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

@@ -1644,6 +1644,7 @@ function itp_fn_grid_make_remote(option) {
 		mtype: 'POST',
 		multiselect: false,
 		rownumbers: true,
+		
 		ondblClickRow: null,
 		loadBeforeSend: function(jqXHR) {
 			jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);

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

@@ -427,7 +427,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
-					$("tr.jqgrow:odd").css("background", "#f5f5f5");
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
 					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/js/app/oper/ITP_OPER02010.js

@@ -442,6 +442,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER02010_GRID_ID, true, 'number', 'OPER02010', listObj.grid.itp_OPER02010_search, _this.itp_fn_OPER02010_empty, true, data.gridRecords, true);
 					var ids = $(OPER02010_GRID_ID).getDataIDs();

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

@@ -428,6 +428,7 @@ let listObj = {
 					}
 				},
 				loadComplete: function(data) {
+					$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
 					console.log(data);
 					itp_fn_grid_load_complete(data, OPER03010_GRID_ID, true, 'number', 'OPER03010', pageObj.itp_OPER03010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(OPER03010_GRID_ID).getDataIDs();

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

@@ -247,6 +247,7 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
+                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경
                     // console.log(data);
                     itp_fn_grid_load_complete(data, OPER04010_GRID_ID, true, 'number', 'OPER04010', listObj.itp_OPER04010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER04010_GRID_ID).getDataIDs();

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

@@ -337,6 +337,7 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
+                	$("tr.jqgrow:odd").css("background", "#f5f5f5"); //2번째 마다 색변경ㄴ
                     console.log(data);
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER06010_GRID_ID).getDataIDs();

src/main/webapp/js/app/popup/biz/ITP_BIZPOP_COL_STTMT_PRN.js

@@ -6,34 +6,34 @@ require(['config'], function() {
 	});
 });
 
-let API_POP_INV_INFO = '/api/pomng/inoutmng/info-inv';
+let API_POP_INV_INFO = '/api/rtnmng/inoutmng/info-pick';
 
-const THIS_FORM_ID = '#ITP_FORM_BIZPOP_COL_PICK_PRN';
-const THIS_GIRD_ID = '#ITP_BIZPOP_COL_PICK_PRN_jqGrid';
-const THIS_GIRD_LIST = '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list';
-const THIS_GIRD_PAGER = '#ITP_BIZPOP_COL_PICK_PRN_jqGridPager';
-const THIS_GIRD_EMPTY = '#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty';
+const THIS_FORM_ID = '#ITP_FORM_BIZPOP_COL_STTMT_PRN';
+const THIS_GIRD_ID = '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid';
+const THIS_GIRD_LIST = '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list';
+const THIS_GIRD_PAGER = '#ITP_BIZPOP_COL_STTMT_PRN_jqGridPager';
+const THIS_GIRD_EMPTY = '#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty';
 
-function itp_fn_BIZPOP_COL_PICK_PRN(parentPopFn, args, returnType) {
+function itp_fn_BIZPOP_COL_STTMT_PRN(parentPopFn, args, returnType) {
 	
 	
-	let itp_BIZPOP_COL_PICK_PRN_param = args;
-	let itp_BIZPOP_COL_PICK_PRN_search = false;
+	let itp_BIZPOP_COL_STTMT_PRN_param = args;
+	let itp_BIZPOP_COL_STTMT_PRN_search = false;
 
 	
-	$('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(args.brandId);
-	$('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val(args.dlvSttmtUnqNo);
+	$('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(args.brandId);
+	$('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val(args.colPickUnqNo);
 	
 
-	$('#ITP_BIZPOP_COL_PICK_PRN').one('shown.bs.modal', function(e) {
-		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list', '');
+	$('#ITP_BIZPOP_COL_STTMT_PRN').one('shown.bs.modal', function(e) {
+		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list', '');
 		itp_fn_fire_window_resize();
 	}).one('hidden.bs.modal', function(e) {
-		$('#ITP_BIZPOP_COL_PICK_PRN').remove();
+		$('#ITP_BIZPOP_COL_STTMT_PRN').remove();
 	}).modal('show');
 
 
-	$('#ITP_BIZPOP_COL_PICK_PRN_BTN_SEARCH').on('click', function() {
+	$('#ITP_BIZPOP_COL_STTMT_PRN_BTN_SEARCH').on('click', function() {
 		//인쇄부분 여기에 추가함
 	});
 /*	
@@ -44,23 +44,23 @@ function itp_fn_BIZPOP_COL_PICK_PRN(parentPopFn, args, returnType) {
 	});
 */
 
-	$('#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty').on('click', function() {
-		itp_fn_BIZPOP_COL_PICK_PRN_empty.back();
+	$('#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty').on('click', function() {
+		itp_fn_BIZPOP_COL_STTMT_PRN_empty.back();
 		//itp_BIZPOP_PO_REJECT_param.gridSize = 10;
-		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_COL_PICK_PRN_param)}).trigger('reloadGrid');
+		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_COL_STTMT_PRN_param)}).trigger('reloadGrid');
 	});
 
-	var itp_fn_BIZPOP_COL_PICK_PRN_empty = {
+	var itp_fn_BIZPOP_COL_STTMT_PRN_empty = {
 		push: function() {
-			let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val() };
-			itp_BIZPOP_COL_PICK_PRN_param = param;
+			let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
+			itp_BIZPOP_COL_STTMT_PRN_param = param;
 		},
 		back: function() {
 		}
 	};
 
-	itp_fn_BIZPOP_COL_PICK_PRN_empty.push();
-	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_PICK_PRN_COL_PICK_UNQ_NO').val() };
+	itp_fn_BIZPOP_COL_STTMT_PRN_empty.push();
+	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_BRAND_ID').val(), colPickUnqNo: $('#ITP_FORM_ITP_BIZPOP_COL_STTMT_PRN_COL_STTMT_UNQ_NO').val() };
 	console.log(JSON.stringify(param));
 	
 	const gridColModel = {
@@ -117,8 +117,8 @@ let pageObj = {
 		fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
 	},
 	button: function() {
-		$('#ITP_BIZPOP_COL_PICK_PRN_BTN_PRINT').on('click', function (printDiv){
-			  var divToPrint=document.getElementById('ITP_BIZPOP_COL_PICK_PRN_PRINT_AREA');
+		$('#ITP_BIZPOP_COL_STTMT_PRN_BTN_PRINT').on('click', function (printDiv){
+			  var divToPrint=document.getElementById('ITP_BIZPOP_COL_STTMT_PRN_PRINT_AREA');
 
 			  var newWin=window.open('','Print-Window');
 
@@ -136,24 +136,25 @@ let pageObj = {
 	
 	callback: function (result) {
 		console.log(result);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColPickUnqNo').text(result.colPickUnqNo);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColRegDt').text(result.colRegDt);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColPickUnqNo').text(result.colPickUnqNo);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColRegDt').text(result.colRegDt);
 		
-		$('#ITP_BIZPOP_DLV_PICK_PRN .fnPickMgrNm').text(result.pickMgrNm);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnWhsAddr').text(result.whsAddr);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnPndrTelNo').text(result.pndrTelNo);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColSchDt').text(result.colSchDt);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnPickMgrNm').text(result.pickMgrNm);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnWhsAddr').text(result.whsAddr);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnPndrTelNo').text(result.pndrTelNo);
 		
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColBsnsRegno').text(result.colBsnsRegno);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColNm').text(result.colNm);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnColOwnerNm').text(result.colOwnerNm);
-		$('#ITP_BIZPOP_DLV_PICK_PRN .fnColAddr').text(result.colAddr);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColBsnsRegno').text(result.colBsnsRegno);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColNm').text(result.colNm);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColOwnerNm').text(result.colOwnerNm);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnColAddr').text(result.colAddr);
 		
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnBsnsRegno').text(result.rtnBsnsRegno);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnNm').text(result.rtnNm);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnOwnerNm').text(result.rtnOwnerNm);
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnRtnAddr').text(result.rtnAddr);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnBsnsRegno').text(result.rtnBsnsRegno);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnNm').text(result.rtnNm);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnOwnerNm').text(result.rtnOwnerNm);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnRtnAddr').text(result.rtnAddr);
 		
-		$('#ITP_BIZPOP_COL_PICK_PRN .fnDlvQty').text(result.dlvQty);
+		$('#ITP_BIZPOP_COL_STTMT_PRN .fnDlvQty').text(result.dlvQty);
 		
 		// 품목  리스트 조회
 		pageObj.grid.init(result.pickDtlInfoList);
@@ -164,9 +165,9 @@ let pageObj = {
 			this.unload();
 			this.load(gridRows);
 		},
-		gridId: '#ITP_BIZPOP_COL_PICK_PRN_jqGrid',
-		gridList: '#ITP_BIZPOP_COL_PICK_PRN_jqGrid_list',
-		gridEmpty: '#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty',
+		gridId: '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid',
+		gridList: '#ITP_BIZPOP_COL_STTMT_PRN_jqGrid_list',
+		gridEmpty: '#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty',
 		gridRows: '',
 		load : function(gridRows) {
 			var _this = this;
@@ -188,13 +189,13 @@ let pageObj = {
 							{
 								index: 'ITEM_NM', name: 'itemNm',
 								label: '품목명', //
-								width: '10', fixed: false, align: 'center',
+								width: '5', fixed: false, align: 'center',
 								sortable: false, hidden: false
 							},
 							{
 								index: 'COL_REQ_QTY', name: 'colReqQty',
 								label: '수거요청수량', //
-								width: '5', fixed: false, align: 'center',
+								width: '10', fixed: false, align: 'center',
 								sortable: false, hidden: false
 							},
 							{
@@ -219,8 +220,8 @@ let pageObj = {
 				data: gridRows,
 				multiselect: false,
 				loadComplete: function(data) {
-					$('#ITP_BIZPOP_COL_PICK_PRN_jqGrid').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
-					data.records === 0 ? _this.clearData() : $('#ITP_BIZPOP_COL_PICK_PRN_jqGridEmpty').hide();
+					$('#ITP_BIZPOP_COL_STTMT_PRN_jqGrid').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
+					data.records === 0 ? _this.clearData() : $('#ITP_BIZPOP_COL_STTMT_PRN_jqGridEmpty').hide();
 				},
 				onCellSelect: function(rowid, cellIdx, cellValue) {
 				}

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

@@ -124,7 +124,6 @@ let mobContentObj = {
 		},
 		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');
@@ -197,25 +196,24 @@ let mobContentObj = {
 			var formId = '#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
-				this.callbackFn('');
-				// location.replace('app:barcode');
+				// this.callbackApp('BRD2211000022211100000003005');
+				location.replace('app:barcode');
 				// location.href = 'app:barcode';
 			}
 		},
-		callbackFn: function(barcode) {
+		callbackApp: function(barcode) {
 			var infoFn = function(result) {
-				console.log(result);
+				if(result) {
+					mobContentObj.list.itemAdd([result]);
+				}
+			};
+			const param = {
+				'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
+				'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
+				'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
+				'sBarcode': barcode
 			};
-			// const param = {
-			// 	'sBrandId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID').val(),
-			// 	'sWhsId': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_WHS_ID').val(),
-			// 	'sLocation': $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH #ITP_FORM_MSTOCKMNG02010_LIST_SEARCH_LOCATION').val(),
-			// 	'sBarcode': barcode
-			// };
-			// fn_ajax_call(API_MOBILE_BARCODE, param, callbackFn, 'GET');
-			const param = $('#ITP_FORM_MSTOCKMNG02010_LIST_SEARCH').serializeObject();
-			param['sBarcode'] = barcode;
-			fn_ajax_call(API_MOBILE_BARCODE, JSON.stringify(param), infoFn, 'GET');
+			fn_ajax_call(API_MOBILE_BARCODE, param, infoFn, 'GET');
 		}
 	}
 };