재고 실사 개발중

src/main/webapp/app/stockmng/STOCKMNG02010.html

@@ -58,26 +58,28 @@
 					<div class="itp_lg_form itp_type1 fix">
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
-								<form id="ITP_FORM_STOCKMNG02010_DETAIL_SEARCH" class="form-horizontal">
+								<form id="ITP_FORM_STOCKMNG02010_DETAIL" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STOCKMNG02010_DETAIL_BRAND_ID" name="brandId" value="">
+									<input type="hidden" id="ITP_FORM_STOCKMNG02010_DETAIL_STORE_ID" name="storeId" value="">
+								
 									<div class="form-group">
 										<div class="col-xs-10">
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_DETAIL_SERVICE_CDD_DT" class="form-control itp_input" name="serviceCddDt">
-													<option value="">실사기준일</option>											
-												</select>
+												<div class="input-group date">
+												<input type="text" id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DT" class="form-control itp_input" name="cddDt" readonly>
+												<span class="input-group-addon itp_input itp_date_to">
+													<i class="glyphicon glyphicon-calendar"></i>
+												</span>
+												</div>												
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_DETAIL_SERVICE_WHS_NM" class="form-control itp_input" name="servicewhsNm">
-													<option value="">창고</option>											
-												</select>	
+												<select id="ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" disabled="disabled"></select>	
 											</div>
 											<div class="col-xs-3 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_STCK_DVSN" class="form-control itp_input" name="sStckDvsn">
-												<option value="">판매용/B품/폐기품</option>											
-												</select>										
+												<select id="ITP_FORM_STOCKMNG02010_DETAIL_LOCATION" class="form-control itp_input" name="location" disabled="disabled"></select>										
 											</div>
 											<div class="col-xs-2 itp_ip">
-												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;엑셀업로드&nbsp;&nbsp;</button>
+												<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_EXCEL_UPLOAD" class="btn btn-warning btn-sm FFB"><i class="glyphicon "></i>&nbsp;&nbsp;엑셀업로드&nbsp;&nbsp;</button>
 											</div>
 										</div>
 									</div>
@@ -85,7 +87,7 @@
 							</div>
 						</div>
 					</div>
-					<div class="fix" style="padding-right:10px;">
+					<div class="fix" style="padding-right:15px;margin-bottom: 13px;">
 						<div class="pull-right itp_cicon">
 							<button type="button" id="ITP_BTN_STOCKMNG02010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
 						</div>

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

@@ -7,7 +7,6 @@
  * let listObj = {}			: 목록화면 Object			*
  * let viewObj = {}			: 상세화면 Object			*
  * let stockCddObj = {}		: 재고실사 Object			*
- * let locInfoObj = {}		: 로케이션정보 Object				*
  *******************************************************/
 
 /*화면 변수*/
@@ -156,16 +155,65 @@ const gridColModel = {
 			sortable: false, hidden: true
 		},
 		{
-			index: 'LOCATION', name: 'location',
-			label: "로케이션",
+			index: 'BRAND_NM', name: 'brandNm',
+			label: "브랜드",
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: true, edittype: 'text',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'WHS_ID', name: 'whsId',
+			label: "창고번호",
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'WHS_NM', name: 'whsNm',
+			label: "창고명",
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
 			editrules: {required: false}
 		},
 		{
 			index: 'LOCATION_NM', name: 'locationNm',
-			label: "로케이션명",
+			label: "Location",
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: "품목번호",
 			width: '12', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: "품목명",
+			width: '10', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'UNIT', name: 'unit',
+			label: "단위",
+			width: '8', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'STCK_QTY', name: 'stckQty',
+			label: "현재고수량",
+			width: '8', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
+		},
+		{
+			index: 'CDD_QTY', name: 'cddQty',
+			label: "실사수량",
+			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, edittype: 'text',
 			editrules: {required: true}
 		}
