재고실사

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

@@ -1,16 +1,10 @@
 <div id="ITP_BIZPOP_PO_STOCK_ITEM_ADD" class="modal itp_modal">
 	<div class="modal-dialog">
 		<div class="modal-content">		
-			<form id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_VIEW_CD" name="viewCd" value="C">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_BRAND_CD" name="brandCd" value="">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_STORE_NO" name="storeNo" value="">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_EVENT_CD" name="eventNo" value="">
-			</form>
 			<form id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_CMPY_CD" name="scmpyCd" value="">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BRAND_CD" name="sbrandCd" value="">
-			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_STORE_NO" name="sstoreNo" value="">
+			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BRAND_ID" name="sbrandId" value="">
+			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_WHS_ID" name="swhsId" value="">
+			<input type="hidden" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_LOCATION" name="slocation" value="">
 			
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -21,16 +15,16 @@
 						<div class="col-xs-12 itp_form_inline">
 							<div class="form-horizontal fix">
 								<div class="col-xs-3 itp_ip itp_pr">
-									<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE" class="form-control itp_input" name="sprdtType"></select>
+									<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="sitemStCd"></select>
 								</div>
 								<div class="col-xs-3 itp_ip itp_pr">
-									<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_CLASS_CD" class="form-control itp_input" name="sclassCd"></select>									
+									<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_GUBUN" data-select-code="ITEM_GUBUN" class="form-control itp_input" name="sitemGubun"></select>																		
 								</div>
 								<div class="col-xs-3 itp_ip itp_pr">
-									<input type="text" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_NM" class="form-control itp_input" name="sprdtNm" placeholder="상품명" />								
+									<select id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_TYPE" data-select-code="ITEM_TYPE" class="form-control itp_input" name="sitemType"></select>																										
 								</div>
 								<div class="col-xs-3 itp_ip itp_noMar">
-									<input type="text" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BARCODE_NO" class="form-control itp_input" name="sbarcodeNo" placeholder="바코드" />
+									<input type="text" id="ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
 								</div>
 							</div>
 						</div>
@@ -38,7 +32,7 @@
 					<div class="itp_form fix">
 						<div class="pull-right itp_cicon">
 							<button type="button" class="btn btn-success btn-sm" id="ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SEARCH" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i> 조회</button>
-							<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SAVE"><i class="glyphicon glyphicon-ok"></i> 저장</button>
+							<button type="button" class="btn btn-primary btn-sm" id="ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SELECT"><i class="glyphicon glyphicon-ok"></i> 선택</button>
 						</div>
 					</div>
 					<div id="ITP_BIZPOP_PO_STOCK_ITEM_ADD_jqGrid_list" class="itp_tb_list" data-total-cnt="">

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

@@ -17,6 +17,7 @@
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STOCKMNG02010_SEARCH" class="form-horizontal">
 									<input type="hidden" id="ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
+									<input type="hidden" id="ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM" value="">
 									<input type="hidden" id="ITP_FORM_STOCKMNG02010_SEARCH_STORE_ID" name="sstoreId" value="">
 								
 									<div class="form-group">
@@ -59,6 +60,7 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STOCKMNG02010_DETAIL" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STOCKMNG02010_DETAIL_VIEW_CD" name="viewCd" value="C">
 									<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="">
 								
@@ -78,6 +80,9 @@
 											<div class="col-xs-3 itp_ip itp_noMar">
 												<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 itp_noMar">
+												<select id="ITP_FORM_STOCKMNG02010_DETAIL_CDD_DVSN" data-select-code="CDD_DVSN" class="form-control itp_input" name="cddDvsn"></select>										
+											</div>
 											<div class="col-xs-2 itp_ip">
 												<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>
@@ -102,48 +107,66 @@
 					</div>
 				</div>
 				<div id="ITP_AJAX_STOCKMNG02010_VIEW_CONTAINER">
