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

bin/src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -386,7 +386,7 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG04010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			let param = $('#ITP_FORM_STOCKMNG04010_SEARCH').serializeObject();

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

@@ -0,0 +1,65 @@
+<div id="ITP_BIZPOP_PO_STOCK_PROC" class="modal itp_modal">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<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="itp_form itp_type1 fix">
+					<div class="col-xs-12">
+						<div class="form-horizontal">
+							<form id="ITP_FORM_PO_STOCK_PROC_POPUP">
+								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID" name="brandId" value="">
+								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID" name="sourceWhsId" value="">
+								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION" name="sourceLocation" value="">
+								<input type="hidden" id="ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID" name="itemId" value="">
+							
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">창고명</label>
+									<div class="col-xs-4 itp_ip fnWhsNm"></div>
+									<label class="col-xs-2 itp_lb">로케이션</label>
+									<div class="col-xs-4 itp_ip fnLocationNm"></div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">품목번호</label>
+									<div class="col-xs-4 itp_ip fnItemId"></div>
+									<label class="col-xs-2 itp_lb">품목명</label>
+									<div class="col-xs-4 itp_ip fnItemNm"></div>
+								</div>
+								<div class="form-group border">
+									<label class="col-xs-2 itp_lb">현재고</label>
+									<div class="col-xs-4 itp_ip fnStckQty"></div>
+									<label class="col-xs-2 itp_lb">관리등급</label>
+									<div class="col-xs-4 itp_ip"></div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-2 itp_lb">창고선택</label>
+									<div class="col-xs-4 itp_ip">
+									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID" class="form-control itp_input" name="targetWhsId"></select>
+									</div>
+									<label class="col-xs-2 itp_lb">Location</label>
+									<div class="col-xs-4 itp_ip">
+									<select id="ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION" class="form-control itp_input" name="targetLocation"></select>
+									</div>
+								</div>
+								<div class="form-group colspan">
+									<label class="col-xs-2 itp_lb">이동수량</label>
+									<div class="col-xs-4 itp_ip">
+									<input type="text" id="ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY" class="form-control itp_input" name="moveQty" />
+									</div>									
+								</div>								
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" id="ITP_BTN_PO_STOCK_PROC_CLOSE_POP" class="btn btn-danger btn-sm CLB">&nbsp;&nbsp;취소&nbsp;&nbsp;</button>
+				<button type="button" id="ITP_BTN_PO_STOCK_PROC_SAVE_POP" class="btn btn-primary btn-sm SAB" style="display: inline-block;">&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
+			</div>
+		</div>
+	</div>
+
+	<div id="ITP_POPUP_JS"></div>
+</div>

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

