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

src/main/webapp/app/oper/OPER06010.html

@@ -58,29 +58,49 @@
 									<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-7 itp_in">
+													<input type="text" name="afflShopNm" id="ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_NM" data-check-required="empty" class="form-control itp_input" readonly placeholder="가맹점명">
+												</div>
+												<div class="col-xs-3 itp_in">
+													<button type="button" id="ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-search"></i></button>
+													<button type="button" id="ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP" class="btn btn-primary btn-sm SEB"><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 class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in">
 													<div class="col-xs-9 itp_in fnBrandId"></div>
 												</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-10 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BRAND_NM" data-check-required="empty" class="form-control itp_input" name="brandNm" 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">
-													<select id="ITP_FORM_OPER06010_DETAIL_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="stCd">
+													<select id="ITP_FORM_OPER06010_DETAIL_ST_CD" data-select-code="ST_CD" data-check-required="empty" class="form-control itp_input" name="stCd">
 													</select>
 												</div>
 											</div>
 										</div>
 										<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-10 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BRAND_NM" class="form-control itp_input" name="brandNm" value="테스트 브랜드" maxlength="20">
+												<div class="col-xs-7 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWNER_NM" data-check-required="empty" class="form-control itp_input" name="ownerNm" value="">
 												</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_OPER06010_DETAIL_BRAND_TYPE" data-select-code="BRAND_TYPE" class="form-control itp_input" name="brandType">
+													<select id="ITP_FORM_OPER06010_DETAIL_BRAND_TYPE" data-select-code="BRAND_TYPE" data-check-required="empty" class="form-control itp_input" name="brandType">
 													</select>
 												</div>
 											</div>
@@ -89,7 +109,7 @@
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-10 itp_in">
-													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO" data-check-required="empty" class="form-control itp_input" name="bsnsRegNo" value="" maxlength="20">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">법인번호</label>
@@ -103,13 +123,13 @@
 											<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_OPER06010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="">																								
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="">
 												</div>
 												<!-- <button type="button" id="ITP_BTN_OPER06010_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-1 itp_in">
-												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER06010_DETAIL_BRAND_LOGO "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="brandLogo" >																					
+												<img src="/oqpo-view/images/naver.png" alt="로고 샘플" id="ITP_FORM_OPER06010_DETAIL_BRAND_LOGO "style="border:none; top:12px; left:12px; height:100px; width:125px; position:absolute;" class="form-control itp_input" name="brandLogo" >
 											</div>
 										</div>
 										<div class="form-group">
@@ -155,47 +175,46 @@
 												<label class="col-xs-2 itp_lb">입금계좌정보</label>
 												<div class="col-xs-12 itp_ip">
 													<div class="col-xs-1 itp_in">
-														<select id="ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" class="form-control itp_input" name="dpstBnkCd">
+														<select id="ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD" data-select-code="BNK_CD" data-check-required="empty" class="form-control itp_input" name="bnkCd">
 														</select>
 													</div>
 													<div class="col-xs-4 itp_in">
-														<input type="text" id="ITP_FORM_OPER06010_DETAIL_RCV_ACCT_NO" class="form-control itp_input" name="rcvAcctNo" value="" placeholder="계좌번호">													
+														<input type="text" id="ITP_FORM_OPER06010_DETAIL_RCV_ACCT_NO" data-check-required="empty" class="form-control itp_input" name="acctNo" value="" placeholder="계좌번호">
 													</div>
 													<div class="col-xs-2 itp_in">
-														<input type="text" id="ITP_FORM_STNFO01010_DETAIL_OWAC_NM" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">													
+														<input type="text" id="ITP_FORM_OPER06010_DETAIL_OWAC_NM" data-check-required="empty" class="form-control itp_input" name="owacNm" value="" placeholder="예금주명">
 													</div>										
 												</div>
 											</div>
 										</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<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_OPER06010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">													
-													</div>
-													<div class="col-xs-2 itp_in" style="width:10%;">
-														<button type="button" id="ITP_FORM_OPER06010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
-													</div>
-													<div class="col-xs-4 itp_in" style="margin:0 5px;">
-														<input type="text" id="ITP_FORM_OPER06010_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_OPER06010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
-													</div>
-
-
-													<!-- 주소 맵 -->
-													<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_LOTS_ADDRESS" value="" />
-													<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_STREET_ADDRESS" value="" />
-													<input type="hidden" name="cmpyLat" id="ITP_FORM_OPER06010_DETAIL_LAT" value="" />
-													<input type="hidden" name="cmpyLng" id="ITP_FORM_OPER06010_DETAIL_LNG" value="" />
-													<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_HJ_DONG" value="" />
-													<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_BJ_DONG" value="" />
-													<div id="ITP_FORM_OPER06010_DETAIL_MAP" style="width:700px; height:400px;"></div>
+									<div class="itp_form_in">
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">주소</label>
+											<div class="col-xs-10 itp_ip">
+												<div class="col-xs-1 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ZIPNO" class="form-control itp_input" name="zipNo" value="" maxlength="6" readonly placeholder="우편번호">
+												</div>
+												<div class="col-xs-1 itp_in">
+													<button type="button" id="ITP_FORM_OPER06010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
+												</div>
+												<div class="col-xs-4 itp_in" style="margin-right: 5px; margin-left:20px;">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES" class="form-control itp_input" name="addr1" value="" readonly placeholder="기본주소">
+												</div>
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_OPER06010_DETAIL_ADRES_DTL" class="form-control itp_input" name="addr2" value="" placeholder="상세주소">
 												</div>
-											</div>	
-										</div>	
+
+												<!-- 주소 맵 -->
+												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_LOTS_ADDRESS" value="" />
+												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_STREET_ADDRESS" value="" />
+												<input type="hidden" name="latX" id="ITP_FORM_OPER06010_DETAIL_LAT" value="" />
+												<input type="hidden" name="latY" id="ITP_FORM_OPER06010_DETAIL_LNG" value="" />
+												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_HJ_DONG" value="" />
+												<input type="hidden" id="ITP_FORM_OPER06010_DETAIL_BJ_DONG" value="" />
+												<div id="ITP_FORM_OPER06010_DETAIL_MAP" style="width:700px; height:400px;"></div>
+											</div>
+										</div>
+									</div>
 								</section>								
 							</form>
 						</div>
@@ -263,49 +282,54 @@
 										</div>
 									</div>
 										<div class="itp_form_in">	
-											<div class="form-group border">
+											<div class="form-group">
 												<label class="col-xs-2 itp_lb">입금계좌정보</label>
 												<div class="col-xs-12 itp_ip">
-													<div class="col-xs-1 itp_in fnDpstBnkCd"></div>
-													<div class="col-xs-1 itp_in fnRcvAcctNo"></div>
-													<div class="col-xs-2 itp_in fnOwacNm"></div>										
+													<div class="col-xs-2 itp_in fnDpstBnkCd"></div>
+													<div class="col-xs-2 itp_in fnRcvAcctNo"></div>
+													<div class="col-xs-2 itp_in fnOwacNm"></div>
 												</div>
 											</div>
 										</div>