-					<div class="itp_lg_form itp_type1 fix">
-						<div class="itp_srh_border fix">
-							<div class="col-xs-12">
-								<form id="ITP_FORM_STOCKMNG02010_VIEW_SEARCH" class="form-horizontal">
-									<div class="form-group">
-										<div class="col-xs-10">
-											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_VIEW_SERVICE_CDD_DT" class="form-control itp_input" name="serviceCddDt">
-													<option value="">실사기준일</option>											
-												</select>
-											</div>
-											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_VIEW_SERVICE_WHS_NM" class="form-control itp_input" name="servicewhsNm">
-													<option value="">창고</option>											
-												</select>	
-											</div>
-											<div class="col-xs-3 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG02010_VIEW_SEARCH_STCK_DVSN" class="form-control itp_input" name="sStckDvsn">
-												<option value="">판매용/B품/폐기품</option>											
-												</select>										
-											</div>
-											<div class="col-xs-2 itp_ip">
-												<button type="button" id="ITP_BTN_STOCKMNG02010_VIEW_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i>&nbsp;&nbsp;엑셀업로드&nbsp;&nbsp;</button>
-											</div>
-										</div>
-									</div>
-								</form>
-							</div>
-						</div>
-					</div>
-					<div class="fix" style="padding-right:10px;">
-						<div class="pull-right itp_cicon">
-							<button type="button" id="ITP_BTN_STOCKMNG02010_VIEW_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;품목추가&nbsp;&nbsp;</button>
-						</div>
-					</div>
-					<div class="itp_table fix">
-						<div id="ITP_STOCKMNG02010_VIEW_jqGrid_list" class="itp_tb_list itp_gType1" data-total-cnt="${totalCnt}">
-							<div id="ITP_STOCKMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
-							<table id="ITP_STOCKMNG02010_VIEW_jqGrid"></table>
-							<div id="ITP_STOCKMNG02010_VIEW_jqGridPager"></div>
-							<div id="ITP_STOCKMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>
-						</div>
+					<div class="itp_form itp_type1 fix">
+				        <div class="col-xs-12">
+				            <form id="ITP_FORM_STOCKMNG02010_VIEW" class="form-horizontal">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_VIEW_CD" name="viewCd" value="R">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG02010_VIEW_CDD_ID" name="cddId" value="">
+				    
+				                <section class="itp_form_sec">
+				                    <h4 class="itp_form_tit">재고실사 정보</h4>
+				                    <div class="itp_form_in">
+				                        <div class="form-group">
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
+				                                <div class="col-xs-4 itp_ip">
+				                                    <div class="col-xs-9 itp_in fnBrandNm"></div>												
+				                                </div>
+				                            <label class="col-xs-2 itp_lb">실사담당자</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnCddMgrNm"></div>
+				                            </div>
+				                        </div>
+				                        <div class="form-group">
+				                            <label class="col-xs-2 itp_lb">창고코드 </label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnWhsId"></div>
+				                            </div>
+				                            <label class="col-xs-2 itp_lb">창고명</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnWhsNm"></div>
+				                            </div>
+				                        </div>
+				                        <div class="form-group">
+				                            <label class="col-xs-2 itp_lb">Location</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnLocation"></div>
+				                            </div>
+				                            <label class="col-xs-2 itp_lb">매장명</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnStoreNm"></div>
+				                            </div>
+				                        </div>				                        
+				                    </div>
+			                        <div class="itp_form_in">	
+			                            <div class="form-group">
+			                                <label class="col-xs-2 itp_lb">실사일시</label>
+			                                <div class="col-xs-10 itp_ip fnCddDtm"></div>
+			                            </div>	
+			                        </div>	
+				                </section>								
+				            </form>
+				        </div>
+				    </div>
+				    <div class="itp_table fix">
+					    <div class="itp_table_head fix" style="background:#f5f5f5;">
+					        <h4 class="itp_table_tit">실사 품목 정보</h4>
+					    </div>
+					    <div id="ITP_STOCKMNG02010_VIEW_jqGrid_list" class="itp_tb_list">
+					        <div id="ITP_STOCKMNG02010_VIEW_jqGridView" class="itp_views fix"></div>
+					        <table id="ITP_STOCKMNG02010_VIEW_jqGrid"></table>
+					        <div id="ITP_STOCKMNG02010_VIEW_jqGridPager"></div>
+					        <div id="ITP_STOCKMNG02010_VIEW_jqGridEmpty" class="itp_no_data"></div>
+					    </div>
 					</div>
 				</div>
 			</div>

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

@@ -6,30 +6,20 @@ require(['config'], function() {
 	});
 });
 