@@ -184,7 +232,6 @@ let pageObj = {
 	init: function () {
 		this.ui.init();
 		this.event.init();
-		locInfoObj.init();
 	},
 	ui: {
 		init: function () {
@@ -206,15 +253,14 @@ let pageObj = {
 			
 			// 공통코드 표시
 			// fn_make_select(CODE_LIST, 'WHS_DVSN', 'ITP_FORM_STOCKMNG02010_WHS_DVSN');			
-			// fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG02010_WHS_ST_CD');
-			// fn_make_select(CODE_LIST, 'WHS_ST_CD', 'ITP_FORM_STOCKMNG02010_DETAIL_WHS_ST_CD', true, '선택');
 
 			// 조회일자 지정
 			var now = new Date();
-			$('#ITP_FORM_STOCKMNG02010_SEARCH .input-group.date').datepicker(ITP_DATE_LANGUAGE);
+			$('#ITP_TAB_STOCKMNG02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setMonth(now.getMonth() - 1)));
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_TO_DT').datepicker('setDate', new Date());
-					
+			$('#ITP_FORM_STOCKMNG02010_DETAIL_CDD_DT').val(itp_fn_date_format(new Date(), 2));
+								
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(STOCKMNG02010_GRID_ID, STOCKMNG02010_GRID_LIST, 'lg');
@@ -276,18 +322,18 @@ let pageObj = {
 			$('#ITP_BTN_STOCKMNG02010_SAVE').hide();
 			
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_SRH');
-			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_NEWREG');
+			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_STOCK_CDD');
 
 			$('#ITP_AJAX_STOCKMNG02010_LIST_CONTAINER').show();
 			$('#ITP_AJAX_STOCKMNG02010_DETAIL_CONTAINER').hide();
 			$('#ITP_AJAX_STOCKMNG02010_VIEW_CONTAINER').hide();
-		} else if(mode == 'ADD') { // 등록
+		} else if(mode == 'ADD') { // 재고실사
 			ITP_FORM_STOCKMNG02010_DETAIL_IS_DUPLICATE = true;
 
 			$('#ITP_BTN_STOCKMNG02010_SRH').hide();
 			$('#ITP_BTN_STOCKMNG02010_MODIFY').hide();
-			$('#ITP_BTN_STOCKMNG02010_NEWREG').hide();
-			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();
+			$('#ITP_BTN_STOCKMNG02010_STOCK_CDD').hide();
+			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();			
 			
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_CANCELLIST');
 			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_SAVE');
@@ -296,44 +342,14 @@ let pageObj = {
 			$('#ITP_AJAX_STOCKMNG02010_DETAIL_CONTAINER').show();
 			$('#ITP_AJAX_STOCKMNG02010_VIEW_CONTAINER').hide();
 						
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_VIEW_CD').val('C');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_BRAND_ID').val(data.brandId);
-			$('#ITP_FORM_STOCKMNG02010_DETAIL .fnBrandNm').text(data.brandNm);
-			$('#ITP_FORM_STOCKMNG02010_DETAIL .fnWhsId').text('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL .fnRegDtm').text('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_STORE_ID').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ST_CD').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_NM').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_MGR_TEL_NO').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_MGR_NM').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_STORE_NM').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_ZIPNO').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_LOAD_ADDR').val('');
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_DTL_ADDR').val('');
+			$('#ITP_FORM_STOCKMNG02010_DETAIL_BRAND_ID').val($('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val());
+			$('#ITP_FORM_STOCKMNG02010_DETAIL_STORE_ID').val($('#ITP_FORM_STOCKMNG02010_SEARCH_STORE_ID').val());
+			$('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val($('#ITP_FORM_STOCKMNG02010_SEARCH_WHS_ID').val());
+			$('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION').val($('#ITP_FORM_STOCKMNG02010_SEARCH_LOCATION').val());
 			
-		} else if(mode == 'MODIFY') { // 수정
-			$('#ITP_BTN_STOCKMNG02010_SRH').hide();
-			$('#ITP_BTN_STOCKMNG02010_MODIFY').hide();
-			$('#ITP_BTN_STOCKMNG02010_NEWREG').hide();
-			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();
-			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_CANCELLIST');
-			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_SAVE');
-			fn_show_btn_auth('#ITP_BTN_STOCKMNG02010_RESET_PW');
-
-			$('#ITP_AJAX_STOCKMNG02010_LIST_CONTAINER').hide();
-			$('#ITP_AJAX_STOCKMNG02010_DETAIL_CONTAINER').show();
-			$('#ITP_AJAX_STOCKMNG02010_VIEW_CONTAINER').hide();
-			// $('#ITP_FORM_STOCKMNG02010_DETAIL_USER_ID').attr('readonly', true);
-			// $('#ITP_FORM_STOCKMNG02010_DETAIL_DUP').attr('disabled', true);
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP_NM').attr('readonly', true);
-
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP').hide();
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_DELETE_AFFL_SHOP').hide();
 		} else if(mode == 'VIEW') { // 보기
 			$('#ITP_BTN_STOCKMNG02010_SRH').hide();
-			$('#ITP_BTN_STOCKMNG02010_NEWREG').hide();
+			$('#ITP_BTN_STOCKMNG02010_STOCK_CDD').hide();
 			$('#ITP_BTN_STOCKMNG02010_DELETE').hide();
 			$('#ITP_BTN_STOCKMNG02010_SAVE').hide();
 			
@@ -352,6 +368,7 @@ let pageObj = {
 		fn_ajax_call(WHS_MNG_DETAIL_GRID_LIST, JSON.stringify(param), function(result) {
 			
 			fn_make_select_whs(result.gridRows, 'ITP_FORM_STOCKMNG02010_SEARCH_WHS_ID');
+			fn_make_select_whs(result.gridRows, 'ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID');
 			
 			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
 					
@@ -365,6 +382,7 @@ let pageObj = {
 		fn_ajax_call(WHS_MNG_LOCATION_GRID_LIST, JSON.stringify(param), function(result) {
 			
 			fn_make_select_location(result.gridRows, 'ITP_FORM_STOCKMNG02010_SEARCH_LOCATION');
+			fn_make_select_location(result.gridRows, 'ITP_FORM_STOCKMNG02010_DETAIL_LOCATION');
 			
 			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
 					
@@ -674,83 +692,3 @@ let stockCddObj = {
 		$.jgrid.gridUnload(STOCKMNG02010_DETAIL_GRID_ID);
 	}
 };
-
-/*로케이션정보 Object*/
-let locInfoObj = {
-	init: function () {
-		if(AUTH_TYPE_CD === '10' || AUTH_TYPE_CD === '20') {
-			this.action();
-		} else {
-			this.make();
-		}
-	},
-	button: {
-		addRow: function() {
-			// $(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
-			// $(STOCKMNG02010_DETAIL_GRID_EMPTY).hide();
-			STOCKMNG02010_DETAIL_GRID_LAST_ROW_ID = itp_fn_add_grid_row(STOCKMNG02010_DETAIL_GRID_ID, undefined, ['location'],'STOCKMNG02010_DETAIL');
-		},
-		delRow: function() {
-			itp_fn_grid_del_row(STOCKMNG02010_DETAIL_GRID_ID);
-		}
-	},
-	make: function() {
-		$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP').hide();
-		$('#ITP_FORM_STOCKMNG02010_DELETE_AFFL_SHOP').hide();
-		if(AFFL_SHOP_LIST) {
-			$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP_ID').val(AFFL_SHOP_LIST[0].afflShopId);
-			$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP_NM').val(AFFL_SHOP_LIST[0].afflShopNm);
-		}
-		if(AFFL_BRAND_LIST) {
-			fn_make_select_brand(AFFL_BRAND_LIST, 'ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID');
-		}
-	},
-	action: function () {
-		var _this = this;
-		// 로케이션정보 조회 버튼 클릭
-		$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP').on('click', function() {
-			_this.popup('L');
-		});
-		// 로케이션정보 텍스트 삭제 버튼 클릭
-		$('#ITP_FORM_STOCKMNG02010_DELETE_AFFL_SHOP').on('click', function() {
-			$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP_NM').val('');
-			$('select#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID option').remove();
-		});
-		// 신규등록 로케이션정보 조회 버튼 클릭
-		$('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP').on('click', function() {
-			_this.popup('C');
-		});
-		// 신규등록 로케이션정보 텍스트 삭제 버튼 클릭
-		$('#ITP_FORM_STOCKMNG02010_DETAIL_DELETE_AFFL_SHOP').on('click', function() {
-			$('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP_NM').val('');
-			$('select#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_BRAND_ID option').remove();
-		});
-	},
-	popup: function (view) {
-		// 팝업
-		var popFn = (view === 'C') ? this.callback.create : this.callback.list;
-		fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
-	},
-	callback: {
-		list: function(rowDataPop) {
-			// console.log(rowDataPop);
-			if(rowDataPop.AFFL_SHOP) {
-				$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
-				$('#ITP_FORM_STOCKMNG02010_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
-			}
-			if(rowDataPop.AFFL_BRAND) {
-				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID', true, '선택');
-			}
-		},
-		create: function(rowDataPop) {
-			// console.log(rowDataPop);
-			if(rowDataPop.AFFL_SHOP) {
-				// $('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
-				// $('#ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
-			}
-			if(rowDataPop.AFFL_BRAND) {
-				fn_make_select_brand(rowDataPop.AFFL_BRAND, 'ITP_FORM_STOCKMNG02010_DETAIL_SEARCH_BRAND_ID', true, '선택');
-			}
-		}
-	}
-};