@@ -0,0 +1,128 @@
+require(['config'], function() {
+	require([
+		'jquery'
+	], function($) {
+
+	});
+});
+
+let STOCK_MNG_INFO_STOCK = '/api/stock/mng/info-stock'; // 재고정보
+let STOCK_MNG_PROC_STOCK = '/api/stock/mng/proc-stock'; // 재고처리
+let WHS_MNG_DETAIL_GRID_LIST = '/api/whs/mng/detail-grid-list';
+let WHS_MNG_LOCATION_GRID_LIST = '/api/whs/mng/location-grid-list';
+
+var popPageObj = {
+	init: function () {
+		this.button();
+		this.change();
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		//재고정보 조회
+		this.fnStockInfo();
+	},
+	brandInfo: {},
+	parentPopFn: null,
+	args: null,
+	returnType: null,
+	button: function() {
+		$('#ITP_BTN_PO_STOCK_PROC_CLOSE_POP').on('click', function () {
+			$('#ITP_BIZPOP_PO_STOCK_PROC').modal('hide'); // 팝업닫기
+		});
+		$('#ITP_BTN_PO_STOCK_PROC_SAVE_POP').on('click', function () {
+			popPageObj.fnStockProc();
+		});
+	}, 
+	change: function() {
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').on('change', function () {
+			popPageObj.fnLocationList();
+		});
+	}, 	
+	fnStockInfo: function() {
+		var param = $.param(this.args);
+		fn_ajax_call(STOCK_MNG_INFO_STOCK, param, this.fnStockInfoCallback, 'GET');
+	}, 
+	fnStockInfoCallback: function(result) {
+		// alert(JSON.stringify(result))
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val(result.brandId);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID').val(result.whsId);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION').val(result.location);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP_ITEM_ID').val(result.itemId);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnWhsNm').text(result.whsNm);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnLocationNm').text(result.locationNm);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnItemId').text(result.itemId);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnItemNm').text(result.itemNm);
+		$('#ITP_FORM_PO_STOCK_PROC_POPUP .fnStckQty').text(result.stckQty);
+		
+		// 창고 및 로케이션 리스트
+		popPageObj.fnWhsList(function() {
+			popPageObj.fnLocationList();
+		});
+	}, 
+	fnStockProc: function() {
+		const formId = '#ITP_FORM_PO_STOCK_PROC_POPUP';
+		itp_fn_form_clear_validate(null, formId);
+		
+		var vali_moveQty = itp_fn_form_validate(formId, formId + '_MOVE_QTY', ['empty','number'], undefined);
+		
+		if (vali_moveQty) {			
+			// 창고 & 로케이션 비교
+			if($('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_WHS_ID').val() == $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').val() 
+			&& $('#ITP_FORM_PO_STOCK_PROC_POPUP_SOURCE_LOCATION').val() == $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION').val()) {
+				itp_fn_modal_alert_ajax('동일한 로케이션으로 재고처리를 할 수 없습니다.');
+				return;
+			}
+			var stckQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP .fnStckQty').text());
+			var moveQty = parseInt($('#ITP_FORM_PO_STOCK_PROC_POPUP_MOVE_QTY').val());
+			if(moveQty > stckQty) {
+				itp_fn_modal_alert_ajax('이동수량은 현재고수량 이하로 입력하세요.');
+				return;
+			}
+			
+			let param = $(formId).serializeObject();
+			// param.gridInsertData = gridInsertData;
+			// console.log(JSON.stringify(param));
+			var callbackFn = function() {
+				popPageObj.parentPopFn();
+				$('#ITP_BIZPOP_PO_STOCK_PROC').modal('hide'); // 팝업닫기
+			};
+			fn_ajax_call(STOCK_MNG_PROC_STOCK, JSON.stringify(param), callbackFn, 'POST');
+		}
+	}, 
+	fnWhsList: function(fnCall) {
+		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
+		const param = {sbrandId: brandIdVal, pagingYn: false};
+		
+		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
+			
+			fn_make_select_whs(result.gridRows, 'ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID');
+			
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
+					
+		}, 'POST');
+	}, 
+	fnLocationList: function(fnCall) {
+		const brandIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_BRAND_ID').val();	
+		const whsIdVal = $('#ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_WHS_ID').val();	
+		const param = {brandId: brandIdVal, whsId: whsIdVal, pagingYn: false};
+		
+		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
+			
+			fn_make_select_location(result.gridRows, 'ITP_FORM_PO_STOCK_PROC_POPUP_TARGET_LOCATION');
+			
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
+					
+		}, 'POST');
+	}
+};
+
+function itp_fn_BIZPOP_PO_STOCK_PROC(parentPopFn, args, returnType) {
+	$('#ITP_BIZPOP_PO_STOCK_PROC').one('shown.bs.modal', function(e) {
+		itp_fn_fire_window_resize();
+	}).one('hidden.bs.modal', function(e) {
+		$('#ITP_BIZPOP_PO_STOCK_PROC').remove();
+	}).modal('show');
+
+	popPageObj.parentPopFn = parentPopFn;
+	popPageObj.args = args;
+	popPageObj.returnType = returnType;
+	popPageObj.init();
+}

src/main/webapp/js/app/stockmng/ITP_STOCKMNG01010.js

