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

# Conflicts:
#	src/main/webapp/js/app/locales/locale-ko.js

bin/src/main/webapp/app/oper/OPER03010.html

@@ -56,6 +56,7 @@
 						<div class="col-xs-12">
 							<form id="ITP_FORM_OPER03010_DETAIL" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_VIEW_CD" name="viewCd" value="C">
+								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_ID" class="form-control itp_input" name="afflShopId">
 								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_CMPY_LOCATION" name="cmpyLocation" value="">
 					
 								<section class="itp_form_sec">
@@ -76,17 +77,15 @@
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">가맹점 명 *</label>
 											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-7 itp_in">
-													<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_NM" class="form-control itp_input" name="afflShopNm" value="" maxlength="10">
-												</div>
+												<div class="col-xs-7 itp_in fnAfflShopNm"></div>
 											</div>
 											<label class="col-xs-2 itp_lb">가맹점 KEY *<br>사용자 계정 추가-3자리</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-4 itp_in">
 													<div class="input-group">
-														<input type="text" id="ITP_FORM_OPER03010_DETAIL_" class="form-control itp_input" name="" value="" maxlength="10" readonly>
+														<input type="text" id="ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_KEY" class="form-control itp_input" name="" value="" maxlength="10" readonly>
 														<span class="input-group-btn">
-															<button id="ITP_FORM_OPER03010_DETAIL_" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
+															<button id="ITP_BTN_OPER03010_DETAIL_AFFL_SHOP_KEY" class="btn btn-default btn-sm itp_btn SHOW" type="button" disabled><i class="glyphicon glyphicon-ok"></i></button>
 														</span>
 													</div>
 												</div>
@@ -119,13 +118,13 @@
 											<label class="col-xs-2 itp_lb">가맹점 구분</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-7 itp_in">
-													<select id="ITP_FORM_OPER03010_DETAIL_" class="form-control itp_input" name=""></select>
+													<select id="ITP_FORM_OPER03010_DETAIL_AUTH_TYPE" class="form-control itp_input" name=""></select>
 												</div>
 												<!-- <button type="button" id="ITP_BTN_STINFO01010_RESET_PW" class="btn btn-danger btn-xs PWC" style="margin: 3px 0px 0px 3px;">비밀번호 초기화</button> -->
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >																					
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -260,8 +259,8 @@
 					<div class="itp_form itp_type1 fix">
 						<div class="col-xs-12">
 							<form id="ITP_FORM_OPER03010_VIEW" class="form-horizontal">
-								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_VIEW_CD" name="viewCd" value="C">
-								<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_CMPY_LOCATION" name="cmpyLocation" value="">
+								<input type="hidden" id="ITP_FORM_OPER03010_VIEW_VIEW_CD" name="viewCd" value="R">
+								<input type="hidden" id="ITP_FORM_OPER03010_VIEW_AFFL_SHOP_ID" name="afflShopId" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">가맹점정보</h4>
@@ -303,7 +302,7 @@
 											</div>
 											<label class="col-xs-2 itp_lb"></label>
 											<div class="col-xs-4 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_ "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >																					
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_STINFO01010_DETAIL_LOGO "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -371,30 +370,24 @@
 													<div class="col-xs-2 itp_in fnLoadAddr"></div>
 													<div class="col-xs-3 itp_in fnDtlAddr"></div>
 												</div>
-												
+
 												<!-- 주소 맵 -->
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_LOTS_ADDRESS" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_STREET_ADDRESS" value="" />
-												<input type="hidden" name="cmpyLat" id="ITP_FORM_OPER03010_DETAIL_LAT" value="" />
-												<input type="hidden" name="cmpyLng" id="ITP_FORM_OPER03010_DETAIL_LNG" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_HJ_DONG" value="" />
-												<input type="hidden" id="ITP_FORM_OPER03010_DETAIL_BJ_DONG" value="" />
-												<div id="ITP_FORM_OPER03010_DETAIL_MAP" style="width:700px; height:400px;"></div>
+												<div id="ITP_FORM_OPER03010_VIEW_MAP" style="width:700px; height:400px;"></div>
 											</div>
 										</div>
 									</div>
 								</section>								
 							</form>
 						</div>
-					</div>	
+					</div>
 					<div class="itp_table fix">
-						<div id="ITP_OPER03010_DETAIL_jqGrid_list" class="itp_tb_list">
-							<div id="ITP_OPER03010_DETAIL_jqGridView" class="itp_views fix"></div>
-							<table id="ITP_OPER03010_DETAIL_jqGrid"></table>
-							<div id="ITP_OPER03010_DETAIL_jqGridPager"></div>
-							<div id="ITP_OPER03010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
+						<div id="ITP_OPER03010_VIEW_jqGrid_list" class="itp_tb_list">
+							<div id="ITP_OPER03010_VIEW_jqGridView" class="itp_views fix"></div>
+							<table id="ITP_OPER03010_VIEW_jqGrid"></table>
+							<div id="ITP_OPER03010_VIEW_jqGridPager"></div>
+							<div id="ITP_OPER03010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 						</div>
-					</div>				
+					</div>
 				</div>
 			</div>
 		</article>

bin/src/main/webapp/app/stockmng/STOCKMNG04010.html

@@ -5,7 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>창고관리</strong></h2>
 				<div class="pull-right itp_cicon">
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
-				    <button type="button" id="ITP_BTN_STOCKMNG04010_MODIFY" class="btn btn-success btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
+				    <button type="button" id="ITP_BTN_STOCKMNG04010_NEWREG" class="btn btn-success btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STOCKMNG04010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i> &nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
@@ -17,16 +17,18 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STOCKMNG04010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STOCKMNG04010_SEARCH_BRAND_ID" name="sbrandId" value="">
+									
 									<div class="form-group">
 										<div class="col-xs-10">
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG04010_WHS_DVSN" class="form-control itp_input" name="sWhsDvsn"></select>										
+												<select id="ITP_FORM_STOCKMNG04010_WHS_DVSN" class="form-control itp_input" name="swhsDvsn"></select>										
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG04010_WHS_ST_CD" class="form-control itp_input" name="sWhsStCd"></select>										
+												<select id="ITP_FORM_STOCKMNG04010_WHS_ST_CD" class="form-control itp_input" name="swhsStCd"></select>										
 											</div>
 											<div class="col-xs-5 itp_ip itp_noMar">
-												<input type="text" id="ITP_FORM_STOCKMNG04010_SEARCH_WHS_NM" class="form-control itp_input" name="sWhsNm" placeholder="창고명" />
+												<input type="text" id="ITP_FORM_STOCKMNG04010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="창고명" />
 											</div>
 										</div>
 									</div>
@@ -48,21 +50,22 @@
 				        <div class="col-xs-12">
 				            <form id="ITP_FORM_STOCKMNG04010_DETAIL" class="form-horizontal">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_BRAND_ID" name="brandId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_ID" name="storeId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" 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>
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
 				                                <div class="col-xs-4 itp_ip">
-				                                    <div class="col-xs-9 itp_in fnBrandUnitUnqNo"></div>												
+				                                    <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">
-				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_ST_CD" class="form-control itp_input" name="stCd">
-				                                    	<option value="">운영/미운영</option>
-				                                    </select>
+				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ST_CD" class="form-control itp_input" name="whsStCd"></select>
 				                                </div>
 				                            </div>
 				                        </div>
@@ -74,7 +77,7 @@
 				                            <label class="col-xs-2 itp_lb">창고명</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in">
-			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="서울 창고" maxlength="20">
+			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" maxlength="20">
 				                                </div>
 				                            </div>
 				                        </div>
@@ -82,7 +85,7 @@
 				                            <label class="col-xs-2 itp_lb">연락처</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="###-####-####" maxlength="20">