-										<div class="itp_form_in">	
-											<div class="form-group border">
-												<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-3 itp_in fnLoadAddr"></div>
-													<div class="col-xs-2 itp_in fnDtlAddr"></div>	
-												</div>
-											</div>	
-										</div>	
 										<div class="itp_form_in">
-											<div class="form-group border">
-												<label class="col-xs-2 itp_lb">등록자/등록일 </label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-2 itp_in">
-														<div class="input-group fnRegId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-1" style="top:7px;">/</label>
-													<div class="col-xs-4 itp_in">
-														<div class="input-group fnRegDt" style="padding:5px;"></div>
+											<div class="form-group ">
+												<label class="col-xs-2 itp_lb">주소 *</label>
+												<div class="col-xs-10 itp_ip">
+													<div class="col-xs-10 itp_in">
+														<div class="col-xs-1 itp_in fnZipNo"></div>
+														<div class="col-xs-4 itp_in fnLoadAddr"></div>
+														<div class="col-xs-4 itp_in fnDtlAddr"></div>
 													</div>
+
+													<!-- 주소 맵 -->
+													<div id="ITP_FORM_OPER06010_VIEW_MAP" style="width:700px; height:400px;"></div>
 												</div>
-												<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
-												<div class="col-xs-4 itp_ip">
-													<div class="col-xs-2 itp_in">
-														<div class="input-group fnChgId" style="padding:5px;"></div>
-													</div>
-													<label class="col-xs-1" style="top:7px;">/</label>
-													<div class="col-xs-4 itp_in">
-														<div class="input-group fnChgDt" style="padding:5px;"></div>
-													</div>
+											</div>
+										</div>
+									<div class="itp_form_in">
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">등록자/등록일 </label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-2 itp_in">
+													<div class="input-group fnRegId" style="padding:5px;"></div>
 												</div>
-											</div>	
-										</div>						
+												<label class="col-xs-1" style="top:7px;">/</label>
+												<div class="col-xs-6 itp_in">
+													<div class="input-group fnRegDt" style="padding:5px;"></div>
+												</div>
+											</div>
+											<label class="col-xs-2 itp_lb">최종  수정자/수정일</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-2 itp_in">
+													<div class="input-group fnChgId" style="padding:5px;"></div>
+												</div>
+												<label class="col-xs-1" style="top:7px;">/</label>
+												<div class="col-xs-6 itp_in">
+													<div class="input-group fnChgDt" style="padding:5px;"></div>
+												</div>
+											</div>
+										</div>
+									</div>
 								</section>								
 							</form>
 						</div>

src/main/webapp/app/stinfo/STINFO02010.html

@@ -19,17 +19,17 @@
 								<form id="ITP_FORM_STINFO02010_SEARCH" class="form-horizontal">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_STINFO02010_SERVICE_ST_DT" class="form-control itp_input" name="serviceStDt">
-												<option value="">등록일</option>
-												<option value="">오픈일</option>
+											<select id="ITP_FORM_STINFO02010_SERVICE_ST_DT" class="form-control itp_input" name="searchDateType">
+												<option value="20">등록일</option>
+												<option value="10">오픈일</option>
 											</select>
 										</div>
 										<div class="col-xs-10 itp_ip itp_noMar">
 										<div class="col-xs-4 itp_ip">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_STINFO02010_SEARCH_REG_DT" class="form-control itp_input" name="sregDt">
+												<input type="text" id="ITP_FORM_STINFO02010_SEARCH_REG_DT" class="form-control itp_input" name="fromDt" readonly>
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_STINFO02010_SEARCH_OPEN_DT" class="form-control itp_input" name="sopenDt">
+												<input type="text" id="ITP_FORM_STINFO02010_SEARCH_OPEN_DT" class="form-control itp_input" name="toDt" readonly>
 											</div>
 										</div>
 										</div>
@@ -46,7 +46,7 @@
 											</select>
 										</div>
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_STINFO02010_SEARCH_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="sdvsn">
+											<select id="ITP_FORM_STINFO02010_SEARCH_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="sloanDvsn">
 												<option value="">정산타입</option>
 											</select>
 										</div>
@@ -78,14 +78,14 @@
 									<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-10 itp_in fnBrandNm"></div>
 											</div>
 											<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_STINFO02010_DETAIL_STORE_ST_CD" data-select-code="ST_CD" class="form-control itp_input" name="stCd"></select>
+								                	<select id="ITP_FORM_STINFO02010_DETAIL_STORE_ST_CD" data-select-code="ST_CD" data-check-required="empty" class="form-control itp_input" name="stCd"></select>
 												</div>
 											</div>
 										</div>
@@ -99,7 +99,7 @@
 											<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_STINFO02010_DETAIL_STORE_DVSN" data-select-code="STORE_DVSN" class="form-control itp_input" name="storeDvsn"></select>
+								                <select id="ITP_FORM_STINFO02010_DETAIL_STORE_DVSN" data-select-code="STORE_DVSN" data-check-required="empty" class="form-control itp_input" name="storeDvsn"></select>
 												</div>
 											</div>
 										</div>
@@ -109,7 +109,7 @@
 											<label class="col-xs-2 itp_lb">매장명 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-9 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_STORE_NM" class="form-control itp_input" name="storeNm" value="">
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_STORE_NM" data-check-required="empty" class="form-control itp_input" name="storeNm" value="">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">업태</label>
@@ -125,7 +125,7 @@
 											<label class="col-xs-2 itp_lb">사업자번호 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_BSNS_REG_NO" class="form-control itp_input" name="bsnsRegNo" value="">
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_BSNS_REG_NO"  data-check-required="empty"class="form-control itp_input" name="bsnsRegNo" value="">
 												</div>
 											</div>
 											<label class="col-xs-2 itp_lb">업종</label>
@@ -147,7 +147,7 @@
 											<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_STINFO02010_DETAIL_TEL_NO" class="form-control itp_input" name="telNo" value="">
+								                	<input type="text" id="ITP_FORM_STINFO02010_DETAIL_TEL_NO" data-check-required="empty" class="form-control itp_input" name="telNo" value="">
 												</div>
 											</div>
 										</div>
@@ -189,7 +189,7 @@
 											<label class="col-xs-2 itp_lb">지역 *</label>
 											<div class="col-xs-4 itp_ip">
 												<div class="col-xs-6 itp_in">
-												<select id="ITP_FORM_STINFO02010_DETAIL_AREA_CD" data-select-code="AREA_CD" class="form-control itp_input" name="areaCd">
+												<select id="ITP_FORM_STINFO02010_DETAIL_AREA_CD" data-select-code="AREA_CD" data-check-required="empty" class="form-control itp_input" name="areaCd">
 												</select>												
 												</div>
 											</div>
@@ -203,21 +203,39 @@
 											</div>
 										</div>
 									</div>