-let PO_STOCK_ITEM_ADD_POP_GRID_LIST = '/api/nk/product/grid-list';
-let NK_LIST_CLASS = '/api/nk/class/list-class'; // 카테고리리스트
-let NK_SAVE_EVENT_PRODUCT = '/api/nk/event/save-event-product'; // 이벤트 상품정보 저장
+let STOCK_MNG_DETAIL_GRID_LIST = '/api/stock/mng/detail-grid-list';
 
 function itp_fn_BIZPOP_PO_STOCK_ITEM_ADD(parentPopFn, schParam, returnType) {
 	
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_BRAND_CD').val(schParam.brandCd);
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_STORE_NO').val(schParam.storeNo);
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE_EVENT_CD').val(schParam.eventNo);
-	
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_CMPY_CD').val(schParam.cmpyCd);
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BRAND_CD').val(schParam.brandCd);
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_STORE_NO').val(schParam.storeNo);
+	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BRAND_ID').val(schParam.brandId);
+	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_WHS_ID').val(schParam.whsId);
+	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_LOCATION').val(schParam.location);
 	
 	// 공통코드 표시
-	if(schParam.manageType == 'B') {
-		$('<option/>', {'value': 'B', 'text': '본사상품'}).appendTo($('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE'));	
-	} else if(schParam.manageType == 'S') {
-		$('<option/>', {'value': 'S', 'text': '매장상품'}).appendTo($('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE'));
-		$('<option/>', {'value': 'B', 'text': '본사상품'}).appendTo($('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE'));
-	}
-	
-	// 카테고리리스트
-	itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_class_list();
+    $('select').each(function() {
+        if($(this).data('select-code')) {
+            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+        }
+    });
 	
 	let itp_BIZPOP_PO_STOCK_ITEM_ADD_param = {};
 	let itp_BIZPOP_PO_STOCK_ITEM_ADD_search = false;
@@ -44,42 +34,25 @@ function itp_fn_BIZPOP_PO_STOCK_ITEM_ADD(parentPopFn, schParam, returnType) {
 	}).one('hidden.bs.modal', function(e) {
 		$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD').remove();
 	}).modal('show');
-	
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE').on('change', function() {
-		// 카테고리리스트
-		itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_class_list(function() {
-			itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_search(THIS_FORM_ID, THIS_GIRD_ID);	
-		});	
-	});
-	
-	$('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_CLASS_CD').on('change', function() {
-		itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_search(THIS_FORM_ID, THIS_GIRD_ID);	
-	});
 
 	$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SEARCH').on('click', function() {
 		itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_search(THIS_FORM_ID, THIS_GIRD_ID);
 	});
 	
-	$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SAVE').on('click', function() {		
+	$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD_BTN_SELECT').on('click', function() {		
 		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
 	    if (!rowKey) {
 	    	return;
 	    }
 
-		var gridInsertData = [];
+		var list = [];
 	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
 		
 	    for (var i=selectedIds.length-1; i>=0; i--) {
-			gridInsertData.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
+			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
 		}
-		
-		let param = $('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_SAVE').serializeObject();
-		param.gridInsertData = gridInsertData;
-		
-		fn_ajax_call(NK_SAVE_EVENT_PRODUCT, JSON.stringify(param), function() {			
-			parentPopFn();
-			$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD').modal('hide'); // 팝업닫기			
-		}, 'POST');
+		parentPopFn(list);
+		$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD').modal('hide'); // 팝업닫기		
 	});
 
 	$('#ITP_BIZPOP_PO_STOCK_ITEM_ADD_jqGridEmpty').on('click', function() {
@@ -94,10 +67,10 @@ function itp_fn_BIZPOP_PO_STOCK_ITEM_ADD(parentPopFn, schParam, returnType) {
 			itp_BIZPOP_PO_STOCK_ITEM_ADD_param = param;
 		},
 		back: function() {
-			$(THIS_FORM_ID + '_PRDT_TYPE').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sprdtType);
-			$(THIS_FORM_ID + '_CLASS_CD').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sclassCd);
-			$(THIS_FORM_ID + '_PRDT_NM').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sprdtNm);
-			$(THIS_FORM_ID + '_BARCODE_NO').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sbarcodeNo);
+			$(THIS_FORM_ID + '_ITEM_ST_CD').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sitemStCd);
+			$(THIS_FORM_ID + '_ITEM_GUBUN').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sitemGubun);
+			$(THIS_FORM_ID + '_ITEM_TYPE').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sitemType);
+			$(THIS_FORM_ID + '_ITEM_NM').val(itp_BIZPOP_PO_STOCK_ITEM_ADD_param.sitemNm);
 		}
 	};
 
