모바일 반품관리 디자인 적용

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

@@ -1,46 +1,8 @@
 <section id="ITP_MOBILE_MRTNMNG04010">
-	<div id="ITP_POP_MRTNMNG04010_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_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
-				</div>
-			</div>
-			<div class="search_bar">
-				<form id="ITP_FORM_MRTNMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
-					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
-					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
-					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
-					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
-				</form>
-			</div>
-			<div class="select_btn">
-				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
-			</div>
-			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
-				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:;">
-					<li class="list-row row_2">
-						<div class="scroll_left">
-							<div class="con_2 fnWhsNm"></div>
-							<div class="con_2 sub fnLocationNm"></div>
-						</div>
-						<div class="scroll_right">
-							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
-						</div>
-					</li>
-				</div>
-			</div>
-		</div>
-	</div>
 	<div id="ITP_AJAX_MRTNMNG04010_LIST_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MRTNMNG04010_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">
 			<div class="content">
 				<div class="line header">
 				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품발주현황</div>
@@ -223,4 +185,41 @@
 		</form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MRTNMNG04010_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_MRTNMNG04010_POP_WHS_CLOSE"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MRTNMNG04010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MRTNMNG04010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MRTNMNG04010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MRTNMNG04010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="select_btn">
+				<button id="ITP_BTN_MRTNMNG04010_POP_WHS_NM" class="btn_blue">납품장소 <img src="../img/arrow_down.png"></button>
+			</div>
+			<div id="ITP_LIST_MRTNMNG04010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MRTNMNG04010_POP_WHS_ROWCOPY" style="display:none;">
+					<li class="list-row row_2">
+						<div class="scroll_left">
+							<div class="con_2 fnWhsNm"></div>
+							<div class="con_2 sub fnLocationNm"></div>
+						</div>
+						<div class="scroll_right">
+							<button id="ITP_BTN_MRTNMNG04010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
 </section>

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

@@ -25,8 +25,8 @@
 				<div class="line">
 					<label>반품입고장소</label>
 					<div class="float_left">
-						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" class="" name="srtnWhsNm" placeholder="매장명" readonly />
-						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" data-check-required="empty" class="" name="srtnWhsId" />
+						<input type="text" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" class="" name="srtnWhsNm" placeholder="수거창고" readonly />
+						<input type="hidden" id="ITP_FORM_MRTNMNG05010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG05010_LIST_SEARCH_RTN_WHS_NM"><img src="../img/search.png" alt=""></button>
 						</div>
@@ -67,7 +67,7 @@
 		<form id="ITP_FORM_MRTNMNG05010_LIST_MODIFY" class="form-horizontal" onsubmit="return false;">
 			<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_AREA" class="scroll_area row-10">
 				<ul id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS" class="panel-group"></ul>
-				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWCOPY" style="display: none;">
 					<li class="history_list2">
 						<div class="left">
 							<div class="nomal">

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

@@ -3,7 +3,7 @@
 		<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="">
 			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
-			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_IDX" name="sidx" value="0">
+			<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_SPPLY_ID" name="sspplyId" value="">
 			<div class="content">
 				<div class="line header">
 				  <div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품현황</div>
@@ -25,7 +25,7 @@
 				<div class="line top3">
 					<label>반품입고장소</label>
 					<div class="float_left">
-						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" placeholder="매장명" readonly>
+						<input id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" name="srtnWhsNm" type="text" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="수거창고" placeholder="매장명" readonly>
 						<input type="hidden" id="ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_ID" class="" name="srtnWhsId" />
 						<div class="itp_input_btn">
 							<button id="ITP_BTN_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM" data-call-popup="ITP_POP_MRTNMNG06010_WHS_NM"><img src="../img/search.png" alt=""></button>
@@ -151,7 +151,7 @@
 			</div>
 			<div id="ITP_LIST_MRTNMNG06010_POP_WHS_AREA" class="popup_scroll">
 				<ul id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWS" class="mb_0 panel-group itp_nav"></ul>
-				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: block;">
+				<div id="ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY" style="display: none;">
 					<li class="row_2">
 						<div class="scroll_left">
 							<div class="con_2 fnWhsNm">브랜드 창고 명A</div>

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