+									<div class="itp_form_in">
+										<div class="form-group border">
+											<label class="col-xs-2 itp_lb">브랜드 계좌정보</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-12 itp_in fbBrandAcctInfo"></div>
+											</div>
+											<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_STINFO02010_DETAIL_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="loanDvsn">
+													</select>
+												</div>
+												<div class="col-xs-4 itp_in">
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREDT_LIMIT_AMT" class="form-control itp_input" name="credtLimitAmt" value="후불한도금액">
+												</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-1 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ZIP_NO" class="form-control itp_input" name="zipNo" value="" maxlength="6" placeholder="우편번호">													
+													<input type="text" id="ITP_FORM_STINFO02010_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_STINFO02010_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_STINFO02010_DETAIL_ADRES_SCH" class="btn btn-primary btn-sm SHOW" style="margin: -1px 0px 0px 3px;">&nbsp;&nbsp;주소검색&nbsp;&nbsp;</button>
 												</div>
 												<div class="col-xs-4 itp_in" style="margin:0 5px;">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_LOAD_ADDR" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">													
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ADRES" class="form-control itp_input" name="loadAddr" value="" placeholder="기본주소">
 												</div>
 												<div class="col-xs-4 itp_in">
-													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_DTL_ADDR" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">													
+													<input type="text" id="ITP_FORM_STINFO02010_DETAIL_ADRES_DTL" class="form-control itp_input" name="dtlAddr" value="" placeholder="상세주소">
 												</div>
 											</div>
 										</div>
@@ -236,24 +254,6 @@
 											</div>
 										</div>
 									</div>
-									<div class="itp_form_in">
-										<div class="form-group border">
-											<label class="col-xs-2 itp_lb">브랜드 계좌정보</label>
-											<div class="col-xs-4 itp_ip">
-												<div class="col-xs-12 itp_in fbBrandAcctInfo"></div>
-											</div>
-											<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_STINFO02010_DETAIL_LOAN_DVSN" data-select-code="LOAN_DVSN" class="form-control itp_input" name="loanDvsn">
-													</select>
-												</div>
-												<div class="col-xs-4 itp_in">
-						                			<input type="text" id="ITP_FORM_STINFO02010_DETAIL_CREDT_LIMIT_AMT" class="form-control itp_input" name="credtLimitAmt" value="후불한도금액">
-												</div>
-											</div>
-										</div>
-									</div>
 								</section>
 							</form>
 						</div>

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