+				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_MGR_TEL_NO" class="form-control itp_input" name="mgrTelNo" value="" maxlength="20" placeholder="###-####-####">
 				                                </div>
 				                            </div>
 				                            <label class="col-xs-2 itp_lb">담당자명</label>
@@ -96,15 +99,15 @@
 				                            <label class="col-xs-2 itp_lb">매장명</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sSpplyNm" value="공급업체" />
+													<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
 												</div>
-												<div class="col-xs-3 itp_in" style="padding:0px;">
-													<button type="button" id="ITP_BTN_RTNMNG03010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_RTNMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
+													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 				                            </div>
-				                            <label class="col-xs-2 itp_lb"></label>
-				                            <div class="col-xs-4 itp_ip"></div>
+				                            <label class="col-xs-2 itp_lb">등록일시</label>
+				                            <div class="col-xs-4 itp_ip fnRegDtm"></div>				                            
 				                        </div>
 				                    </div>
 			                        <div class="itp_form_in">	
@@ -112,16 +115,16 @@
 			                                <label class="col-xs-2 itp_lb">주소</label>
 			                                <div class="col-xs-10 itp_ip">
 			                                    <div class="col-xs-2 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호" readonly="readonly">													
 			                                    </div>
 			                                    <div class="col-xs-2 itp_in" style="width:10%;">
-			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_FILE_SEARCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
+			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_ADDRESS_SEARCH" class="btn btn-primary btn-sm ADDS" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
 			                                    </div>
 			                                    <div class="col-xs-4 itp_in" style="margin:0 5px;">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="addr1" value="" placeholder="기본주소" readonly="readonly">													
 			                                    </div>
 			                                    <div class="col-xs-4 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">													
 			                                    </div>
 			                                </div>
 			                            </div>	
@@ -151,14 +154,17 @@
 				        <div class="col-xs-12">
 				            <form id="ITP_FORM_STOCKMNG04010_VIEW" class="form-horizontal">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_BRAND_ID" name="brandId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_STORE_ID" name="storeId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" 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>
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
 				                                <div class="col-xs-4 itp_ip">
-				                                    <div class="col-xs-9 itp_in fnBrandUnitUnqNo"></div>												
+				                                    <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">
@@ -190,18 +196,14 @@
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-5 itp_in fnSpplyNm"></div>
 				                            </div>
-				                            <label class="col-xs-2 itp_lb"></label>
-				                            <div class="col-xs-4 itp_ip"></div>
+				                            <label class="col-xs-2 itp_lb">등록일시</label>
+				                            <div class="col-xs-4 itp_ip fnRegDtm"></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">
-												<div class="col-xs-1 itp_in fnZipNo"></div>
-												<div class="col-xs-2 itp_in fnLoadAddr"></div>
-												<div class="col-xs-2 itp_in fnDtlAddr"></div>	
-											</div>
+			                                <div class="col-xs-10 itp_ip fnAddress"></div>
 			                            </div>	
 			                        </div>	
 				                </section>								
@@ -219,96 +221,7 @@
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 					    </div>
 					</div>
-				</div>
-				<div id="ITP_AJAX_STOCKMNG04010_DETAIL_CONTAINER">
-				    <div class="itp_form itp_type1 fix">
-				        <div class="col-xs-12">
-				            <form id="ITP_FORM_STOCKMNG04010_DETAIL" class="form-horizontal">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
-				    
-				                <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 fnBrandUnitUnqNo"></div>												
-				                                </div>
-				                            <label class="col-xs-2 itp_lb">상태*</label>
-				                            <div class="col-xs-4 itp_ip">
-				                                <div class="col-xs-8 itp_in">
-				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_ST_CD" class="form-control itp_input" name="stCd">
-				                                    	<option value="">운영/미운영</option>
-				                                    </select>
-				                                </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">
-			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="서울 창고" maxlength="20">
-				                                </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">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="###-####-####" maxlength="20">
-				                                </div>
-				                            </div>
-				                            <label class="col-xs-2 itp_lb">담당자명</label>
-				                            <div class="col-xs-4 itp_ip">
-				                                <div class="col-xs-8 itp_in">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_MGR_NM" class="form-control itp_input" name="mgrNm" value="" maxlength="20">
-				                                </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">
-			                                    <div class="col-xs-2 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
-			                                    </div>
-			                                    <div class="col-xs-2 itp_in" style="width:10%;">
-			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_FILE_SEARCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
-			                                    </div>
-			                                    <div class="col-xs-4 itp_in" style="margin:0 5px;">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">													
-			                                    </div>
-			                                    <div class="col-xs-4 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
-			                                    </div>
-			                                </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">Location 정보</h4>
-					        <div class="pull-right itp_cicon">
-					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
-					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon"></i>&nbsp;&nbsp;행삭제&nbsp;&nbsp;</button>									
-					        </div>
-					    </div>
-					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
-					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
-					    </div>
-					</div>
-				</div>
+				</div>				
 			</div>
 		</article>
 	</div>

bin/src/main/webapp/js/app/config.js

@@ -603,7 +603,7 @@ function fn_make_select_upper_menu(options, select_id, all_show_yn, all_name) {
 		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
 	}
 	$.each(options, function(key, value) {
-		if (value.level == 2) {
+		if (value.level == 3) {
 			$('<option/>', {
 	            'value': value.menuNo,
 	            'text': value.menuNm
@@ -634,14 +634,13 @@ function fn_make_select_store(options, select_id, all_show_yn, all_name, all_val
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.storeNo,	// 매장번호
-            'data-sale-store-no': value.saleStoreNo,	// 판매매장번호
+            'value': value.storeId,	// 매장번호
             'text': value.storeNm	// 매장명
         }).appendTo($select_id);
 	});
 };
 
-function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포스 셀렉트 박스 만들기
+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) {
@@ -649,67 +648,8 @@ function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.posNo,	// 포스번호
-            'text': value.posNo		// 포스명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_van(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.vanCd,	// VAN코드
-            'text': value.vanNm		// VAN명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_class(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);
-	}
-	if(options == null) {
-		return;
-	}
-	$.each(options, function(key, value) {
-		$('<option/>', {
-            'value': value.classCd,	
-            'text': value.classNm	
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_corner(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.cornerCd,	
-            'text': value.cornerNm	
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_workplace(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.wkpeNo,	// 사업장번호
-            'text': value.wkpeNm	// 사업장명
+            'value': value.whsId,	// 창고아이디
+            'text': value.whsNm		// 창고명
         }).appendTo($select_id);
 	});
 };
@@ -722,22 +662,8 @@ function fn_make_select_location(options, select_id, all_show_yn, all_name) { //
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.lctnNo,	// 위치번호
-            'text': value.lctnNm	// 위치명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_category(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.cateNo,	// 카테고리번호
-            'text': value.cateNm	// 카테고리명
+            'value': value.location,	// 로케이션
+            'text': value.locationNm	// 로케이션명
         }).appendTo($select_id);
 	});
 };
@@ -871,44 +797,33 @@ function fn_make_input_common_cd(options, code, input_id, all_show_yn) { //HIDDE
 	});
 };
 
