모바일 재고현황 수정

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

@@ -6,20 +6,25 @@
 		  <div class="content">
 			<div class="line">
 			  <label>창고선택</label>
-			  <div class="search_wrap">
+				<div class="line_right">
+					<select name="swhsId" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM">
+						<option value=""></option>
+					</select>
+				</div>
+			  <!--<div class="search_wrap">
 				  <div class="float_left">
-					<input id="ITP_FORM_MSTOCKMNG01010_LIST_WHS_NM" type="text" data-select-code="WHS_NM" data-check-required="empty" placeholder="A매장명">
+					<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM" type="text" placeholder="A매장명">
 				  </div>
 				  <div class="float_left_btn">
 					<button id="ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"><img src="../img/search.png" alt=""></button>
 					<button id="ITP_BTN_MSTOCKMNG01010_LIST_DETELE_WHS_NM"><img src="../img/delete.png" alt=""></button>
 				  </div>
-			  </div>
+			  </div>-->
 			</div>
 			<div class="line">
 			  <label>Location</label>
 			  <div class="line_right">
-				<select name="whsDvsn" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_DVSN">
+				<select name="slocation" id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION">
 				  <option value=""></option>
 				</select>
 			  </div>
@@ -27,7 +32,7 @@
 			<div class="line">
 			  <label>품목명</label>
 			  <div class="search_wrap">
-				<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_ITEM_NM" name="itemNm" style="width: 262px;" type="text" placeholder="품목명">
+				<input id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_ITEM_NM" name="sitemNm" style="width: 262px;" type="text" placeholder="품목명">
 			  </div>
 			</div>
 			<div class="line" style="height:45px;">
@@ -100,6 +105,43 @@
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>
+	<div id="ITP_POP_MSTOCKMNG01010_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_MSTOCKMNG01010_POP_WHS_CLOSE" class="btn-pop-close"><img src="../img/close.png"></button>
+				</div>
+			</div>
+			<div class="search_bar">
+				<form id="ITP_FORM_MSTOCKMNG01010_POP_WHS" class="form-horizontal" onsubmit="return false;">
+					<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_WHS_ITEM_BRAND_ID" name="sbrandId" value="">
+					<input type="hidden" id="ITP_FORM_MSTOCKMNG01010_WHS_ITEM_STORE_ID" name="sstoreId" value="">
+					<input id="ITP_FORM_MSTOCKMNG01010_POP_WHS_KEYWORD" type="text" name="swhsNm" placeholder="납품장소명">
+					<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_SEARCH"><img src="../img/search.png"></button>
+				</form>
+			</div>
+			<div class="search_bar">
+				<button id="ITP_BTN_MSTOCKMNG01010_POP_WHS_NM" class="btn_blue">납품장소▼</button>
+			</div>
+			<div id="ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA" class="popup_scroll">
+				<ul id="ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS" class="panel-group itp_nav"></ul>
+				<div id="ITP_LIST_MSTOCKMNG01010_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_MSTOCKMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
+						</div>
+					</li>
+				</div>
+			</div>
+		</div>
+	</div>
 	<div id="ITP_POP_MSTOCKMNG01010_ITEM_AREA" class="popup2 mobile-pop-close" style="display: none;">
 		<div class="pop">
 			<div class="header">
@@ -164,7 +206,7 @@
 					<label>창고선택</label>
 				</div>
 			 	  <div class="line_right">
-					<select name="whsNm" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM" data-select-code="WHS_NM" data-check-required="empty">
+					<select name="whsNm" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_NM" data-check-required="empty">
 					  <option value=""></option>
 					</select>
 				  </div>
@@ -174,7 +216,7 @@
 				  		<label>Location</label>
 					</div>
 				  <div class="line_right">
