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

src/main/webapp/app/pomng/POMNG08010.html

@@ -5,7 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>위시리스트 관리</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_POMNG08010_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_POMNG08010_NEWREG" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;등록&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_POMNG08010_SAVE" class="btn btn-primary btn-sm ADB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -22,15 +22,18 @@
 												<option value="">위시리스트 선택</option>
 											</select>
 										</div>
+										<div class="col-xs-a itp_ip itp_noMar" style="margin-right:5px;">
+											<button type="button" id="ITP_BTN_POMNG08010_ADD" class="btn btn-primary btn-sm ADB" style="display: inline-block;">&nbsp;&nbsp;추가&nbsp;&nbsp;</button>
+										</div>
+										<div class="col-xs-a itp_ip itp_noMar">
+											<button type="button" id="ITP_BTN_POMNG08010_VIEW" class="btn btn-primary btn-sm ADB" style="display: inline-block;">&nbsp;&nbsp;상세&nbsp;&nbsp;</button>
+										</div>
 										<div style="float:right;">
 											<div class="col-xs-a itp_ip itp_noMar" style="margin-right:5px;">
 												<button type="button" id="ITP_BTN_POMNG08010_ITEM_DELETE" class="btn btn-danger btn-sm ADB" style="display: inline-block;">품목삭제</button>
 											</div>
-											<div class="col-xs-a itp_ip itp_noMar" style="margin-right:5px;">
-												<button type="button" id="ITP_BTN_POMNG08010_ITEM_SAVE" class="btn btn-primary btn-sm ADB" style="display: inline-block;">품목저장</button>
-											</div>
 											<div class="col-xs-a itp_ip itp_noMar">
-												<button type="button" id="ITP_BTN_POMNG08010_ITEM_ADD" class="btn btn-success btn-sm ADB" style="display: inline-block;">품목추가</button>
+												<button type="button" id="ITP_BTN_POMNG08010_ITEM_ADD" class="btn btn-primary btn-sm ADB" style="display: inline-block;">품목추가</button>
 											</div>
 										</div>
 									</div>

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

@@ -1,5 +1,5 @@
 <div id="ITP_BIZPOP_WISH_LIST" class="modal itp_modal">
-	<div class="modal-dialog">
+	<div class="modal-dialog" style="width:400px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_WISH_LIST">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WISH_LIST_BRAND_ID" name="sbrandId" value="">
@@ -9,26 +9,35 @@
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
 					<h5 class="modal-title">위시리스트 정보</h5>
 				</div>
-				<div class="modal-body">
+				<div class="modal-body" style="margin-top:5px; padding:0; height:30px;">
 					<div class="itp_form fix">
 						<div class="col-xs-12 itp_form_inline">
 							<div class="form-horizontal fix">
-								<div class="col-xs-6 itp_ip itp_pr">
-									<input type="text" name="swhsNm" id="ITP_FORM_BIZPOP_WISH_LIST_WHS_NM" class="form-control itp_input" placeholder="위시리스트명">
-								</div>
 								<div class="pull-right itp_cicon">
-									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_WISH_LIST_BTN_CLOSE" style="display: inline-block;">취소</button>
-									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_WISH_LIST_BTN_SEARCH" style="display: inline-block;">조회</button>
-									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_WISH_LIST_BTN_SAVE">저장</button>
+									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_WISH_LIST_BTN_SAVE">&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
+									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_WISH_LIST_BTN_CLOSE" style="display: inline-block;">&nbsp;&nbsp;닫기&nbsp;&nbsp;</button>
 								</div>
 							</div>
 						</div>
 					</div>
-					<div id="ITP_BIZPOP_WISH_LIST_jqGrid_list" class="itp_tb_list" data-total-cnt="">
-						<div id="ITP_BIZPOP_WISH_LIST_jqGridView" class="itp_views fix"></div>
-						<table id="ITP_BIZPOP_WISH_LIST_jqGrid"></table>
-						<div id="ITP_BIZPOP_WISH_LIST_jqGridPager"></div>
-						<div id="ITP_BIZPOP_WISH_LIST_jqGridEmpty" class="itp_no_data"></div>
+				</div>
+				<div class="itp_form_in" style="height:44px; padding-left:10px; top: -10px; position: relative;">
+					<div class="form-group" style="margin-bottom:8px;">
+						<label class="lb_area itp_lb">위시리스트명</label>
+						<div class="wish_input itp_in">
+							<input type="email" id="ITP_FORM_SITP_TAB_STINFO07010_POP_WISH_LIST_NM" data-check-required="empty" class="form-control itp_input" name="itemClassNm" placeholder="" maxlength="40">
+						</div>
+					</div>
+				</div>
+				<div class="itp_form_in" style="height:60px; padding-left:10px; top: -10px; position: relative;">
+					<div class="form-group" style="margin-bottom:13px;">
+						<label class="lb_area bd itp_lb">사용여부</label>
+						<div class="wish_input bd itp_in">
+							<select style="text-align:center;" type="email" id="ITP_FORM_SITP_TAB_STINFO07010_POP_USE_YN" data-check-required="empty" class="form-control itp_input" name="itemClassNm" placeholder="분류명" maxlength="40">
+								<option>사용</option>
+								<option>미사용</option>
+							</select>
+						</div>
 					</div>
 				</div>
 			</form>

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