@@ -108,34 +81,33 @@ function itp_fn_BIZPOP_PO_STOCK_ITEM_ADD(parentPopFn, schParam, returnType) {
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
-				index: 'CLASS_NM', name: 'classNm',
-				label: '카테고리', 
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'PRDT_NO', name: 'prdtNo',
-				label: '상품번호', // 
-				width: '10', fixed: false, align: 'center',
+	            index: 'BRAND_ID', name: 'brandId',
+	            label: ITP_MSG_LOCALE.label.brandId, //브랜드ID
+	            width: '10', fixed: false, align: 'center',
+	            sortable: false, hidden: true
+	        },
+	        {
+	            index: 'ITEM_ID', name: 'itemId',
+	            label: ITP_MSG_LOCALE.label.itemId, //품목번호
+	            width: '10', 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',
+	            sortable: false, hidden: false
+	        },
+	        {
+				index: 'UNIT', name: 'unit',
+				label: "단위", 
+				width: '7', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'PRDT_NM', name: 'prdtNm',
-				label: '상품명', // 
-				width: '15', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'SALE_PRICE', name: 'salePrice',
-				label: '상품가격', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false, 
-				formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-			},
-			{
-				index: 'BARCODE_NO', name: 'barcodeNo',
-				label: '바코드', //
-				width: '10', fixed: false, align: 'center',
+				index: 'STCK_QTY', name: 'stckQty',
+				label: "현재고수량", 
+				width: '8', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			}
 		],
@@ -143,7 +115,7 @@ function itp_fn_BIZPOP_PO_STOCK_ITEM_ADD(parentPopFn, schParam, returnType) {
 		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
 		},
 		postData: JSON.stringify(param),
-		url: DOMAIN + PO_STOCK_ITEM_ADD_POP_GRID_LIST,
+		url: DOMAIN + STOCK_MNG_DETAIL_GRID_LIST,
 		pager: THIS_GIRD_PAGER,
 		multiselect: true,
 		loadComplete: function(data) {
@@ -167,22 +139,3 @@ var itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_search = function(FORM_ID, GRID_ID) {
 	param.gridPage = $.jgrid.defaults.page;
 	$(GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 };
-
-var itp_fn_BIZPOP_PO_STOCK_ITEM_ADD_class_list = function(fnCall) {
-	
-	const prdtType = $('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_PRDT_TYPE').val();
-	const brandCdVal = $('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_BRAND_CD').val();
-	let storeNoVal = $('#ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_STORE_NO').val();
-	// 본사상품	
-	if(prdtType == 'B') storeNoVal = '0000';
-	
-	const key = {brandCd: brandCdVal, storeNo: storeNoVal};
-	var param = $.param(key);
-	fn_ajax_call(NK_LIST_CLASS, param, function(result) {
-		
-		fn_make_select_class(result, 'ITP_FORM_BIZPOP_PO_STOCK_ITEM_ADD_CLASS_CD', true, '카테고리');
-		
-		if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
-		 	
-	}, 'GET');
-};

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

@@ -34,18 +34,23 @@ let STOCKMNG02010_DETAIL_GRID_LAST_ROW_ID;
 // let ITP_COMMON_CD_LOC_ST_CD = fn_make_common_cd_list(CODE_LIST, 'LOC_ST_CD', true);
 
 /*API URL*/
-let WHS_MNG_INFO_WHS = '/api/whs/mng/info-whs';
-let WHS_MNG_ADD_WHS = '/api/whs/mng/add-whs';
-let WHS_MNG_MIDIFY_WHS = '/api/whs/mng/modify-whs';
-let WHS_MNG_REMOVE_WHS = '/api/whs/mng/remove-whs'; 
+let STOCK_CDD_INFO_CDD = '/api/stock/cdd/info-cdd';
+let STOCK_CDD_SAVE_STOCK_CDD = '/api/stock/cdd/save-stock-cdd'; // 재고실사 저장
 
 let STOCK_CDD_DETAIL_GRID_LIST = '/api/stock/cdd/detail-grid-list';
+let STOCK_CDD_CDD_DETAIL_GRID_LIST = '/api/stock/cdd/cdd-detail-grid-list';
 let WHS_MNG_DETAIL_GRID_LIST = '/api/whs/mng/detail-grid-list';
 let WHS_MNG_LOCATION_GRID_LIST = '/api/whs/mng/location-grid-list';
 
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
+		{
+			index: 'CDD_ID', name: 'cddId',
+			label: "실사번호", 
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
 		{
 			index: 'BRAND_ID', name: 'brandId',
 			label: "브랜드ID", 
@@ -119,32 +124,69 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.viewCd,
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: true
-		},		
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: "브랜드",
+			width: '10', fixed: false, align: 'center',
+			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: 'LOCATION', name: 'location',
-			label: "로케이션",
+			index: 'WHS_NM', name: 'whsNm',
+			label: "창고명",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text',
-			editrules: {required: true}
+			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: true, editable: false, edittype: 'text',
-			editrules: {required: true}
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
 		},
 		{
-			index: 'STCK_DVSN_NM', name: 'stckDvsnNm',
-			label: "관리등록",
+			index: 'ITEM_NM', name: 'itemNm',
+			label: "품목명",
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
+			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: 'COM_EXST_QTY', name: 'comExstQty',
+			label: "현재고수량",
+			width: '8', fixed: false, align: 'center',
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
 		},
 		{
-			index: 'LOC_ST_NM', name: 'locStNm',
-			label: "상태",
+			index: 'CDD_QTY', name: 'cddQty',
+			label: "실사수량",
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text'
+			sortable: false, editable: false, edittype: 'text',
+			editrules: {required: false}
 		}
 	],
 	detail: [
@@ -215,7 +257,7 @@ const gridColModel = {
 			label: "실사수량",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: true, edittype: 'text',
-			editrules: {required: true}
+			editrules: {required: false}
 		}
 	]
 };