-					<select name="whsDvsn" id="ITP_FORM_MSTOCKMNG01010_POP_WHS_DVSN" data-select-code="EMAIL_CD" data-check-required="empty">
+					<select name="location" id="ITP_FORM_MSTOCKMNG01010_POP_LOCATION" data-check-required="empty">
 					  <option value=""></option>
 					</select>
 				  </div>
@@ -184,7 +226,7 @@
 						<label>이동 수량</label>
 					</div>
 					<div class="line_right">
-						<input id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" data-select-code="QTY" data-check-required="empty" >
+						<input id="ITP_FORM_MSTOCKMNG01010_POP_QTY" type="text" data-check-required="empty" >
 					</div>
 				</div>
 			    <div class="search">

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

@@ -6,9 +6,11 @@ require(['config'], function() {
 });
 
 /*API URL*/
-const API_MOBILE_GRID_LIST 			= '/api/unpaid/mng/detail-grid-list';	// 목록
-const API_MOBILE_INFO 				= '/api/unpaid/mng/info-unpaid';		// 상세
-const API_MOBILE_HISTORY			= '/api/unpaid/mng/stl-grid-list';		// 이력
+const API_MOBILE_GRID_LIST 			= '/api/stock/cdd/detail-grid-list';	// 목록
+const API_MOBILE_INFO 				= '/api/stock/cdd/info-cdd';			// 상세
+const API_MOBILE_SAVE 				= '/api/stock/cdd/save-stock-cdd';		// 저장
+const API_MOBILE_WHS_GRID_LIST 		= '/api/whs/mng/detail-grid-list';
+const API_MOBILE_LOCATION_LIST 		= '/api/whs/mng/location-grid-list';
 const API_POP_SEARCH_LIST			= '/api/store/pop-grid-list';
 
 const PAGE_MODE_LIST				= "LIST";