@@ -1,5 +1,5 @@
 <div id="ITP_BIZPOP_WISH_LIST_ITEM" class="modal itp_modal">
-	<div class="modal-dialog">
+	<div class="modal-dialog" style="width:700px; ">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_WISH_LIST_ITEM">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WISH_LIST_ITEM_BRAND_ID" name="sbrandId" value="">
@@ -10,15 +10,17 @@
 					<h5 class="modal-title">위시리스트 품목 검색</h5>
 				</div>
 				<div class="modal-body">
-					<div class="itp_form fix">
+					<div class="itp_form fix" style="height:30px;">
 						<div class="col-xs-12 itp_form_inline">
 							<div class="form-horizontal fix">
-								<div class="col-xs-8 itp_ip itp_pr">
-									<input type="text" name="swhsNm" id="ITP_FORM_BIZPOP_WISH_LIST_ITEM_WHS_NM" class="form-control itp_input" placeholder="위시리스트명">
+								<div class="col-xs-8 itp_ip itp_pr" style="padding:0;">
+									<select type="text" name="swhsNm" id="ITP_FORM_BIZPOP_WISH_LIST_ITEM_LIST" class="form-control itp_input">
+										<option>위시리스트 목록</option>
+									</select>
 								</div>
-								<div class="pull-right itp_cicon">
+								<div class="itp_cicon" style="float:left; margin-left:5px;">
 									<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_WISH_LIST_ITEM_BTN_SEARCH" style="display: inline-block;">조회</button>
-									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_WISH_LIST_ITEM_BTN_SELECT">저장</button>
+									<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_WISH_LIST_ITEM_BTN_SELECT">선택</button>
 								</div>
 							</div>
 						</div>

src/main/webapp/css/style.css

@@ -14,7 +14,6 @@ a, button {outline:none !important; text-decoration:none !important;}
 .itp_tb {display:table; width:100%;}
 .itp_tr {display:table-row;}
 .itp_td {display:table-cell; vertical-align:middle;}
-
 .tr {text-align:right !important;}
 .tl {text-align:left !important;}
 .tc {text-align:center !important;}
@@ -682,6 +681,10 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 	cursor:pointer; opacity:0; outline:0;
 	background:none; z-index:1;
 }
+#ITP_ASIDE .lb_area{border-top:1px solid #aaa; float:left; font-size:13px; margin:0; padding:13px 12px; height:44px; background:#eee; min-width:100px; border-right:1px solid #aaa; border-left:1px solid #ccc;}
+#ITP_ASIDE .wish_input{border-top:1px solid #aaa; float:left; font-size:13px; margin:0; padding:4px 12px; width:280px; height:44px; min-width:100px; border-right:1px solid #aaa;}
+#ITP_ASIDE .bd {border-bottom:1px solid #aaa;}
+
 #ITP_ASIDE .itp_modal .itp_addr_wrap {height:220px; overflow:auto; border:1px solid #ddd;}
 #ITP_ASIDE .itp_modal .itp_addr_wrap .itp_addr_no {font-size:13px; line-height:218px; text-align:center; margin:0; padding:0;}
 #ITP_ASIDE .itp_modal .itp_addr_wrap .itp_addr_box {display:none;}
@@ -761,6 +764,7 @@ _:-ms-fullscreen, :root .itp_logs {max-width: 1287px}
 .fnNumeric {text-align: center;}
 .fnNumericDot {text-align: center;}
 
+
 /* 팝업 추가 */
 
 #ITP_POPUP_CONTAINER .modal-body .itp_title label {font-size:3rem; text-decoration:underline; text-underline-position:under;}

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