@@ -246,13 +288,18 @@ let pageObj = {
 			// 브랜드ID 지정
 			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val(data.brandId);
+			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM').val(data.brandNm); 
 			
 			pageObj.fnWhsList(function() {
 				pageObj.fnLocationList();
 			}); // 창고리스트
 			
 			// 공통코드 표시
-			// fn_make_select(CODE_LIST, 'WHS_DVSN', 'ITP_FORM_STOCKMNG02010_WHS_DVSN');			
+			$('select').each(function() {
+		        if($(this).data('select-code')) {
+		            fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+		        }
+		    });			
 
 			// 조회일자 지정
 			var now = new Date();
@@ -463,11 +510,10 @@ let listObj = {
 				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');
+					if (colNm == 'cddDt') {
+						const cddIdVal = $(this).jqGrid('getCell', rowId, 'cddId');
 						
-						const key = {brandId: brandIdVal, whsId: whsIdVal, viewCd: 'R'};
+						const key = {cddId: cddIdVal, viewCd: 'R'};
 						var param = $.param(key);
 						viewObj.init(param);
 					}
@@ -477,7 +523,7 @@ let listObj = {
 					itp_fn_grid_load_complete(data, STOCKMNG02010_GRID_ID, true, 'number', 'STOCKMNG02010', listObj.itp_STOCKMNG02010_search, listObj.empty, true, data.gridRecords, true);
 					var ids = $(STOCKMNG02010_GRID_ID).getDataIDs();
 					$.each(ids, function(idx, rowId) {
-						$(STOCKMNG02010_GRID_ID).jqGrid('setCell', rowId, 'whsNm', '', ITP_GRID_COL_STYLE.link);
+						$(STOCKMNG02010_GRID_ID).jqGrid('setCell', rowId, 'cddDt', '', ITP_GRID_COL_STYLE.link);
 					});
 				},
 				onPaging: function(action) {
@@ -504,26 +550,20 @@ let viewObj = {
 		this.load(param);
 	},
 	load: function(param) {
-		fn_ajax_call(WHS_MNG_INFO_WHS, param, this.callback, 'GET');
+		fn_ajax_call(STOCK_CDD_INFO_CDD, param, this.callback, 'GET');
 	},
 	callback: function (result) {
 		// console.log(result);
 		pageObj.switchScreen('VIEW');
-		$('#ITP_FORM_STOCKMNG02010_VIEW #ITP_FORM_STOCKMNG02010_VIEW_BRAND_ID').val(result.brandId);
-		$('#ITP_FORM_STOCKMNG02010_VIEW #ITP_FORM_STOCKMNG02010_VIEW_STORE_ID').val(result.storeId);
-		$('#ITP_FORM_STOCKMNG02010_VIEW #ITP_FORM_STOCKMNG02010_VIEW_WHS_ID').val(result.whsId);
+		$('#ITP_FORM_STOCKMNG02010_VIEW #ITP_FORM_STOCKMNG02010_VIEW_CDD_ID').val(result.cddId);
 		
 		$('#ITP_FORM_STOCKMNG02010_VIEW .fnBrandNm').text(result.brandNm);
-		$('#ITP_FORM_STOCKMNG02010_VIEW .fnStCd').text(result.whsStNm);
+		$('#ITP_FORM_STOCKMNG02010_VIEW .fnCddMgrNm').text(result.cddMgrNm);
 		$('#ITP_FORM_STOCKMNG02010_VIEW .fnWhsId').text(result.whsId);
 		$('#ITP_FORM_STOCKMNG02010_VIEW .fnWhsNm').text(result.whsNm);
-		$('#ITP_FORM_STOCKMNG02010_VIEW .fnTelNo').text(result.mgrTelNo);
-		$('#ITP_FORM_STOCKMNG02010_VIEW .fnMgrNm').text(result.mgrNm);		
-		$('#ITP_FORM_STOCKMNG02010_VIEW .fnSpplyNm').text(result.storeNm ? result.storeNm : '');		
-		$('#ITP_FORM_STOCKMNG02010_VIEW .fnRegDtm').text(result.sysRegDttm);
-		if(result.zipNo) {
-			$('#ITP_FORM_STOCKMNG02010_VIEW .fnAddress').text('('+result.zipNo+') ' + result.addr1 + ' ' + result.addr2);	
-		}		
+		$('#ITP_FORM_STOCKMNG02010_VIEW .fnLocation').text(result.locationNm);
+		$('#ITP_FORM_STOCKMNG02010_VIEW .fnStoreNm').text(result.storeNm == null ? '' : result.storeNm);
+		$('#ITP_FORM_STOCKMNG02010_VIEW .fnCddDtm').text(result.cddDt + ' ' + (result.cddTm == null ? '' : result.cddTm));
 
 		// 권한정보 리스트 조회
 		viewObj.grid.init();
@@ -536,13 +576,13 @@ let viewObj = {
 		load : function() {
 			let param = $('#ITP_FORM_STOCKMNG02010_VIEW').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
-			param.pagingYn = false; // 페이징안함
+			param.pagingYn = true; 
 
 			var option = {
 				gridId: STOCKMNG02010_VIEW_GRID_ID,
 				colModel: gridColModel.view,
 				param: JSON.stringify(param),
-				url: DOMAIN + WHS_MNG_LOCATION_GRID_LIST,
+				url: DOMAIN + STOCK_CDD_CDD_DETAIL_GRID_LIST,
 				pager: STOCKMNG02010_VIEW_GRID_PAGER,
 				loadComplete: function(data) {
 					itp_fn_grid_load_complete(data, STOCKMNG02010_VIEW_GRID_ID, true, undefined, 'STOCKMNG02010_VIEW');
@@ -600,46 +640,86 @@ let stockCddObj = {
 		},
 		addRow: function() {
 			var brandId = $('#ITP_FORM_STOCKMNG02010_DETAIL_BRAND_ID').val();
+			var whsId = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val();
+			var location = $('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION').val();
+			
+			var args = {'brandId': brandId, 'whsId': whsId, 'location': location};
+			fn_call_popup('biz', 'BIZPOP_PO_STOCK_ITEM_ADD', '#ITP_ASIDE', stockCddObj.button.addRowCallback, args, 'S');
+		}, 
+		addRowCallback: function(rowDataPop) {
+			var brandId = $('#ITP_FORM_STOCKMNG02010_DETAIL_BRAND_ID').val();
+			var brandNm = $('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM').val();
+			var whsId = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val();
+			var whsNm = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID option:selected').text();
+			var location = $('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION').val();
+			var locationNm = $('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION option:selected').text();
+			
 			
-			var args = {'brandId': brandId};
-			fn_call_popup('biz', 'BIZPOP_PO_STOCK_ITEM_ADD', '#ITP_ASIDE', null, args, 'S');
+			// 기존등록 데이터 체크
+			var exists = '';
+			const rowData = $(STOCKMNG02010_DETAIL_GRID_ID).getRowData();
+			$.each(rowData, function(key, value) {
+				exists = exists + value.itemId + ';';
+			});
+
+			$.each(rowDataPop, function(key, value) {
+				if(exists.indexOf(value.itemId) < 0) {
+					// 행추가
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
+					var rids = $(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('getDataIDs');
+					var last_row_id = rids[rids.length - 1];
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');					
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'brandId', brandId);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'brandNm', brandNm);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'whsId', whsId);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'whsNm', whsNm);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'location', location);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'locationNm', locationNm);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'itemId', value.itemId);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'itemNm', value.itemNm);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'unit', value.unit);
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stckQty', value.stckQty);
+				}
+			});
+			$(STOCKMNG02010_DETAIL_GRID_EMPTY).hide();
 		}, 
 		save: function() {
-			var detailViewCd = $('#ITP_FORM_STOCKMNG02010_DETAIL_VIEW_CD').val();
 			const formId = '#ITP_FORM_STOCKMNG02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			
-			var vali_whsStatCd = itp_fn_form_validate(formId, formId + '_WHS_ST_CD', ['empty'], undefined); // 상태
-			var vali_whsNm = itp_fn_form_validate(formId, formId + '_WHS_NM', ['empty'], undefined);
+			var vali_cddDt = itp_fn_form_validate(formId, formId + '_CDD_DT', ['empty'], undefined); 
+			var vali_cddDvsn = itp_fn_form_validate(formId, formId + '_CDD_DVSN', ['empty'], undefined);
 			
-			if (vali_whsStatCd && vali_whsNm) {
+			if (vali_cddDt && vali_cddDvsn) {
 				let gridInsertData = [];
-				let gridUpdateData = [];
-				let gridDeleteData = [];
 				const rowData = $(STOCKMNG02010_DETAIL_GRID_ID).getRowData();
-				// const keyValue = $(formId + '_WHS_ID').val();
+				
+				if(rowData.length < 1) {
+					itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.grid.noData);
+					return;
+				}	
+				var dataCheck = true;			
 				$.each(rowData, function(key, value) {
-					if (value.viewCd != 'R') {
-						// value.whsId = keyValue;
-						if (value.viewCd == 'C') {
-							gridInsertData.push(value);
-						} else if (value.viewCd == 'U') {
-							gridUpdateData.push(value);
-						} else if (value.viewCd == 'D') {
-							gridDeleteData.push(value);
-						}
-					}
+					if (value.cddQty == '' || isNaN(value.cddQty)) {
+						dataCheck = false;
+					}					
+					gridInsertData.push(value);
 				});
+				// 데이터 체크
+				if(!dataCheck) {
+					itp_fn_modal_alert_ajax('실사수량을 입력하세요.');
+					return;
+				}				
 				let param = $(formId).serializeObject();
+				param.whsId = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val();
+				param.location = $('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION').val();
 				param.gridInsertData = gridInsertData;
-				param.gridUpdateData = gridUpdateData;
-				param.gridDeleteData = gridDeleteData;
 				//console.log(JSON.stringify(param));
 				var searhFn = function() {
 					ITP_FORM_STOCKMNG02010_DETAIL_IS_WRITING = false;
 					listObj.grid.search();
 				};
-				fn_ajax_call(detailViewCd == 'C' ? WHS_MNG_ADD_WHS : WHS_MNG_MIDIFY_WHS, JSON.stringify(param), searhFn, 'POST');
+				fn_ajax_call(STOCK_CDD_SAVE_STOCK_CDD, JSON.stringify(param), searhFn, 'POST');
 			}
 		}
 	},
@@ -655,6 +735,9 @@ let stockCddObj = {
 			url: DOMAIN + WHS_MNG_LOCATION_GRID_LIST,
 			pager: STOCKMNG02010_DETAIL_GRID_PAGER,
 			multiselect: true,
+			onCellSelect: function(rowId, cellIdx, cellValue) {
+				STOCKMNG02010_DETAIL_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, STOCKMNG02010_DETAIL_GRID_LAST_ROW_ID, STOCKMNG02010_DETAIL_GRID_ID);
+	   		},
 			loadComplete: function(data) {
 				itp_fn_grid_load_complete(data, STOCKMNG02010_DETAIL_GRID_ID, true, undefined, 'STOCKMNG02010_DETAIL');
 			},