@@ -27,16 +29,6 @@ let mobPageObj = {
 			this.info();
 		},
 		view: function() {
-			// 공통코드 표시
-			$('select').each(function() {
-				if($(this).data('select-code')) {
-					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
-				}
-			});
-
-			// 조회일자 지정
-			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
 		},
 		info: function() {
 			$('input:hidden[id$="_BRAND_ID"]').val(fn_make_user_info.get('brandId'));
@@ -45,14 +37,14 @@ let mobPageObj = {
 	},
 	event: {
 		init: function() {
-			this.button();
+			this.action();
 		},
-		button: function() {
+		action: function() {
 			$('button[id^="ITP_BTN_MSTOCKMNG01010_LIST"]').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_STORE_NM'	: mobPopObj.popStoreNm.init(); 		break;
-					case 'ITP_BTN_MSTOCKMNG01010_LIST_DELETE_STORE_NM'	: mobPopObj.popStoreNm.delete(); 	break;
+					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH_WHS_NM'	: mobPopObj.popWhsNm.init(); 		break;
+					case 'ITP_BTN_MSTOCKMNG01010_LIST_DETELE_WHS_NM'	: mobPopObj.popWhsNm.delete(); 		break;
 					case 'ITP_BTN_MSTOCKMNG01010_LIST_SEARCH'			: mobContentObj.list.search();		break;
 				}
 				return false;
@@ -67,12 +59,16 @@ let mobPageObj = {
 				return false;
 			});
 
+			$('select[id="ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM"]').on('change', function() {
+				mobContentObj.list.locationList();
+			});
+
 			$(document).on('click', '#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS li', function() {
 				var item = mobContentObj.list.rows[$(this).index()];
 				mobContentObj.view.init(item);
 			});
 
-			$(document).on('click', '#ITP_LIST_MSTOCKMNG01010_POP_STORE_ROWS li button', function() {
+			$(document).on('click', '#ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWS li button', function() {
 				mobPopObj.popWhsNm.choice($(this));
 			});
 		}
@@ -120,7 +116,8 @@ let mobContentObj = {
 		rows: [],
 		init: function() {
 			mobPageObj.switchScreen(PAGE_MODE_LIST);
-			this.search();
+			// this.search();
+			this.whsList();
 		},
 		search: function() {
 			this.listPage = 0;
@@ -140,27 +137,45 @@ let mobContentObj = {
 					$('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWCOPY').html());
 					var $li = $('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_AREA .panel-group > .list-row:last');
 					$li.find('.fnStoreNm').text(item.storeNm);
-					$li.find('.fnLoanDvsnNm').text(item.loanDvsnNm);
-					var limitAmt;
-					if(item.loanDvsn == 'LD01') { // 선불(충전)
-						limitAmt = item.chrgeLimitAmt;
-					} else if(item.loanDvsn == 'LD02') { // 후불(신용)
-						limitAmt = item.credtLimitAmt;
-					}
-					$li.find('.fnLimitAmt').text(CommonObj.currency.add(limitAmt));
-					$li.find('.fnPosbLimitAmt').text(CommonObj.currency.add(limitAmt - item.useAmtTotal));
-					$li.find('.fnTmpRcvAcctTotal').text(CommonObj.currency.add(item.tmpRcvAcctTotal));
-					$li.find('.fnUseAmtTotal').text(CommonObj.currency.add(item.useAmtTotal));
-					$li.find('.fnUseYnNm').text(item.useYnNm);
 					_this.rows.push(item);
 				});
 			};
 			var errFn = function() { _this.isSearch = false;};
 			const param = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH').serializeObject();
 			param.gridPage = ++this.listPage;
-			param.gridSize = this.listSize
-			// console.log(JSON.stringify(param));
+			param.gridSize = this.listSize;
+			param.pagingYn = true;
+			console.log(JSON.stringify(param));
 			fn_ajax_call(API_MOBILE_GRID_LIST, JSON.stringify(param), callbackFn, 'POST', errFn);
+		},
+		whsList: function() {
+			const brandIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_BRAND_ID').val();
+			const storeIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_ID').val();
+			const param = {sbrandId: brandIdVal, sstoreId: storeIdVal, pagingYn: false};
+
+			fn_ajax_call(API_MOBILE_WHS_GRID_LIST, JSON.stringify(param), function(result) {
+				console.log(result);
+				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM');
+				fn_make_select_whs(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_WHS_NM');
+
+				if(result.gridRecords > 0) {
+					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').trigger('change');
+				}
+			}, 'POST');
+		},
+		locationList: function() {
+			const brandIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_BRAND_ID').val();
+			const storeIdVal = $('#ITP_FORM_MLOANMNG01010_LIST_SEARCH_STORE_ID').val();
+			const whsIdVal = $('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val();
+			const param = {brandId: brandIdVal, storeId: storeIdVal, whsId: whsIdVal, pagingYn: false};
+			console.log(JSON.stringify(param));
+
+			fn_ajax_call(API_MOBILE_LOCATION_LIST, JSON.stringify(param), function(result) {
+
+				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION');
+				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_POP_LOCATION');
+
+			}, 'POST');
 		}
 	},
 	view: {
@@ -199,51 +214,6 @@ let mobContentObj = {
 			$(id).find('.fnUseAmtTotal').text(CommonObj.currency.add(result.useAmtTotal));
 			_this.history.init(result.loanMgntUnqNo);
 		},
-		history: {
-			rows: [],
-			init: function(loanMgntUnqNo) {
-				// 조회일자 지정
-				$('#ITP_FORM_MSTOCKMNG01010_VIEW_SEARCH_FROM_DT').val(itp_fn_date_add('M', -1));
-				$('#ITP_FORM_MSTOCKMNG01010_VIEW_SEARCH_TO_DT').val(itp_fn_date_add('M', 0));
-				this.loanMgntUnqNo = loanMgntUnqNo;
-				this.search();
-			},
-			search: function() {
-				this.listPage = 0;
-				this.totPage = 0;
-				this.rows.length = 0;
-				$('#ITP_LIST_MSTOCKMNG01010_LIST_ITEM_ROWS').empty();
-				this.load();
-			},
-			load: function() {
-				var _this = this;
-				this.isSearch = true;
-				var callbackFn = function(result) {
-					console.log(result);
-					_this.isSearch = false;
-					_this.totPage = result.gridTotal;
-					$.each(result.gridRows, function (i, item) {
-						$('#ITP_LIST_MSTOCKMNG01010_VIEW_ITEM_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_VIEW_ITEM_ROWCOPY').html());
-						var $li = $('#ITP_LIST_MSTOCKMNG01010_VIEW_ITEM_AREA .panel-group > .list-row:last');
-						$li.find('.fnLoanRegDt').text(item.loanRegDt);
-						$li.find('.fnDpstPayDvsnNm').text(item.dpstPayDvsnNm);
-						$li.find('.fnDstpAmt').text(item.dstpAmt);
-						$li.find('.fnTrscAfBal').text(item.trscAfBal);
-						$li.find('.fnUse').text(item.use);
-						_this.rows.push(item);
-					});
-				};
-				var errFn = function() { _this.isSearch = false;};
-				const param = $('#ITP_FORM_MSTOCKMNG01010_VIEW_SEARCH').serializeObject();
-				param.gridPage = ++this.listPage;
-				param.gridSize = this.listSize;
-				param.sloanMgntUnqNo = _this.loanMgntUnqNo;
-				param.fromDt = CommonObj.onlyNumber(param.fromDt);
-				param.toDt = CommonObj.onlyNumber(param.toDt);
-				console.log(JSON.stringify(param));
-				fn_ajax_call(API_MOBILE_HISTORY, JSON.stringify(param), callbackFn, 'POST', errFn);
-			}
-		},
 		cancel: function () {
 			var id = '#ITP_AJAX_MSTOCKMNG01010_VIEW_CONTAINER';
 			$(id).find('.fnItemid').text('');
@@ -261,8 +231,8 @@ let mobContentObj = {
 };
 
 let mobPopObj = {
-	popStoreNm: {
-		popId: 'ITP_POP_MSTOCKMNG01010_STORE_AREA',
+	popWhsNm: {
+		popId: 'ITP_POP_MSTOCKMNG01010_WHS_AREA',
 		rows: [],
 		init: function () {
 			this.rows.length = 0;
@@ -272,56 +242,69 @@ let mobPopObj = {
 		},
 		search: function () {
 			var _this = this;
-			$('#ITP_LIST_MSTOCKMNG01010_POP_STORE_AREA .panel-group').empty();
+			$('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group').empty();
 			var callbackFn = function(result) {
 				console.log(result);
 				_this.view(result.gridRows);
 			};
-			const param = $('#ITP_FORM_MSTOCKMNG01010_POP_STORE').serializeObject();
+			const param = $('#ITP_FORM_MSTOCKMNG01010_POP_WHS').serializeObject();
+			console.log(JSON.stringify(param));
 			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_MSTOCKMNG01010_POP_STORE_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_POP_STORE_ROWCOPY').html());
-				var $li = $('#ITP_LIST_MSTOCKMNG01010_POP_STORE_AREA .panel-group > .list-row:last');
-				$li.find('.fnStoreNm').text(item.storeNm);
-				$li.find('.fnStoreStNm').text(item.storeStNm);
-				$li.find('.fnStoreId').data('store-id', item.storeId);
+				$('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group').append($('#ITP_LIST_MSTOCKMNG01010_POP_WHS_ROWCOPY').html());
+				var $li = $('#ITP_LIST_MSTOCKMNG01010_POP_WHS_AREA .panel-group > .list-row:last');
+				$li.find('.fnWhsNm').text(item.whsNm);
+				$li.find('.fnLocationNm').text(item.locationNm);
+				$li.find('.fnWhsId').data('whs-id', item.whsId);
 			});
 		},
 		choice: function(elem) {
 			var _this = this;
-			var storeId = $(elem).data('store-id');
+			var whsId = $(elem).data('whs-id');
 			$.each(this.rows, function (i, item) {
-				if(storeId === item.storeId) {
-					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_ID').val(item.storeId);
-					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_NM').val(item.storeNm);
+				if(whsId === item.whsId) {
+					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_ID').val(item.whsId);
+					$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val(item.whsNm);
 					_this.close();
+					_this.location(item.whsId);
 					return false;
 				}
 			});
 		},
+		location: function(whsId) {
+			var callbackFn = function(result) {
+				fn_make_select_location(result.gridRows, 'ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_LOCATION');
+			};
+			var param = {
+				'brandId': fn_make_user_info.get('brandId'),
+				'storeId': fn_make_user_info.get('storeId'),
+				'whsId': whsId
+			};
+			fn_ajax_call(API_MOBILE_LOCATION, JSON.stringify(param), callbackFn, 'POST');
+		},
 		action: function() {
 			var _this = this;
-			$('button[id^="ITP_BTN_MSTOCKMNG01010_POP_STORE"]').off('click').on('click', function() {
+			$('button[id^="ITP_BTN_MSTOCKMNG01010_POP_WHS"]').off('click').on('click', function() {
 				var id = $(this).attr('id');
 				switch (id) {
-					case 'ITP_BTN_MSTOCKMNG01010_POP_STORE_SEARCH'	: _this.search();			break;
-					case 'ITP_BTN_MSTOCKMNG01010_POP_STORE_CHOICE'	: _this.choice($(this)); 	break;
-					case 'ITP_BTN_MSTOCKMNG01010_POP_STORE_CLOSE'	: _this.close(); 			break;
+					case 'ITP_BTN_MSTOCKMNG01010_POP_WHS_SEARCH'	: _this.search();			break;
+					case 'ITP_BTN_MSTOCKMNG01010_POP_WHS_CHOICE'	: _this.choice($(this)); 	break;
+					case 'ITP_BTN_MSTOCKMNG01010_POP_WHS_CLOSE'		: _this.close(); 			break;
 				}
 				return false;
 			});
 		},
 		delete: function() {
-			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_ID').val('');
-			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_STORE_NM').val('');
+			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_ID').val('');
+			$('#ITP_FORM_MSTOCKMNG01010_LIST_SEARCH #ITP_FORM_MSTOCKMNG01010_LIST_SEARCH_WHS_NM').val('');
 		},
 		close: function() {
 			this.rows.length = 0;
 			$('#ITP_POP_MSTOCKMNG01010_LIST_WHS_AREA .panel-group').empty();
-			$('#ITP_FORM_MSTOCKMNG01010_POP_STORE #ITP_FORM_MSTOCKMNG01010_POP_STORE_KEYWORD').val('');
+			$('#ITP_FORM_MSTOCKMNG01010_POP_WHS #ITP_FORM_MSTOCKMNG01010_POP_WHS_KEYWORD').val('');
 			mobPopObj.hide(this.popId);
 		}
 	},

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

@@ -312,6 +312,20 @@ function fn_make_select_store(options, select_id, all_show_yn, all_name, all_val
 	});
 }
 
+function fn_make_select_whs(options, select_id, all_show_yn, all_name) { //창고 셀렉트 박스 만들기
+	$select_id = $('#' + select_id);
+	$select_id.empty();
+	if(all_show_yn == true) {
+		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
+	}
+	$.each(options, function(key, value) {
+		$('<option/>', {
+			'value': value.whsId,	// 창고아이디
+			'text': value.whsNm		// 창고명
+		}).appendTo($select_id);
+	});
+};
+
 function fn_make_select_location(options, select_id, all_show_yn, all_name) { //위치 셀렉트 박스 만들기
 	$select_id = $('#' + select_id);
 	$select_id.empty();