-function fn_make_input_store_print(options, input_id, all_show_yn) { //HIDDEN 매장프린터 리스트 만들기
-	$input_id = $('#' + input_id);
-	$input_id.val('');
-	let list = '';
-	if(all_show_yn == true) {
-		list = list + ':';
-	}
-	$.each(options, function(key, value) {		
-		if(key > 0) {
-			list = list + ';';
-		} else if(key == 0 && all_show_yn == true) {
-			list = list + ';';
-		}
-		list = list + value.printNo;
-		list = list + ':';
-		list = list + value.printNo;		
-	});
-	$input_id.val(list);
-};
-
-function fn_make_input_store_kds(options, input_id, all_show_yn) { //HIDDEN 매장KDS 리스트 만들기
-	$input_id = $('#' + input_id);
-	$input_id.val('');
-	let list = '';
-	if(all_show_yn == true) {
-		list = list + ':';
-	}
-	$.each(options, function(key, value) {		
-		if(key > 0) {
-			list = list + ';';
-		} else if(key == 0 && all_show_yn == true) {
-			list = list + ';';
+function fn_make_common_cd_list(options, code, all_show_yn) { // 공통코드 리스트 만들기
+	// $input_id = $('#' + input_id);
+	// $input_id.val('');
+	var return_val;
+	$.each(options, function(key, value) {
+		if (value.codeCd == code) {
+			//예제) :;BN:읽기버튼;BNW:쓰기버튼;LK:링크;MU:메뉴
+			let code_list = '';
+			if(all_show_yn == true) {
+				code_list = code_list + ':';
+			}
+			$.each(value.codeDtlList, function(k, val) {
+				if(k > 0) {
+					code_list = code_list + ';';
+				} else if(k == 0 && all_show_yn == true) {
+					code_list = code_list + ';';
+				}
+				code_list = code_list + val.codeDtlCd;
+				code_list = code_list + ':';
+				code_list = code_list + val.codeDtlNm;
+			});
+			// $input_id.val(code_list);
+			// return code_list;
+			return_val = code_list;
 		}
-		list = list + value.kdsNo;
-		list = list + ':';
-		list = list + value.kdsNo;		
 	});
-	$input_id.val(list);
+	return return_val;
 };
 
 function fnHashed(code) { //유니코드로 들어오는 해쉬키를 스트링으로 변환
@@ -1676,7 +1591,7 @@ function itp_fn_grid_make_local(option) {
 		multiselect: false,
 		rownumbers: true
 	}, option);
-	$(OPER03010_VIEW_GRID_ID).jqGrid({
+	$(option.gridId).jqGrid({
 		colModel: options.colModel,
 		data: options.data,
 		datatype: 'local',
@@ -1987,6 +1902,31 @@ function itp_fn_grid_add_row(gridId, fn, cm, menuId) {
 	return last_row_id;
 };
 
+function itp_fn_add_grid_row(gridId, fn, cm, menuId) {
+	if (cm !== undefined || typeof cm !== 'undefined') {
+		if (cm !== null) {
+			const cols = $(gridId).jqGrid('getGridParam', 'colModel');
+			for (var i=0; i<cols.length; i++) {
+				for (var j=0; j<cm.length; j++) {
+					if (cols[i].name == cm[j]) {
+						$(gridId).jqGrid('setColProp', cols[i].name, {editable: false});
+					}
+				}
+			}
+		}
+	}
+	$(gridId + '_list').find('.ui-jqgrid-bdiv').css('min-height', 'auto');
+	$('#ITP_' + menuId + '_jqGridEmpty').hide();
+	$(gridId).jqGrid('addRow', {position: 'last'});
+	var rids = $(gridId).jqGrid('getDataIDs');
+	var last_row_id = rids[rids.length - 1];
+	$(gridId).jqGrid('setCell', last_row_id, 'viewCd', 'C');
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		fn(last_row_id, rids.length);
+	}
+	return last_row_id;
+};
+
 function itp_fn_grid_del_row(gridId) {
 	const rowKey = $(gridId).getGridParam('selrow');
     if (!rowKey) {

bin/src/main/webapp/js/app/locales/locale-ko.js

@@ -127,7 +127,8 @@ const ITP_MSG_LOCALE = (function() {
 			"stNm": "상태",
 			"ownerNm": "대표자명",
 			"rprstTelNo": "대표연락처",
-			"joinDt": "가입일자"
+			"joinDt": "가입일자",
+			"writeYn": "쓰기여부"
 		},
 		"table": {
 			"brandId": "브랜드ID",

bin/src/main/webapp/js/app/oper/ITP_OPER03010.js

@@ -260,9 +260,9 @@ let pageObj = {
 		comCode: function () {
 			// 공통코드 표시
 			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_SEARCH_ST_CD', true, '상태(전체)');
-			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_DETAIL_STAT_CD', true, '선택');
+			fn_make_select(CODE_LIST, 'ST_CD', 'ITP_FORM_OPER03010_DETAIL_ST_CD', true, '선택');
 			fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_OPER03010_DETAIL_TYPE_CD', true, '선택');
-			fn_make_select(CODE_LIST, 'FRCOMP_AUTH_CD', 'ITP_FORM_OPER03010_DETAIL_FRCOMP_AUTH_CD', true, '선택');
+			fn_make_select(CODE_LIST, 'AUTH_TYPE', 'ITP_FORM_OPER03010_DETAIL_AUTH_TYPE', true, '선택');
 		},
 		ready: function () {
 			listObj.init();
@@ -475,20 +475,24 @@ let viewObj = {
 		pageObj.switchScreen('VIEW');
 		$('#ITP_FORM_OPER03010_VIEW #ITP_FORM_OPER03010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
 
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyNm').text(result.afflShopNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyStatCd').text(result.cmpyStatNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyCd').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_VIEW .fnAfflShopId').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_VIEW .fnAfflShopNm').text(result.afflShopNm);
+		$('#ITP_FORM_OPER03010_VIEW .fnStCd').text(result.stNm);
 		$('#ITP_FORM_OPER03010_VIEW .fnCmpyTypeCd').text(result.corpType);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyRegNum').text(result.corpRegNo);
-		$('#ITP_FORM_OPER03010_VIEW .fnFrcompAuthCd').text(result.frcompAuthNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnCoptNum').text(result.coptNum);
-		$('#ITP_FORM_OPER03010_VIEW .fnBizCate').text(result.bizCate);
-		$('#ITP_FORM_OPER03010_VIEW .fnBizType').text(result.bizType);
-		$('#ITP_FORM_OPER03010_VIEW .fnBossNm').text(result.ownerNm);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainTel').text(result.ownerTelNo);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainFax').text(result.mainFax);
-		$('#ITP_FORM_OPER03010_VIEW .fnMainEmail').text(result.mainEmail);
-		$('#ITP_FORM_OPER03010_VIEW .fnCmpyAddress').text('('+ result.cmpyZipno + ') ' + result.addr1 + ' ' + result.addr2);
+		$('#ITP_FORM_OPER03010_VIEW .fnBsnsRegNo').text(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnCorpRegNo').text(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnTelNo').text(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnFaxNo').text(result.rprstFaxNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnEmalAddr').text(result.rprstEmai);
+		$('#ITP_FORM_OPER03010_VIEW .fnBsnsCndt').text(result.bsnsCndt);
+		$('#ITP_FORM_OPER03010_VIEW .fnOwnerNm').text(result.ownerNm);
+		$('#ITP_FORM_OPER03010_VIEW .fnCtgrBsns').text(result.ctgrBsns);
+		$('#ITP_FORM_OPER03010_VIEW .fnOwnerTelNo').text(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnContSttDt').text(result.joinSttDt);
+		$('#ITP_FORM_OPER03010_VIEW .fnContEndDt').text(result.joinEndDt);
+		$('#ITP_FORM_OPER03010_VIEW .fnZipNo').text(result.zipNo);
+		$('#ITP_FORM_OPER03010_VIEW .fnLoadAddr').text(result.addr1);
+		$('#ITP_FORM_OPER03010_VIEW .fnDtlAddr').text(result.addr2);
 
 		$('#ITP_FORM_OPER03010_VIEW .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03010_VIEW .fnChgDt').text(result.chgDt);
@@ -549,23 +553,25 @@ let modifyObj = {
 		pageObj.switchScreen('MODIFY');
 		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_VIEW_CD').val('U');
 
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_NM').val(result.afflShopNm);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_STAT_CD').val(result.afflAbbr);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_FRCOMP_AUTH_CD').val(result.frcompAuthCd);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_CD').val(result.afflShopId);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_TYPE_CD').val(result.corpType);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_REG_NUM').val(result.cmpyRegNum);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_COPT_NUM').val(result.coptNum);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BIZ_CATE').val(result.bizCate);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BIZ_TYPE').val(result.bizType);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BOSS_NM').val(result.ownerNm);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_TEL').val(result.ownerTelNo);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_FAX').val(result.mainFax);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_MAIN_EMAIL').val(result.mainEmail);
-
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ZIPNO').val(result.cmpyZipno);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ADRES').val(result.addr1);
-		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CMPY_ADRES_DTL').val(result.addr2);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
+		$('#ITP_FORM_OPER03010_DETAIL .fnAfflShopId').text(result.afflShopId);
+		$('#ITP_FORM_OPER03010_DETAIL .fnAfflShopNm').text(result.afflShopNm);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ST_CD').val(result.stNm);
+		// $('#ITP_FORM_OPER03010_DETAIL #fnCmpyTypeCd').text(result.corpType);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BSNS_REG_NO').val(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CORP_REG_NO').val(result.corpRegNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_STINFO01010_DETAIL_TEL_NO').val(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_STINFO01010_DETAIL_FAX_NO').val(result.rprstFaxNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_EMAL_ADDR').val(result.rprstEmai);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_BSNS_CNDT').val(result.bsnsCndt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_NM').val(result.ownerNm);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_CTGR_BSNS').val(result.ctgrBsns);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_OWNER_TEL_NO').val(result.ownerTelNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_CONT_STT_DT').val(result.joinSttDt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_SEARCH_CONT_END_DT').val(result.joinEndDt);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_ZIPNO').val(result.zipNo);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_LOAD_ADDR').val(result.addr1);
+		$('#ITP_FORM_OPER03010_DETAIL #ITP_FORM_OPER03010_DETAIL_DTL_ADDR').val(result.addr2);
 
 		$('#ITP_FORM_OPER03010_DETAIL .fnAddDt').text(result.regDt);
 		$('#ITP_FORM_OPER03010_DETAIL .fnChgDt').text(result.chgDt);
@@ -573,13 +579,13 @@ let modifyObj = {
 		kakaoMap.init('ITP_FORM_OPER03010_DETAIL_MAP', $('#ITP_FORM_OPER03010_DETAIL_CMPY_ADRES').val());
 
 		// 영업담당자 리스트 조회
-		modifyObj.grid.load();
+		modifyObj.grid.load(result.saleList);
 	},
 	grid: {
 		init: function() {
 		},
 		colModel: gridColModel.detail,
-		load: function() {
+		load: function(gridData) {
 			let param = $('#ITP_FORM_OPER03010_DETAIL').serializeObject();
 			param.gridSize = $.jgrid.defaults.rowNum;
 			param.pagingYn = false; // 페이지안함
@@ -587,40 +593,10 @@ let modifyObj = {
 			var option = {
 				gridId: OPER03010_DETAIL_GRID_ID,
 				colModel: gridColModel.detail,
-				param: JSON.stringify(param),
-				url: DOMAIN + AFFL_DETAIL_GRID_LIST,
+				data: gridData,
 				pager: OPER03010_DETAIL_GRID_PAGER,
-				loadComplete: function(data) {
-					itp_fn_grid_load_complete(data, OPER03010_DETAIL_GRID_ID, true, undefined, 'OPER03010_DETAIL');
-				},
-				onPaging: function(action) {
-					var pagingFn = {
-						callBack: function(args) {
-							$(args).trigger('reloadGrid');
-						}
-					};
-					if (itp_fn_check_grid_is_writing(OPER03010_DETAIL_GRID_ID)) {
-						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, pagingFn, OPER03010_DETAIL_GRID_ID);
-						return 'stop';
-					} else {
-						itp_fn_grid_paging(OPER03010_DETAIL_GRID_ID, action, param);
-					}
-				},
-				onSortCol: function(index, columnIndex, sortOrder) {
-					var sortingFn = {
-						callBack: function(args) {
-							$(args).trigger('reloadGrid');
-						}
-					};
-					if (itp_fn_check_grid_is_writing(OPER03010_DETAIL_GRID_ID)) {
-						itp_fn_modal_confirm(ITP_MSG_LOCALE.message.ajax.cancelData, sortingFn, OPER03010_DETAIL_GRID_ID);
-						return 'stop';
-					} else {
-						itp_fn_grid_sorting(OPER03010_DETAIL_GRID_ID, index, sortOrder);
-					}
-				}
 			};
-			itp_fn_grid_make_remote(option);
+			itp_fn_grid_make_local(option);
 		},
 		clearData : function() {
 			$(OPER03010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
@@ -704,21 +680,20 @@ let createObj = {
 				var exists = '';
 				const rowData = $(OPER03010_DETAIL_GRID_ID).getRowData();
 				$.each(rowData, function(key, value) {
-					exists = exists + value.salesUserId + ';';
+					exists = exists + value.saleMgrId + ';';
 				});
 
 				$.each(rowDataPop, function(key, value) {
-					if(exists.indexOf(value.salesUserId) < 0) {
+					if(exists.indexOf(value.saleMgrId) < 0) {
 						// 행추가
 						$(OPER03010_DETAIL_GRID_ID).jqGrid('addRow', {position: 'last'});
 						var rids = $(OPER03010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 						var last_row_id = rids[rids.length - 1];
 						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'viewCd', 'C');
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'salesUserId', value.salesUserId);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'salesUserNm', value.salesUserNm);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'useStatCd', value.useStatCd);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'useStatNm', value.useStatNm);
-						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'cmpyCd', '');
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'saleMgrId', value.saleMgrId);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'saleMgrNm', value.saleMgrNm);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stCd', value.stCd);
+						$(OPER03010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stNm', value.stNm);
 					}
 				});
 				$(OPER03010_DETAIL_GRID_EMPTY).hide();

bin/src/main/webapp/js/app/popup/biz/ITP_BIZPOP_NK_SALES_USER_SCH.js

@@ -6,7 +6,8 @@ require(['config'], function() {
 	});
 });
 
-let SAUSER_POP_SALEUSER_GRID_LIST = '/api/sauser/pop-saleuser-grid-list';
+let SAUSER_POP_SALEUSER_GRID_LIST = '/api/srep/pop-grid-list';
+// let SAUSER_POP_SALEUSER_GRID_LIST = '/api/sauser/pop-saleuser-grid-list';
 
 function itp_fn_BIZPOP_NK_SALES_USER_SCH(parentPopFn, schParam, returnType) {
 	
@@ -78,22 +79,28 @@ function itp_fn_BIZPOP_NK_SALES_USER_SCH(parentPopFn, schParam, returnType) {
 	$(THIS_GIRD_ID).jqGrid({
 		colModel: [
 			{
-				index: 'SALES_USER_ID', name: 'salesUserId',
+				index: 'SALE_MGR__ID', name: 'saleMgrId',
 				label: '영업담당자ID', 
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'SALES_USER_NM', name: 'salesUserNm',
+				index: 'SALE_MGR_NM', name: 'saleMgrNm',
 				label: '영업담당자명', // 
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'USE_STAT_NM', name: 'useStatNm',
+				index: 'ST_CD', name: 'stCd',
 				label: '상태', //
 				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
+			},
+			{
+				index: 'ST_NM', name: 'stNm',
+				label: '상태', //
+				width: '12', fixed: false, align: 'center',
+				sortable: false, hidden: true
 			}
 		],
 		loadBeforeSend: function(jqXHR) {

bin/src/main/webapp/js/app/system/ITP_SYSTEM03010.js

@@ -239,12 +239,12 @@ var itp_fn_SYSTEM03010_detail_grid = {
 					editoptions: {maxlength: 128}
 				},
 				{
-					index: 'CONN_URL', name: 'connUrl',
-					label: ITP_MSG_LOCALE.label.actionUrl,
-					width: '18', fixed: false, align: 'left',
-					sortable: false, editable: true, edittype: 'text',
-					editrules: {required: false},
-					editoptions: {maxlength: 128}
+					index: 'WRITE_YN', name: 'writeYn',
+					label: ITP_MSG_LOCALE.label.writeYn,
+					width: '8', fixed: false, align: 'center',
+					sortable: false, editable: true, formatter: 'checkbox', edittype: 'checkbox',
+					editoptions: {value: 'Y:N', defaultValue: 'Y'},
+					editrules: {required: true}
 				},
 				{
 					index: 'USE_YN', name: 'useYn',

bin/src/main/webapp/js/app/system/ITP_SYSTEM04010.js

@@ -114,10 +114,22 @@ require(['config'], function() {
 						$.each(rowData, function(key, value) {
 							if (value.viewCd != 'R') {
 								value.authNo = keyValue;
+								
+								if (value.readYn == 'N' && value.writeYn == 'Y') {
+									value.readYn = 'Y';
+								}
+								
 								if (value.viewCd == 'C') {
 									gridInsertData.push(value);
 								} else if (value.viewCd == 'U') {
-									gridUpdateData.push(value);
+									
+									if (value.readYn == 'N' && value.writeYn == 'N') {
+										value.viewCd = 'D';
+										gridDeleteData.push(value);
+									} else {
+										gridUpdateData.push(value);
+									}
+									
 								}
 							}
 						});

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

@@ -2,7 +2,7 @@
 	<div class="itp_cont">
 		<article class="itp_detail">
 			<div class="itp_det_head fix">
-				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>재고 관리-팝업있음</strong></h2>
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>재고 관리</strong></h2>
 				<div class="pull-right itp_cicon">
 					<button type="button" id="ITP_BTN_STOCKMNG01010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
 				</div>					
@@ -13,53 +13,54 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STOCKMNG01010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID" name="sbrandId" value="">
+									<input type="hidden" id="ITP_FORM_STOCKMNG01010_SEARCH_STORE_ID" name="sstoreId" value="">
+								
 									<div class="form-group">
 										<div class="col-xs-10">
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG01010_SERVICE_WHS_MGNT_BASE_INFO" class="form-control itp_input" name="serviceswhsMgntBaseInfo">
-													<option value="">창고</option>											
-												</select>	
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_WHS_ID" class="form-control itp_input" name="swhsId"></select>	
 											</div>
 											<div class="col-xs-3 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG01010_SEARCH_WHS_MGNT_BASE_LOC" class="form-control itp_input" name="sWhsMgntBaseLoc">
-													<option value="">판매용/B품/폐기품</option>											
-												</select>										
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_LOCATION" class="form-control itp_input" name="slocation"></select>										
 											</div>
 										</div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
-										<div class="col-xs-1 itp_in" style="width:14%; padding:0px;">
-											<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS1" class="form-control itp_input" name="sItemClass1">
-												<option value="">품목분류Level1</option>											
-											</select>										
-										</div>
-										<div class="col-xs-1 itp_in" style="width:14%; padding:0px;">
-											<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS2" class="form-control itp_input" name="sItemClass2">
-												<option value="">품목분류Level2</option>											
-											</select>										
-										</div>
-										<div class="col-xs-1 itp_in" style="width:14%; padding:0px;">
-											<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS3" class="form-control itp_input" name="sItemClass3">
-												<option value="">품목분류Level3</option>											
-											</select>										
-										</div>
-										<div class="col-xs-1 itp_in" style="width:14%; padding:0px;">
-											<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS4" class="form-control itp_input" name="sItemClass4">
-												<option value="">품목분류Level4</option>											
-											</select>										
-										</div>
-										<div class="col-xs-4 itp_in">
-											<input type="text" id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />
+										<div class="col-xs-10">
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS1" class="form-control itp_input" name="sitemClass1">
+													<option value="">품목분류Level1</option>											
+												</select>										
+											</div>
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS2" class="form-control itp_input" name="sitemClass2">
+													<option value="">품목분류Level2</option>											
+												</select>										
+											</div>
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS3" class="form-control itp_input" name="sitemClass3">
+													<option value="">품목분류Level3</option>											
+												</select>										
+											</div>
+											<div class="col-xs-2 itp_ip itp_noMar">
+												<select id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_CLASS4" class="form-control itp_input" name="sitemClass4">
+													<option value="">품목분류Level4</option>											
+												</select>										
+											</div>
+											<div class="col-xs-4 itp_in itp_noMar">
+												<input type="text" id="ITP_FORM_STOCKMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="품목번호 or 품목명" />
+											</div>
 										</div>							
 									</div>
 								</form>
 							</div>
 						</div>
 					</div>
-					<div class="fix" style="padding-right:10px;">
+					<div class="fix" style="padding-right:16px;">
 						<div class="pull-right itp_cicon">
 							<button type="button" id="ITP_BTN_STOCKMNG01010_ADDROW" class="btn btn-primary btn-sm IPS" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;재고처리&nbsp;&nbsp;</button>
-							<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-danger btn-sm "><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>									
+							<button type="button" id="ITP_BTN_STOCKMNG01010_DELROW" class="btn btn-primary btn-sm IPS"><i class="glyphicon"></i>&nbsp;&nbsp;재고이력&nbsp;&nbsp;</button>									
 						</div>
 					</div>
 					<div class="itp_table fix">

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

@@ -5,7 +5,7 @@
 				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>창고관리</strong></h2>
 				<div class="pull-right itp_cicon">
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;조회&nbsp;&nbsp;</button>
-				    <button type="button" id="ITP_BTN_STOCKMNG04010_MODIFY" class="btn btn-success btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
+				    <button type="button" id="ITP_BTN_STOCKMNG04010_NEWREG" class="btn btn-success btn-sm NEB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;신규등록&nbsp;&nbsp;</button>
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_SAVE" class="btn btn-success btn-sm SAB"><i class="glyphicon "></i>&nbsp;&nbsp;저장&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_STOCKMNG04010_MODIFY" class="btn btn-success btn-sm UPB" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;수정&nbsp;&nbsp;</button>
 				    <button type="button" id="ITP_BTN_STOCKMNG04010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon "></i> &nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
@@ -17,16 +17,18 @@
 						<div class="itp_srh_border fix">
 							<div class="col-xs-12">
 								<form id="ITP_FORM_STOCKMNG04010_SEARCH" class="form-horizontal">
+									<input type="hidden" id="ITP_FORM_STOCKMNG04010_SEARCH_BRAND_ID" name="sbrandId" value="">
+									
 									<div class="form-group">
 										<div class="col-xs-10">
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG04010_WHS_DVSN" class="form-control itp_input" name="sWhsDvsn"></select>										
+												<select id="ITP_FORM_STOCKMNG04010_WHS_DVSN" class="form-control itp_input" name="swhsDvsn"></select>										
 											</div>
 											<div class="col-xs-2 itp_ip itp_noMar">
-												<select id="ITP_FORM_STOCKMNG04010_WHS_ST_CD" class="form-control itp_input" name="sWhsStCd"></select>										
+												<select id="ITP_FORM_STOCKMNG04010_WHS_ST_CD" class="form-control itp_input" name="swhsStCd"></select>										
 											</div>
 											<div class="col-xs-5 itp_ip itp_noMar">
-												<input type="text" id="ITP_FORM_STOCKMNG04010_SEARCH_WHS_NM" class="form-control itp_input" name="sWhsNm" placeholder="창고명" />
+												<input type="text" id="ITP_FORM_STOCKMNG04010_SEARCH_WHS_NM" class="form-control itp_input" name="swhsNm" placeholder="창고명" />
 											</div>
 										</div>
 									</div>
@@ -48,21 +50,22 @@
 				        <div class="col-xs-12">
 				            <form id="ITP_FORM_STOCKMNG04010_DETAIL" class="form-horizontal">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_BRAND_ID" name="brandId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_ID" name="storeId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ID" name="whsId" 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>
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
 				                                <div class="col-xs-4 itp_ip">
-				                                    <div class="col-xs-9 itp_in fnBrandUnitUnqNo"></div>												
+				                                    <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">
-				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_ST_CD" class="form-control itp_input" name="stCd">
-				                                    	<option value="">운영/미운영</option>
-				                                    </select>
+				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_ST_CD" class="form-control itp_input" name="whsStCd"></select>
 				                                </div>
 				                            </div>
 				                        </div>
@@ -74,7 +77,7 @@
 				                            <label class="col-xs-2 itp_lb">창고명</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in">
-			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="서울 창고" maxlength="20">
+			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="" maxlength="20">
 				                                </div>
 				                            </div>
 				                        </div>
@@ -82,7 +85,7 @@
 				                            <label class="col-xs-2 itp_lb">연락처</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="###-####-####" maxlength="20">
+				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_MGR_TEL_NO" class="form-control itp_input" name="mgrTelNo" value="" maxlength="20" placeholder="###-####-####">
 				                                </div>
 				                            </div>
 				                            <label class="col-xs-2 itp_lb">담당자명</label>
@@ -96,15 +99,15 @@
 				                            <label class="col-xs-2 itp_lb">매장명</label>
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-5 itp_in">
-													<input type="text" id="ITP_FORM_RTNMNG03010_SEARCH_SPPLY_NM" class="form-control itp_input" name="sSpplyNm" value="공급업체" />
+													<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="" readonly="readonly" />
 												</div>
-												<div class="col-xs-3 itp_in" style="padding:0px;">
-													<button type="button" id="ITP_BTN_RTNMNG03010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-													<button type="button" id="ITP_BTN_RTNMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+												<div class="col-xs-3 itp_in" style="padding:0px; margin-left: 3px;">
+													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_SRH" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_BTN_STOCKMNG04010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 								                </div>
 				                            </div>
-				                            <label class="col-xs-2 itp_lb"></label>
-				                            <div class="col-xs-4 itp_ip"></div>
+				                            <label class="col-xs-2 itp_lb">등록일시</label>
+				                            <div class="col-xs-4 itp_ip fnRegDtm"></div>				                            
 				                        </div>
 				                    </div>
 			                        <div class="itp_form_in">	
@@ -112,16 +115,16 @@
 			                                <label class="col-xs-2 itp_lb">주소</label>
 			                                <div class="col-xs-10 itp_ip">
 			                                    <div class="col-xs-2 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호" readonly="readonly">													
 			                                    </div>
 			                                    <div class="col-xs-2 itp_in" style="width:10%;">
-			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_FILE_SEARCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
+			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_ADDRESS_SEARCH" class="btn btn-primary btn-sm ADDS" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
 			                                    </div>
 			                                    <div class="col-xs-4 itp_in" style="margin:0 5px;">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="addr1" value="" placeholder="기본주소" readonly="readonly">													
 			                                    </div>
 			                                    <div class="col-xs-4 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
+			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">													
 			                                    </div>
 			                                </div>
 			                            </div>	
@@ -151,14 +154,17 @@
 				        <div class="col-xs-12">
 				            <form id="ITP_FORM_STOCKMNG04010_VIEW" class="form-horizontal">
 				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_VIEW_CD" name="viewCd" value="C">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_BRAND_ID" name="brandId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_STORE_ID" name="storeId" value="">
+				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_VIEW_WHS_ID" name="whsId" 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>
+				                            <label class="col-xs-2 itp_lb">브랜드명</label>
 				                                <div class="col-xs-4 itp_ip">
-				                                    <div class="col-xs-9 itp_in fnBrandUnitUnqNo"></div>												
+				                                    <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">
@@ -190,18 +196,14 @@
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-5 itp_in fnSpplyNm"></div>
 				                            </div>
-				                            <label class="col-xs-2 itp_lb"></label>
-				                            <div class="col-xs-4 itp_ip"></div>
+				                            <label class="col-xs-2 itp_lb">등록일시</label>
+				                            <div class="col-xs-4 itp_ip fnRegDtm"></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">
-												<div class="col-xs-1 itp_in fnZipNo"></div>
-												<div class="col-xs-2 itp_in fnLoadAddr"></div>
-												<div class="col-xs-2 itp_in fnDtlAddr"></div>	
-											</div>
+			                                <div class="col-xs-10 itp_ip fnAddress"></div>
 			                            </div>	
 			                        </div>	
 				                </section>								
@@ -219,96 +221,7 @@
 					        <div id="ITP_STOCKMNG04010_VIEW_jqGridEmpty" class="itp_no_data"></div>
 					    </div>
 					</div>
-				</div>
-				<div id="ITP_AJAX_STOCKMNG04010_DETAIL_CONTAINER">
-				    <div class="itp_form itp_type1 fix">
-				        <div class="col-xs-12">
-				            <form id="ITP_FORM_STOCKMNG04010_DETAIL" class="form-horizontal">
-				                <input type="hidden" id="ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD" name="viewCd" value="C">
-				    
-				                <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 fnBrandUnitUnqNo"></div>												
-				                                </div>
-				                            <label class="col-xs-2 itp_lb">상태*</label>
-				                            <div class="col-xs-4 itp_ip">
-				                                <div class="col-xs-8 itp_in">
-				                                    <select id="ITP_FORM_STOCKMNG04010_DETAIL_ST_CD" class="form-control itp_input" name="stCd">
-				                                    	<option value="">운영/미운영</option>
-				                                    </select>
-				                                </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">
-			                                    	<input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_WHS_NM" class="form-control itp_input" name="whsNm" value="서울 창고" maxlength="20">
-				                                </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">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="###-####-####" maxlength="20">
-				                                </div>
-				                            </div>
-				                            <label class="col-xs-2 itp_lb">담당자명</label>
-				                            <div class="col-xs-4 itp_ip">
-				                                <div class="col-xs-8 itp_in">
-				                                    <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_MGR_NM" class="form-control itp_input" name="mgrNm" value="" maxlength="20">
-				                                </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">
-			                                    <div class="col-xs-2 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
-			                                    </div>
-			                                    <div class="col-xs-2 itp_in" style="width:10%;">
-			                                        <button type="button" id="ITP_FORM_STOCKMNG04010_DETAIL_FILE_SEARCH" class="btn btn-primary btn-sm FILE_SEARCH" style="margin:0 3px;">&nbsp;&nbsp;주소찾기&nbsp;&nbsp;</button>
-			                                    </div>
-			                                    <div class="col-xs-4 itp_in" style="margin:0 5px;">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">													
-			                                    </div>
-			                                    <div class="col-xs-4 itp_in">
-			                                        <input type="text" id="ITP_FORM_STOCKMNG04010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
-			                                    </div>
-			                                </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">Location 정보</h4>
-					        <div class="pull-right itp_cicon">
-					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_ADDROW" class="btn btn-primary btn-sm ARB" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;행추가&nbsp;&nbsp;</button>
-					            <button type="button" id="ITP_BTN_STOCKMNG04010_DETAIL_DELROW" class="btn btn-danger btn-sm DRB"><i class="glyphicon"></i>&nbsp;&nbsp;행삭제&nbsp;&nbsp;</button>									
-					        </div>
-					    </div>
-					    <div id="ITP_STOCKMNG04010_DETAIL_jqGrid_list" class="itp_tb_list">
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridView" class="itp_views fix"></div>
-					        <table id="ITP_STOCKMNG04010_DETAIL_jqGrid"></table>
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridPager"></div>
-					        <div id="ITP_STOCKMNG04010_DETAIL_jqGridEmpty" class="itp_no_data"></div>
-					    </div>
-					</div>
-				</div>
+				</div>				
 			</div>
 		</article>
 	</div>

src/main/webapp/js/app/config.js

@@ -602,7 +602,7 @@ function fn_make_select_upper_menu(options, select_id, all_show_yn, all_name) {
 		$('<option/>', {'value': '', 'text': all_name}).prependTo($select_id);
 	}
 	$.each(options, function(key, value) {
-		if (value.level == 2) {
+		if (value.level == 3) {
 			$('<option/>', {
 	            'value': value.menuNo,
 	            'text': value.menuNm
@@ -647,14 +647,13 @@ function fn_make_select_store(options, select_id, all_show_yn, all_name, all_val
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.storeNo,	// 매장번호
-            'data-sale-store-no': value.saleStoreNo,	// 판매매장번호
+            'value': value.storeId,	// 매장번호
             'text': value.storeNm	// 매장명
         }).appendTo($select_id);
 	});
 };
 
-function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포스 셀렉트 박스 만들기
+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) {
@@ -662,67 +661,8 @@ function fn_make_select_pos(options, select_id, all_show_yn, all_name) { //포
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.posNo,	// 포스번호
-            'text': value.posNo		// 포스명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_van(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.vanCd,	// VAN코드
-            'text': value.vanNm		// VAN명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_class(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);
-	}
-	if(options == null) {
-		return;
-	}
-	$.each(options, function(key, value) {
-		$('<option/>', {
-            'value': value.classCd,	
-            'text': value.classNm	
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_corner(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.cornerCd,	
-            'text': value.cornerNm	
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_workplace(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.wkpeNo,	// 사업장번호
-            'text': value.wkpeNm	// 사업장명
+            'value': value.whsId,	// 창고아이디
+            'text': value.whsNm		// 창고명
         }).appendTo($select_id);
 	});
 };
@@ -735,22 +675,8 @@ function fn_make_select_location(options, select_id, all_show_yn, all_name) { //
 	}
 	$.each(options, function(key, value) {
 		$('<option/>', {
-            'value': value.lctnNo,	// 위치번호
-            'text': value.lctnNm	// 위치명
-        }).appendTo($select_id);
-	});
-};
-
-function fn_make_select_category(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.cateNo,	// 카테고리번호
-            'text': value.cateNm	// 카테고리명
+            'value': value.location,	// 로케이션
+            'text': value.locationNm	// 로케이션명
         }).appendTo($select_id);
 	});
 };
@@ -884,6 +810,35 @@ function fn_make_input_common_cd(options, code, input_id, all_show_yn) { //HIDDE
 	});
 };
 
+function fn_make_common_cd_list(options, code, all_show_yn) { // 공통코드 리스트 만들기
+	// $input_id = $('#' + input_id);
+	// $input_id.val('');
+	var return_val;
+	$.each(options, function(key, value) {
+		if (value.codeCd == code) {
+			//예제) :;BN:읽기버튼;BNW:쓰기버튼;LK:링크;MU:메뉴
+			let code_list = '';
+			if(all_show_yn == true) {
+				code_list = code_list + ':';
+			}
+			$.each(value.codeDtlList, function(k, val) {
+				if(k > 0) {
+					code_list = code_list + ';';
+				} else if(k == 0 && all_show_yn == true) {
+					code_list = code_list + ';';
+				}
+				code_list = code_list + val.codeDtlCd;
+				code_list = code_list + ':';
+				code_list = code_list + val.codeDtlNm;
+			});
+			// $input_id.val(code_list);
+			// return code_list;
+			return_val = code_list;
+		}
+	});
+	return return_val;
+};
+
 function fn_make_input_store_print(options, input_id, all_show_yn) { //HIDDEN 매장프린터 리스트 만들기
 	$input_id = $('#' + input_id);
 	$input_id.val('');
@@ -2002,6 +1957,31 @@ function itp_fn_grid_add_row(gridId, fn, cm, menuId) {
 	return last_row_id;
 };
 
+function itp_fn_add_grid_row(gridId, fn, cm, menuId) {
+	if (cm !== undefined || typeof cm !== 'undefined') {
+		if (cm !== null) {
+			const cols = $(gridId).jqGrid('getGridParam', 'colModel');
+			for (var i=0; i<cols.length; i++) {
+				for (var j=0; j<cm.length; j++) {
+					if (cols[i].name == cm[j]) {
+						$(gridId).jqGrid('setColProp', cols[i].name, {editable: false});
+					}
+				}
+			}
+		}
+	}
+	$(gridId + '_list').find('.ui-jqgrid-bdiv').css('min-height', 'auto');
+	$('#ITP_' + menuId + '_jqGridEmpty').hide();
+	$(gridId).jqGrid('addRow', {position: 'last'});
+	var rids = $(gridId).jqGrid('getDataIDs');
+	var last_row_id = rids[rids.length - 1];
+	$(gridId).jqGrid('setCell', last_row_id, 'viewCd', 'C');
+	if (fn !== undefined || typeof fn !== 'undefined') {
+		fn(last_row_id, rids.length);
+	}
+	return last_row_id;
+};
+
 function itp_fn_grid_del_row(gridId) {
 	const rowKey = $(gridId).getGridParam('selrow');
     if (!rowKey) {

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

@@ -0,0 +1,301 @@
+/********************************************************
+ --------------------------------------------------------
+ - Object 목록								            -
+ --------------------------------------------------------
+ * const gridColModel = {}	: 화면 Grid Object			*
+ * let pageObj = {}			: 화면공통 Object			*
+ * let listObj = {}			: 목록화면 Object			*
+ * let viewObj = {}			: 상세화면 Object			*
+ * let modifyObj = {}		: 수정화면 Object			*
+ * let createObj = {}		: 신규화면 Object			*
+ * let locInfoObj = {}		: 로케이션정보 Object				*
+ *******************************************************/
+
+/*화면 변수*/
+const STOCKMNG01010_GRID_ID = '#ITP_STOCKMNG01010_jqGrid';
+const STOCKMNG01010_GRID_LIST = '#ITP_STOCKMNG01010_jqGrid_list';
+const STOCKMNG01010_GRID_PAGER = '#ITP_STOCKMNG01010_jqGridPager';
+const STOCKMNG01010_GRID_EMPTY = '#ITP_STOCKMNG01010_jqGridEmpty';
+
+let ITP_FORM_STOCKMNG01010_DETAIL_IS_DUPLICATE = false;
+let ITP_FORM_STOCKMNG01010_DETAIL_IS_WRITING = false;
+let STOCKMNG01010_DETAIL_GRID_LAST_ROW_ID;
+
+/*API URL*/
+let STOCK_MNG_DETAIL_GRID_LIST = '/api/stock/mng/detail-grid-list';
+let WHS_MNG_ADD_WHS = '/api/whs/mng/add-whs';
+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: 'BRAND_ID', name: 'brandId',
+			label: "브랜드ID", 
+			width: '0', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'STORE_ID', name: 'storeId',
+			label: "매장ID", 
+			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',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'STORE_NM', name: 'storeNm',
+			label: "매장명", 
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'WHS_ID', name: 'whsId',
+			label: "창고번호", 
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'WHS_NM', name: 'whsNm',
+			label: "창고명", 
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'WHS_ST_NM', name: 'whsStNm',
+			label: ITP_MSG_LOCALE.label.status, //상태
+			width: '6', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'MGR_NM', name: 'mgrNm',
+			label: "담당자명", 
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'MGR_TEL_NO', name: 'mgrTelNo',
+			label: "연락처", 
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	]
+};
+
+require(['config'], function() {
+	require([
+	], function($) {
+		pageObj.init();
+	});
+});
+
+/*화면공통 Object*/
+let pageObj = {
+	init: function () {
+		this.ui.init();
+		this.event.init();
+	},
+	ui: {
+		init: function () {
+			this.view();
+			this.grid();
+			this.ready();
+		},
+		view: function() {
+			// 버튼 권한설정
+			fn_proc_btn_auth('STOCKMNG01010');
+			
+			// 브랜드ID 지정
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(data.brandId);
+			
+			pageObj.fnWhsList(function() {
+				pageObj.fnLocationList();
+			}); // 창고리스트
+			
+			// 공통코드 표시
+			// fn_make_select(CODE_LIST, 'WHS_DVSN', 'ITP_FORM_STOCKMNG01010_WHS_DVSN');			
+
+			// 조회일자 지정
+			$('#ITP_TAB_STOCKMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);			
+		},
+		grid: function() {
+			itp_fn_jqgrid_resize(STOCKMNG01010_GRID_ID, STOCKMNG01010_GRID_LIST, 'lg');
+			listObj.empty.init();
+			itp_fn_fire_window_resize();
+		},
+		ready: function() {
+			listObj.init();
+		}
+	},
+	event: {
+		init: function () {
+			this.button();
+		},
+		button: function () {
+			// 버튼 클릭 이벤트
+			$('button').each(function() {
+				var id = $(this).attr('id');
+				$(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;	// 재고이력 버튼
+					}
+				});
+			});
+
+			$('body').on('click', function(e) {
+				
+			});
+
+		}
+	},
+	switchScreen: function(mode) {
+		if(mode == 'LIST') { // 목록			
+			fn_show_btn_auth('#ITP_BTN_STOCKMNG01010_SRH');
+
+			$('#ITP_AJAX_STOCKMNG01010_LIST_CONTAINER').show();
+		}
+	}, 
+	fnWhsList: function(fnCall) {
+		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_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_STOCKMNG01010_SEARCH_WHS_ID');
+			
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
+					
+		}, 'POST');
+	}, 
+	fnLocationList: function(fnCall) {
+		const brandIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val();	
+		const whsIdVal = $('#ITP_FORM_STOCKMNG01010_SEARCH_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_STOCKMNG01010_SEARCH_LOCATION');
+			
+			if (fnCall !== undefined || typeof fnCall !== 'undefined') fnCall();
+					
+		}, 'POST');
+	}
+};
+
+/*목록화면 Object*/
+let listObj = {
+	init: function () {
+		this.grid.init();
+	},
+	itp_STOCKMNG01010_search: false,
+	button: {
+		search: function() {
+			listObj.itp_STOCKMNG01010_search = true;
+			let param = $('#ITP_FORM_STOCKMNG01010_SEARCH').serializeObject();
+			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();
+		}
+	},
+	empty: {
+		init: function() {
+			var _this = this;
+			this.push();
+			$(STOCKMNG01010_GRID_EMPTY).on('click', function() {
+				_this.back();
+				_this.itp_STOCKMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+				$(STOCKMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_STOCKMNG01010_param)}).trigger('reloadGrid');
+			});
+		},
+		itp_STOCKMNG01010_param: {},
+		push: function() {
+			let param = $('#ITP_FORM_STOCKMNG01010_SEARCH').serializeObject();
+			listObj.itp_STOCKMNG01010_param = param;
+		},
+		back: function() {
+			$('#ITP_FORM_STOCKMNG01010_DEVI_TP_CD').val(this.itp_STOCKMNG01010_param.deviTpCd);
+			$('#ITP_FORM_STOCKMNG01010_ORDER_YN').val(this.itp_STOCKMNG01010_param.orderYn);
+			$('#ITP_FORM_STOCKMNG01010_ADT_AUTH_CD').val(this.itp_STOCKMNG01010_param.adtAuthCd);
+			$('#ITP_FORM_STOCKMNG01010_EMAIL_RCV_YN').val(this.itp_STOCKMNG01010_param.emailRcvYn);
+			$('#ITP_FORM_STOCKMNG01010_MEMB_EXIT_DT').val(this.itp_STOCKMNG01010_param.membExitDt);
+			$('#ITP_FORM_STOCKMNG01010_FROM_DT').val(this.itp_STOCKMNG01010_param.fromDt);
+			$('#ITP_FORM_STOCKMNG01010_TO_DT').val(this.itp_STOCKMNG01010_param.toDt);
+			$('#ITP_FORM_STOCKMNG01010_KEYWORD').val(this.itp_STOCKMNG01010_param.keyword);
+		}
+	},
+	grid: {
+		init: function () {
+			// 데이터 없을때
+			listObj.empty.push();
+			this.search();
+		},
+		colModel: gridColModel.list,
+		search: function() {
+			pageObj.switchScreen('LIST');
+			this.unload();
+			this.load();
+		},
+		load: function() {
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_cd'));
+			$('#ITP_FORM_STOCKMNG01010_SEARCH_BRAND_ID').val(data.brandId);
+			
+			let param = $('#ITP_FORM_STOCKMNG01010_SEARCH').serializeObject();
+			param.gridSize = $.jgrid.defaults.rowNum;
+
+			var option = {
+				gridId: STOCKMNG01010_GRID_ID,
+				colModel: gridColModel.list,
+				param: JSON.stringify(param),
+				url: DOMAIN + STOCK_MNG_DETAIL_GRID_LIST,
+				pager: STOCKMNG01010_GRID_PAGER,
+				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) {
+					console.log(data);
+					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);
+					});
+				},
+				onPaging: function(action) {
+					itp_fn_grid_paging(STOCKMNG01010_GRID_ID, action, param);
+				}
+			};
+			itp_fn_grid_make_remote(option);
+		},
+		clearData : function() {
+			$(STOCKMNG01010_GRID_ID).jqGrid('clearGridData', true);
+			$(STOCKMNG01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+			$(STOCKMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+			$(STOCKMNG01010_GRID_EMPTY).show();
+		},
+		unload : function() {
+			$.jgrid.gridUnload(STOCKMNG01010_GRID_ID);
+		}
+	}
+};

src/main/webapp/js/app/system/ITP_SYSTEM03010.js

@@ -239,12 +239,12 @@ var itp_fn_SYSTEM03010_detail_grid = {
 					editoptions: {maxlength: 128}
 				},
 				{
-					index: 'CONN_URL', name: 'connUrl',
-					label: ITP_MSG_LOCALE.label.actionUrl,
-					width: '18', fixed: false, align: 'left',
-					sortable: false, editable: true, edittype: 'text',
-					editrules: {required: false},
-					editoptions: {maxlength: 128}
+					index: 'WRITE_YN', name: 'writeYn',
+					label: ITP_MSG_LOCALE.label.writeYn,
+					width: '8', fixed: false, align: 'center',
+					sortable: false, editable: true, formatter: 'checkbox', edittype: 'checkbox',
+					editoptions: {value: 'Y:N', defaultValue: 'Y'},
+					editrules: {required: true}
 				},
 				{
 					index: 'USE_YN', name: 'useYn',

src/main/webapp/js/app/system/ITP_SYSTEM04010.js

@@ -114,10 +114,22 @@ require(['config'], function() {
 						$.each(rowData, function(key, value) {
 							if (value.viewCd != 'R') {
 								value.authNo = keyValue;
+								
+								if (value.readYn == 'N' && value.writeYn == 'Y') {
+									value.readYn = 'Y';
+								}
+								
 								if (value.viewCd == 'C') {
 									gridInsertData.push(value);
 								} else if (value.viewCd == 'U') {
-									gridUpdateData.push(value);
+									
+									if (value.readYn == 'N' && value.writeYn == 'N') {
+										value.viewCd = 'D';
+										gridDeleteData.push(value);
+									} else {
+										gridUpdateData.push(value);
+									}
+									
 								}
 							}
 						});