@@ -5,10 +5,6 @@
  * const gridColModel = {}	: 화면 Grid Object			*
  * let pageObj = {}			: 화면공통 Object			*
  * let listObj = {}			: 목록화면 Object			*
- * let viewObj = {}			: 상세화면 Object			*
- * let modifyObj = {}		: 수정화면 Object			*
- * let createObj = {}		: 신규화면 Object			*
- * let locInfoObj = {}		: 로케이션정보 Object				*
  *******************************************************/
 
 /*화면 변수*/
@@ -37,21 +33,21 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},
 		{
-			index: 'STORE_ID', name: 'storeId',
-			label: "매장ID", 
+			index: 'LOCATION', name: 'location',
+			label: "로케이션", 
 			width: '0', fixed: false, align: 'center',
 			sortable: false, hidden: true
 		},
 		{
 			index: 'BRAND_NM', name: 'brandNm',
 			label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-			width: '13', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
 			index: 'STORE_NM', name: 'storeNm',
 			label: "매장명", 
-			width: '13', fixed: false, align: 'center',
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
@@ -67,23 +63,53 @@ const gridColModel = {
 			sortable: false, hidden: false
 		},
 		{
-			index: 'WHS_ST_NM', name: 'whsStNm',
-			label: ITP_MSG_LOCALE.label.status, //상태
-			width: '6', fixed: false, align: 'center',
+			index: 'LOCATION_NM', name: 'locationNm',
+			label: "Location명", 
+			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'MGR_NM', name: 'mgrNm',
-			label: "담당자명", 
+			index: 'ITEM_ID', name: 'itemId',
+			label: "품목번호", 
+			width: '11', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: "품목명", 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: "단위", 
+			width: '7', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'STCK_QTY', name: 'stckQty',
+			label: "현재고수량", 
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
 		{
-			index: 'MGR_TEL_NO', name: 'mgrTelNo',
-			label: "연락처", 
+			index: 'PRP_STCK_QTY', name: 'prpStckQty',
+			label: "적정재고수량", 
 			width: '8', fixed: false, align: 'center',
 			sortable: false, hidden: false
-		}
+		},
+		{
+			index: 'SFT_STCK_RT', name: 'sftStckRt',
+			label: "안전재고비율(%)", 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'CUR_STCK_RT', name: 'curStckRt',
+			label: "현재고비율(%)", 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}		
 	]
 };
 