@@ -143,7 +143,7 @@ let mobContentObj = {
 				_this.totPage = result.gridTotal;
 				$.each(result.gridRows, function (i, item) {
 					$('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_LIST_ITEM_ROWCOPY').html());
-					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .history_list:last');
+					var $li = $('#ITP_LIST_MRTNMNG04010_LIST_ITEM_AREA .panel-group > .history_list7:last');
 					$li.find('.fnRtnOdrRegDt').text(item.rtnOdrRegDt);
 					$li.find('.fnColDvsnNm').text(item.colDvsnNm);
 					$li.find('.fnRtnOdrStNm').text(item.rtnOdrStNm);
@@ -190,7 +190,7 @@ let mobContentObj = {
 			$(id).find('.fnWhsNm').text(result.whsNm);
 			$.each(result.rtnOdrDtlList, function (i, item) {
 				$('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .list-row2:last');
+				var $li = $('#ITP_LIST_MRTNMNG04010_VIEW_ITEM_AREA .panel-group > .history_list5:last');
 				$li.find('.fnItemNm').text(item.itemNm);
 				$li.find('.fnRtnOdrQty').text(CommonObj.comma.set(item.rtnOdrQty, item.unit));
 				$li.find('.fnRtnOdrAmt').text(CommonObj.currency.add(item.rtnOdrAmt));
@@ -198,11 +198,16 @@ let mobContentObj = {
 			});
 		},
 		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');
-			}
+			var modalFn = {
+				callBack: () => {
+					const param = {'brandId': fn_make_user_info.get('brandId'), 'rtnPodrUnqNo': this.rtnPodrUnqNo};
+					var searhFn = function () {
+						mobContentObj.list.init();
+					};
+					fn_ajax_call(API_RTNMNG_RTN_CANCEL_RTNPO, JSON.stringify(param), searhFn, 'POST');
+				}
+			};
+			itp_fn_modal_confirm('반품발주를 취소 하시겠습니까?', modalFn);
 		},
 		cancel: function (isSearch) {
 			var id = '#ITP_AJAX_MRTNMNG04010_VIEW_CONTAINER';
@@ -300,11 +305,7 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG04010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			param.swhsDvsn = CommonObj.schWhsDvsn(true);
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {

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

@@ -151,36 +151,76 @@ let mobContentObj = {
 		},
 		save: function() {
 			var _this = this;
+			var chkQtyYn1 = true;
+			var chkQtyYn2 = true;
+			var chkQtyYn3 = true;
 			var gridInsertData = [];
+			var swhsId = "";
+			var srtnWhsId = "";
+			var storeId = "";
 			$('#ITP_LIST_MRTNMNG05010_LIST_ITEM_ROWS li').each(function(index) {
 				var whsQty = $(this).find('input[name="whsQty"]').val();
 				if(whsQty !== '') {
+					if(Number(whsQty) > _this.rows[index].colReqQty) {
+						chkQtyYn1 = false;
+						return false;
+					}
+					if (swhsId !== "" && swhsId !== _this.rows[index].whsId) {
+						chkQtyYn2 = false;
+						return false;
+					}
+					if (srtnWhsId !== "" && srtnWhsId !== _this.rows[index].rtnWhsId) {
+						chkQtyYn3 = false;
+						return false;
+					}
 					var item = {
 						'dlvSttmtDtlNo'	: _this.rows[index].dlvSttmtDtlNo,
 						'dlvSttmtUnqNo'	: _this.rows[index].dlvSttmtUnqNo,
 						'itemId'		: _this.rows[index].itemId,
 						'whsQty'		: whsQty
 					};
+					swhsId = value.whsId;
+					srtnWhsId = value.rtnWhsId;
+					storeId = value.storeId;
 					gridInsertData.push(item);
 				}
 			});
-			if(gridInsertData.length > 0) {
-				var modalFn = {
-					callBack: (args) => {
-						let param = {};
-						param['viewCd'] = 'C';
-						param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID').val();
-						param['storeId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_STORE_ID').val();
-						param['whsId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MRTNMNG05010_LIST_SEARCH_WHS_ID').val();
-						param['gridInsertData'] = gridInsertData;
-						console.log(JSON.stringify(param));
-						var saveFn = function () {
-						};
-						fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
-					}
-				};
-				itp_fn_modal_confirm('저장 하시겠습니까?', modalFn);
+
+			if (chkQtyYn1 === false) {
+				itp_fn_modal_alert("수거요청수량보다 수거수량이 더 많습니다.");
+				return;
+			}
+			if (chkQtyYn2 === false) {
+				itp_fn_modal_alert("서로 다른 반품입고창고 품목은 처리할 수 없습니다.");
+				return;
+			}
+			if (chkQtyYn3 === false) {
+				itp_fn_modal_alert("서로 다른 수거창고 품목은 처리할 수 없습니다.");
+				return;
+			}
+
+			if (gridInsertData.length === 0) {
+				itp_fn_modal_alert("반품처리할 품목이 없습니다.");
+				return ;
 			}
+
+			var modalFn = {
+				callBack: (args) => {
+					let param = {};
+					param['viewCd'] = 'C';
+					param['whsId'] = swhsId;
+					param['rtnWhsId'] = srtnWhsId;
+					param['brandId'] = $('#ITP_FORM_MRTNMNG05010_LIST_SEARCH #ITP_FORM_MPOMNG02010_LIST_SEARCH_BRAND_ID').val();
+					param['storeId'] = storeId;
+					param['gridInsertData'] = gridInsertData;
+					console.log(JSON.stringify(param));
+					var saveFn = function () {
+						_this.search();
+					};
+					fn_ajax_call(API_MOBILE_SAVE, JSON.stringify(param), saveFn, 'POST');
+				}
+			};
+			itp_fn_modal_confirm('반품처리 하시겠습니까?', modalFn);
 		}
 	}
 };
@@ -204,11 +244,7 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG05010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			param.swhsDvsn = CommonObj.schWhsDvsn();
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {

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

@@ -118,11 +118,7 @@ let mobContentObj = {
 			// this.search();
 		},
 		search: function() {
-			if($('#ITP_FORM_MRTNMNG06010_LIST_SEARCH #ITP_FORM_MRTNMNG06010_LIST_SEARCH_RTN_WHS_NM').val().length < 1) {
-				alert('수거창고를 지정해주세요!');
-				return;
-			}
-			var formId = '#ITP_FORM_MRTNMNG05010_LIST_SEARCH';
+			var formId = '#ITP_FORM_MRTNMNG06010_LIST_SEARCH';
 			itp_fn_form_clear_validate(null, formId);
 			if (itp_fn_form_event.isValid(formId)) {
 				this.listPage = 0;
@@ -157,8 +153,6 @@ let mobContentObj = {
 			const param = $('#ITP_FORM_MRTNMNG06010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
 			param.gridSize = this.listSize;
-			param.fromDt = CommonObj.onlyNumber(param.fromDt);
-			param.toDt = CommonObj.onlyNumber(param.toDt);
 			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
 		}
@@ -248,18 +242,15 @@ let mobPopObj = {
 				_this.view(result.gridRows);
 			};
 			const param = $('#ITP_FORM_MRTNMNG06010_POP_WHS').serializeObject();
-			if(this.popMode === 'RTN_WHS') {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			} else {
-				(fn_make_user_info.get('authTpCd') === '50') ? param.swhsDvsn = 'W02' : param.swhsDvsn = 'W01';
-			}
+			// param.swhsDvsn = (fn_make_user_info.get('authTpCd') === '50') ? 'W02' : '';
+			param.swhsDvsn = CommonObj.schWhsDvsn(true);
 			fn_ajax_call(API_POP_SEARCH_LIST, JSON.stringify(param), callbackFn, 'POST');
 		},
 		view: function(gridRows) {
 			this.rows = gridRows;
 			$.each(gridRows, function (i, item) {
 				$('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MRTNMNG06010_POP_WHS_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group > .list-row:last');
+				var $li = $('#ITP_LIST_MRTNMNG06010_POP_WHS_AREA .panel-group > .row_2:last');
 				$li.find('.fnWhsNm').text(item.whsNm);
 				$li.find('.fnLocationNm').text(item.locationNm);
 				$li.find('.fnWhsId').data('whs-id', item.whsId);

src/main/webapp/mobile/js/config.js

@@ -829,6 +829,9 @@ let CommonObj = {
 	btnPay: function(id) {
 		return this.isPayPossible() ? $(id).show() : $(id).hide();
 	},
+	schWhsDvsn: function(isEmpty) {
+		return (fn_make_user_info.get('authTpCd') === '50') ? 'W02' : isEmpty ? '' : 'W01';
+	},
 	isApp: (/oqpo_android|oqpo_ios/).test(navigator.userAgent.toLowerCase())
 };