@@ -371,12 +371,10 @@ require([
 					} else {
 						// sessionStorage.removeItem('itp_manage_cmpy_cd');
 						*/
-						sessionStorage.setItem('itp_manage_cmpy_cd', '{}'); 
+						sessionStorage.setItem('itp_manage_cmpy_cd', '{}');
 					//}
-					// 사용자명
-					$('#ITP_LOGIN_USER').text(LOGIN_USER_INFO.userNm);
-					// 가맹점 만들기
-					fn_make_affl_brand.init();
+					// 사용자 정보 만들기
+					fn_make_user_info.init(result.userInfo);
 					// 왼쪽 메뉴 만들기
 					fn_make_side_menu();
 					// 메뉴 요약
@@ -399,22 +397,22 @@ function fn_make_menu_summary() {
 	
 }
 
-var fn_make_affl_brand = {
-	init : function() {
-		this.make();
-		this.action();
-	},
-	make: function () {
-		let authTypeNm = (LOGIN_USER_INFO.authTpNm === undefined) ? '오더퀸' : LOGIN_USER_INFO.authTpNm;
-		$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
+var fn_make_user_info = {
+	init : function(userInfo) {
+		this.button();
+		this.view(userInfo);
 	},
-	view: function() {
-		let brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
-		if(brandInfo) {
-			$('#ITP_TXT_MAIN_SHR_BRAND').text('(' + brandInfo.brandNm + ')');
+	view: function(userInfo) {
+		if(sessionStorage.getItem('itp_manage_user_info') === undefined) {
+			sessionStorage.setItem('itp_manage_user_info', JSON.stringify(userInfo));
 		}
+		// 사용자명
+		$('#ITP_LOGIN_USER').text(userInfo.userNm);
+		let authTypeNm = (userInfo.authTpNm === undefined) ? '오더퀸' : userInfo.authTpNm;
+		$('#ITP_TXT_MAIN_SHR_AFFL').text(authTypeNm);
+		$('#ITP_TXT_MAIN_SHR_BRAND').text('(' + userInfo.brandNm + ')');
 	},
-	action: function () {
+	button: function() {
 		var _this = this;
 		$('#ITP_BTN_MAIN_SHR_AFFL').on('click', function() {
 			// 팝업
@@ -422,19 +420,22 @@ var fn_make_affl_brand = {
 				// console.log(rowDataPop);
 				// sessionStorage.setItem('itp_manage_cmpy_cd', JSON.stringify(AFFL_BRAND_LIST[0]));
 				// $('#ITP_TXT_MAIN_SHR_CMPY').text(AFFL_BRAND_LIST[0].brandNm);
+				var sessionUserInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 				$.each(rowDataPop, function(key, value) {
 					itp_fn_close_other_tab(''); // 다른탭 닫기
-					sessionStorage.setItem('itp_manage_brand_info', JSON.stringify(value));
+					sessionUserInfo['afflShopId'] = value.afflShopId;
+					sessionUserInfo['afflShopNm'] = value.afflShopNm;
+					sessionUserInfo['brandId'] = value.brandId;
+					sessionUserInfo['brandNm'] = value.brandNm;
+					sessionStorage.setItem('itp_manage_user_info', JSON.stringify(sessionUserInfo));
+					// sessionStorage.setItem('itp_manage_brand_info', JSON.stringify(value));
 					_this.view();
 				});
 			};
 			fn_call_popup('biz', 'BIZPOP_AFFL_BRAND', '#ITP_ASIDE', popFn, null, 'S');
 		});
-	},
-	remove: function() {
-		sessionStorage.removeItem('itp_manage_brand_info');
 	}
-};
+}
 
 function fn_make_side_menu() {
 	$('#ITP_SIDEBAR .panel-group').empty();
@@ -481,7 +482,7 @@ function fn_make_side_menu() {
 
 		console.log('[ITP_NAV_LINK] data-itp-nav-id = ' + id + ', data-conn-url = ' + connUrl + ', tabSize = ' + tabSize);
 
-		if(String(id).indexOf('OPER') === -1 && String(id).indexOf('SYSTEM') === -1 && !sessionStorage.getItem('itp_manage_brand_info')) {
+		if(String(id).indexOf('OPER') === -1 && String(id).indexOf('SYSTEM') === -1 && !sessionStorage.getItem('itp_manage_user_info')) {
 			itp_fn_modal_alert(ITP_MSG_LOCALE.message.page.noChoiceBrand);
 			return false;
 		}

src/main/webapp/js/app/login.js

@@ -74,7 +74,7 @@ function itp_fn_login_proc() {
 		$('#password').val(CryptoJS.AES.encrypt($('#ITP_FORM_LOGIN_USER_PW').val(), hashed));
 	    var loginFn = function(result) {
 			// alert('SIGN-IN RESULT : ' + JSON.stringify(result));
-			sessionStorage.removeItem('itp_manage_brand_info');
+			sessionStorage.removeItem('itp_manage_user_info');
 			sessionStorage.setItem('itp_login_info', JSON.stringify({
 				timestamp: new Date(),
 		        connKey: result.connKey		// Jwt키를 가져와서 세션 스토리지에 저장

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

@@ -584,7 +584,7 @@ let createObj = {
 			// var vali_mainEmail = itp_fn_form_validate(formId, formId + 'MAIN_EMAIL', ['empty'], undefined);
 
 			var isValid = false;
-			$(formId).find('input, select, checkbox').each(function(k) {
+			$(formId).find('input, select, checkbox, textarea').each(function(k) {
 				if($(this).data('check-required')) {
 					var arry = $(this).data('check-required').split(',');
 					isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);

src/main/webapp/js/app/oper/ITP_OPER03011.js

@@ -248,9 +248,9 @@ let viewObj = {
 		this.load();
 	},
 	load: function() {
-		// const afflShopIdVal = JSON.parse(sessionStorage.getItem('itp_manage_brand_info')).afflShopId;
-		// const key = {afflShopId: afflShopIdVal, viewCd: 'R'};
-		const key = {afflShopId: 'FRCMP02', viewCd: 'R'};
+		const afflShopIdVal = JSON.parse(sessionStorage.getItem('itp_manage_user_info')).afflShopId;
+		const key = {afflShopId: afflShopIdVal, viewCd: 'R'};
+		// const key = {afflShopId: 'FRCMP02', viewCd: 'R'};
 		var param = $.param(key);
 		fn_ajax_call(API_DETAIL_INFO, param, this.callback, 'GET');
 	},

src/main/webapp/js/app/oper/ITP_OPER06010.js

@@ -40,7 +40,6 @@ let API_DETAIL_GRID_LIST = '/api/brand/detail-grid-list';
 let API_DETAIL_INFO = '/api/brand/info-brand';
 let API_DETAIL_SAVE = '/api/brand/save-brand';
 
-let ITP_FORM_OPER06010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
 
 /*화면 Grid Object*/
@@ -180,7 +179,6 @@ let pageObj = {
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_SRH', '#ITP_BTN_OPER06010_NEWREG']);
             $('#ITP_AJAX_OPER06010_LIST_CONTAINER').show();
         } else if(mode == 'ADD') { // 등록
-            ITP_FORM_OPER06010_DETAIL_IS_DUPLICATE = true;
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE']);
 
@@ -193,14 +191,26 @@ let pageObj = {
 
             $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_FILE_NO').val('');
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_CD').removeAttr('readonly');
-            $('#ITP_FORM_OPER06010_DETAIL_DUP').removeAttr('disabled');
+            $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').removeAttr('readonly');
+            $('#ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO').removeAttr('readonly');
+            $('#ITP_FORM_OPER06010_DETAIL_CORP_REG_NO').removeAttr('readonly');
+            // $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').removeAttr('disabled');
+            // $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').removeAttr('disabled');
+            $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').show();
+            $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').show();
             $('.fnBrandId').text('(자동부여)');
         } else if(mode == 'MODIFY') { // 수정
             $('#ITP_AJAX_OPER06010_DETAIL_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_CANCELLIST', '#ITP_BTN_OPER06010_SAVE', '#ITP_BTN_OPER06010_RESET_PW']);
 
             $('#ITP_FORM_OPER06010_DETAIL_BRAND_CD').attr('readonly', true);
-            $('#ITP_FORM_OPER06010_DETAIL_DUP').attr('disabled', true);
+            $('#ITP_FORM_OPER06010_DETAIL_BRAND_NM').attr('readonly', true);
+            $('#ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO').attr('readonly', true);
+            $('#ITP_FORM_OPER06010_DETAIL_CORP_REG_NO').attr('readonly', true);
+            // $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').attr('disabled', true);
+            // $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').attr('disabled', true);
+            $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').hide();
+            $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').hide();
         } else if(mode == 'VIEW') { // 보기
             $('#ITP_AJAX_OPER06010_VIEW_CONTAINER').show();
             fn_show_btn_auth_array(['#ITP_BTN_OPER06010_MODIFY', '#ITP_BTN_OPER06010_CANCELLIST']);
@@ -283,7 +293,7 @@ let listObj = {
                     }
                 },
                 loadComplete: function(data) {
-                    //console.log(JSON.stringify(data));
+                    console.log(data);
                     itp_fn_grid_load_complete(data, OPER06010_GRID_ID, true, 'number', 'OPER06010', listObj.itp_OPER06010_search, listObj.empty, true, data.gridRecords, true);
                     var ids = $(OPER06010_GRID_ID).getDataIDs();
                     $.each(ids, function(idx, rowId) {
@@ -317,18 +327,19 @@ let viewObj = {
         fn_ajax_call(API_DETAIL_INFO, param, this.callback, 'GET');
     },
     callback: function (result) {
-        // console.log(result);
+        console.log(result);
         pageObj.switchScreen('VIEW');
         $('#ITP_FORM_OPER06010_VIEW #ITP_FORM_OPER06010_VIEW_AFFL_SHOP_ID').val(result.afflShopId);
         $('#ITP_FORM_OPER06010_VIEW #ITP_FORM_OPER06010_VIEW_BRAND_ID').val(result.brandId);
         $('#ITP_FORM_OPER06010_VIEW .fnBrandUnitUnqNo').text(result.brandId);
-        $('#ITP_FORM_OPER06010_VIEW .fnStCd').text(result.stCd);
+        $('#ITP_FORM_OPER06010_VIEW .fnStCd').text(result.stNm);
         $('#ITP_FORM_OPER06010_VIEW .fnBrandNm').text(result.brandNm);
-        $('#ITP_FORM_OPER06010_VIEW .fnBrandType').text(result.brandType);
+        $('#ITP_FORM_OPER06010_VIEW .fnBrandType').text(result.brandTypeNm);
+        $('#ITP_FORM_OPER06010_VIEW .fnOwnerNm').text(result.ownerNm);
         $('#ITP_FORM_OPER06010_VIEW .fnTelNo').text(result.telNo);
         $('#ITP_FORM_OPER06010_VIEW .fnFaxNo').text(result.faxNo);
-        $('#ITP_FORM_OPER06010_VIEW .fnEmalAddr').text(result.email);
-        $('#ITP_FORM_OPER06010_VIEW .fnDpstBnkCd').text(result.bnkCd);
+        $('#ITP_FORM_OPER06010_VIEW .fnEmalAddr').text(result.emalAddr);
+        $('#ITP_FORM_OPER06010_VIEW .fnDpstBnkCd').text(result.bnkCdNm);
         $('#ITP_FORM_OPER06010_VIEW .fnRcvAcctNo').text(result.acctNo);
         $('#ITP_FORM_OPER06010_VIEW .fnOwacNm').text(result.owacNm);
         $('#ITP_FORM_OPER06010_VIEW .fnZipNo').text(result.zipNo);
@@ -339,6 +350,10 @@ let viewObj = {
         $('#ITP_FORM_OPER06010_VIEW .fnChgId').text(result.sysChgId);
         $('#ITP_FORM_OPER06010_VIEW .fnChgDt').text(result.sysChgDttm);
         // $('#ITP_FORM_OPER06010_VIEW .fnBrandLogo').text(result.lastLoginDt);
+
+        let locate = result.addr1 + ' ' + result.addr2;
+        kakaoMap.init('ITP_FORM_OPER06010_VIEW', locate);
+
     }
 };
 
@@ -362,21 +377,24 @@ let modifyObj = {
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_VIEW_CD').val('U');
 
         $('#ITP_FORM_OPER06010_DETAIL .fnBrandId').text(result.brandId);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRANDP_ID').val(result.brandId);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(result.afflShopId);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_NM').val(result.afflShopNm);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(result.brandId);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ST_CD').val(result.stCd);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_NM').val(result.brandNm);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BRAND_TYPE').val(result.brandType);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_BSNS_REG_NO').val(result.bsnsRegNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_CORP_REG_NO').val(result.corpRegNo);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OWNER_NM').val(result.ownerNm);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_TEL_NO').val(result.telNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_FAX_NO').val(result.faxNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_EMAL_ADDR').val(result.emalAddr);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD').val(result.dpstBnkCd);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_DPST_BNK_CD').val(result.bnkCd);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_RCV_ACCT_NO').val(result.acctNo);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_OWAC_NM').val(result.owacNm);
         $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ZIPNO').val(result.zipNo);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_LOAD_ADDR').val(result.addr1);
-        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_DTL_ADDR').val(result.addr2);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER06010_DETAIL_ADRES').val(result.addr1);
+        $('#ITP_FORM_OPER06010_DETAIL #ITP_FORM_OPER03010_DETAIL_ADRES_DTL').val(result.addr2);
 
         $('#ITP_FORM_OPER06010_DETAIL .fnAddDt').text(result.sysRegDttm);
         $('#ITP_FORM_OPER06010_DETAIL .fnChgDt').text(result.sysChgDttm);
@@ -390,50 +408,65 @@ let modifyObj = {
 /*신규화면 Object*/
 let createObj = {
     init: function () {
+        this.button.init();
         pageObj.fileUpload();
         $('#ITP_FORM_OPER06010_DETAIL_BRAND_ID').val(LOGIN_USER_INFO.brandId);
         kakaoMap.init('ITP_FORM_OPER06010_DETAIL', '');
     },
     button: {
+        init: function() {
+            // 가맹점 조회 버튼 클릭
+            $('#ITP_FORM_OPER06010_DETAIL_SEARCH_AFFL_SHOP').on('click', function() {
+                createObj.popup();
+            });
+            // 가맹점 텍스트 삭제 버튼 클릭
+            $('#ITP_FORM_OPER06010_DETAIL_DELETE_AFFL_SHOP').on('click', function() {
+                $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val('');
+                $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_NM').val('');
+            });
+        },
         address: function() {
-            new daum.Postcode({
-                oncomplete: function(data) {
-                    // 전체주소 리턴
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_ZIPNO').value = data.zonecode;
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_ADRES').value = data.roadAddress;
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_LOTS_ADDRESS').value = !!data.autoJibunAddress ? data.autoJibunAddress : data.jibunAddress;
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_STREET_ADDRESS').value = data.roadAddress;
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_HJ_DONG').value = !!data.hname ? data.hname : data.bname;
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_BJ_DONG').value = data.bname;
-
-                    kakaoMap.init('ITP_FORM_OPER06010_DETAIL', data.roadAddress);
-                    document.getElementById('ITP_FORM_OPER06010_DETAIL_ADRES_DTL').focus();
-                }
-            }).open();
+            kakaoMap.address('ITP_FORM_OPER06010_DETAIL');
         },
         save: function() {
             const formId = '#ITP_FORM_OPER06010_DETAIL';
             itp_fn_form_clear_validate(null, formId);
-            var vali_brandCd = itp_fn_form_validate(formId, formId + '_BRAND_ID', ['empty'], undefined);
-            var vali_brandUseCd = itp_fn_form_validate(formId, formId + '_BRAND_USE_CD', ['empty'], undefined);
-            var vali_brandNm = itp_fn_form_validate(formId, formId + '_BRAND_NM', ['empty'], undefined);
-
-            if (vali_brandCd && vali_brandUseCd && vali_brandNm) {
-                if (ITP_FORM_OPER06010_DETAIL_IS_DUPLICATE) {
-                    itp_fn_modal_duplicate(ITP_MSG_LOCALE.label.brandId, formId + '_BRAND_ID');
-                } else {
-                    let param = $(formId).serializeObject();
+            // var vali_brandCd = itp_fn_form_validate(formId, formId + '_BRAND_ID', ['empty'], undefined);
+            // var vali_brandUseCd = itp_fn_form_validate(formId, formId + '_BRAND_USE_CD', ['empty'], undefined);
+            // var vali_brandNm = itp_fn_form_validate(formId, formId + '_BRAND_NM', ['empty'], undefined);
 
-                    var searhFn = function() {
-                        ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
-                        listObj.grid.search();
-                    };
-                    fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+            var isValid = false;
+            $(formId).find('input, select, checkbox, textarea').each(function(k) {
+                if($(this).data('check-required')) {
+                    var arry = $(this).data('check-required').split(',');
+                    isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
+                    if(!isValid) return false;
                 }
+            });
+
+            if (isValid) {
+                let param = $(formId).serializeObject();
+                // console.log(JSON.stringify(param));
+
+                var searhFn = function() {
+                    ITP_FORM_OPER06010_DETAIL_IS_WRITING = false;
+                    listObj.grid.search();
+                };
+                fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
             }
         },
         cancel: function () {
             listObj.grid.search();
         }
+    },
+    popup: function() {
+        var popFn = function(rowDataPop) {
+            // console.log(rowDataPop);
+            if(rowDataPop.AFFL_SHOP) {
+                $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_ID').val(rowDataPop.AFFL_SHOP.afflShopId);
+                $('#ITP_FORM_OPER06010_DETAIL_AFFL_SHOP_NM').val(rowDataPop.AFFL_SHOP.afflShopNm);
+            }
+        };
+        fn_call_popup('biz', 'BIZPOP_AFFL_SHOP', '#ITP_ASIDE', popFn, null, 'S');
     }
 };

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

@@ -13,10 +13,10 @@ let API_ITEM_CLASS_LEVEL_POP	= '/api/item/class-level-list';			//품목분류 le
 var popPageObj = {
 	init: function () {
 		this.button();
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.userInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		popItemClassLevel.list(1, true);
 	},
-	brandInfo: {},
+	userInfo: {},
 	parentPopFn: null,
 	args: null,
 	returnType: null,
@@ -43,7 +43,7 @@ var popItemClassLevel = {
 	isList: true,
 	level: 1,
 	keys: function() {
-		var keys = {sBrandId:popPageObj.brandInfo.brandId, sItemLevel: this.level};
+		var keys = {sBrandId:popPageObj.userInfo.brandId, sItemLevel: this.level};
 		for(var i=1; i<this.level; i++) {
 			var key = 'sItemClass' + i;
 			var id = '#ITP_FORM_STINFO04010_DETAIL_ITEM_CLASS' + i;

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

@@ -15,7 +15,7 @@ var popPageObj = {
 	init: function () {
 		this.button();
 		this.change();
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		//재고정보 조회
 		this.fnStockInfo();
 	},

src/main/webapp/js/app/stinfo/ITP_STINFO01010.js

@@ -105,7 +105,7 @@ let pageObj = {
         this.event.init();
     },
     brandInfo: function() {
-        return JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+        return JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
     },
     ui: {
         init: function () {
@@ -174,7 +174,7 @@ let pageObj = {
         $('.itp_det_head').find('button[id^="ITP_BTN_STINFO01010_"]').each(function(i) {
             $(this).hide();
         });
-        $('#ITP_TABSTINFO01010').find('div[id$="_CONTAINER"]').each(function(i) {
+        $('#ITP_TAB_STINFO01010').find('div[id$="_CONTAINER"]').each(function(i) {
             $(this).hide();
         });
         if(mode == 'LIST') { // 목록

src/main/webapp/js/app/stinfo/ITP_STINFO02010.js

@@ -34,7 +34,6 @@ const STINFO02010_DETAIL_GRID_LIST = '#ITP_STINFO02010_DETAIL_jqGrid_list';
 const STINFO02010_DETAIL_GRID_PAGER = '#ITP_STINFO02010_DETAIL_jqGridPager';
 const STINFO02010_DETAIL_GRID_EMPTY = '#ITP_STINFO02010_DETAIL_jqGridEmpty';
 
-let ITP_FORM_STINFO02010_DETAIL_IS_DUPLICATE = false;
 let ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
 
 /*API URL*/
@@ -144,7 +143,7 @@ let pageObj = {
 		this.event.init();
 	},
 	brandInfo: function() {
-		return JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		return JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 	},
 	ui: {
 		init: function () {
@@ -162,6 +161,9 @@ let pageObj = {
 					fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
 				}
 			});
+
+			// 조회일자 지정
+			$('#ITP_TAB_STINFO02010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 		},
 		grid: function() {
 			itp_fn_jqgrid_resize(STINFO02010_GRID_ID, STINFO02010_GRID_LIST, 'lg');
@@ -182,38 +184,34 @@ let pageObj = {
 				var id = $(this).attr('id');
 				$(this).on('click', function() {
 					switch (id) {
-						case 'ITP_BTN_STINFO02010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
-						case 'ITP_BTN_STINFO02010_NEWREG'			: listObj.button.create(); 		break;	// 신규등록 버튼
-						case 'ITP_BTN_STINFO02010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
-						case 'ITP_BTN_STINFO02010_CANCELLIST'		: createObj.button.cancel(); 	break;	// 취소/목록 버튼
-						case 'ITP_BTN_STINFO02010_DELETE'			: 								break;	// 삭제 버튼
-						case 'ITP_BTN_STINFO02010_SAVE'				: createObj.button.save(); 		break;	// 저장 버튼
-						case 'ITP_FORM_STINFO02010_DETAIL_DUP'		: createObj.button.duplicate();	break;	// 중복체크
-						case 'ITP_BTN_STINFO02010_RESET_PW'			: createObj.button.resetPass();	break;	// 상세:비밀번호 초기화
+						case 'ITP_BTN_STINFO02010_SRH'					: listObj.button.search();		break;	// 조회 버튼 클릭
+						case 'ITP_BTN_STINFO02010_NEWREG'				: listObj.button.create(); 		break;	// 신규등록 버튼
+						case 'ITP_BTN_STINFO02010_MODIFY'				: modifyObj.button.modify();	break;	// 수정 버튼
+						case 'ITP_BTN_STINFO02010_CANCELLIST'			: createObj.button.cancel(); 	break;	// 취소/목록 버튼
+						case 'ITP_BTN_STINFO02010_DELETE'				: 								break;	// 삭제 버튼
+						case 'ITP_BTN_STINFO02010_SAVE'					: createObj.button.save(); 		break;	// 저장 버튼
+						case 'ITP_FORM_STINFO02010_DETAIL_ADRES_SCH'	: createObj.button.address();	break;	// 신규등록 주소 찾기
+						case 'ITP_FORM_STINFO02010_DETAIL_DUP'			: createObj.button.duplicate();	break;	// 중복체크
+						case 'ITP_BTN_STINFO02010_RESET_PW'				: createObj.button.resetPass();	break;	// 상세:비밀번호 초기화
 					}
 				});
 			});
 
-			$('body').on('click', function(e) {
-				var gridId = STINFO02010_DETAIL_GRID_ID.replace('#', '');
-				var rids = $(STINFO02010_DETAIL_GRID_ID).jqGrid('getDataIDs');
-				var last_row_id = rids[rids.length - 1];
-				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'STINFO02010_DETAIL');
-			});
-
 		}
 	},
 	switchScreen: function(mode) {
 		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO02010_"]').each(function(i) {
 			$(this).hide();
 		});
-		$('#ITP_TABSTINFO02010').find('div[id$="_CONTAINER"]').each(function(i) {
+		$('#ITP_TAB_STINFO02010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
 		if(mode == 'LIST') { // 목록
+			console.log(LOGIN_USER_INFO);
 			$('#ITP_AJAX_STINFO02010_LIST_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_SRH', '#ITP_BTN_STINFO02010_NEWREG']);
 		} else if(mode == 'ADD') { // 등록
+			console.log(LOGIN_USER_INFO);
 			$('#ITP_AJAX_STINFO02010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_CANCELLIST', '#ITP_BTN_STINFO02010_SAVE']);
 
@@ -224,6 +222,9 @@ let pageObj = {
 				}
 			});
 
+			$('#ITP_FORM_STINFO02010_DETAIL_BRAND_ID').val(LOGIN_USER_INFO.brandId);
+			$('#ITP_FORM_STINFO02010_DETAIL .fnBrandNm').text(LOGIN_USER_INFO.brandNm);
+
 			$('#ITP_FORM_STINFO02010_DETAIL .fnStoreNm').text('(자동부여)');
 			$('#ITP_FORM_STINFO02010_DETAIL_STORE_ID').removeAttr('readonly');
 			$('#ITP_FORM_STINFO02010_DETAIL_DUP').removeAttr('disabled');
@@ -231,6 +232,9 @@ let pageObj = {
 			$('#ITP_AJAX_STINFO02010_DETAIL_CONTAINER').show();
 			fn_show_btn_auth_array(['#ITP_BTN_STINFO02010_CANCELLIST', '#ITP_BTN_STINFO02010_SAVE', '#ITP_BTN_STINFO02010_RESET_PW']);
 
+			$('#ITP_FORM_STINFO02010_DETAIL_BRAND_ID').val(LOGIN_USER_INFO.brandId);
+			$('#ITP_FORM_STINFO02010_DETAIL .fnBrandNm').text(LOGIN_USER_INFO.brandNm);
+
 			$('#ITP_FORM_STINFO02010_DETAIL_STORE_ID').attr('readonly', true);
 			$('#ITP_FORM_STINFO02010_DETAIL_DUP').attr('disabled', true);
 			$('#ITP_FORM_STINFO02010_DETAIL_SEARCH_AFFL_SHOP_NM').attr('readonly', true);
@@ -280,12 +284,12 @@ let listObj = {
 			listObj.itp_STINFO02010_param = param;
 		},
 		back: function() {
-			$('#ITP_FORM_STINFO02010_SERVICE_ST_DT').val(this.itp_STINFO02010_param.serviceStDt);
-			$('#ITP_FORM_STINFO02010_SEARCH_REG_DT').val(this.itp_STINFO02010_param.sregDt);
-			$('#ITP_FORM_STINFO02010_SEARCH_OPEN_DT').val(this.itp_STINFO02010_param.sopenDt);
+			$('#ITP_FORM_STINFO02010_SERVICE_ST_DT').val(this.itp_STINFO02010_param.searchDateType);
+			$('#ITP_FORM_STINFO02010_SEARCH_REG_DT').val(this.itp_STINFO02010_param.fromDt);
+			$('#ITP_FORM_STINFO02010_SEARCH_OPEN_DT').val(this.itp_STINFO02010_param.toDt);
 			$('#ITP_FORM_STINFO02010_SEARCH_STORE_DVSN').val(this.itp_STINFO02010_param.sstoreDvsn);
 			$('#ITP_FORM_STINFO02010_SEARCH_STORE_ST_CD').val(this.itp_STINFO02010_param.sstoreStCd);
-			$('#ITP_FORM_STINFO02010_SEARCH_LOAN_DVSN').val(this.itp_STINFO02010_param.sdvsn);
+			$('#ITP_FORM_STINFO02010_SEARCH_LOAN_DVSN').val(this.itp_STINFO02010_param.sloanDvsn);
 			$('#ITP_FORM_STINFO02010_SEARCH_STORE_NM').val(this.itp_STINFO02010_param.sstoreMm);
 		}
 	},
@@ -457,51 +461,43 @@ let createObj = {
 		kakaoMap.init('ITP_FORM_STINFO02010_DETAIL', '');
 	},
 	button: {
+		address: function() {
+			kakaoMap.address('ITP_FORM_STINFO02010_DETAIL');
+		},
 		cancel: function() {
 			listObj.grid.search();
 		},
 		save: function() {
 			const formId = '#ITP_FORM_STINFO02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
-			var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
-			var vali_userStatCd = itp_fn_form_validate(formId, formId + '_USER_STAT_CD', ['empty'], undefined);
-			var vali_userNm = itp_fn_form_validate(formId, formId + '_USER_NM', ['empty'], undefined);
-			var vali_telNo = itp_fn_form_validate(formId, formId + '_TEL_NO', ['empty'], undefined);
-			var vali_email = itp_fn_form_validate(formId, formId + '_EMAIL', ['empty'], undefined);
-			var vali_userPw = true;
-			var vali_userPwConfirm = true;
-			if (vali_userId && vali_userStatCd && vali_userNm && vali_userPw && vali_userPwConfirm && vali_telNo && vali_email) {
-				if (ITP_FORM_STINFO02010_DETAIL_IS_DUPLICATE) {
-					itp_fn_modal_duplicate(ITP_MSG_LOCALE.label.userId, formId + '_USER_ID');
-				} else {
-					let gridInsertData = [];
-					let gridUpdateData = [];
-					let gridDeleteData = [];
-					const rowData = $(STINFO02010_DETAIL_GRID_ID).getRowData();
-					const keyValue = $(formId + '_USER_ID').val();
-					$.each(rowData, function(key, value) {
-						if (value.viewCd != 'R') {
-							value.userId = keyValue;
-							if (value.viewCd == 'C') {
-								gridInsertData.push(value);
-							} else if (value.viewCd == 'U') {
-								gridUpdateData.push(value);
-							} else if (value.viewCd == 'D') {
-								gridDeleteData.push(value);
-							}
-						}
-					});
-					let param = $(formId).serializeObject();
-					param.gridInsertData = gridInsertData;
-					param.gridUpdateData = gridUpdateData;
-					param.gridDeleteData = gridDeleteData;
-					//console.log(JSON.stringify(param));
-					var searhFn = function() {
-						ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
-						listObj.grid.search();
-					};
-					fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
+			// var vali_userId = itp_fn_form_validate(formId, formId + '_USER_ID', ['empty'], undefined);
+			// var vali_userStatCd = itp_fn_form_validate(formId, formId + '_USER_STAT_CD', ['empty'], undefined);
+			// var vali_userNm = itp_fn_form_validate(formId, formId + '_USER_NM', ['empty'], undefined);
+			// var vali_telNo = itp_fn_form_validate(formId, formId + '_TEL_NO', ['empty'], undefined);
+			// var vali_email = itp_fn_form_validate(formId, formId + '_EMAIL', ['empty'], undefined);
+			// var vali_userPw = true;
+			// var vali_userPwConfirm = true;
+
+			var isValid = false;
+			$(formId).find('input, select, checkbox, textarea').each(function(k) {
+				if($(this).data('check-required')) {
+					var arry = $(this).data('check-required').split(',');
+					isValid = itp_fn_form_validate(formId, '#' + $(this).attr('id'), arry, undefined);
+					if(!isValid) return false;
 				}
+			});
+
+			if (isValid) {
+				let param = $(formId).serializeObject();
+				param.gridInsertData = gridInsertData;
+				param.gridUpdateData = gridUpdateData;
+				param.gridDeleteData = gridDeleteData;
+				//console.log(JSON.stringify(param));
+				var searhFn = function() {
+					ITP_FORM_STINFO02010_DETAIL_IS_WRITING = false;
+					listObj.grid.search();
+				};
+				fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
 			}
 		},
 		resetPass: function() {

src/main/webapp/js/app/stinfo/ITP_STINFO03010.js

@@ -156,7 +156,7 @@ const gridColModel = {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},
@@ -224,7 +224,7 @@ let pageObj = {
 		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO03010_"]').each(function(i) {
 			$(this).hide();
 		});
-		$('#ITP_TABSTINFO03010').find('div[id$="_CONTAINER"]').each(function(i) {
+		$('#ITP_TAB_STINFO03010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
 		if(mode == 'LIST') { // 목록

src/main/webapp/js/app/stinfo/ITP_STINFO04010.js

@@ -152,7 +152,7 @@ const gridColModel = {
 /*화면공통 Object*/
 let pageObj = {
     init: function () {
-        this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+        this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
         this.ui.init();
         this.event.init();
     },
@@ -225,7 +225,7 @@ let pageObj = {
         $('.itp_det_head').find('button[id^="ITP_BTN_STINFO04010_"]').each(function(i) {
             $(this).hide();
         });
-        $('#ITP_TABSTINFO04010').find('div[id$="_CONTAINER"]').each(function(i) {
+        $('#ITP_TAB_STINFO04010').find('div[id$="_CONTAINER"]').each(function(i) {
             $(this).hide();
         });
         if(mode == 'LIST') { // 목록

src/main/webapp/js/app/stinfo/ITP_STINFO05010.js

@@ -138,7 +138,7 @@ const gridColModel = {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},
@@ -202,7 +202,7 @@ let pageObj = {
 		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO05010_"]').each(function(i) {
 			$(this).hide();
 		});
-		$('#ITP_TABSTINFO05010').find('div[id$="_CONTAINER"]').each(function(i) {
+		$('#ITP_TAB_STINFO05010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
 		if(mode == 'LIST') { // 목록

src/main/webapp/js/app/stinfo/ITP_STINFO06010.js

@@ -39,7 +39,7 @@ let API_DETAIL_SAVE 		= '/api/itemunit/save-store-itemunit';		// 저장
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},
@@ -96,7 +96,7 @@ let pageObj = {
 		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO06010_"]').each(function(i) {
 			$(this).hide();
 		});
-		$('#ITP_TABSTINFO06010').find('div[id$="_CONTAINER"]').each(function(i) {
+		$('#ITP_TAB_STINFO06010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
 		if(mode == 'LIST') { // 목록

src/main/webapp/js/app/stinfo/ITP_STINFO07010.js

@@ -91,7 +91,7 @@ const gridColModel = {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},
@@ -146,7 +146,7 @@ let pageObj = {
 		$('.itp_det_head').find('button[id^="ITP_BTN_STINFO07010_"]').each(function(i) {
 			$(this).hide();
 		});
-		$('#ITP_TABSTINFO07010').find('div[id$="_CONTAINER"]').each(function(i) {
+		$('#ITP_TAB_STINFO07010').find('div[id$="_CONTAINER"]').each(function(i) {
 			$(this).hide();
 		});
 		if(mode == 'LIST') { // 목록

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

@@ -123,7 +123,7 @@ require(['config'], function() {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},

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

@@ -303,7 +303,7 @@ let pageObj = {
 			fn_proc_btn_auth('STOCKMNG02010');
 			
 			// 브랜드ID 지정
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val(data.brandId);
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_NM').val(data.brandNm); 
 			
@@ -514,7 +514,7 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 			$('#ITP_FORM_STOCKMNG02010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			let param = $('#ITP_FORM_STOCKMNG02010_SEARCH').serializeObject();
@@ -691,7 +691,8 @@ let stockCddObj = {
 		cancel: function() {
 			listObj.grid.search();
 		},
-		uploadExcel: function() {
+		uploadExcel: function() {			
+			stockCddObj.clearData(); 
 			// 파일선택
 			$('#ITP_FORM_STOCKMNG02010_DETAIL_EXCEL_UPLOAD_SELECT_FILE').click();
 		}, 
@@ -712,11 +713,8 @@ let stockCddObj = {
 				processArray.push(processData);
 			});
 			
-			// $.each(processArray, function(key, value) {
-			// console.log(JSON.stringify(value));					
-			// });
-			
 			// 엑셀 목록을 서버에서 조회한다.
+			const itemMap = new Map();
 			const formId = '#ITP_FORM_STOCKMNG02010_DETAIL';
 			let param = $(formId).serializeObject();
 			param.whsId = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val();
@@ -725,8 +723,52 @@ let stockCddObj = {
 			//console.log(JSON.stringify(param));
 			var callbackFn = function(result) {
 				// TODO 엑셀 데이터를 현재고수량 참고하여 ROW를 추가한다.
-				console.log('RESULT : ' + JSON.stringify(result));
-				// addRowCallback 참고
+				// console.log('RESULT : ' + JSON.stringify(result));
+				$.each(result.gridRows, function(key, value) {
+					itemMap.set(value.itemId.toString(), value);	
+				});
+				
+				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 normalYn = 'Y';
+				var errorMsg = '';
+								
+				$.each(processArray, function(key, value) {
+					// console.log(JSON.stringify(value));
+					// 품목번호 체크
+					var itemObject;
+					if (!itemMap.has(value.itemId)) {
+						normalYn = "N";
+						errorMsg = "품목번호 미존재";
+					} else {
+						itemObject = itemMap.get(value.itemId)
+					}
+					
+					// 행추가
+					$(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, 'normalYn', normalYn); // 정상여부
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'errorMsg', errorMsg); 
+					$(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', itemObject ? itemObject.itemNm : '');
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'unit', itemObject ? itemObject.unit : '');
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'stckQty', itemObject ? itemObject.stckQty : '');
+					$(STOCKMNG02010_DETAIL_GRID_ID).jqGrid('setCell', last_row_id, 'cddQty', value.cddQty);										
+			 	});
+				$(STOCKMNG02010_DETAIL_GRID_EMPTY).hide();
+				
 			};
 			fn_ajax_call(STOCK_MNG_CDD_GRID_LIST, JSON.stringify(param), callbackFn, 'POST');
 						
@@ -792,18 +834,26 @@ let stockCddObj = {
 					itp_fn_modal_alert_ajax(ITP_MSG_LOCALE.message.grid.noData);
 					return;
 				}	
-				var dataCheck = true;			
+				var cddQtyCheck = true;			
+				var normalYnCheck = true;			
 				$.each(rowData, function(key, value) {
 					if (value.cddQty == '' || isNaN(value.cddQty)) {
-						dataCheck = false;
-					}					
+						cddQtyCheck = false;
+					}		
+					if (value.normalYn == 'N') {
+						normalYnCheck = false;
+					}			
 					gridInsertData.push(value);
 				});
 				// 데이터 체크
-				if(!dataCheck) {
+				if(!cddQtyCheck) {
 					itp_fn_modal_alert_ajax('실사수량을 입력하세요.');
 					return;
-				}				
+				}			
+				if(!normalYnCheck) {
+					itp_fn_modal_alert_ajax('정상여부 값이 N인 데이터가 있습니다.\n품목번호를 확인하세요.');
+					return;
+				}	
 				let param = $(formId).serializeObject();
 				param.whsId = $('#ITP_FORM_STOCKMNG02010_DETAIL_WHS_ID').val();
 				param.location = $('#ITP_FORM_STOCKMNG02010_DETAIL_LOCATION').val();

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

@@ -120,7 +120,7 @@ require(['config'], function() {
 /*화면공통 Object*/
 let pageObj = {
 	init: function () {
-		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+		this.brandInfo = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 		this.ui.init();
 		this.event.init();
 	},
@@ -136,7 +136,7 @@ let pageObj = {
 			fn_proc_btn_auth('STOCKMNG03010');
 			
 			// 브랜드ID 지정
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 			$('#ITP_FORM_STOCKMNG03010_SEARCH_BRAND_ID').val(data.brandId);
 			
 			pageObj.fnWhsList(function() {
@@ -330,7 +330,7 @@ let listObj = {
 			this.load();
 		},
 		load: function() {
-			var data = JSON.parse(sessionStorage.getItem('itp_manage_brand_info'));
+			var data = JSON.parse(sessionStorage.getItem('itp_manage_user_info'));
 			$('#ITP_FORM_STOCKMNG03010_BRAND_ID').val(data.brandId);
 			$('#ITP_FORM_STOCKMNG03010_SEARCH_BRAND_ID').val(data.brandId);
 			

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

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