@@ -111,7 +137,7 @@ let pageObj = {
 			fn_proc_btn_auth('STOCKMNG01010');
 			
 			// 브랜드ID 지정
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			pageObj.fnWhsList(function() {
@@ -136,6 +162,7 @@ let pageObj = {
 	event: {
 		init: function () {
 			this.button();
+			this.change();
 		},
 		button: function () {
 			// 버튼 클릭 이벤트
@@ -144,8 +171,8 @@ let pageObj = {
 				$(this).on('click', function() {
 					switch (id) {
 						case 'ITP_BTN_STOCKMNG01010_SRH'		: listObj.button.search();		break;	// 조회 버튼
-						case 'ITP_BTN_STOCKMNG01010_ADDROW'		: locInfoObj.button.addRow();	break;	// 재고처리 버튼
-						case 'ITP_BTN_STOCKMNG01010_DELROW'		: locInfoObj.button.delRow();	break;	// 재고이력 버튼
+						case 'ITP_BTN_STOCKMNG01010_ADDROW'		: listObj.button.clickStockProc();	break;	// 재고처리 버튼
+						case 'ITP_BTN_STOCKMNG01010_DELROW'		: listObj.button.clickStockHist();	break;	// 재고이력 버튼
 					}
 				});
 			});
@@ -153,7 +180,18 @@ let pageObj = {
 			$('body').on('click', function(e) {
 				
 			});
-
+		}, 
+		change: function () {
+			// 창고 변경
+			$('#ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID').on('change', function() {
+				pageObj.fnLocationList(function() {
+					listObj.button.search(); // 조회	
+				}); // 로케이션 리스트
+			});
+			$('#ITP_FORM_STOCKMNG01010_SEARCH_LOCATION').on('change', function() {
+				listObj.button.search(); // 조회
+			});
+			
 		}
 	},
 	switchScreen: function(mode) {
@@ -203,12 +241,31 @@ let listObj = {
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.gridPage = $.jgrid.defaults.page;
 			$(STOCKMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
-		},
-		create: function() {
-			pageObj.switchScreen('ADD');			
-			itp_fn_form_clear_validate(null, '#ITP_FORM_STOCKMNG01010_DETAIL');						
-			// 로케이션 리스트 조회
-			createObj.init();
+		}, 
+		clickStockProc: function() {
+			// 그리드에서 최소1개는 선택해야 함
+			const rowKey = $(STOCKMNG01010_GRID_ID).getGridParam('selrow');
+		    if (!rowKey) {
+				itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.ajax.noData);
+		    	return;
+		    }
+			var selectedIds = $(STOCKMNG01010_GRID_ID).getGridParam('selarrrow');
+			if (selectedIds.length > 1) {
+				itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.ajax.noSingleData);
+		    	return;
+			}
+			var brandId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).brandId;
+			var whsId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).whsId;
+			var location = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).location;
+			var itemId = $(STOCKMNG01010_GRID_ID).jqGrid('getRowData', selectedIds[0]).itemId;
+			
+			var args = {'brandId': brandId, 'whsId': whsId, 'location': location, 'itemId': itemId};			
+			fn_call_popup('biz', 'BIZPOP_PO_STOCK_PROC', '#ITP_ASIDE', function() {
+				listObj.button.search(); // 조회
+			}, args, 'S');
+		}, 
+		clickStockHist: function() {
+			
 		}
 	},
 	empty: {
@@ -250,7 +307,7 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			let param = $('#ITP_FORM_STOCKMNG01010_SEARCH').serializeObject();
@@ -262,16 +319,12 @@ let listObj = {
 				param: JSON.stringify(param),
 				url: DOMAIN + STOCK_MNG_DETAIL_GRID_LIST,
 				pager: STOCKMNG01010_GRID_PAGER,
+				multiselect: true,
 				onCellSelect: function(rowId, cellIdx, cellValue) {
 					var cm = $(this).jqGrid('getGridParam', 'colModel');
 					var colNm = cm[cellIdx].name;
 					if (colNm == 'whsNm') {
-						const brandIdVal = $(this).jqGrid('getCell', rowId, 'brandId');
-						const whsIdVal = $(this).jqGrid('getCell', rowId, 'whsId');
 						
-						const key = {brandId: brandIdVal, whsId: whsIdVal, viewCd: 'R'};
-						var param = $.param(key);
-						viewObj.init(param);
 					}
 				},
 				loadComplete: function(data) {
@@ -279,7 +332,7 @@ let listObj = {
 					itp_fn_grid_load_complete(data, STOCKMNG01010_GRID_ID, true, 'number', 'STOCKMNG01010', listObj.itp_STOCKMNG01010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(STOCKMNG01010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
-						$(STOCKMNG01010_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', ITP_GRID_COL_STYLE.link);
+						// $(STOCKMNG01010_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', ITP_GRID_COL_STYLE.link);
 					});
 				},
 				onPaging: function(action) {

src/main/webapp/js/app/stockmng/ITP_STOCKMNG04010.js

@@ -274,7 +274,7 @@ let pageObj = {
 			$('#ITP_AJAX_STOCKMNG04010_DETAIL_CONTAINER').show();
 			$('#ITP_AJAX_STOCKMNG04010_VIEW_CONTAINER').hide();
 						
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val('C');
 			$('#ITP_FORM_STOCKMNG04010_DETAIL_BRAND_ID').val(data.brandId);
 			$('#ITP_FORM_STOCKMNG04010_DETAIL .fnBrandNm').text(data.brandNm);
@@ -385,7 +385,7 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG04010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			let param = $('#ITP_FORM_STOCKMNG04010_SEARCH').serializeObject();