@@ -1695,6 +1695,7 @@ function itp_fn_grid_make_remote(option) {
 		loadBeforeSend: options.loadBeforeSend,
 		onCellSelect: options.onCellSelect,
 		ondblClickRow: options.ondblClickRow,
+		beforeProcessing: options.beforeProcessing,
 		loadComplete: options.loadComplete,
 		loadError: options.loadError,
 		onPaging: options.onPaging

src/main/webapp/js/app/pomng/ITP_POMNG03011.js

@@ -49,28 +49,41 @@ let API_DETAIL_PASSQTY 		    = '/api/stock/mng/whs-passqty-list';			// 창고선
 
 
 /*화면 Grid ColModel*/
+function arrtSetting(rowId, val, rawObject, cm) {
+	if(typeof rawObject.attr=='object' ) {
+		var attr = rawObject.attr[cm.name], result=null;
+		if(attr ) {
+			if (attr.rowspan) {
+				result = ' rowspan=' + '"' + attr.rowspan + '"';
+			} else if (attr.display) {
+				result = ' style="display:' + attr.display + '"';
+			}
+		}
+		return result;
+	}
+}
 const gridColModel = {
 	list: [
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: '브랜드',
-			width: '10', fixed: false, align: 'left',
-			minwidth: 120,
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
-		},
-		{
-			index: 'BRAND_NM', name: 'brandNm',
-			label: '납품장소',
-			width: '10', fixed: false, align: 'left',
+			width: '10', fixed: false, align: 'center',
 			minwidth: 120,
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
+			sortable: false, hidden: false, classes: 'ui-ellipsis', cellattr: arrtSetting
 		},
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 			label: '구매요청번호', 
 			width: '11', fixed: false, align: 'center',
 			minwidth: 180,
-			sortable: false, hidden: false
+			sortable: false, hidden: false, cellattr: arrtSetting
+		},
+		{
+			index: 'WHS_NM', name: 'whsNm',
+			label: '납품장소',
+			width: '10', fixed: false, align: 'left',
+			minwidth: 120,
+			sortable: false, hidden: false, classes: 'ui-ellipsis', cellattr: arrtSetting
 		},
 		{
 			index: 'ITEM_ID', name: 'itemId',
@@ -632,6 +645,7 @@ let pageObj = {
 };
 
 /*목록화면 Object*/
+
 let listObj = {
 	init: function () {
 		this.grid.init();
@@ -734,9 +748,9 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
+
 			let param = $('#ITP_FORM_POMNG03011_SEARCH').serializeObject();
-			param.gridSize = $.jgrid.defaults.rowNum;
-			
+			// param.gridSize = $.jgrid.defaults.rowNum;
 			var option = {
 				multiselect: true,
 				autowidth: true,
@@ -744,10 +758,61 @@ let listObj = {
 				colModel: gridColModel.list,
 				param: param,
 				url: DOMAIN + API_DETAIL_GRID_LIST,
-				pager: POMNG03011_GRID_PAGER,
-				rownumbers: false,
-				loadComplete: function(data) {
+				// pager: POMNG03011_GRID_PAGER,
+				rownumbers: false, 
+				
+				beforeProcessing: function(data) { 
+					var rows=data.gridRows;
+					var cnt=rows.length, prev1='', prev2='', sp1=0, sp2=0;
+					var displayAttr=function(sp, ep, field) {
+						var rs=ep-sp;
+						if( rs>1 ) {
+							for(var n=sp; n<ep; n++) {
+								var cur=rows[n], attr=cur.attr;
+								if(!attr.hasOwnProperty(field) ) {
+									attr[field]={};
+								}
+								if(n==sp) {
+									attr[field].rowspan=rs;
+								} else {
+									attr[field].display='none';
+								}
+							}
+						}
+						//attr: {country: {display: "none"}, state: {display: "none"}} 
+					};
+					for(var n=0;n<=cnt; n++) {
+						if(n==cnt) {
+							displayAttr(sp1, n, 'pchReqUnqNo');
+							displayAttr(sp2, n, 'whsNm');
+							break;
+						} 
+						var cur=rows[n];
+						if(n==0) {
+							cur.attr={brandNm: {rowspan:cnt}};
+						} else {
+							cur.attr={brandNm: {display: "none"}};
+						}
+						if(prev2!=cur.whsNm) {							
+							displayAttr(sp2, n, 'whsNm');
+							sp2=n;
+							prev2=cur.whsNm;
+						}
+						if(prev1!=cur.pchReqUnqNo) {
+							displayAttr(sp1, n, 'pchReqUnqNo');
+							displayAttr(sp2, n, 'whsNm');
+							sp1=sp2=n;
+							prev2=cur.whsNm;
+							prev1=cur.pchReqUnqNo;
+						}
+						
+					}
+					console.log("load data==>", rows);
+
+				}, 
+				loadComplete: function(data) {  
 					itp_fn_grid_load_complete(data, POMNG03011_GRID_ID, true, 'number', 'POMNG03011', listObj.itp_POMNG03011_search, listObj.empty, true, data.gridRecords, true);
+					 
 					var ids = $(POMNG03011_GRID_ID).getDataIDs();
 					var css = {'background-color':'#FFCCCC'};
 					$.each(ids, function(idx, rowId) {
@@ -755,6 +820,7 @@ let listObj = {
 						$(POMNG03011_GRID_ID).jqGrid('setCell', rowId, 'dlvReqDt', '', css);
 						$(POMNG03011_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', css);
 					});
+					// $(POMNG03011_GRID_ID).trigger("reloadGrid");
 					$(POMNG03011_GRID_ID).setSelection(1, true);
 				},
 				onPaging: function(action) {
@@ -762,6 +828,7 @@ let listObj = {
 				}
 			};
 			itp_fn_grid_make_remote(option);
+			
 		},
 		button: {
 		},

src/main/webapp/js/app/pomng/ITP_POMNG06010.js

@@ -202,6 +202,7 @@ let listObj = {
 		this.view();
 		this.action();
 		this.event.init();
+		this.setBrand();
 		this.grid.init();
 		this.screen();
 	},
@@ -228,6 +229,30 @@ let listObj = {
 		$('#ITP_BTN_POMNG06010_EXCEL').show();
 	},
 	itp_POMNG06010_search: false,
+	setBrand: function() {
+		let authTpCd = fn_make_user_info.get('authTpCd');
+		let URL = '/api/whs/mng/pop-whs-search';
+		let param = {};
+		param.sbrandId = fn_make_user_info.get('brandId');
+		param.sstoreId = fn_make_user_info.get('storeId');
+		if (authTpCd == 50) {
+			param.swhsDvsn = 'W02';
+			let answer = function(result) {
+				$('#ITP_FORM_POMNG06010_SEARCH_WHS_ID').val(result.gridRows[0].whsId);
+				$('#ITP_FORM_POMNG06010_SEARCH_WHS_NM').val(result.gridRows[0].whsNm);
+				$('#ITP_BTN_POMNG06010_DELETE_WHS_ID').attr('disabled', true);
+				$('#ITP_BTN_POMNG06010_SEARCH_WHS_ID').attr('disabled', true);
+			}
+			fn_ajax_call(URL, JSON.stringify(param), answer, 'POST');
+		} else if (authTpCd == 40) {
+			param.swhsDvsn = 'W01';
+			let answer = function(result) {
+				$('#ITP_FORM_POMNG06010_SEARCH_WHS_ID').val(result.gridRows[0].whsId);
+				$('#ITP_FORM_POMNG06010_SEARCH_WHS_NM').val(result.gridRows[0].whsNm);
+			}
+			fn_ajax_call(URL, JSON.stringify(param), answer, 'POST');
+		}
+	},
 	button: {
 		search: function() {
 			console.log("search event");
@@ -436,6 +461,12 @@ let listObj = {
 				},
 				loadComplete: function(data) {
 					itp_fn_grid_load_complete(data, POMNG06010_GRID_ID, true, 'number', 'POMNG06010', listObj.itp_POMNG06010_search, listObj.empty, true, data.gridRecords, true);
+					var ids = $(POMNG06010_GRID_ID).jqGrid('getDataIDs');
+					for (var i = 0; i < ids.length; i++) {
+						var rowData = $(POMNG06010_GRID_ID).jqGrid('getRowData', ids[i]);
+						var whsQty = rowData.dlvQty
+						$(POMNG06010_GRID_ID).jqGrid('setRowData', ids[i], {whsQty: whsQty});
+					}
 				},
 				onPaging: function(action) {
 					itp_fn_grid_paging(POMNG06010_GRID_ID, action, param);

src/main/webapp/js/app/pomng/ITP_POMNG08010.js

@@ -51,37 +51,37 @@ const gridColModel = {
 		{
 			index: 'ITEM_CLASS_NM', name: 'itemClassNm',
 			label: '품목명',
-			width: '10', fixed: false, align: 'left',
+			width: '20', fixed: false, align: 'left',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: '단위', 
-			width: '10', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: '기준수량', 
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false, classes: 'ui-ellipsis'
+			sortable: false, hidden: true, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: '통화', 
-			width: '10', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: '단가', 
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
 			index: 'UNIT', name: 'unit',
 			label: '사용여부', 
-			width: '10', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		}
 	]
@@ -146,10 +146,14 @@ let pageObj = {
 		if(mode == 'LIST') { // 목록
 			//itp_fn_fire_window_resize();
 			$('#ITP_AJAX_POMNG08010_LIST_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_POMNG08010_SRH', '#ITP_BTN_POMNG08010_NEWREG', '#ITP_BTN_POMNG08010_DELETE']);
+			$('#ITP_BTN_POMNG08010_SAVE').show();
+			$('#ITP_BTN_POMNG08010_VIEW').show();
+			$('#ITP_BTN_POMNG08010_ITEM_DELETE').show();
+			$('#ITP_BTN_POMNG08010_ITEM_ADD').show();
+			fn_show_btn_auth_array(['#ITP_BTN_POMNG08010_SRH', '#ITP_BTN_POMNG08010_SAVE', '#ITP_BTN_POMNG08010_DELETE']);
 		} else if(mode == 'ADD') { // 등록
 			$('#ITP_AJAX_POMNG08010_DETAIL_CONTAINER').show();
-			fn_show_btn_auth_array(['#ITP_BTN_POMNG08010_CANCELLIST', '#ITP_BTN_POMNG08010_SAVE']);
+			fn_show_btn_auth_array(['#ITP_BTN_POMNG08010_CANCELLIST']);
 
 			$('#ITP_FORM_POMNG08010_DETAIL').find('input, textarea, select, checkbox').each(function(i, elem) {
 				$(this).attr('id') === 'ITP_FORM_POMNG08010_DETAIL_VIEW_CD' ? $(this).val('C') : $(this).val('');
@@ -320,7 +324,7 @@ let listObj = {
 			if(rowDataPop)
 				listObj.button.search();
 		};
-		fn_call_popup('biz', 'BIZPOP_ITEM_CLASS_MANAGE', '#ITP_ASIDE', popFn, param, 'S');
+		fn_call_popup('biz', 'BIZPOP_WISH_LIST_ITEM', '#ITP_ASIDE', popFn, param, 'S');
 	}
 };
 

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

@@ -78,37 +78,37 @@ function itp_fn_BIZPOP_WISH_LIST_ITEM(parentPopFn, args, returnType) {
 			{
 				index: 'BRAND_NM', name: 'brandNm',
 				label: '번호', //
-				width: '14', fixed: false, align: 'left',
+				width: '6', fixed: false, align: 'left',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '품목번호', //
-				width: '12', fixed: false, align: 'center',
+				width: '14', fixed: false, align: 'center',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'STCK_DVSN_NM', name: 'stckDvsnNm',
 				label: '품목명', //
-				width: '4', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'left',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '기본수량', //
-				width: '12', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'right',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '단위', //
-				width: '12', fixed: false, align: 'center',
+				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{
 				index: 'WHS_NM', name: 'whsNm',
 				label: '단가', //
-				width: '12', fixed: false, align: 'center',
+				width: '10', fixed: false, align: 'right',
 				sortable: false, hidden: false, classes: 'ui-ellipsis'
 			},
 			{

src/main/webapp/js/app/rtnmng/ITP_RTNMNG05010.js

@@ -211,6 +211,7 @@ let listObj = {
 	init: function() {
 		this.view();
 		this.action();
+		this.setBrand();
 		this.event.init();
 		this.grid.init();
 	},
@@ -243,6 +244,30 @@ let listObj = {
 		$('#ITP_BTN_RTNMNG05010_EXCEL').show();
 	},
 	itp_RTNMNG05010_search: false,
+	setBrand: function() {
+		let authTpCd = fn_make_user_info.get('authTpCd');
+		let URL = '/api/whs/mng/pop-whs-search';
+		let param = {};
+		param.sbrandId = fn_make_user_info.get('brandId');
+		param.sstoreId = fn_make_user_info.get('storeId');
+		if (authTpCd == 50) {
+			param.swhsDvsn = 'W02';
+			let answer = function(result) {
+				$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val(result.gridRows[0].whsId);
+				$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM').val(result.gridRows[0].whsNm);
+				$('#ITP_BTN_RTNMNG05010_SEARCH_DEL_SRTN_WHS_NM').attr('disabled', true);
+				$('#ITP_BTN_RTNMNG05010_SEARCH_POP_SRTN_WHS_NM').attr('disabled', true);
+			}
+			fn_ajax_call(URL, JSON.stringify(param), answer, 'POST');
+		} else if (authTpCd == 40) {
+			param.swhsDvsn = 'W01';
+			let answer = function(result) {
+				$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val(result.gridRows[0].whsId);
+				$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM').val(result.gridRows[0].whsNm);
+			}
+			fn_ajax_call(URL, JSON.stringify(param), answer, 'POST');
+		}
+	},
 	button: {
 		search: function() {
 			listObj.itp_RTNMNG05010_search = true;
@@ -256,7 +281,6 @@ let listObj = {
 				itp_fn_modal_alert("수거창고를 지정해주세요!");
 				return;
 			}
-			
 			if (param.fromDt == '' || param.toDt == '') {
 				itp_fn_modal_alert("수거요청일 기간을 지정해주세요!");
 				return;
@@ -265,7 +289,6 @@ let listObj = {
 			$(RTNMNG05010_GRID_ID).setGridParam({ 'postData': JSON.stringify(param) }).trigger('reloadGrid');
 		},
 		save: function() {
-			
 			$('body').trigger('click');
 			
 			var chkQtyYn1 = true;
@@ -276,11 +299,8 @@ let listObj = {
 			var swhsId = "";
 			var srtnWhsId = "";
 			var storeId = "";
-			
 			$.each(rowData, function(key, value) {		
-				
 				if (value.colQty !== '') {
-									
 					if (parseInt(value.colQty) > parseInt(value.colReqQty)) {									
 						chkQtyYn1 = false;
 					}								
@@ -296,7 +316,6 @@ let listObj = {
 					gridInsertData.push(value);	
 				}						
 			});
-			
 			if (chkQtyYn1 === false) {
 				itp_fn_modal_alert("수거요청수량보다 수거수량이 더 많습니다.");
 				return;	
@@ -309,12 +328,10 @@ let listObj = {
 				itp_fn_modal_alert("서로 다른 수거창고 품목은 처리할 수 없습니다.");
 				return;	
 			}						
-			
 			if (gridInsertData.length == 0) {
 				itp_fn_modal_alert("반품처리할 품목을 없습니다.");
 				return ;
 			}
-			
 			var modalFn = {
 				callBack: () => {
 					let param = {};
@@ -332,13 +349,11 @@ let listObj = {
 					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
 				}
 			};
-		
 			itp_fn_modal_confirm('반품처리 하시겠습니까?', modalFn);			
 		}
 	},
 	action: function() {
 		var _this = this;
-		
 		// 공급업체 조회 버튼 클릭
 		$('#ITP_BTN_RTNMNG05010_SEARCH_POP_SSPPLY_NM').on('click', function() {
 			_this.popup('spply');
@@ -370,7 +385,6 @@ let listObj = {
 			$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_NM').val('');
 			$('#ITP_FORM_RTNMNG05010_SEARCH_SRTN_WHS_ID').val('');
 		});
-
 	},
 	popup: function(arg) {
 		var whsDvsn = "";		
@@ -389,7 +403,6 @@ let listObj = {
 			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:whsDvsn};
 			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
-		
 	},
 	callback: {
 		supply: function(rowDataPop) {
@@ -414,7 +427,6 @@ let listObj = {
 						case 'ITP_BTN_RTNMNG05010_SRH'		: listObj.button.search(); 	break;	// 조회 버튼 클릭
 						case 'ITP_BTN_RTNMNG05010_RTN_PROC'	: listObj.button.save(); 	break;	// 입고처리 버튼
 						case 'ITP_BTN_RTNMNG05010_EXCEL'	: listObj.excelDown(); 	break;	// 엑셀다운로드
-
 					}
 				});
 			});
@@ -426,8 +438,6 @@ let listObj = {
 
 				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'RTNMNG05010');
 			});
-
-
 		}
 	},
 	empty: {
@@ -447,7 +457,6 @@ let listObj = {
 			// 데이터 없을때
 			itp_fn_jqgrid_resize(RTNMNG05010_GRID_ID, RTNMNG05010_GRID_LIST, 'lg');
 			this.search();
-
 		},
 		colModel: gridColModel.list,
 		search: function() {
@@ -472,6 +481,13 @@ let listObj = {
 				},
 				loadComplete: function(data) {
 					itp_fn_grid_load_complete(data, RTNMNG05010_GRID_ID, true, 'number', 'RTNMNG05010', listObj.itp_RTNMNG05010_search, listObj.empty, true, data.gridRecords, true);
+					var ids = $(RTNMNG05010_GRID_ID).jqGrid('getDataIDs');
+					console.log(ids);
+					for (var i = 0; i < ids.length; i++) {
+						var rowData = $(RTNMNG05010_GRID_ID).jqGrid('getRowData', ids[i]);
+						var colQty = rowData.colReqQty
+						$(RTNMNG05010_GRID_ID).jqGrid('setRowData', ids[i], {colQty: colQty});
+					}
 				},
 				onPaging: function(action) {
 					itp_fn_grid_paging(RTNMNG05010_GRID_ID, action, param);
@@ -493,7 +509,6 @@ let listObj = {
 		
 	},
 	excelDown: function() {
-		
 		var excelParam =  $('#ITP_FORM_RTNMNG05010_SEARCH').serializeObject();
 		excelParam.sbrandId = fn_make_user_info.get('brandId');
 		excelParam.sstoreId = fn_make_user_info.get('storeId');
@@ -508,5 +523,3 @@ let listObj = {
 		itp_fn_remote_to_excel(param);
 	}
 };
-
-

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -227,14 +227,15 @@ const gridColModel = {
 		{
 			index: 'ITEM_ID', name: 'itemId',
 			label: ITP_MSG_LOCALE.label.itemId, //품목번호
-			minwidth: 160,
+			minwidth: 200,
 			width: '13', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'ITEM_NM', name: 'itemNm',
 			label: ITP_MSG_LOCALE.label.itemNm, //품목명
-			width: '13', fixed: false, align: 'center',
+			width: '13', fixed: false, align: 'left',
+			minwidth: 200,
 			sortable: false, hidden: false, classes: 'ui-ellipsis'
 		},
 		{
@@ -252,28 +253,28 @@ const gridColModel = {
 		{
 			index: 'UNIT', name: 'unit',
 			label: ITP_MSG_LOCALE.label.unit, //기본단위
-			width: '8', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_DSTRBT_COST_UNIT}
 		},
 		{
 			index: 'CURR', name: 'curr',
 			label: ITP_MSG_LOCALE.label.curr, //통화
-			width: '7', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_CURR}
 		},
 		{
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
-			width: '10', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'right',
 			sortable: true, editable: false, edittype: 'text',
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'UNIT_TARGET_CD', name: 'unitTargetCd',
 			label: ITP_MSG_LOCALE.label.unitTargetCd, //대상여부
-			width: '10', fixed: false, align: 'center',
+			width: '6', fixed: false, align: 'center',
 			sortable: false, editable: false, formatter: 'select', edittype: 'select',
 			editoptions: {value: ITP_COMMON_CD_UNIT_TARGET_CD}
 		}
@@ -532,12 +533,12 @@ let pageObj = {
 	},
 	calculate: function() {
 		var ids = $(STINFO06010_DETAIL_GRID_ID).jqGrid('getDataIDs');
-		console.log(ids);
 		for (var i = 0; i < ids.length; i++) {
 			var rowData = $(STINFO06010_DETAIL_GRID_ID).jqGrid('getRowData', ids[i]);
-			console.log(rowData.spplyUnitAmt);
+			if (rowData.spplyUnitAmt == null || rowData.spplyUnitAmt == '') {
+				return false;
+			}
 			var unitAmt = Math.floor(Number(rowData.spplyUnitAmt) / 100 * (Number($('#ITP_STINFO06010_UNIT_STDD').val()) + 100));
-			console.log(unitAmt);
 			$(STINFO06010_DETAIL_GRID_ID).jqGrid('setRowData', ids[i], {unitAmt: unitAmt});
 		}
 	}	

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

@@ -81,10 +81,10 @@
                 	<div class="itp_amt amt_wd fnOrdAmt"></div>
 	              </div>
 	            </div>
-				<div class="right" style="width:125px;">
-					<button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
+				<div class="right" style="width:100px;">
+					<button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS"><img src="../img/minus.png" alt=""></button>
                     <input type="number" id="ITP_MPOMNG01010_DETAIL_NUM" class="" value="1" maxlength="5">
-					<button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
+					<button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS"><img src="../img/plus.png" alt=""></button>
 				</div>
 			</li>
         </div>

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

@@ -244,7 +244,7 @@
       <div id="ITP_LIST_MPOMNG02010_MODIFY_AREA" class="scroll_area row-1">
         <ul id="ITP_LIST_MPOMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
         <div id="ITP_LIST_MPOMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- display:grid -->
-          <li class="item-row">
+          <li class="item-row list-row">
             <div class="left_info item">
               <div class="check_box">
                 <input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
@@ -259,9 +259,9 @@
               </div>
             </div>
             <div class="right">
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS">-</button>
+              <button id="ITP_BTN_MPOMNG02010_MODIFY_MINUS"><img src="../img/minus.png" alt=""></button>
 			  <input type="number" id="ITP_MPOMNG02010_MODIFY_NUM" class="" value="1" maxlength="5" data-brandUnitUnqNo="">
-              <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS">+</button>
+              <button id="ITP_BTN_MPOMNG02010_MODIFY_PLUS"><img src="../img/plus.png" alt=""></button>
             </div>
           </li>
         </div>

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

@@ -62,9 +62,9 @@
 			              </div>
 			            </div>
 						<div class="right" style="width:125px;">
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS">-</button>
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_MINUS" class="DETAIL_ITEM_MINUS"><img src="../img/minus.png" alt=""></button>
 							<input type="number" id="ITP_MRTNMNG01010_DETAIL_NUM" class="" value="1" maxlength="5">
-							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS">+</button>
+							<button id="ITP_BTN_MRTNMNG01010_DETAIL_PLUS" class="DETAIL_ITEM_PLUS"><img src="../img/plus.png" alt=""></button>
 						</div>
 					</li>
 				</div>

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

@@ -203,7 +203,7 @@
 			<div id="ITP_LIST_MRTNMNG02010_MODIFY_AREA" class="scroll_area row-7">
 				<ul id="ITP_LIST_MRTNMNG02010_MODIFY_ROWS" class="mb_0 panel-group"></ul>
 				<div id="ITP_LIST_MRTNMNG02010_MODIFY_ROWCOPY" style="display: none;"><!-- style="display: gird;" -->
-					<li class="item-row">
+					<li class="item-row list-row">
 						<div class="left_info item">
 							<div class="check_box"><!-- class 변경 -->
 								<input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" />
@@ -218,9 +218,9 @@
 				              </div>
 						</div>
 						<div class="right">
-							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS">-</button>
+							<button id="ITP_BTN_MRTNMNG02010_MODIFY_MINUS" class="DETAIL_ITEM_MINUS"><img src="../img/minus.png" alt=""></button>
 							<input type="number" id="ITP_MRTNMNG02010_MODIFY_NUM" class="" value="1" maxlength="5" data-brandUnitUnqNo="">
-							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS">+</button>
+							<button id="ITP_BTN_MRTNMNG02010_MODIFY_PLUS" class="DETAIL_ITEM_PLUS"><img src="../img/plus.png" alt=""></button>
 						</div>
 					</li>
 				</div>

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

@@ -336,7 +336,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   font-size: 16px;
 }
 .content {position: fixed; display:contents; z-index: 10; width:100%; background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
-.content .content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
+.content .content_fix {background:linear-gradient(to bottom, #f5f6f6, #fff); border-bottom:1px dashed #E0B8AB;}
 .content .content_inside {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .content .header {width:100% !important; margin:0 !important;}
 .content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 30px; margin-bottom: -10px;}
@@ -403,7 +403,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .table_btn {margin-top: 6px; width: 100%; height: 40px;}
 .content .table_header h1 {margin-left: 15px; margin-top:0px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
 .content .table_btn h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:15px;}
+.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:5px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .detail_content .detail_header {width: 330px; height: 30px; margin:0; left:50%; position:relative; transform:translateX(-50%);}
@@ -462,9 +462,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area ul.mb_0 {margin-bottom:0 !important;}
 .scroll_area .itp_non_data {margin:35% auto;}
 
-.scroll_area li {margin:0; list-style: none; width: 100vw; height: 85px; border-bottom: 1px solid #ccc; background-color: #fff;}
+.scroll_area li {margin:0; list-style: none; width: 100vw; height: 85px; border-bottom: 1px dashed #ccc; background-color: #fff;}
 .scroll_area li.check {background:#f5f6f6;}
-.scroll_area li.list-row {display: inline-flex; height:76px;}
+.scroll_area li.list-row {display: inline-flex; height:60px;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
 .scroll_area li .podr_list {margin: 0px 10%;border: 1px solid #ccc; border-bottom:none; width: 89%;}
@@ -474,17 +474,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 .scroll_area li .left_info {width: calc(100% - 66px); float:left;}
 .scroll_area li .left_info.item {width: calc(100% - 120px); float:left;}
-.scroll_area li .left_info div {display: inline-block; font-size:14pt;}
+.scroll_area li .left_info div {display: inline-block; font-size:12pt;}
 .scroll_area li .left_info .slash {width:calc(100% - 98px);}
 
-.scroll_area li .left_info span {font-size: 14pt;}
+.scroll_area li .left_info span {font-size: 12pt;}
 .scroll_area li .left_info label{width:60px; font-size: 14pt; font-weight:100; margin-top:5px;}
 .scroll_area li .left_info label.two{width:84px; font-size: 12pt;}
 .scroll_area li .left_info .check_box {padding-top:8px; height:50px; float:left; width:22px;}
 .scroll_area li .left_info .check_box input[type=checkbox] {width:15px; margin:10px 0 0 7px;}
-.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:38px; font-weight: 100;}
-.scroll_area li .left_info .thick .itp_item {color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
-.scroll_area li .left_info .thick .itp_gram {position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:14pt; text-align:right; width: 85px;}
+.scroll_area li .left_info .thick {float:left; text-align: left; width: 90%; height:26px; font-weight: 100;}
+.scroll_area li .left_info .thick .itp_item {padding-left:5px; color:gray;text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width:calc(100% - 81px); top:7px; text-align:left; position:relative;}
+.scroll_area li .left_info .thick .itp_gram {padding-left:6px; position:relative; top:7px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; color:#aaa; font-size:12pt; text-align:right; width: 85px;}
 .scroll_area li .left_info .thick .auto {width:auto;}
 .scroll_area li .left_info .thick .itp_amt {color:#b88278; text-overflow:ellipsis; overflow:hidden; white-space:nowrap; width: calc(100% - 105px); top: 7px; position:relative; text-align:left;}
 .scroll_area li .left_info .thick .amt_wd {width:calc(100% - 95px);}
@@ -593,13 +593,14 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal div.non_btn {width:calc(100% - 192px);}
 
 
-.scroll_area li .right {margin: 22px 10px 22px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right {margin: 15px 10px 15px 0; position: relative; display: flex; width:110px; height:30px; font-size: 1.4rem; font-weight: 700; float: right;}
 .scroll_area li .right .num {padding:2px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB; background:#fff; font-size:14pt;}
 .scroll_area li .right .fnnum {margin:5px 30px; font-size:14pt;}
-.scroll_area li .right input {width:45px; height:30px; margin:0; padding:5px; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
+.scroll_area li .right input {width:45px; height:30px; margin:0; padding:5px; text-align:center; border-radius:0px; border:none;}
 .scroll_area li .right input:focus {outline:none;}
-.scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 16px; border-radius: 0px;}
-.scroll_area li .right button:hover {background:#FCD5C1;}
+.scroll_area li .right button {border:none; padding:0px;}
+.scroll_area li .right button:hover {background:transparent; opacity:0.7;}
+.scroll_area li .right button img {width:28px;}
 
 /* ITP_FOOTER */
 #ITP_FOOTER .itp_modal {z-index:10000;}