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

src/main/webapp/app/inoutmng/INOUTMNG01010.html

@@ -4,7 +4,8 @@
 			<div class="itp_det_head fix">
 				<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_INOUTMNG01010_SRH" class="btn btn-success btn-sm OUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하지시&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_INOUTMNG01010_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_INOUTMNG01010_OUT" class="btn btn-success btn-sm OUD" style="display: inline-block;"><i class="glyphicon "></i>&nbsp;&nbsp;출하지시&nbsp;&nbsp;</button>
 				</div>
 			</div>
 			<div class="itp_det_in">
@@ -21,24 +22,29 @@
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_REQ_DT" class="form-control itp_input" name="dlvReqDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT" class="form-control itp_input" name="fromDt" value="">
 												<span class="input-group-addon itp_date_to">~</span>
-												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_DT" class="form-control itp_input" name="dlvDt" value="">
+												<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_TO_DT" class="form-control itp_input" name="toDt" value="">
 											</div>
 										</div>
+										
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_ID" class="form-control itp_input" name="sShmtWhsId">
-												<option value="A">출하창고*</option>											
-											</select>
+											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM" class="form-control itp_input" name="sshmtWhsNm" placeholder="출고창고" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID" class="form-control itp_input" name="sshmtWhsId"  />
 										</div>
+										<div class="col-xs-1 itp_in" style="padding:0px; width:10%;">
+											<button type="button" id="ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+						                </div>
 									</div>
 									<div class="form-group" style="padding-top: 10px; border-top: 1px dotted #ccc;">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="납품매장" />
+											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품매장창고" />
+											<input type="hidden" id="ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" placeholder="납품창고" />
 										</div>
 										<div class="col-xs-1 itp_in" style="width:11%; padding:0px;">
-											<button type="button" id="ITP_BTN_INOUTMNG01010_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_INOUTMNG01010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM" class="btn btn-success btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_INOUTMNG01010_DELETE_WHS_NM" class="btn btn-primary btn-sm SHOW" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
 											<input type="text" id="ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="품목번호 or 품목명" />

src/main/webapp/app/loanmng/LOANMNG03010.html

@@ -61,7 +61,7 @@
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STORE_ID" name="storeId" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
 				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_RCPT_YN" value="">
-				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT" value="">
+				                <input type="hidden" id="ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT" value="">
 				    
 				                <section class="itp_form_sec">
 				                    <h4 class="itp_form_tit">정산 상세정보</h4>
@@ -76,6 +76,16 @@
 				                                <div class="col-xs-8 itp_in fnStoreNm"></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 fnAcctBal"></div>
+				                            </div>
+				                            <label class="col-xs-2 itp_lb">매장 사용가능한도금액</label>
+				                            <div class="col-xs-4 itp_ip">
+				                                <div class="col-xs-8 itp_in fnUseAmtTotal"></div>
+				                            </div>
+				                        </div>
 				                        <div class="form-group">
 				                            <label class="col-xs-2 itp_lb">정산요청일자</label>
 				                            <div class="col-xs-4 itp_ip">
@@ -91,13 +101,13 @@
 				                            <div class="col-xs-4 itp_ip">
 				                                <div class="col-xs-8 itp_in fnSttlReqAmt"></div>
 				                            </div>
-				                            <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-8 itp_in fnUseAmtTotal"></div>
+				                                <div class="col-xs-8 itp_in fnUnpaidAmt"></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-5 itp_in fnSttlDt"></div>
 				                            </div>

src/main/webapp/app/ordmng/ORDMNG03010.html

@@ -15,10 +15,10 @@
 							<div class="col-xs-12">
 								<form id="ITP_FORM_ORDMNG03010_SEARCH" class="form-horizontal">
 								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SPPLY_ID" name="sspplyId" value="">
-									
+								<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_ORDMNG03010_SERVICE_" class="form-control itp_input" name="">
+											<select id="ITP_FORM_ORDMNG03010_SERVICE_DLV_DT" class="form-control itp_input" name="">
 												<option value="A">납품일자 *</option>											
 											</select>
 										</div>										
@@ -30,14 +30,15 @@
 											</div>
 										</div>
 										<div class="col-xs-2 itp_in itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_DLV_PLACE" class="form-control itp_input" name="sDlvPlace" placeholder="납품장소(매장/창고)" />
+											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM" class="form-control itp_input" name="swhsNm" placeholder="납품장소(매장/창고)" />
+											<input type="hidden" id="ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID" class="form-control itp_input" name="swhsId" />
 										</div>
 										<div class="col-xs-1 itp_in" style="padding: 0px; width:8%;">
-											<button type="button" id="ITP_BTN_ORDMNG03010_PO_POPUP" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
-											<button type="button" id="ITP_BTN_ORDMNG03010_SEARCH_MODIFY" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
+											<button type="button" id="ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM" class="btn btn-success btn-sm SEB" style="display: inline-block;"><i class="glyphicon glyphicon-search"></i></button>
+											<button type="button" id="ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM" class="btn btn-primary btn-sm UPB" style="display: inline-block;"><i class="glyphicon glyphicon-erase"></i></button>
 						                </div>
 										<div class="col-xs-4 itp_ip itp_noMar">
-											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sItemNm" placeholder="발주번호/품목번호 /품목명" />
+											<input type="text" id="ITP_FORM_ORDMNG03010_SEARCH_ITEM_NM" class="form-control itp_input" name="sitemNm" placeholder="발주번호/품목번호 /품목명" />
 										</div>
 									</div>
 								</form>

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

@@ -2,10 +2,12 @@
 	<div class="modal-dialog" style="width:1200px;">
 		<div class="modal-content">
 			<form id="ITP_FORM_BIZPOP_DLV_STTMT_PRN">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
+				<!-- <input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT" name="fromDt" value="">
 				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT" name="toDt" value="">
 				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="sbrandId" value="">
-				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID" name="sspplyId" value=""> -->
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID" name="brandId" value="">
+				<input type="hidden" id="ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO" name="dlvSttmtUnqNo" value="">
 				<div id="ITP_POPUP_CONTAINER">
 					<div class="modal-header">
 						<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
@@ -51,7 +53,6 @@
 										<label style="width:100px;">납품담당</label>
 										<label>:</label>
 										<span class="fnDlvMgrNm"></span>
-										<span class="fnDlvMgrTelNo"></span>
 									</div>
 								</div>
 								<div class="col-xs-6">
@@ -65,7 +66,7 @@
 										<div class="itp_sign_header">
 											<label>납품확인일</label>
 										</div>
-										<div class="itp_sign_area fnDlvCnfmDt"></div>
+										<div class="itp_sign_area"></div>
 									</div>
 								</div>
 							</div>	
@@ -74,14 +75,12 @@
 									<div>
 										<label style="width:100px;">납품 장소</label>
 										<label>:</label>
-										<span style="margin:0px; " class="fnZipNo"></span>
-										<span class="fnLoadAddr"></span>
-										<span class="fnDtlAddr"></span>
+										<span style="margin:0px; " class="fnDlvAddr"></span>
 									</div>
 									<div>
 										<label style="width:100px;">전화번호</label>
 										<label>:</label>
-										<span class="fnVndrTelNo"></span>
+										<span class="fnWhsMgrTelNo"></span>
 									</div>
 								</div>
 							</div>	
@@ -93,25 +92,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBsnsRegNo"></div>
+											<div class="col-xs-12 itp_in fnDlvBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnSpplyNm"></div>
+											<div class="col-xs-12 itp_in fnDlvNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvAddr"></div>
 										</div>
 									</div>
 								</div>	
@@ -124,25 +123,25 @@
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-4">등록번호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnPoBsnsRegno"></div>
 										</div>
 									</div>	
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">상호</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnPoNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">성명</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnDlvSttmtUnqNo"></div>
+											<div class="col-xs-12 itp_in fnPoOwnerNm"></div>
 										</div>
 									</div>
 									<div class="col-xs-11" style="padding:0; width:90%;">
 										<label class="col-xs-2">주소</label>
 										<div class="col-xs-8 itp_form_it">
-											<div class="col-xs-12 itp_in fnBrandNm"></div>
+											<div class="col-xs-12 itp_in fnDlvQty"></div>
 										</div>
 									</div>
 								</div>	

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

@@ -23,13 +23,17 @@
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_BRAND_ID" name="brandId" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_BRAND_NM" name="brandNm" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_STORE_ID" name="storeId" value="" />
+								<!--  
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="" />
+								-->
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO_LIST" name="sttlMgntUnqNoList" value="" />
 								
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_PO_ORD_NO" name="poOrdNo" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_ORD_NM" name="ordNm" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_NM" name="goodsNm" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_JAVASCRIPT_URL" name="kiccJavascriptUrl" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_WEB_URL" name="kiccActionWebUrl" value="" />
+								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL" name="kiccActionMobileUrl" value="" />
 								<input type="hidden" id="ITP_FORM_PO_PAYMENT_POPUP_MALL_ID" name="mallId" value="" />
 							
 								<div class="form-group">
@@ -82,7 +86,8 @@
 							<input type="hidden" id="brandId" name="brandId" value="" />
 							<input type="hidden" id="storeId" name="storeId" value="" />
 							
-							<input type="hidden" id="kiccActionWebUrl" 	name="kiccActionWebUrl"		value="">
+							<input type="hidden" id="kiccActionWebUrl" 		name="kiccActionWebUrl"			value="">
+							<input type="hidden" id="kiccActionMobileUrl" 	name="kiccActionMobileUrl"		value="">
 							
 							<!-- WEB -->
 							

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

@@ -4,9 +4,10 @@
 			<form id="ITP_FORM_BIZPOP_WHS_LOCATION">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_BRAND_ID" name="sbrandId" value="">
 				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_STORE_ID" name="sstoreId" value="">
+				<input type="hidden" id="ITP_FORM_BIZPOP_WHS_LOCATION_WHS_DVSN" name="swhsDvsn" value="">
 				<div class="modal-header">
 					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-					<h5 class="modal-title">납품장소 검색</h5>
+					<h5 class="modal-title">창고 검색</h5>
 				</div>
 				<div class="modal-body">
 					<div class="itp_form fix">

src/main/webapp/app/settmng/SETTMNG03010.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_SETTMNG03010_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_SETTMNG03010_STTL_END" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;정산완료&nbsp;&nbsp;</button>
+					<button type="button" id="ITP_BTN_SETTMNG03010_STTL_END" class="btn btn-primary btn-sm REQ" style="display: inline-block;"><i class="glyphicon"></i>&nbsp;&nbsp;정산확정&nbsp;&nbsp;</button>
 					<button type="button" id="ITP_BTN_SETTMNG03010_CANCELLIST" class="btn btn-warning btn-sm PRB"><i class="glyphicon"></i>&nbsp;&nbsp;취소/목록&nbsp;&nbsp;</button>
 				</div>
 			</div>
@@ -82,6 +82,8 @@
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STORE_ID" name="storeId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_SPPLY_ID" name="spplyId" value="">
 								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO" name="sttlMgntUnqNo" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL" name="acctBal" value="">
+								<input type="hidden" id="ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT" name="sttlReqAmt" value="">
 					
 								<section class="itp_form_sec">
 									<h4 class="itp_form_tit">정산 상세정보</h4>
@@ -98,6 +100,16 @@
 												</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 fnLoanDvsnNm"></div>
+											</div>
+											<label class="col-xs-2 itp_lb">매장 계좌잔액</label>
+											<div class="col-xs-4 itp_ip">
+												<div class="col-xs-8 itp_in fnAcctBal"></div>
+											</div>											
+										</div>
 										<div class="form-group">
 											<label class="col-xs-2 itp_lb">정산상태</label>
 											<div class="col-xs-4 itp_ip">
@@ -119,23 +131,23 @@
 											</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-8 itp_in fnSttlDt"></div>
 											</div>
-											<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 fnSttlAmt"></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-8 itp_in fnRcptYn"></div>
+												<div class="col-xs-8 itp_in fnRcptYnDate"></div>
 											</div>
-											<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 fnRcptDt"></div>
+												<div class="col-xs-10 itp_in fnUnpaidAmt"></div>
 											</div>
 										</div>
 										<div class="form-group">

src/main/webapp/easypay/oqpo/mobile_order_req.jsp

@@ -1,6 +1,8 @@
+<!--인증요청 페이지-->
+<!--메뉴얼 '인증페이지 작성' 인증요청 파라미터 포함.-->
+
 <!DOCTYPE html>
 <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%
 /* -------------------------------------------------------------------------- */
 /* 캐쉬 사용안함                                                              */
@@ -8,28 +10,32 @@
 response.setHeader("cache-control","no-cache");
 response.setHeader("expires","-1");
 response.setHeader("pragma","no-cache");
-
 request.setCharacterEncoding("utf-8");
+
+String kiccActionMobileUrl = request.getParameter("kiccActionMobileUrl");
 %>
-<c:set var="contextPath" value="${pageContext.request.contextPath}" /> 
-<html lang="ko" xmlns="http://www.w3.org/1999/xhtml">
+<html style="height: 100%;">
 <head>
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 <meta name="robots" content="noindex, nofollow" />
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Type" content="text/html; charset=euc-kr" />
 <script type="text/javascript">
     window.onload = function()
     {
         document.frm.submit();
     } 
 </script>
-<title>오더퀸 주문(모바일)</title>
-</head>
+<title>오더퀸 수발주 모바일 결제</title>
 </head>
 <body>
-    <form name="frm" method="post" action="<spring:eval expression="@applicationProperties.getProperty('kicc.action.mobile.url')" />"> <!-- 테스트 -->
-    <!--form name="frm" method="post" action="https://pg.easypay.co.kr/webpay/MainAction.do"--> <!-- 운영 -->
-
+    <!-- KICC 서버로 인증요청 -->
+    
+    <!-- TEST -->
+    <form name="frm" method="post" action="<%= kiccActionMobileUrl %>" >
+    <!-- REAL -->
+    <!--form name="frm" method="post" action="https://sp.easypay.co.kr/ep8/MainAction.do" -->
+    
+            
         <!--공통-->
         <input type="hidden" id="sp_mall_id"           name="sp_mall_id"           value="<%=request.getParameter("sp_mall_id")           %>" /> <!--[필수]가맹점ID -->
         <input type="hidden" id="sp_mall_nm"           name="sp_mall_nm"           value="<%=request.getParameter("sp_mall_nm")           %>" /> <!--[선택]가맹점명 -->
@@ -85,7 +91,7 @@ request.setCharacterEncoding("utf-8");
                    
         <!--선불카드-->
         <input type="hidden" id="sp_prepaid_cp"       name="sp_prepaid_cp"         value="<%=request.getParameter("sp_prepaid_cp")        %>" /> <!--[선택]선불카드 CP -->
-        
-    </form>
+             
+     </form>
 </body>
-</html>
+</html>

src/main/webapp/easypay/oqpo/mobile_order_res_submit.jsp

@@ -29,65 +29,67 @@ request.setCharacterEncoding("utf-8");
 <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
 <meta name="robots" content="noindex, nofollow" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<script type="text/javascript">
-	/*--KICC 서버로부터 인증응답 파라미터 수신--*/
-	window.onload = function() {
-	    // <!--공통-->
-	    window.document.getElementById("sp_res_cd").value             = "<%=getNullToSpace(request.getParameter("sp_res_cd"))           %>";  // [필수]응답코드
-	    window.document.getElementById("sp_res_msg").value            = "<%=getNullToSpace(request.getParameter("sp_res_msg"))          %>";  // [필수]응답메세지
-	    window.document.getElementById("sp_tr_cd").value              = "<%=getNullToSpace(request.getParameter("sp_tr_cd"))            %>";  // [필수]결제창 요청구분
-	    window.document.getElementById("sp_ret_pay_type").value       = "<%=getNullToSpace(request.getParameter("sp_ret_pay_type"))     %>";  // [필수]결제수단
-	    window.document.getElementById("sp_trace_no").value           = "<%=getNullToSpace(request.getParameter("sp_trace_no"))         %>";  // [선택]추적번호     
-	    window.document.getElementById("sp_order_no").value           = "<%=getNullToSpace(request.getParameter("sp_order_no"))         %>";  // [필수]가맹점 주문번호
-	    window.document.getElementById("sp_sessionkey").value         = "<%=getNullToSpace(request.getParameter("sp_sessionkey"))       %>";  // [필수]세션키
-	    window.document.getElementById("sp_encrypt_data").value       = "<%=getNullToSpace(request.getParameter("sp_encrypt_data"))     %>";  // [필수]암호화전문
-	    window.document.getElementById("sp_mall_id").value            = "<%=getNullToSpace(request.getParameter("sp_mall_id"))          %>";  // [필수]가맹점 ID
-	    window.document.getElementById("sp_mobilereserved1").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved1"))  %>";  // [선택]여유필드
-	    window.document.getElementById("sp_mobilereserved2").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved2"))  %>";  // [선택]여유필드
-	    window.document.getElementById("sp_reserved1").value          = "<%=getNullToSpace(request.getParameter("sp_reserved1"))        %>";  // [선택]여유필드 
-	    window.document.getElementById("sp_reserved2").value          = "<%=getNullToSpace(request.getParameter("sp_reserved2"))        %>";  // [선택]여유필드
-	    window.document.getElementById("sp_reserved3").value          = "<%=getNullToSpace(request.getParameter("sp_reserved3"))        %>";  // [선택]여유필드
-	    window.document.getElementById("sp_reserved4").value          = "<%=getNullToSpace(request.getParameter("sp_reserved4"))        %>";  // [선택]여유필드
-	
-	    // <!--신용카드-->
-	    window.document.getElementById("sp_card_code").value          = "<%=getNullToSpace(request.getParameter("sp_card_code"))        %>";  // [필수]카드코드 
-	    window.document.getElementById("sp_eci_code").value           = "<%=getNullToSpace(request.getParameter("sp_eci_code"))         %>";  // [선택]ECI코드(MPI인 경우)
-	    window.document.getElementById("sp_card_req_type").value      = "<%=getNullToSpace(request.getParameter("sp_card_req_type"))    %>";  // [필수]거래구분
-	    window.document.getElementById("sp_save_useyn").value         = "<%=getNullToSpace(request.getParameter("sp_save_useyn"))       %>";  // [선택]카드사 세이브 여부
-	    window.document.getElementById("sp_card_prefix").value        = "<%=getNullToSpace(request.getParameter("sp_card_prefix"))      %>";  // [선택]신용카드 Prefix 
-	    window.document.getElementById("sp_card_no_7").value          = "<%=getNullToSpace(request.getParameter("sp_card_no_7"))        %>";  // [선택]신용카드번호 앞7자리   
-	    
-	    // <!--간편결제-->
-	    window.document.getElementById("sp_spay_cp").value            = "<%=getNullToSpace(request.getParameter("sp_spay_cp"))          %>";  // [선택]간편결제 CP코드
-	    
-	    // <!--선불카드-->
-	    window.document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
-	                      
-		if( "<%=request.getParameter("sp_res_cd") %>" == "0000" )
-	    {
-	        frm_pay.target = "_self";
-	        frm_pay.action = "/moblie_easypay_request.itp";
-	        frm_pay.submit();
-	    }
-	    else
-	    {
-	        alert( urldecode("<%=request.getParameter("sp_res_cd") %> : <%=request.getParameter("sp_res_msg") %>"));
-	        location.href="/hmpage_member_order_confirm.itp";
-	    }
-	}
-	
+<script>
+    /*--KICC 서버로부터 인증응답 파라미터 수신--*/
+    window.onload = function() 
+    {
+        // <!--공통-->
+        window.document.getElementById("sp_res_cd").value             = "<%=getNullToSpace(request.getParameter("sp_res_cd"))           %>";  // [필수]응답코드
+        window.document.getElementById("sp_res_msg").value            = "<%=getNullToSpace(request.getParameter("sp_res_msg"))          %>";  // [필수]응답메세지
+        window.document.getElementById("sp_tr_cd").value              = "<%=getNullToSpace(request.getParameter("sp_tr_cd"))            %>";  // [필수]결제창 요청구분
+        window.document.getElementById("sp_ret_pay_type").value       = "<%=getNullToSpace(request.getParameter("sp_ret_pay_type"))     %>";  // [필수]결제수단
+        window.document.getElementById("sp_trace_no").value           = "<%=getNullToSpace(request.getParameter("sp_trace_no"))         %>";  // [선택]추적번호     
+        window.document.getElementById("sp_order_no").value           = "<%=getNullToSpace(request.getParameter("sp_order_no"))         %>";  // [필수]가맹점 주문번호
+        window.document.getElementById("sp_sessionkey").value         = "<%=getNullToSpace(request.getParameter("sp_sessionkey"))       %>";  // [필수]세션키
+        window.document.getElementById("sp_encrypt_data").value       = "<%=getNullToSpace(request.getParameter("sp_encrypt_data"))     %>";  // [필수]암호화전문
+        window.document.getElementById("sp_mall_id").value            = "<%=getNullToSpace(request.getParameter("sp_mall_id"))          %>";  // [필수]가맹점 ID
+        window.document.getElementById("sp_mobilereserved1").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved1"))  %>";  // [선택]여유필드
+        window.document.getElementById("sp_mobilereserved2").value    = "<%=getNullToSpace(request.getParameter("sp_mobilereserved2"))  %>";  // [선택]여유필드
+        window.document.getElementById("sp_reserved1").value          = "<%=getNullToSpace(request.getParameter("sp_reserved1"))        %>";  // [선택]여유필드 
+        window.document.getElementById("sp_reserved2").value          = "<%=getNullToSpace(request.getParameter("sp_reserved2"))        %>";  // [선택]여유필드
+        window.document.getElementById("sp_reserved3").value          = "<%=getNullToSpace(request.getParameter("sp_reserved3"))        %>";  // [선택]여유필드
+        window.document.getElementById("sp_reserved4").value          = "<%=getNullToSpace(request.getParameter("sp_reserved4"))        %>";  // [선택]여유필드
 
-   	function urldecode( str ) {
-       // 공백 문자인 + 를 처리하기 위해 +('%20') 을 공백으로 치환
-       return decodeURIComponent((str + '').replace(/\+/g, '%20'));
-   	}
+        // <!--신용카드-->
+        window.document.getElementById("sp_card_code").value          = "<%=getNullToSpace(request.getParameter("sp_card_code"))        %>";  // [필수]카드코드 
+        window.document.getElementById("sp_eci_code").value           = "<%=getNullToSpace(request.getParameter("sp_eci_code"))         %>";  // [선택]ECI코드(MPI인 경우)
+        window.document.getElementById("sp_card_req_type").value      = "<%=getNullToSpace(request.getParameter("sp_card_req_type"))    %>";  // [필수]거래구분
+        window.document.getElementById("sp_save_useyn").value         = "<%=getNullToSpace(request.getParameter("sp_save_useyn"))       %>";  // [선택]카드사 세이브 여부
+        window.document.getElementById("sp_card_prefix").value        = "<%=getNullToSpace(request.getParameter("sp_card_prefix"))      %>";  // [선택]신용카드 Prefix 
+        window.document.getElementById("sp_card_no_7").value          = "<%=getNullToSpace(request.getParameter("sp_card_no_7"))        %>";  // [선택]신용카드번호 앞7자리   
+        
+        // <!--간편결제-->
+        window.document.getElementById("sp_spay_cp").value            = "<%=getNullToSpace(request.getParameter("sp_spay_cp"))          %>";  // [선택]간편결제 CP코드
+        
+        // <!--선불카드-->
+        window.document.getElementById("sp_prepaid_cp").value         = "<%=getNullToSpace(request.getParameter("sp_prepaid_cp"))       %>";  // [선택]선불카드 CP코드
+                          
+       if( "<%=request.getParameter("sp_res_cd") %>" == "0000" )
+        {
+    	   	// alert('TODO 결제승인처리');
+            frm_pay.target = "_self";
+            frm_pay.action = "../easypay_request.jsp";
+            frm_pay.submit();
+        }
+        else
+        {
+            alert( urldecode("<%=request.getParameter("sp_res_cd") %> : <%=request.getParameter("sp_res_msg") %>"));
+            // 에러 발생시 어떻게 처리할까?
+            // 이전 팝업으로는 돌아갈 수 없다.
+            // location.href="./order.jsp";
+            history.back(-1);
+        }
+    }
+    
+    function urldecode( str ) {
+        // 공백 문자인 + 를 처리하기 위해 +('%20') 을 공백으로 치환
+        return decodeURIComponent((str + '').replace(/\+/g, '%20'));
+    }
 </script>
-<title>오더퀸 수발주 결제하기(모바일)</title>
-</head>
+<title>EasyPay 8.0 webpay mobile</title>
 </head>
 <body>
-  <form name="frm_pay" method="post" >  
-    
+	<form name="frm_pay" method="post" >      
     <!-- [START] 인증응답 필드 -->     
     
     <!--공통-->
@@ -122,7 +124,6 @@ request.setCharacterEncoding("utf-8");
     <input type="hidden" id="sp_prepaid_cp"           name="sp_prepaid_cp"           value="" />          <!-- [선택]선불카드 CP코드 -->
     
     <!-- [END] 인증응답 필드  --> 
-
-   </form>
+    </form>
 </body>
-</html>
+</html>

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG01010.js

@@ -0,0 +1,448 @@
+require(['config'], function() {
+	require([], function($) {
+		listObj.init();
+	});
+});
+
+/********************************************************
+ --------------------------------------------------------
+ - Object 목록								            -
+ --------------------------------------------------------
+ * const gridColModel = {}	: 화면 Grid Object			*
+ * let pageObj = {}			: 화면공통 Object			*
+ * let listObj = {}			: 목록화면 Object			*
+ * let viewObj = {}			: 상세화면 Object			*
+ * let modifyObj = {}		: 수정화면 Object			*
+ * let createObj = {}		: 신규화면 Object			*
+ *******************************************************/
+
+/*화면 변수*/
+const INOUTMNG01010_GRID_ID = '#ITP_INOUTMNG01010_jqGrid';
+const INOUTMNG01010_GRID_LIST = '#ITP_INOUTMNG01010_jqGrid_list';
+const INOUTMNG01010_GRID_PAGER = '#ITP_INOUTMNG01010_jqGridPager';
+const INOUTMNG01010_GRID_EMPTY = '#ITP_INOUTMNG01010_jqGridEmpty';
+
+let ITP_FORM_INOUTMNG01010_DETAIL_IS_WRITING = false;
+let INOUTMNG01010_LAST_ROW_ID;
+
+
+/*API URL*/
+let API_DETAIL_GRID_LIST 		= '/api/pomng/inoutmng/target-grid-list';	// 목록
+
+
+/*화면 Grid ColModel*/
+const gridColModel = {
+	list: [
+		{
+			index: 'BRAND_ID', name: 'brandId',
+			label: ITP_MSG_LOCALE.label.brandId, //브랜드아이디
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'BRAND_NM', name: 'brandNm',
+			label: ITP_MSG_LOCALE.label.brandNm, //브랜드명
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+			label: ITP_MSG_LOCALE.label.pchPodrUnqNo, //구매발주번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'PCH_PODR_DTL_NO', name: 'pchPodrDtlNo',
+			label: ITP_MSG_LOCALE.label.pchPodrDtlNo, //구매발주항번
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_ID', name: 'itemId',
+			label: ITP_MSG_LOCALE.label.itemId, //품목아이디
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'ITEM_NM', name: 'itemNm',
+			label: ITP_MSG_LOCALE.label.itemNm, //품목명
+			width: '10', fixed: false, align: 'left',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'WHS_ID', name: 'whsId',
+			label: ITP_MSG_LOCALE.label.whsId, //납품창고아이디
+			width: '13', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'WHS_NM', name: 'whsNm',
+			label: ITP_MSG_LOCALE.label.whsNm, //납품창고명
+			width: '15', fixed: false, align: 'left',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'LOCATION', name: 'location',
+			label: ITP_MSG_LOCALE.label.location, //납품LOCATION
+			width: '15', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'UNIT_AMT', name: 'unitAmt',
+			label: ITP_MSG_LOCALE.label.unitAmt, //단가
+			width: '6', fixed: false, align: 'right',
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'PODR_QTY', name: 'podrQty',
+			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
+			width: '10', fixed: false, align: 'right',
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'SHMT_QTY', name: 'shmtQty',
+			label: ITP_MSG_LOCALE.label.shmtQty, //출고수량
+			width: '10', fixed: false, align: 'right',
+			sortable: true, editable: true, edittype: 'text',
+			editrules: {required: true, number:true},
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'STCK_QTY', name: 'stckQty',
+			label: ITP_MSG_LOCALE.label.stckQty, //현 재고
+			width: '10', fixed: false, align: 'right',
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'EXPRY_YN', name: 'expryYn',
+			label: ITP_MSG_LOCALE.label.expryYn, //유통기한여부
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'EXPRY_PERIOD', name: 'expryPeriod',
+			label: ITP_MSG_LOCALE.label.expryPeriod, //유통기한기간
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'EXPRY_DATE', name: 'expryDate',
+			label: ITP_MSG_LOCALE.label.expryDate, //유통일자
+			width: '20', fixed: false, align: 'center',
+			sortable: false, hidden: false,
+			editable:true, sorttype:"date", 
+			editoptions : { dataInit : function(e) { $(e).datepicker( ITP_DATE_LANGUAGE ); } }
+		},
+		{
+			index: 'PODR_AMT', name: 'podrAmt',
+			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
+			width: '10', fixed: false, align: 'right',
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'DLV_REQ_DT', name: 'dlvReqDt',
+			label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'SHMT_WHS_ID', name: 'shmtWhsId',
+			label: ITP_MSG_LOCALE.label.shmtWhsId, //출고창고아이디
+			width: '10', fixed: false, align: 'right',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'SHMT_LOCATION', name: 'shmtLocation',
+			label: ITP_MSG_LOCALE.label.shmtLocation, //출고LOCATION
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'SHMT_WHS_NM', name: 'shmtWhsNm',
+			label: ITP_MSG_LOCALE.label.shmtWhsNm, //출고창고명
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		}
+	]
+};
+
+
+
+/*목록화면 Object*/
+let listObj = {
+	init: function () {
+		this.view();
+		this.action();
+		this.event.init();
+		this.grid.init();
+	},
+	view: function() {
+		// 버튼 권한설정
+		fn_proc_btn_auth('INOUTMNG01010');
+
+		// 공통코드 표시
+		$('select').each(function() {
+			if($(this).data('select-code')) {
+				fn_make_select(CODE_LIST, $(this).data('select-code'), $(this).attr('id'));
+			}
+		});
+		
+		var now = new Date();
+		$('#ITP_TAB_INOUTMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
+		$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').datepicker('setDate', new Date(now.setDate(now.getDate())));
+		$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').datepicker('setDate', new Date(now.setDate(now.getDate()+30)));
+		
+		
+	},
+	itp_INOUTMNG01010_search: false,
+	button: {
+		search: function() {
+			console.log("search event");
+			listObj.itp_INOUTMNG01010_search = true;
+			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
+			param.gridSize = $.jgrid.defaults.rowNum;
+			param.gridPage = $.jgrid.defaults.page;
+			param.sbrandId = fn_make_user_info.get('brandId');
+			$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+		},
+		shmtout: function() {
+			
+			
+			
+			
+			
+			console.log("search event");
+			listObj.itp_INOUTMNG01010_search = true;
+			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
+			param.gridSize = $.jgrid.defaults.rowNum;
+			param.gridPage = $.jgrid.defaults.page;
+			param.sbrandId = fn_make_user_info.get('brandId');
+			$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+			
+			
+			
+			
+			
+		}
+	},
+	action: function () {
+		var _this = this;
+		// 출하창고 조회 버튼 클릭
+		$('#ITP_FORM_INOUTMNG01010_SEARCH_SHMT_WHS_NM').on('click', function() {
+			console.log("=================================");
+			_this.popup('S');
+		});
+		// 출하창고 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_INOUTMNG01010_DELETE_SHMT_WHS_NM').on('click', function() {
+			console.log("=================================");
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val('');
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val('');
+			
+		});
+		
+		// 납품장소 조회 버튼 클릭
+		$('#ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM').on('click', function() {
+			console.log("=================================");
+			_this.popup('W');
+		});
+		// 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_INOUTMNG01010_DELETE_WHS_NM').on('click', function() {
+			console.log("=================================");
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val('');
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val('');
+		});
+		
+	},
+	popup: function (arg) {
+		var popFn ;
+		// 팝업
+		if (arg == "S") {
+			popFn = this.callback.shmtwhs;
+		} else {
+			popFn = this.callback.whs;
+		}
+		
+		var whsDvsn = "";
+		
+		if (arg == "S") {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn: whsDvsn};
+		
+		
+		 
+		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		
+	},
+	callback: {
+		shmtwhs: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop) {
+				$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMT_WHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_INOUTMNG01010_SEARCH_SSHMTWHS_ID').val(rowDataPop.whsId);
+			}
+			
+		},
+		whs: function(rowDataPop) {
+			console.log(rowDataPop);
+			if(rowDataPop) {
+				$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_INOUTMNG01010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
+			}
+			
+		}
+	},
+	event: {
+		init: function () {
+			this.button();
+		},
+		button: function () {
+			// 버튼 클릭 이벤트
+			$('button').each(function() {
+				var id = $(this).attr('id');
+				$(this).on('click', function() {
+					console.log("button");
+					console.log(id);
+					switch (id) {
+						case 'ITP_BTN_INOUTMNG01010_SRH'					: listObj.button.search();		break;	// 조회 버튼 클릭
+						case 'ITP_BTN_INOUTMNG01010_OUT'				: listObj.button.shmtout();	break;	// 출하지시 버튼
+						
+					}
+				});
+			});
+			
+			$('body').on('click', function(e) {
+				var gridId = INOUTMNG01010_GRID_ID.replace('#', '');
+				var rids = $(INOUTMNG01010_GRID_ID).jqGrid('getDataIDs');
+				var last_row_id = rids[rids.length - 1];
+				
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'INOUTMNG01010');	
+			});
+
+			
+		}
+	},
+	empty: {
+		init: function() {
+			var _this = this;
+			this.push();
+			$(INOUTMNG01010_GRID_EMPTY).on('click', function() {
+				_this.back();
+				_this.itp_INOUTMNG01010_param.gridSize = $.jgrid.defaults.rowNum;
+				$(INOUTMNG01010_GRID_ID).setGridParam({'postData': JSON.stringify(_this.itp_INOUTMNG01010_param)}).trigger('reloadGrid');
+			});
+		},
+		itp_INOUTMNG01010_param: {},
+		push: function() {
+			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
+			listObj.itp_INOUTMNG01010_param = param;
+		},
+		back: function() {
+			/*
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_FROM_DT').val(this.itp_INOUTMNG01010_param.fromDt);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_TO_DT').val(this.itp_INOUTMNG01010_param.toDt);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SPPLY_ID').val(this.itp_INOUTMNG01010_param.sspplyId);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_SPPLY_NM').val(this.itp_INOUTMNG01010_param.sspplyNm);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_WHS_NM').val(this.itp_INOUTMNG01010_param.swhsNm);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_WHS_ID').val(this.itp_INOUTMNG01010_param.swhsId);
+			$('#ITP_FORM_INOUTMNG01010_SEARCH_ITEM_NM').val(this.itp_INOUTMNG01010_param.sitemNm);
+			*/
+		}
+	},
+	grid: {
+		init: function () {
+			// 데이터 없을때
+			listObj.empty.push();
+			itp_fn_jqgrid_resize(INOUTMNG01010_GRID_ID, INOUTMNG01010_GRID_LIST, 'lg');
+			itp_fn_fire_window_resize();
+			this.search();
+			
+		},
+		colModel: gridColModel.list,
+		search: function() {
+			this.unload();
+			this.load();
+		},
+		load: function() {
+			let param = $('#ITP_FORM_INOUTMNG01010_SEARCH').serializeObject();
+			param.gridSize = $.jgrid.defaults.rowNum;
+			param.sbrandId = fn_make_user_info.get('brandId');
+			
+			var option = {
+				multiselect: true,
+				autowidth: true,
+				gridId: INOUTMNG01010_GRID_ID,
+				colModel: gridColModel.list,
+				param: param,
+				url: DOMAIN + API_DETAIL_GRID_LIST,
+				pager: INOUTMNG01010_GRID_PAGER,
+				
+				onCellSelect: function(rowid, cellIdx, cellValue) {
+					INOUTMNG01010_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, INOUTMNG01010_LAST_ROW_ID, INOUTMNG01010_GRID_ID, ['pchPodrUnqNo']);
+					/*
+					if(rowid && rowid!==INOUTMNG01010_LAST_ROW_ID){
+						console.log("onCellSelect  if in");
+						console.log(INOUTMNG01010_LAST_ROW_ID);
+						jQuery(INOUTMNG01010_GRID_ID).jqGrid('restoreRow',INOUTMNG01010_LAST_ROW_ID);
+						jQuery(INOUTMNG01010_GRID_ID).jqGrid('editRow',rowid,true,pickdates);
+						INOUTMNG01010_LAST_ROW_ID=rowid;
+					}
+					
+					function pickdates(rowid){
+						console.log("pickdates  if in");
+						jQuery("#"+id+"_expryDate",INOUTMNG01010_GRID_ID).datepicker({dateFormat:"yyyy.mm.dd"});
+					}
+					*/
+				},
+				/*
+				onSelectRow: function(id){
+					console.log("onSelectRow");
+					console.log(id);
+					if(id && id!==INOUTMNG01010_LAST_ROW_ID){
+						console.log("onSelectRow  if in");
+						console.log(INOUTMNG01010_LAST_ROW_ID);
+						jQuery(INOUTMNG01010_GRID_ID).jqGrid('restoreRow',INOUTMNG01010_LAST_ROW_ID);
+						jQuery(INOUTMNG01010_GRID_ID).jqGrid('editRow',id,true,pickdates);
+						INOUTMNG01010_LAST_ROW_ID=id;
+					}
+					
+					function pickdates(id){
+						console.log("pickdates  if in");
+						jQuery("#"+id+"_expryDate",INOUTMNG01010_GRID_ID).datepicker({dateFormat:"yyyy.mm.dd"});
+					}
+				}, */
+				loadComplete: function(data) {
+					itp_fn_grid_load_complete(data, INOUTMNG01010_GRID_ID, true, 'number', 'INOUTMNG01010', listObj.itp_INOUTMNG01010_search, listObj.empty, true, data.gridRecords, true);
+					var ids = $(INOUTMNG01010_GRID_ID).getDataIDs();
+					$.each(ids, function(idx, rowId) {
+						$(INOUTMNG01010_GRID_ID).jqGrid('setCell', rowId, 'storeId', '', ITP_GRID_COL_STYLE.link);
+					});
+				},
+				onPaging: function(action) {
+					itp_fn_grid_paging(INOUTMNG01010_GRID_ID, action, param);
+				}
+			};
+			itp_fn_grid_make_remote(option);
+		},
+		button: {
+		},
+		unload : function() {
+			$.jgrid.gridUnload(INOUTMNG01010_GRID_ID);
+		},
+		clearData : function() {
+			$(INOUTMNG01010_GRID_ID).jqGrid('clearGridData', true);
+			$(INOUTMNG01010_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
+			$(INOUTMNG01010_GRID_EMPTY).html(ITP_MSG_LOCALE.message.grid.noData);
+			$(INOUTMNG01010_GRID_EMPTY).show();
+		}
+	}
+};
+
+

src/main/webapp/js/app/inoutmng/ITP_INOUTMNG02010.js

@@ -405,12 +405,22 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn ;
+		
 		if(keyword == 'shmtWhs') {
 			popFn = this.callback.shmtWhs;
 		} else if(keyword == 'whs'){
 			popFn = this.callback.whs;
 		}
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
+		var whsDvsn = "";
+		if(keyword == 'shmtWhs') {
+			whsDvsn = "W01";
+		} else if(keyword == 'whs'){
+			whsDvsn = "W02";
+		}
+		
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: whsDvsn};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		
 	},

src/main/webapp/js/app/loanmng/ITP_LOANMNG01010.js

@@ -80,26 +80,26 @@ const gridColModel = {
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'POSB_LIMIT_AMT', name: 'posbLimitAmt',
-			label: "가용한도금액", 
+			index: 'ACCT_BAL', name: 'acctBal',
+			label: "입금금액", 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-		},
+		},		
 		{
-			index: 'TMP_RCV_ACCT_TOTAL', name: 'tmpRcvAcctTotal',
-			label: '가수금액', 
+			index: 'POSB_LIMIT_AMT', name: 'posbLimitAmt',
+			label: "사용가능금액", 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
-			label: '사용금액', 
+			label: '사용한금액', 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false, 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
-		},		
+		},
 		{
 			index: 'USE_YN_NM', name: 'useYnNm',
 			label: "사용여부", 

src/main/webapp/js/app/loanmng/ITP_LOANMNG03010.js

@@ -101,10 +101,17 @@ const gridColModel = {
 		},
 		{
 			index: 'STTL_DT', name: 'sttlDt',
-			label: "정산확인일", 
+			label: "정산확정일", 
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},	
+		{
+			index: 'UNPAId_AMT', name: 'unpaidAmt',
+			label: '미납금액', 
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false, 
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},		
 		{
 			index: 'USE_AMT_TOTAL', name: 'useAmtTotal',
 			label: '사용가능한도', 
@@ -473,8 +480,8 @@ let viewObj = {
 			var args = {'payTpCd': '20', 
 				'brandId': $('#ITP_FORM_LOANMNG03010_VIEW_BRAND_ID').val(), 
 				'storeId': $('#ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(), 
-				'sttlMgntUnqNo': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
-				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val() };
+				'sttlMgntUnqNoList': $('#ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(), 
+				'goodsAmt': $('#ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val() }; 
 			fn_call_popup('biz', 'BIZPOP_PO_PAYMENT', '#ITP_ASIDE', popFn, args, 'S');
 		}
 	}, 
@@ -488,7 +495,7 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
 		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_RCPT_YN').val(result.rcptYn);
-		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_STTL_REQ_AMT').val(result.sttlReqAmt);
+		$('#ITP_FORM_LOANMNG03010_VIEW #ITP_FORM_LOANMNG03010_VIEW_UNPAID_AMT').val(result.unpaidAmt);
 		
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnStoreNm').text(result.storeNm);
@@ -499,6 +506,8 @@ let viewObj = {
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSysRegNm').text(result.sysRegNm + ' (' + result.sysRegDttm + ')');
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnSttlReqAmt').text(itp_fn_number_comma(result.sttlReqAmt));
 		$('#ITP_FORM_LOANMNG03010_VIEW .fnUseAmtTotal').text(itp_fn_number_comma(result.useAmtTotal));
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
+		$('#ITP_FORM_LOANMNG03010_VIEW .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
 		
 		if(result.rcptYn == 'Y') { // 수납여부
 			$('#ITP_BTN_LOANMNG03010_PAYMENT').hide();

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

@@ -227,7 +227,9 @@ const ITP_MSG_LOCALE = (function() {
 			"shmtReqStCd": "출하상태코드",
 			"shmtQty": "출하수량",
 			"shmtAmt": "출하금액",
-			"whsDt": "입고일"
+			"whsDt": "입고일",
+			"pchReqDtlStNm": "요청상세상태",
+			"dlvDvsnNm": "배송구분"
 		},
 		"table": {
 			"brandId": "브랜드ID",

src/main/webapp/js/app/ordmng/ITP_ORDMNG01010.js

@@ -406,7 +406,7 @@ let listObj = {
 	popup: function() {
 		// 팝업
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 	},
 	callback: {

src/main/webapp/js/app/ordmng/ITP_ORDMNG03010.js

@@ -29,7 +29,7 @@ let ITP_FORM_ORDMNG03010_DETAIL_IS_WRITING = false;
 
 /*API URL*/
 let API_DELI_GRID_LIST 	= '/api/pomng/inoutmng/spply-deli-grid-list';// 목록
-let API_INFO_INV 		= '/api/pomng/inoutmng/info-inv';	// 상세
+let API_INFO_INV 		= '/api/pomng/inoutmng/init-spply-inv';	// 상세
 let API_SAVE_SPPLY_INV 	= '/api/pomng/inoutmng/save-spply-inv';// 저장
 let API_ITEM_CLASS_LEVEL= '/api/item/class-level-list';		//품목분류 level 검색
 
@@ -37,10 +37,16 @@ let API_ITEM_CLASS_LEVEL= '/api/item/class-level-list';		//품목분류 level
 const gridColModel = {
 	list: [
 	
+			{
+				index: 'Brand_ID', name: 'brandId',
+				label: ITP_MSG_LOCALE.label.brandId, //브랜드
+				width: '18', fixed: false, align: 'center',
+				sortable: false, hidden: true
+			},
 			{
 				index: 'Brand_Nm', name: 'brandNm',
 				label: ITP_MSG_LOCALE.label.brandNm, //브랜드
-				width: '10', fixed: false, align: 'center',
+				width: '20', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
@@ -51,25 +57,31 @@ const gridColModel = {
 			},
 			{
 				index: 'ITEM_ST_CD', name: 'dlvStCd',
-				label: ITP_MSG_LOCALE.label.dlvStCd, //납품서상태
-				width: '6', fixed: false, align: 'center',
+				label: '납품상태', //납품서상태
+				width: '12', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
-				index: 'poBsnsRegno', name: 'podrRegDt',
-				label: ITP_MSG_LOCALE.label.podrRegDt, //수주일자
-				width: '10', fixed: false, align: 'center',
+				index: 'PODR_REG_DT', name: 'podrRegDt',
+				label: '수주일자', //수주일자
+				width: '14', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvReqDt',
 				label: ITP_MSG_LOCALE.label.dlvReqDt, //납품요청일
-				width: '10', fixed: false, align: 'center',
+				width: '14', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvSchDt',
 				label: ITP_MSG_LOCALE.label.dlvSchDt, //납품예정일
+				width: '14', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
+			{
+				index: 'PCH_ITEM_YN', name: 'dlvCmpltDt',
+				label: ITP_MSG_LOCALE.label.dlvCmpltDt, //납품완료일
 				width: '10', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
@@ -86,7 +98,7 @@ const gridColModel = {
 				sortable: false, hidden: false
 			},
 			{
-				index: 'UNIT', name: 'podrQty',
+				index: 'PODR_QTY', name: 'podrQty',
 				label: ITP_MSG_LOCALE.label.podrQty, //수주수량
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
@@ -97,12 +109,24 @@ const gridColModel = {
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
+			{
+				index: 'UNIT', name: 'unit',
+				label: ITP_MSG_LOCALE.label.unit, //납품수량
+				width: '6', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
 			{
 				index: 'PCH_ITEM_YN', name: 'unitAmt',
 				label: ITP_MSG_LOCALE.label.unitAmt, //납품금액
 				width: '6', fixed: false, align: 'center',
 				sortable: false, hidden: false
 			},
+			{
+				index: 'SALE_ITEM_YN', name: 'whsNm',
+				label: ITP_MSG_LOCALE.label.whsNm, //납품장소
+				width: '6', fixed: false, align: 'center',
+				sortable: false, hidden: false
+			},
 			{
 				index: 'PCH_ITEM_YN', name: 'dlvMgrNm',
 				label: ITP_MSG_LOCALE.label.dlvMgrNm, //납품담당자
@@ -158,6 +182,7 @@ let pageObj = {
 			this.ui.init();
 			this.event.init();
 			this.fileUpload();
+			this.action();
 	},
 	ui: {
 			init: function () {
@@ -186,6 +211,53 @@ let pageObj = {
 			ready: function() {
 					listObj.init();
 			}
+	},
+	action: function () {
+		var _this = this;
+		// 검색 납품장소
+		$('#ITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM').on('click', function() {
+			_this.popup('SW');
+		});
+		// 검색 납품장소 텍스트 삭제 버튼 클릭
+		$('#ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM').on('click', function() {
+			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM').val('');
+			$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID').val('');
+		});
+	
+	},
+	popup: function (arg) {
+		var popFn ;
+		// 팝업
+		if (arg == "SW") {
+			popFn = this.callback.searWhs;
+		} 
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+		if (arg == "SW" ) {
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+		} 
+		
+		
+	},
+	callback: {
+		searWhs: function(rowDataPop) {
+			if(rowDataPop) {
+				$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_NM').val(rowDataPop.whsNm);
+				$('#ITP_FORM_ORDMNG03010_SEARCH_SWHS_ID').val(rowDataPop.whsId);
+			}
+			
+		},
+		poRej: function(rowDataPop) {
+			if(rowDataPop) {
+				console.log(rowDataPop);
+				
+				if (rowDataPop.retVal == "Y") {
+				  modifyObj.button.rejectSave(rowDataPop);
+				}
+			}
+		}
+		
+		
 	},
 	event: {
 			init: function () {
@@ -198,7 +270,7 @@ let pageObj = {
 							$(this).on('click', function() {
 									switch (id) {
 											case 'ITP_BTN_ORDMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
-											case 'ITP_BTN_ORDMNG03010_POPUP'			: listObj.button.create(); 		break;	// 신규등록 버튼
+											case 'ITP_BTN_ORDMNG03010_POPUP'			: listObj.button.create(); 		break;	// 납품서출력
 											case 'ITP_BTN_ORDMNG03010_MODIFY'			: modifyObj.button.modify();	break;	// 수정 버튼
 											case 'ITP_BTN_ORDMNG03010_CANCELLIST'		: createObj.button.cancel(); 	break;	// 취소/목록 버튼
 											case 'ITP_BTN_ORDMNG03010_DELETE'			: 								break;	// 삭제 버튼
@@ -239,7 +311,8 @@ let pageObj = {
 			});
 			if(mode == 'LIST') { // 목록
 				$('#ITP_FORM_ORDMNG03010_SEARCH_SPPLY_ID').val(fn_make_user_info.get('userId'));
-					$('#ITP_AJAX_ORDMNG03010_LIST_CONTAINER').show();
+				$('#ITP_FORM_ORDMNG03010_SEARCH_BRAND_ID').val(fn_make_user_info.get('brandId'));					$('#ITP_AJAX_ORDMNG03010_LIST_CONTAINER').show();
+					$('#ITP_FORM_ORDMNG03010_SDELETE_SWHS_NM').show();
 					fn_show_btn_auth_array(['#ITP_BTN_ORDMNG03010_SRH', '#ITP_BTN_ORDMNG03010_POPUP']);
 			} else if(mode == 'ADD') { // 등록
 					$('#ITP_AJAX_ORDMNG03010_DETAIL_CONTAINER').show();
@@ -287,36 +360,55 @@ let listObj = {
 			this.grid.init();
 	},
 	itp_ORDMNG03010_search: false,
+	
 	button: {
 			search: function() {
 					listObj.itp_ORDMNG03010_search = true;
+					console.log(1);
 					let param = $('#ITP_FORM_ORDMNG03010_SEARCH').serializeObject();
 					param.gridSize = $.jgrid.defaults.rowNum;
-					param.gridPage = $.jgrid.defaults.page;
+					param.gridPage = $.jgrid.defaults.pageITP_FORM_ORDMNG03010_SSEARCH_SWHS_NM;
 					$(ORDMNG03010_GRID_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
 			},
+			
 			create: function() {
 					if(!fn_make_user_info.isEmpty()) {
 						// 팝업
-						var popFn = (result) => {
-							console.log(result);
+//						var popFn = this.callback.deliPrt;
+
+						const rowKey = $(ORDMNG03010_GRID_ID).getGridParam('selrow');
+						if (!rowKey) {
+							alert("납품서를 선택해주세요 (대표 납품서번호)") ;
+							return;
+						}
+						
+						var selectedIds = $(ORDMNG03010_GRID_ID).getGridParam('selarrrow');
+						
+						if(selectedIds.length > 1) { // 1개만 선택
+						   alert("납품서 하나만 선택해주세요 (대표 납품서번호)") ;
+							return;
+						} 
+						
+						var selRowData ;
+						
+						for (var i=selectedIds.length-1; i>=0; i--) {
+							selRowData = $(ORDMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
 						}
-					    var selectedIds = $(ORDMNG03010_GRID_ID).getGridParam('selarrrow');
-					    console.log(selectedIds);
-					    if(selectedIds.length !== 1) {
-					    	return;
-					    }
-						var param = {
-							'dlvSttmtUnqNo':selectedIds[0].dlvSttmtUnqNo,
-							'fromDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_REQ_DT').val(),
-							'toDt': $('#ITP_FORM_ORDMNG03010_SEARCH #ITP_FORM_ORDMNG03010_SEARCH_DLV_CMPLT_DT').val()
-						};
-						console.log(param);
-						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE', popFn, param, 'S');
+						console.log(selRowData);
+						const key = {brandId :fn_make_user_info.get('brandId'), dlvSttmtUnqNo : selRowData.dlvSttmtUnqNo};
+						console.log(key);
+						fn_call_popup('biz', 'BIZPOP_DLV_STTMT_PRN', '#ITP_ASIDE',null, key, 'S');
+						console.log(fn_call_popup);
+						// fn_call_popup(type, popnm, container,  popFn, args, returnType)
 					}
 			}
 			
 	},
+//	callback: {
+//		deliPrt: function(rowDataPop) {
+//			console.log(rowDataPop);
+//		}
+//	},
 	empty: {
 			init: function() {
 					var _this = this;

src/main/webapp/js/app/pomng/ITP_POMNG01010.js

@@ -18,35 +18,16 @@ require(['config'], function() {
  *******************************************************/
 
 /*화면 변수*/
-/*
-const POMNG01010_GRID_ID = '#ITP_POMNG01010_jqGrid';
-const POMNG01010_GRID_LIST = '#ITP_POMNG01010_jqGrid_list';
-const POMNG01010_GRID_PAGER = '#ITP_POMNG01010_jqGridPager';
-const POMNG01010_GRID_EMPTY = '#ITP_POMNG01010_jqGridEmpty';
-
-const POMNG01010_VIEW_GRID_ID = '#ITP_POMNG01010_VIEW_jqGrid';
-const POMNG01010_VIEW_GRID_LIST = '#ITP_POMNG01010_VIEW_jqGrid_list';
-const POMNG01010_VIEW_GRID_PAGER = '#ITP_POMNG01010_VIEW_jqGridPager';
-const POMNG01010_VIEW_GRID_EMPTY = '#ITP_POMNG01010_VIEW_jqGridEmpty';
-*/
 const POMNG01010_DETAIL_GRID_ID = '#ITP_POMNG01010_DETAIL_jqGrid';
 const POMNG01010_DETAIL_GRID_LIST = '#ITP_POMNG01010_DETAIL_jqGrid_list';
 const POMNG01010_DETAIL_GRID_PAGER = '#ITP_POMNG01010_DETAIL_jqGridPager';
 const POMNG01010_DETAIL_GRID_EMPTY = '#ITP_POMNG01010_DETAIL_jqGridEmpty';  // ==>dwkim html확인필요
 
-/*
-let ITP_FORM_POMNG01010_DETAIL_IS_DUPLICATE = false;
-let ITP_FORM_POMNG01010_DETAIL_IS_WRITING = false;
-*/
+let POMNG01010_DETAIL_GRID_LAST_ROW_ID;
 
 /*API URL*/
 let API_DETAIL_INIT_INFO = '/api/pomng/init-pchReq'
-//let API_DETAIL_GRID_LIST = '/api/affl/detail-grid-list';
-//let API_DETAIL_INFO = '/api/affl/info-affl';
-//let COMPANY_INFO_COMPANY = '/api/affl/info-affl';
 let API_DETAIL_SAVE = '/api/pomng/save-pchReq';
-//let API_CHECK_DUPLICATE = '/api/affl/check-duplicate';
-//let API_INTI_USERPW = '/api/user/inti-userpw';
 
 /*화면 Grid ColModel   ==>선택박스 항목 추가 부분  */
 const gridColModel = {
@@ -81,20 +62,23 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt,
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text', hidden: false
+			sortable: false, editable: false, edittype: 'text', hidden: false, 
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
 			label: ITP_MSG_LOCALE.label.pchReqQty, //수량
 			width: '10', fixed: false, align: 'right',
-			sortable: true, editable: true, edittype: 'text',
-			editrules: { number:true}
+			sortable: false, editable: true, edittype: 'text',
+			editrules: { number:true }, 
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
 			label: ITP_MSG_LOCALE.label.pchReqAmt,
 			width: '10', fixed: false, align: 'right',
-			sortable: false, editable: false, edittype: 'text', hidden: false
+			sortable: false, editable: false, edittype: 'text', hidden: false, 
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 
 		{
@@ -143,7 +127,15 @@ let pageObj = {
 	popup: function () {
 		// 팝업
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
+		var whsDvsn = "";
+		if (fn_make_user_info.get('storeId') == '' ) {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'),whsDvsn: whsDvsn};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		
 	},
@@ -184,8 +176,6 @@ let pageObj = {
 			$('#ITP_TAB_POMNG01010 .input-group.date').datepicker(ITP_DATE_LANGUAGE);
 			$('#ITP_FORM_POMNG01010_DETAIL_DLV_REQ_DT').datepicker('setDate', new Date(now.setDate(now.getDate() + 5)));
 			
-			
-			
 			//납품장소 필드 readonly
 			$('#ITP_FORM_POMNG01010_DETAIL_WHS_NM').attr('readonly', true);
 			$('#ITP_FORM_POMNG01010_DETAIL_LOCATION_NM').attr('readonly', true);
@@ -217,9 +207,15 @@ let pageObj = {
 					}
 				});
 			});
-
+			
 			$('body').on('click', function(e) {
-				// afflUserObj.grid.resetGrid(e);
+				var gridId = POMNG01010_DETAIL_GRID_ID.replace('#', '');
+				var rids = $(POMNG01010_DETAIL_GRID_ID).jqGrid('getDataIDs');
+				var last_row_id = rids[rids.length - 1];
+				
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'POMNG01010_DETAIL');	
+				
+				pageObj.grid.recal();			
 			});
 
 		}
@@ -269,22 +265,18 @@ let pageObj = {
 				colModel: gridColModel.detail,
 				data: gridData,
 				multiselect: true,
-				cellEdit: true,
+				// cellEdit: true,
+				onCellSelect: function(rowId, cellIdx, cellValue) {
+					POMNG01010_DETAIL_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, POMNG01010_DETAIL_GRID_LAST_ROW_ID, POMNG01010_DETAIL_GRID_ID, ['pchReqQty']);
+		   		},
 				loadComplete: function(data) {
 					_this.clearData();
-				},
-				afterSaveCell: function(rowid,name,val,iRow,iCol) {
-					// 구매요청금액 계산 (기존금액과 )
-					var unitAmt = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell',rowid,iCol-1);
-					jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('setRowData',rowid,{pchReqAmt: parseInt(val)*parseInt(unitAmt)});
-					// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
-					_this.recal();
 				}
 			};
 			itp_fn_grid_make_local(option);
 		},
 		clearData: function() {
-			console.log(this.gridId);
+			// console.log(this.gridId);
 			$(POMNG01010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
 			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
 			$(POMNG01010_DETAIL_GRID_LIST).find('.ui-jqgrid-bdiv').css('min-height', '100px');
@@ -292,19 +284,28 @@ let pageObj = {
 			$(POMNG01010_DETAIL_GRID_EMPTY).show();
 		},
 		recal: function() {
-			//PCH_REQ_AMT
-			console.log("==========================================");
+			
+			var ids = $(POMNG01010_DETAIL_GRID_ID).getDataIDs();
+			$.each(ids, function(idx, rowId) {
+				
+				var viewCd = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'viewCd');
+				var unitAmt = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
+				var pchReqQty = jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'pchReqQty');
+				
+				if(viewCd != 'D' && unitAmt != null && unitAmt != '' && pchReqQty != null && pchReqQty != '') {		
+					jQuery(POMNG01010_DETAIL_GRID_ID).jqGrid('setRowData',rowId,{pchReqAmt: parseInt(unitAmt)*parseInt(pchReqQty)});
+				}
+			});
+			
 			const rowData = $(POMNG01010_DETAIL_GRID_ID).getRowData();
-			console.log("####################################");
 			var pchReqAmt = 0 ;
 			$.each(rowData, function(key, value) {
-				 console.log(rowData);
+				// console.log(JSON.stringify(rowData));
 				if (value.pchReqAmt != null && value.pchReqAmt != "" && value.viewCd != "D") {
 					pchReqAmt = pchReqAmt + parseInt(value.pchReqAmt) ;
-				}
-				
+				}				
 			});
-			$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(pchReqAmt);
+			$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text(itp_fn_number_comma(pchReqAmt));
 		},
 		unload: function() {
 			$.jgrid.gridUnload(this.gridId);
@@ -336,6 +337,8 @@ let createObj = {
 	},
 	button: {
 		save: function(arg) {
+			$('body').trigger('click');
+			
 			const formId = '#ITP_FORM_POMNG01010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			$('#ITP_FORM_POMNG01010_DETAIL_PCH_REQ_ST_CD').val(arg);
@@ -414,7 +417,6 @@ let createObj = {
 		fn_ajax_call(API_DETAIL_INIT_INFO, key, this.callback, 'GET');
 	},
 	callback: function(result) {
-		console.log(result);
 
 		$('#ITP_FORM_POMNG01010_DETAIL #ITP_FORM_POMNG01010_DETAIL_VIEW_CD').val('C');
 
@@ -432,8 +434,7 @@ let createObj = {
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqMgrNm').text(result.userNm);
 		$('#ITP_FORM_POMNG01010_DETAIL .fnPchReqAmt').text("0");
 		$('#ITP_FORM_POMNG01010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
-		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);
-		
+		$('#ITP_FORM_POMNG01010_DETAIL .fnPchActAmt').text(result.ordUseAmt);		
 
 		pageObj.grid.init();
 	}

src/main/webapp/js/app/pomng/ITP_POMNG02010.js

@@ -38,6 +38,7 @@ const POMNG02010_DETAIL_GRID_EMPTY = '#ITP_POMNG02010_DETAIL_jqGridEmpty';
 let ITP_FORM_POMNG02010_DETAIL_IS_WRITING = false;
 
 let POMNG02010_GRID_LAST_ROW_ID;
+let SCREEN_MODE;
 
 
 //let ITP_COMMON_ASSGN_TASK = fn_make_common_cd_list(CODE_LIST, 'ASSGN_TASK', true, '담당업무');
@@ -149,7 +150,7 @@ const gridColModel = {
 			index: 'VIEW_CD', name: 'viewCd',
 			label: ITP_MSG_LOCALE.label.viewCd,
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: true
 		},
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
@@ -189,22 +190,36 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt,
 			width: '10', fixed: false, align: 'center',
-			sortable: false, editable: false, edittype: 'text', hidden: false
+			sortable: false, editable: false, edittype: 'text', hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
 			label: ITP_MSG_LOCALE.label.pchReqQty, //단가
 			width: '10', fixed: false, align: 'right',
 			sortable: true, editable: true, edittype: 'text',
-			editrules: {required: true, number:true}
+			editrules: {required: true, number:true},
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
 			label: ITP_MSG_LOCALE.label.pchReqAmt,
 			width: '10', fixed: false, align: 'right',
+			sortable: false, editable: false, edittype: 'text', hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
+		},
+		{
+			index: 'PCH_REQ_DTL_ST_NM', name: 'pchReqDtlStNm',
+			label: ITP_MSG_LOCALE.label.pchReqDtlStNm,
+			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', hidden: false
 		},
-
+		{
+			index: 'PCH_REQ_DTL_ST_CD', name: 'pchReqDtlStCd',
+			label: ITP_MSG_LOCALE.label.pchReqDtlStNm,
+			width: '10', fixed: false, align: 'right',
+			sortable: false, editable: false, edittype: 'text', hidden: true
+		},
 		{
 			index: 'BRAND_UNIT_UNQ_NO', name: 'brandUnitUnqNo',
 			label: ITP_MSG_LOCALE.label.brandUnitUnqNo,
@@ -314,7 +329,15 @@ let pageObj = {
 			popFn = this.callback.modify;
 		}
 		
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		var whsDvsn = "";
+		if (fn_make_user_info.get('storeId') == '' ) {
+			whsDvsn = "W01";
+		} else {
+			whsDvsn = "W02";
+		}
+		
+		
+		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn: whsDvsn};
 		fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
 		
 	},
@@ -359,13 +382,18 @@ let pageObj = {
 					}
 				});
 			});
-
+			
 			$('body').on('click', function(e) {
 				var gridId = POMNG02010_DETAIL_GRID_ID.replace('#', '');
 				var rids = $(POMNG02010_DETAIL_GRID_ID).jqGrid('getDataIDs');
 				var last_row_id = rids[rids.length - 1];
-				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'POMNG02010_DETAIL');
+				
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, 'POMNG02010_DETAIL');	
+				
+				pageObj.grid.recal();
 			});
+
+			
 		}
 	},
 	switchScreen: function(mode) {
@@ -380,6 +408,7 @@ let pageObj = {
 			$('#ITP_AJAX_POMNG02010_LIST_CONTAINER').show();
 			$('#ITP_FORM_POMNG02010_DETAIL_SBRAND_ID').val(fn_make_user_info.get('brandId'));
 			$('#ITP_FORM_POMNG02010_DETAIL_SSTORE_ID').val(fn_make_user_info.get('storeId'));
+			SCREEN_MODE = 'LIST' ;
 		} else if(mode == 'ADD') { // 등록
 			fn_show_btn_auth_array(['#ITP_BTN_POMNG02010_CANCELLIST', '#ITP_BTN_POMNG02010_SAVE']);
 			$('#ITP_AJAX_POMNG02010_DETAIL_CONTAINER').show();
@@ -390,6 +419,7 @@ let pageObj = {
 					$(this).val('').prop('selected', true);
 				}
 			});
+			SCREEN_MODE = 'DETAIL' ;
 			
 		} else if(mode == 'MODIFY') { // 수정
 			fn_show_btn_auth_array(['#ITP_BTN_POMNG02010_CANCELLIST', '#ITP_BTN_POMNG02010_SAVE', '#ITP_BTN_POMNG02010_REQ']);
@@ -397,15 +427,16 @@ let pageObj = {
 			$('#ITP_AJAX_POMNG02010_DETAIL_CONTAINER').show();
 			$('#ITP_FORM_POMNG02010_DETAIL .itp_form_info').show();
 			$('#ITP_FORM_POMNG02010_DETAIL .itp_form_change').hide();
-			
+			SCREEN_MODE = 'DETAIL' ;
 		} else if(mode == 'VIEW') { // 보기
 			fn_show_btn_auth_array(['#ITP_BTN_POMNG02010_MODIFY', '#ITP_BTN_POMNG02010_CANCELLIST']);
 			$('#ITP_AJAX_POMNG02010_VIEW_CONTAINER').show();
+			SCREEN_MODE = 'VIEW' ;
 		}
 	},
 	grid: {
 		init: function(mode, gridRows) {
-			
+			console.log(mode);
 			this.gridId = (mode === 'VIEW') ? POMNG02010_VIEW_GRID_ID : POMNG02010_DETAIL_GRID_ID;
 			this.gridList = (mode === 'VIEW') ? POMNG02010_VIEW_GRID_LIST : POMNG02010_DETAIL_GRID_LIST;
 			this.gridEmpty = (mode === 'VIEW') ? POMNG02010_VIEW_GRID_EMPTY : POMNG02010_DETAIL_GRID_EMPTY;
@@ -455,7 +486,7 @@ let pageObj = {
 				colModel: gridColModel.detail,
 				data: gridRows,
 				multiselect: true,
-				cellEdit: (mode !== 'VIEW'),
+				//cellEdit: (mode !== 'VIEW'),
 				loadComplete: function(data) {
 					//console.log(data);
 					//$(_this.gridList).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
@@ -465,37 +496,38 @@ let pageObj = {
 				},
 				onCellSelect: function(rowid, cellIdx, cellValue) {
 					if(mode !== 'VIEW') {
-						//POMNG02010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowId, cellIdx, POMNG02010_GRID_LAST_ROW_ID, _this.gridId, ['pchReqDtlNo']);
+						POMNG02010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, POMNG02010_GRID_LAST_ROW_ID, POMNG02010_DETAIL_GRID_ID, ['pchReqUnqNo']);
 					}
 				}
-				,
-				afterSaveCell: function(rowid,name,val,iRow,iCol) {
-					
-					POMNG02010_GRID_LAST_ROW_ID = itp_fn_set_chg_editable(rowid, POMNG02010_GRID_LAST_ROW_ID, POMNG02010_DETAIL_GRID_ID);
-					//POMNG02010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, iCol, POMNG02010_GRID_LAST_ROW_ID,  _this.gridId); 
-					
-					var unitAmt = jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('getCell',rowid,iCol-1);
-					jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('setRowData',rowid,{pchReqAmt: parseInt(val)*parseInt(unitAmt)});
-					// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
-					_this.recal();
-				}
 			};
 			itp_fn_grid_make_local(option);
 		},
 		recal: function() {
-			//PCH_REQ_AMT
-			
-			const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
-			var pchReqAmt = 0 ;
-			$.each(rowData, function(key, value) {
-				console.log(rowData);
-				if (value.pchReqAmt != null && value.pchReqAmt != "" && value.viewCd != "D") {
-					pchReqAmt = pchReqAmt + parseInt(value.pchReqAmt) ;
-				}
+			console.log("recal call");
+			if (SCREEN_MODE === 'DETAIL') {
+				var ids = $(POMNG02010_DETAIL_GRID_ID).getDataIDs();
+				$.each(ids, function(idx, rowId) {
+					console.log("recal start");
+					var viewCd = jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'viewCd');
+					var unitAmt = jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
+					var pchReqQty = jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'pchReqQty');
+					
+					if(viewCd != 'D' && unitAmt != null && unitAmt != '' && pchReqQty != null && pchReqQty != '') {		
+						jQuery(POMNG02010_DETAIL_GRID_ID).jqGrid('setRowData',rowId,{pchReqAmt: parseInt(unitAmt)*parseInt(pchReqQty)});
+					}
+				});
 				
-			});
+				const rowData = $(POMNG02010_DETAIL_GRID_ID).getRowData();
+				var pchReqAmt = 0 ;
+				$.each(rowData, function(key, value) {
+					// console.log(JSON.stringify(rowData));
+					if (value.pchReqAmt != null && value.pchReqAmt != "" && value.viewCd != "D") {
+						pchReqAmt = pchReqAmt + parseInt(value.pchReqAmt) ;
+					}				
+				});
+				$('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(itp_fn_number_comma(pchReqAmt));
+			}
 			
-			$('#ITP_FORM_POMNG02010_DETAIL .fnPchReqTotalAmt').text(pchReqAmt);
 		},
 		clearData : function() {
 			$(this.gridId).jqGrid('clearGridData', true);
@@ -664,15 +696,17 @@ let viewObj = {
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqNm').text(result.pchReqNm);
 		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqStNm').text(result.pchReqStNm);
 		$('#ITP_FORM_POMNG02010_VIEW .pchReqMgrNm').text(result.pchReqMgrNm);
-		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqTotalAmt').text(result.pchReqTotalAmt);
+		
+		
+		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqTotalAmt').text(itp_fn_number_comma(result.pchReqTotalAmt));
 		$('#ITP_FORM_POMNG02010_VIEW .fnDlvReqDt').text(result.dlvReqDt);
 		$('#ITP_FORM_POMNG02010_VIEW .fnWhsNm').text(result.whsNm + " - " + result.locationNm);
 		$('#ITP_FORM_POMNG02010_VIEW .fnLoanDvsnNm').text(result.loanDvsnNm);
 		$('#ITP_FORM_POMNG02010_VIEW .fnOrdUseAmt').text(result.ordUseAmt);
 		$('#ITP_FORM_POMNG02010_VIEW .fnNote').text(result.note);
-		$('#ITP_FORM_POMNG02010_VIEW .fnRjctDt').text(result.pchReqRjctDt);
-		$('#ITP_FORM_POMNG02010_VIEW .fnRjctMgrNm').text(result.pchReqRjctNm);
-		$('#ITP_FORM_POMNG02010_VIEW .fnRjctRsn').text(result.pchReqRjctRsn);
+		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqRjctDt').text(result.pchReqRjctDt);
+		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqRjctNm').text(result.pchReqRjctNm);
+		$('#ITP_FORM_POMNG02010_VIEW .fnPchReqRjctRsn').text(result.pchReqRjctRsn);
 		
 		
 		
@@ -712,6 +746,7 @@ let modifyObj = {
 			modifyObj.load(param);
 		},
 		save: function(arg) {
+			$('body').trigger('click');
 			const formId = '#ITP_FORM_POMNG02010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);
 			

src/main/webapp/js/app/pomng/ITP_POMNG03010.js

@@ -51,12 +51,6 @@ let API_DETAIL_PASSQTY 		    = '/api/stock/mng/whs-passqty-list';			// 창고선
 /*화면 Grid ColModel*/
 const gridColModel = {
 	list: [
-		{
-			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
-			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청고유번호
-			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: true
-		},
 		{
 			index: 'PCH_REQ_DTL_NO', name: 'pchReqDtlNo',
 			label: ITP_MSG_LOCALE.label.pchReqDtlNo, //구매요청상세번호
@@ -75,6 +69,24 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
+		{
+			index: 'DLV_DVSN', name: 'dlvDvsn',
+			label: ITP_MSG_LOCALE.label.dlvDvsnNm, //배송구분
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: true
+		},
+		{
+			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
+			label: ITP_MSG_LOCALE.label.pchReqUnqNo, //구매요청고유번호
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
+		{
+			index: 'DLV_DVSN_NM', name: 'dlvDvsnNm',
+			label: ITP_MSG_LOCALE.label.dlvDvsnNm, //배송구분
+			width: '10', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
 		{
 			index: 'STORE_ID', name: 'storeId',
 			label: ITP_MSG_LOCALE.label.storeId, //매장아이디
@@ -139,19 +151,22 @@ const gridColModel = {
 			index: 'UNIT_AMT', name: 'unitAmt',
 			label: ITP_MSG_LOCALE.label.unitAmt, //구매요청단가
 			width: '10', fixed: false, align: 'right',
-			sortable: false, hidden: true
+			sortable: false, hidden: true,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PO_UNIT_AMT', name: 'poUnitAmt',
 			label: ITP_MSG_LOCALE.label.poUnitAmt, //발주단가
 			width: '10', fixed: false, align: 'right',
-			sortable: false, hidden: true
+			sortable: false, hidden: true,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_REQ_QTY', name: 'pchReqQty',
 			label: ITP_MSG_LOCALE.label.pchReqQty, //구매요청수량
 			width: '10', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
@@ -163,13 +178,15 @@ const gridColModel = {
 			index: 'PCH_REQ_AMT', name: 'pchReqAmt',
 			label: ITP_MSG_LOCALE.label.pchReqAmt, //납품요청금액
 			width: '10', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PCH_ORD_AMT', name: 'pchOrdAmt',
 			label: ITP_MSG_LOCALE.label.pchOrdSpplyAmt, //본사납품금액
 			width: '10', fixed: false, align: 'right',
-			sortable: false, hidden: false
+			sortable: false, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'LEAD_TIME', name: 'leadTime',
@@ -183,13 +200,13 @@ const gridColModel = {
 			index: 'VIEW_CD', name: 'viewCd',
 			label: ITP_MSG_LOCALE.label.viewCd,
 			width: '10', fixed: false, align: 'center',
-			sortable: false, hidden: false
+			sortable: false, hidden: true
 		},
 		{
 			index: 'PCH_REQ_UNQ_NO', name: 'pchReqUnqNo',
 			label: ITP_MSG_LOCALE.label.pchReqUnqNo,  //구매요청번호
 			width: '20', fixed: false, align: 'center',
-			sortable: false, hidden: true, edittype: 'text',
+			sortable: false, hidden: false, edittype: 'text',
 			 editable: false
 		},
 		{
@@ -218,7 +235,8 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.unitAmt, //단가
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false
+			hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'UNIT', name: 'unit',
@@ -232,21 +250,24 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.pchReqQty, //구매요청수량
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false
+			hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_QTY', name: 'podrQty',
 			label: ITP_MSG_LOCALE.label.podrQty, //발주수량
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: true, edittype: 'text',
-			editrules: {required: true}, hidden: false
+			editrules: {required: true}, hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'PODR_AMT', name: 'podrAmt',
 			label: ITP_MSG_LOCALE.label.podrAmt, //발주금액
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false
+			hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'DLV_REQ_DT', name: 'dlvReqDt',
@@ -260,7 +281,8 @@ const gridColModel = {
 			label: ITP_MSG_LOCALE.label.whsPassQty, //출고가능수량
 			width: '10', fixed: false, align: 'right',
 			sortable: false, editable: false, edittype: 'text',
-			hidden: false
+			hidden: false,
+			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'BRAND_UNIT_UNQ_NO', name: 'brandUnitUnqNo',
@@ -421,12 +443,13 @@ let pageObj = {
 		
 		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 		if (arg == "SW" ) {
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+			const keya = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, keya, 'S');
 		} else if (arg == "SS" || arg == "NS" ) {
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if (arg == "SHW" || arg == "NHW") {
-			const key1 = {brandId:fn_make_user_info.get('brandId')};
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
+			const keyb = {brandId:fn_make_user_info.get('brandId'),storeId:"", whsDvsn:"W01"};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, keyb, 'S');
 		} else if (arg == "REJ" ) {
 			/* 선택ROW가져오기 */
 			const rowKey = $(POMNG03010_GRID_ID).getGridParam('selrow');
@@ -445,9 +468,9 @@ let pageObj = {
 			for (var i=selectedIds.length-1; i>=0; i--) {
 				selRowData = $(POMNG03010_GRID_ID).jqGrid('getRowData', selectedIds[i]);
 			}
-			console.log(selRowData);
+			
 			const key1 = {pchReqUnqNo:selRowData.pchReqUnqNo, storeId:selRowData.storeId};
-			//console.log(key);
+			
 			fn_call_popup('biz', 'BIZPOP_PO_REJECT', '#ITP_ASIDE', popFn, key1, 'S');
 		} 
 		
@@ -470,16 +493,14 @@ let pageObj = {
 		},
 		searNSpply: function(rowDataPop) {
 			if(rowDataPop) {
-				//console.log(rowDataPop);
+			
 				var pspplyId = $('#ITP_FORM_POMNG03010_NDETAIL_SPPLY_ID').val();
-				//console.log(pspplyId);
+			
 				if (pspplyId == "") {
-				//	console.log("null");
+				
 					$('#ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM').val(rowDataPop.spplyNm);
 					$('#ITP_FORM_POMNG03010_NDETAIL_SPPLY_ID').val(rowDataPop.spplyId);
 				} else {
-					//$('#Table_ID').getGridParam('reccount');
-				//	console.log("cpzm");
 					var records = $(POMNG03010_NDETAIL_GRID_ID).getGridParam('reccount')
 					if (records != 0) {
 						if (pspplyId != rowDataPop.spplyId ) {
@@ -526,7 +547,6 @@ let pageObj = {
 		},
 		poRej: function(rowDataPop) {
 			if(rowDataPop) {
-				console.log(rowDataPop);
 				
 				if (rowDataPop.retVal == "Y") {
 				  modifyObj.button.rejectSave(rowDataPop);
@@ -559,6 +579,16 @@ let pageObj = {
 					}
 				});
 			});
+			
+			$('body').on('click', function(e) {
+				
+				var gridId = ((SCREEN_MODE === 'NPC') ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).replace('#', '');
+				var rids = $( (SCREEN_MODE === 'NPC') ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('getDataIDs');
+				var last_row_id = rids[rids.length - 1];
+				
+				itp_fn_grid_reset_selection(e, last_row_id, gridId, (SCREEN_MODE === 'NPC') ?  'POMNG03010_NDETAIL' : 'POMNG03010_DETAIL');	
+				pageObj.grid.recal();
+			});
 
 		}
 	},
@@ -654,8 +684,7 @@ let pageObj = {
 					});
 					
 					if (diffchk == "Y") return;
-					//console.log(chkSpplyNm);
-					//console.log(diffchk);
+				
 					if (spplyId == "" ) {
 						$('#ITP_FORM_POMNG03010_NDETAIL_SPPLY_ID').val(chkSpplyId);
 						$('#ITP_FORM_POMNG03010_NDETAIL_SPPLY_NM').val(chkSpplyNm);
@@ -717,7 +746,7 @@ let pageObj = {
 				gridId: _this.gridId,
 				colModel: gridColModel.detail,
 				data: gridRows,
-				cellEdit: true,
+				//cellEdit: true,
 				multiselect: (mode === 'NPC'),
 				loadComplete: function(data) {
 					$(mode === 'NPC' ? POMNG03010_NDETAIL_GRID_LIST : POMNG03010_DETAIL_GRID_LIST).find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
@@ -726,36 +755,41 @@ let pageObj = {
 					
 				},
 				onCellSelect: function(rowid, cellIdx, cellValue) {
-					//POMNG03010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, POMNG03010_GRID_LAST_ROW_ID, _this.gridId, ['actionId']);
-				},
-				afterSaveCell: function(rowid,name,val,iRow,iCol) {
-					// 구매요청금액 계산 (기존금액과 )
-					var	unitAmt  = jQuery(_this.gridId).jqGrid('getCell',rowid,iCol-3);
-					jQuery(_this.gridId).jqGrid('setRowData',rowid,{podrAmt: parseInt(val)*parseInt(unitAmt)});	
-					
-					// 그리드 포문으로 금액 재계산후 구매요청금액에 넣어줌
-					pageObj.grid.recal( mode,_this.gridId);
+					POMNG03010_GRID_LAST_ROW_ID = itp_fn_set_data_editable(rowid, cellIdx, POMNG03010_GRID_LAST_ROW_ID, _this.gridId, ['pchReqDtlNo']);
 				}
 			};
 			itp_fn_grid_make_local(option);
 		},
-		recal: function(mode, gridId) {
+		recal: function() {
 			//PCH_REQ_AMT
-			const rowData = $(gridId).getRowData();
-			var podrAmt = 0 ;
-			$.each(rowData, function(key, value) {
-				if (value.podrAmt != null && value.podrAmt != "" && value.viewCd != "D") {
-					podrAmt = podrAmt + parseInt(value.podrAmt) ;
-				}
+			if (SCREEN_MODE == 'NPC' || SCREEN_MODE === 'POC') {
+				var ids = $((SCREEN_MODE === 'NPC') ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).getDataIDs();
+				$.each(ids, function(idx, rowId) {
+					var viewCd = jQuery(SCREEN_MODE === 'NPC' ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'viewCd');
+					var unitAmt = jQuery(SCREEN_MODE === 'NPC' ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'unitAmt');
+					var podrQty = jQuery(SCREEN_MODE === 'NPC' ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('getCell', rowId, 'podrQty');
+					
+					if(viewCd != 'D' && unitAmt != null && unitAmt != '' && podrQty != null && podrQty != '') {
+					
+						jQuery(SCREEN_MODE === 'NPC' ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('setRowData',rowId,{podrAmt: parseInt(unitAmt)*parseInt(podrQty)});
+					}
+				});
 				
-			});
+				const rowData = $((SCREEN_MODE == 'NPC') ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).getRowData();
+				var podrAmt = 0 ;
+				$.each(rowData, function(key, value) {
+					if (value.podrAmt != null && value.podrAmt != "" && value.viewCd != "D") {
+						podrAmt = podrAmt + parseInt(value.podrAmt) ;
+					}
+					
+				});
 			
-			if (mode == 'NPC')  {
-				$('#ITP_FORM_POMNG03010_NDETAIL .fnPodrAmt').text(podrAmt);	
-			} else {
-				$('#ITP_FORM_POMNG03010_DETAIL .fnPodrAmt').text(podrAmt);
+				if (SCREEN_MODE == 'NPC')  {
+					$('#ITP_FORM_POMNG03010_NDETAIL .fnPodrAmt').text(podrAmt);	
+				} else {
+					$('#ITP_FORM_POMNG03010_DETAIL .fnPodrAmt').text(podrAmt);
+				}
 			}
-			
 		},
 		clearData : function(mode) {
 			$(mode === 'NPC' ? POMNG03010_NDETAIL_GRID_ID : POMNG03010_DETAIL_GRID_ID).jqGrid('clearGridData', true);
@@ -920,7 +954,7 @@ let modifyObj = {
 			listObj.grid.search();
 		},
 		rejectSave: function(param) {
-			console.log(param);
+		
 			var modalFn = {
 					callBack: () => {
 						var searhFn = function () {
@@ -934,7 +968,7 @@ let modifyObj = {
 				itp_fn_modal_confirm('구매요청 반려 하시겠습니까?', modalFn);
 		},
 		save: function() {
-			
+			$('body').trigger('click');
 			const formId = (SCREEN_MODE == 'NPC' ? '#ITP_FORM_POMNG03010_NDETAIL' : '#ITP_FORM_POMNG03010_DETAIL');
 			itp_fn_form_clear_validate(null, formId);
 
@@ -943,16 +977,16 @@ let modifyObj = {
 				
 				if (SCREEN_MODE == 'NPC') {
 					const rowData1 = $(POMNG03010_NDETAIL_GRID_ID).getRowData();
-					//console.log("stsrt");
+				
 					var dataCnt = 0;
 					$.each(rowData1, function(key, value) {
 						console.log(value.viewCd);
 						if (value.viewCd != 'D') {
-							console.log("count");
+						
 							dataCnt = dataCnt + 1;
 						} 
 					});
-					//console.log(dataCnt);
+					
 					
 					if (dataCnt == 0) {
 						alert( "발주 생성할 품목내역이 없습니다.");
@@ -1011,6 +1045,7 @@ let modifyObj = {
 							pageObj.grid.clearData();
 							modifyObj.button.cancel();
 						}
+						console.log(JSON.stringify(param));
 						fn_ajax_call(API_DETAIL_SAVE, JSON.stringify(param), searhFn, 'POST');
 					}
 				};
@@ -1040,7 +1075,7 @@ let modifyObj = {
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_PODR_MGR_TEL_NO').val(result.podrMgrTelNo);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_DLV_DVSN').val(result.dlvDvsn);
 		//$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_').val(result.dlvDvsnNm);
-		$('#ITP_FORM_POMNG03010_DETAIL .fnPodrAmt').text(result.podrTotalAmt);
+		$('#ITP_FORM_POMNG03010_DETAIL .fnPodrAmt').text(itp_fn_number_comma(result.podrTotalAmt));
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_DLV_REQ_DT').val(result.dlvReqDt);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DETAIL_SHMT_WHS_ID').val(result.shmtWhsId);
 		$('#ITP_FORM_POMNG03010_DETAIL #ITP_FORM_POMNG03010_DELETE_SHMT_WHS_NM').val(result.shmtWhsNm + " - " + result.shmtLocationNm );
@@ -1057,8 +1092,6 @@ let modifyObj = {
 	},
 	passQtyCallback: function (result) {
 		
-		console.log(result);
-		console.log(result.size());
 		
 		/*
 		if ($(gridId).jqGrid('getCell', rowId, 'viewCd') === 'R') {

src/main/webapp/js/app/pomng/ITP_POMNG04010.js

@@ -408,11 +408,13 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		
 		if(keyword === 'spply'){
+			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
 			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key, 'S');
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},
 	callback: {

src/main/webapp/js/app/pomng/ITP_POMNG07010.js

@@ -334,11 +334,13 @@ let listObj = {
 	},
 	popup: function(keyword) {
 		var popFn = this.callback.create;
-		// const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+		 
 		if(keyword === 'spply'){
-			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			const key = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId')};
+			fn_call_popup('biz', 'BIZPOP_STORE_SPPLY', '#ITP_ASIDE', popFn, key, 'S');
 		} else if(keyword === 'whs'){
-			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, /*key*/null, 'S');
+			const key1 = {brandId:fn_make_user_info.get('brandId'),storeId:fn_make_user_info.get('storeId'), whsDvsn:""};
+			fn_call_popup('biz', 'BIZPOP_WHS_LOCATION', '#ITP_ASIDE', popFn, key1, 'S');
 		}
 	},
 	callback: {

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

@@ -6,46 +6,26 @@ require(['config'], function() {
 	});
 });
 
-let FRCOMP_POP_GRID_LIST = '/api/pomng/inoutmng/spply-deli-grid-list';
-let FRCOMP_POP_INFO_INV  = '/api/pomng/inoutmng/info-inv';	// 상세
-function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
-	// 공통코드
-	// fn_make_select(CODE_LIST, 'CMPY_TYPE_CD', 'ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_TYPE_CD', true, '가맹점타입 선택');
+let API_POP_INV_INFO = '/api/pomng/inoutmng/info-inv';
+
+const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
+const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
+const THIS_GIRD_LIST = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list';
+const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
+const THIS_GIRD_EMPTY = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty';
+
+function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, returnType) {
+	
 	
-	let itp_BIZPOP_DLV_STTMT_PRN_param = {};
+	let itp_BIZPOP_DLV_STTMT_PRN_param = args;
 	let itp_BIZPOP_DLV_STTMT_PRN_search = false;
 
-	const THIS_FORM_ID = '#ITP_FORM_BIZPOP_DLV_STTMT_PRN';
-	const THIS_GIRD_ID = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid';
-	const THIS_GIRD_PAGER = '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridPager';
-	let viewObj = {
-		init: function (param) {
-			this.load(param);
-		},
-		load: function(param) {
-			fn_ajax_call(FRCOMP_POP_INFO_INV, param, this.callback, 'GET');
-		},
-		callback: function (result) {
-			console.log(result);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(args.dlvSttmtUnqNo);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(args.dlvRegDt);
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrTelNo').text(args.dlvMgrTelNo);
-			var divMgrTelNo = "(" + args.divMgrTelNo + ")";
-			
-			$('#ITP_BIZPOP_DLV_STTMT_PRN .fnZipNo').val(args.zipNo);
-			var zipNo = "(" + args.zipNo + ")";
-		},	
-	};
 	
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(args.brandId);
+	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val(args.dlvSttmtUnqNo);
 	
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(fn_make_user_info.get('brandId'));
-	$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_SPPLY_ID').val(fn_make_user_info.get('spplyId'));
-	if(args) {
-		$('#ITP_FORM_BIZPOP_DLV_STTMT_PRN_CMPY_NM').val(args.brandNm);
-		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_FORM_DT').val(args.fromDt);
-		$('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_TO_DT').val(args.toDt);
-	}
 	
+
 	$('#ITP_BIZPOP_DLV_STTMT_PRN').one('shown.bs.modal', function(e) {
 		itp_fn_jqgrid_resize(THIS_GIRD_ID, '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid_list', '');
 		itp_fn_fire_window_resize();
@@ -53,111 +33,181 @@ function itp_fn_BIZPOP_DLV_STTMT_PRN(parentPopFn, args, schParam, returnType) {
 		$('#ITP_BIZPOP_DLV_STTMT_PRN').remove();
 	}).modal('show');
 
+
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SEARCH').on('click', function() {
-		itp_BIZPOP_DLV_STTMT_PRN_search = true;
-		let param = $(THIS_FORM_ID).serializeObject();
-		param.gridSize = 10;
-		param.gridPage = $.jgrid.defaults.page;
-		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(param)}).trigger('reloadGrid');
+		//인쇄부분 여기에 추가함
 	});
-	
-	$('#ITP_BIZPOP_DLV_STTMT_PRN_BTN_SELECT').on('click', function() {		
-		const rowKey = $(THIS_GIRD_ID).getGridParam('selrow');
-	    if (!rowKey) {
-	    	return;
-	    }
-
-		var list = [];
-	    var selectedIds = $(THIS_GIRD_ID).getGridParam('selarrrow');
-
-		if(selectedIds.length > 1) { // 1개만 선택
-			// return;
-		} 
-		
-	    for (var i=selectedIds.length-1; i>=0; i--) {
-			list.push($(THIS_GIRD_ID).jqGrid('getRowData', selectedIds[i]));	
-		}
-		parentPopFn(list);
-		$('#ITP_BIZPOP_DLV_STTMT_PRN').modal('hide'); // 팝업닫기
+/*	
+	$('#ITP_BIZPOP_PO_REJECT_BTN_CANCEL').on('click', function() {
+		let transParm = {pchReqUnqNo: $('#ITP_FORM_ITP_BIZPOP_PO_REJECT_PCH_REQ_UNQ_NO').val(),pchReqRjctRsn: '', retVal:'N', storeId:$('#ITP_FORM_ITP_BIZPOP_PO_REJECT_STORE_ID').val()}
+		parentPopFn(transParm);
+		$('#ITP_BIZPOP_PO_REJECT').modal('hide'); // 팝업닫기
 	});
+*/
 
 	$('#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty').on('click', function() {
 		itp_fn_BIZPOP_DLV_STTMT_PRN_empty.back();
-		itp_BIZPOP_DLV_STTMT_PRN_param.gridSize = 10;
+		//itp_BIZPOP_PO_REJECT_param.gridSize = 10;
 		$(THIS_GIRD_ID).setGridParam({'postData': JSON.stringify(itp_BIZPOP_DLV_STTMT_PRN_param)}).trigger('reloadGrid');
 	});
 
 	var itp_fn_BIZPOP_DLV_STTMT_PRN_empty = {
 		push: function() {
-			let param = $(THIS_FORM_ID).serializeObject();
+			let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() };
 			itp_BIZPOP_DLV_STTMT_PRN_param = param;
 		},
 		back: function() {
-			$(THIS_FORM_ID + '_CMPY_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyCd);
-			$(THIS_FORM_ID + '_CMPY_NM').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyNm);
-			$(THIS_FORM_ID + '_CMPY_TYPE_CD').val(itp_BIZPOP_DLV_STTMT_PRN_param.scmpyTypeCd);
 		}
 	};
 
 	itp_fn_BIZPOP_DLV_STTMT_PRN_empty.push();
-	let param = $('#ITP_FORM_BIZPOP_DLV_STTMT_PRN').serializeObject();
-	param.gridSize = 10;
-
-	$(THIS_GIRD_ID).jqGrid({
-		colModel: [
-			{
-				index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
-				label: '발주번호', //
-				width: '5', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'AFFL_SHOP_NM', name: 'itemId',
-				label: '품목번호', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'ITEM_NM', name: 'itemNm',
-				label: '품목명', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'PODR_QTY', name: 'podrQty',
-				label: '발주수량', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
-			{
-				index: 'DLV_QTY', name: 'dlvQty',
-				label: '납품서수량', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			},
+	let param = {brandId: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_BRAND_ID').val(), dlvSttmtUnqNo: $('#ITP_FORM_ITP_BIZPOP_DLV_STTMT_PRN_DLV_STTMT_UNQ_NO').val() };
+	console.log(JSON.stringify(param));
+	
+	const gridColModel = {
+		detail: [
 			{
-				index: 'EXPRY_DATE', name: 'expryDate',
-				label: '유통기한', //
-				width: '10', fixed: false, align: 'center',
-				sortable: false, hidden: false
-			}
-		],
-		loadBeforeSend: function(jqXHR) {
-		    jqXHR.setRequestHeader('X-AUTH-TOKEN', CONN_KEY);
+					index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+					label: '발주번호', //
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'ITEM_ID', name: 'itemId',
+					label: '품목번호', //
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'ITEM_NM', name: 'itemNm',
+					label: '품목명', //
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'PODR_QTY', name: 'podrQty',
+					label: '발주수량', //
+					width: '5', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'DLV_QTY', name: 'dlvQty',
+					label: '납품서수량', //
+					width: '5', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				},
+				{
+					index: 'EXPRY_DATE', name: 'expryDate',
+					label: '유통기한', //
+					width: '10', fixed: false, align: 'center',
+					sortable: false, hidden: false
+				}
+		]
+	};
+	
+	pageObj.call(param);
+	
+};
+
+
+let pageObj = {
+	call: function( param) {
+		
+		fn_ajax_call(API_POP_INV_INFO, JSON.stringify(param), this.callback, 'POST');
+	},
+	callback: function (result) {
+		console.log(result);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvSttmtUnqNo').text(result.dlvSttmtUnqNo);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvRegDt').text(result.dlvRegDt);
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvMgrNm').text(result.dlvMgrNm);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnWhsMgrTelNo').text(result.whsMgrTelNo);
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvBsnsRegno').text(result.dlvBsnsRegno);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvNm').text(result.dlvNm);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvOwnerNm').text(result.dlvOwnerNm);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvAddr').text(result.dlvAddr);
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoBsnsRegno').text(result.poBsnsRegno);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoNm').text(result.poNm);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoOwnerNm').text(result.poOwnerNm);
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnPoAddr').text(result.poAddr);
+		
+		$('#ITP_BIZPOP_DLV_STTMT_PRN .fnDlvQty').text(result.dlvQty);
+		
+		// 품목  리스트 조회
+		pageObj.grid.init(result.invDtlInfoList);
+	},
+	grid: {
+		init: function( gridRows) {
+			this.gridRows = gridRows;
+			this.unload();
+			this.load(gridRows);
+		
 		},
-		postData: JSON.stringify(param),
-		url: DOMAIN + FRCOMP_POP_GRID_LIST,
-		pager: THIS_GIRD_PAGER,
-		multiselect: true,
-		loadComplete: function(data) {
-			console.log(data);
-			itp_fn_grid_load_complete(data, THIS_GIRD_ID, true, undefined, 'BIZPOP_DLV_STTMT_PRN', itp_BIZPOP_DLV_STTMT_PRN_search, itp_fn_BIZPOP_DLV_STTMT_PRN_empty, true, data.gridRecords, false);
-	    },
-	    loadError: function(jqXHR, textStatus, errorThrown) {
-	    	itp_fn_grid_load_error(jqXHR, textStatus, errorThrown);
-	    },
-	    onPaging: function(action) {
-	    	itp_fn_grid_paging(THIS_GIRD_ID, action, param);
-	    }
-	}).navGrid(THIS_GIRD_PAGER, ITP_GRID_NAV_DEFAULTS.navGrid);
+		gridId: '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid',
+		gridList: '#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid',
+		gridEmpty: '#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty',
+		gridRows: '',
+		load : function(gridRows) {
+			var _this = this;
+			var option = {
+				gridId: _this.gridId,
+				colModel: [
+						{
+								index: 'PCH_PODR_UNQ_NO', name: 'pchPodrUnqNo',
+								label: '발주번호', //
+								width: '10', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							},
+							{
+								index: 'ITEM_ID', name: 'itemId',
+								label: '품목번호', //
+								width: '10', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							},
+							{
+								index: 'ITEM_NM', name: 'itemNm',
+								label: '품목명', //
+								width: '10', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							},
+							{
+								index: 'PODR_QTY', name: 'podrQty',
+								label: '발주수량', //
+								width: '5', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							},
+							{
+								index: 'DLV_QTY', name: 'dlvQty',
+								label: '납품서수량', //
+								width: '5', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							},
+							{
+								index: 'EXPRY_DATE', name: 'expryDate',
+								label: '유통기한', //
+								width: '10', fixed: false, align: 'center',
+								sortable: false, hidden: false
+							}
+					],
+				data: gridRows,
+				multiselect: false,
+				loadComplete: function(data) {
+					$('#ITP_BIZPOP_DLV_STTMT_PRN_jqGrid').find('.ui-jqgrid .ui-jqgrid-bdiv').css('overflow-x', 'hidden');
+					data.records === 0 ? _this.clearData() : $('#ITP_BIZPOP_DLV_STTMT_PRN_jqGridEmpty').hide();
+				},
+				onCellSelect: function(rowid, cellIdx, cellValue) {
+				}
+			};
+			itp_fn_grid_make_local(option);
+		},
+		unload : function() {
+			$.jgrid.gridUnload(this.gridId);
+		}
+	}
 };
+
+
+

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

@@ -11,8 +11,10 @@ let EASYPAY_PAYMENT_REQUEST = '/api/easypay/payment/request';
 
 let KICC_JAVASCRIPT_URL;
 let KICC_ACTION_WEB_URL;
+let KICC_ACTION_MOBILE_URL; 
 let MALL_ID;
-let RETURN_URL;
+let WEB_RETURN_URL;
+let MOBILE_RETURN_URL;
 
 var popPageObj = {
 	init: function () {
@@ -44,7 +46,8 @@ var popPageObj = {
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('선불(충전)');
 		} else if(popPageObj.args.payTpCd == '20') {  
 			$('#ITP_BIZPOP_PO_PAYMENT_PAY_TP_NM').text('후불(결제)');
-			$('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val(popPageObj.args.sttlMgntUnqNo); // 정산관리고유번호
+			// $('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val(popPageObj.args.sttlMgntUnqNo); // 정산관리고유번호
+			$('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO_LIST').val(popPageObj.args.sttlMgntUnqNoList); // 정산관리고유번호 리스트
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val(popPageObj.args.goodsAmt); // 결제금액
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').attr('readonly','readonly');			
 		} else if(popPageObj.args.payTpCd == '30') {  
@@ -61,6 +64,7 @@ var popPageObj = {
 			$('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_NM').val(result.goodsNm); // 상품명
 			$('#ITP_FORM_PO_PAYMENT_POPUP_KICC_JAVASCRIPT_URL').val(result.kicc_javascript_url); // 
 			$('#ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_WEB_URL').val(result.kicc_action_web_url); // 
+			$('#ITP_FORM_PO_PAYMENT_POPUP_KICC_ACTION_MOBILE_URL').val(result.kicc_action_mobile_url); // 
 			$('#ITP_FORM_PO_PAYMENT_POPUP_MALL_ID').val(result.mallId); // 
 			
 			$('#ITP_FORM_PO_PAYMENT_POPUP .fnPoOrdNo').text(result.poOrdNo); // 주문번호
@@ -71,8 +75,10 @@ var popPageObj = {
 			
 			KICC_JAVASCRIPT_URL = result.kicc_javascript_url;
             KICC_ACTION_WEB_URL = result.kicc_action_web_url;
+            KICC_ACTION_MOBILE_URL = result.kicc_action_mobile_url;
 			MALL_ID = result.mallId;
-			RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
+			WEB_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/oqpo_order_res.jsp');
+			MOBILE_RETURN_URL = window.location.href.replace('main.html', 'easypay/oqpo/mobile_order_res_submit.jsp');
 			
 			const js = '<script src="'+KICC_JAVASCRIPT_URL+'"></script>';
 	        $('#ITP_ASIDE #ITP_BIZPOP_PO_PAYMENT #ITP_POPUP_KICC_JS').empty();
@@ -81,13 +87,14 @@ var popPageObj = {
 			// console.log('KICC_JAVASCRIPT_URL : ' + KICC_JAVASCRIPT_URL);
             // console.log('KICC_ACTION_WEB_URL : ' + KICC_ACTION_WEB_URL);
 			// console.log('MALL_ID : ' + MALL_ID);
-			// console.log('RETURN_URL : ' + RETURN_URL);
+			// console.log('WEB_RETURN_URL : ' + WEB_RETURN_URL);
 			
 			var frm_pay = document.frm_pay;
 
 			/*--웹 결제--*/
 		    /*--공통--*/        
-		    frm_pay.kiccActionWebUrl.value  = KICC_ACTION_WEB_URL;       						  
+		    frm_pay.kiccActionWebUrl.value  	= KICC_ACTION_WEB_URL;       						  
+		    frm_pay.kiccActionMobileUrl.value  	= KICC_ACTION_MOBILE_URL;       						  
 		    frm_pay.EP_mall_id.value        = MALL_ID;       						   //가맹점 ID
 		    frm_pay.EP_mall_nm.value        = fn_make_user_info.get('brandNm');		   //가맹점명
 		    frm_pay.EP_order_no.value       = result.poOrdNo;   					   //가맹점 주문번호    
@@ -107,7 +114,7 @@ var popPageObj = {
 		    frm_pay.EP_user_addr.value      = "";      								   //가맹점 고객 주소
 		    frm_pay.EP_product_type.value   = "0";                                     //상품정보구분 : 0-실물, 1-서비스
 		    frm_pay.EP_product_expr.value   = "";             				           //서비스기간 : YYYYMMDD
-		    frm_pay.EP_return_url.value     = RETURN_URL;  							   // Return 받을 URL (HTTP부터 입력)
+		    frm_pay.EP_return_url.value     = WEB_RETURN_URL;  							   // Return 받을 URL (HTTP부터 입력)
 		                                    
 		    /*--신용카드--*/                    
 		    frm_pay.EP_usedcard_code.value  = "";                                      //사용가능한 카드 LIST
@@ -185,6 +192,8 @@ var popPageObj = {
 			frm_pay.EP_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
 			frm_pay.EP_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
 			frm_pay.EP_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
+			
+			frm_pay.sp_pay_type.value       = $('#ITP_FORM_PO_PAYMENT_POPUP_PAY_METHOD').val();  	// 결제방법
 			frm_pay.sp_product_amt.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT').val();  	// 결제금액			
 			frm_pay.sp_user_phone1.value    = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL').val();  		// 휴대폰
 			frm_pay.sp_user_mail.value      = $('#ITP_FORM_PO_PAYMENT_POPUP_ORD_EMAIL').val();  	// 이메일
@@ -193,6 +202,7 @@ var popPageObj = {
 				f_mobile_cert();
 			} else {
 			    f_cert();
+				// f_mobile_cert();
 			}
 		}
 	} 
@@ -275,7 +285,7 @@ function f_mobile_cert() {
         frm_pay.sp_user_addr.value    = encodeURIComponent( frm_pay.sp_user_addr.value );
     }
 
-   	frm_pay.sp_return_url.value = "/oqpo-view/easypay/oqpo/mobile_order_res_submit.jsp"; //    	
+   	frm_pay.sp_return_url.value = MOBILE_RETURN_URL; //    	
     easypay_card_webpay(frm_pay,"/oqpo-view/easypay/oqpo/mobile_order_req.jsp","_self","0","0","submit",30);    
 }
 
@@ -284,11 +294,18 @@ function f_submit() {
 	
 	$('#frm_pay #poOrdNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_PO_ORD_NO').val()); 
 	$('#frm_pay #payTpCd').val($('#ITP_FORM_PO_PAYMENT_POPUP_PAY_TP_CD').val()); 
-	$('#frm_pay #sttlMgntUnqNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val()); 
+	// $('#frm_pay #sttlMgntUnqNo').val($('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO').val()); 
 	$('#frm_pay #brandId').val($('#ITP_FORM_PO_PAYMENT_POPUP_BRAND_ID').val()); 
 	$('#frm_pay #storeId').val($('#ITP_FORM_PO_PAYMENT_POPUP_STORE_ID').val()); 
+	
+	var reqDataList = [];	
+	var ca = $('#ITP_FORM_PO_PAYMENT_POPUP_STTL_MGNT_UNQ_NO_LIST').val().split(';');
+    for(var i = 0 ; i < ca.length ; i++) {
+		reqDataList.push( { sttlMgntUnqNo : ca[i] } );
+	}	
 		
 	let param = $('#frm_pay').serializeObject();
+	param.reqDataList = reqDataList;
 	
 	// console.log("REQ : " + JSON.stringify(param));
 		

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

@@ -19,6 +19,7 @@ function itp_fn_BIZPOP_WHS_LOCATION(parentPopFn, args, returnType) {
 
 	$('#ITP_FORM_BIZPOP_WHS_LOCATION_BRAND_ID').val(fn_make_user_info.get('brandId'));
 	$('#ITP_FORM_BIZPOP_WHS_LOCATION_STORE_ID').val(fn_make_user_info.get('storeId'));
+	$('#ITP_FORM_BIZPOP_WHS_LOCATION_WHS_DVSN').val(args.whsDvsn);
 
 	
 	$('#ITP_BIZPOP_WHS_LOCATION').one('shown.bs.modal', function(e) {

src/main/webapp/js/app/settmng/ITP_SETTMNG03010.js

@@ -53,6 +53,12 @@ const gridColModel = {
 			width: '10', fixed: false, align: 'center',
 			sortable: false, hidden: false
 		},
+		{
+			index: 'LOAN_DVSN_NM', name: 'loanDvsnNm',
+			label: "정산타입", 
+			width: '8', fixed: false, align: 'center',
+			sortable: false, hidden: false
+		},
 		{
 			index: 'SPPLY_NM', name: 'spplyNm',
 			label: "공급사명",
@@ -92,20 +98,20 @@ const gridColModel = {
 		}, 
 		{
 			index: 'STTL_DT', name: 'sttlDt',
-			label: "정산일",
+			label: "정산확정일",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text'
 		},
 		{
 			index: 'STTL_REQ_AMT', name: 'sttlAmt',
-			label: "정산금액",
+			label: "정산확정금액",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
-			index: 'ACCT_BAL', name: 'acctBal',
-			label: "잔금",
+			index: 'UNPAID_AMT', name: 'unpaidAmt',
+			label: "미납금액",
 			width: '10', fixed: false, align: 'center',
 			sortable: false, editable: false, edittype: 'text', 
 			formatter:'integer',formatoptions: { defaultValue: '', thousandsSeparator: ',' }
@@ -290,7 +296,7 @@ let pageObj = {
 					switch (id) {
 						case 'ITP_BTN_SETTMNG03010_SRH'				: listObj.button.search();		break;	// 조회 버튼 클릭
 						case 'ITP_BTN_SETTMNG03010_CANCELLIST'		: modifyObj.button.cancel(); 	break;	// 취소/목록 버튼
-						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산완료 버튼
+						case 'ITP_BTN_SETTMNG03010_STTL_END'		: modifyObj.button.endSttl(); 	break;	// 정산확정 버튼
 						case 'ITP_BTN_SETTMNG03010_SEARCH_STORE_POP'	: listObj.button.storePop();	break;	// 매장검색 팝업
 						case 'ITP_BTN_SETTMNG03010_SEARCH_ERASE'		: listObj.button.storeErase();	break;	// 매장 지움
 					}
@@ -484,7 +490,7 @@ let modifyObj = {
 			listObj.grid.search();
 		}, 
 		endSttl: function() {
-			// 정산완료
+			// 정산확정
 			const formId = '#ITP_FORM_SETTMNG03010_DETAIL';
 			let param = $(formId).serializeObject();
 			var confirmFn= {
@@ -495,7 +501,18 @@ let modifyObj = {
 					fn_ajax_call(STTL_STATE_STTL_END, JSON.stringify(param), searhFn, 'POST'); 	
 				}
 			};
-			itp_fn_modal_confirm('정산 완료하시겠습니까?', confirmFn, null);
+			var sttlReqAmt =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val());
+			var acctBal =  parseInt($('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val());
+			
+			if(acctBal > 0) {
+				if(acctBal >= sttlReqAmt) {
+					itp_fn_modal_confirm('계좌잔액에서 지급처리가 진행됩니다.\n정산 확정하시겠습니까?', confirmFn, null);						
+				} else {
+					itp_fn_modal_confirm('일부금액이 계좌잔액에서 지급처리가 진행됩니다.\n정산 확정하시겠습니까?', confirmFn, null);	
+				}					
+			} else {
+				itp_fn_modal_confirm('정산 확정하시겠습니까?', confirmFn, null);
+			}
 		}
 	}, 
 	load: function(param) {
@@ -507,9 +524,13 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG03010_DETAIL_BRAND_ID').val(result.brandId);
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STORE_ID').val(result.storeId);
 		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_MGNT_UNQ_NO').val(result.sttlMgntUnqNo);
+		$('#ITP_FORM_SETTMNG03010_DETAIL_ACCT_BAL').val(result.acctBal); // 계좌잔액
+		$('#ITP_FORM_SETTMNG03010_DETAIL_STTL_REQ_AMT').val(result.sttlReqAmt); // 정산요청금액
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnBrandNm').text(result.brandNm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnStoreNm').text(result.storeNm);
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnLoanDvsnNm').text(result.loanDvsnNm);
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlRjctRsn').text(result.sttlRjctRsn == null ? '' : result.sttlRjctRsn);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlStNm').text(result.sttlStNm);
@@ -519,8 +540,17 @@ let modifyObj = {
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlDt').text(result.sttlDt == null ? '' : result.sttlDt);  // 정산요청일자
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSttlAmt').text(itp_fn_number_comma(result.sttlAmt));
 		
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
-		$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYn').text(result.rcptYn == null ? '' : result.rcptYn);
+		// $('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptDt').text(result.rcptDt == null ? '' : result.rcptDt);
+		
+		if(result.rcptYn == null) {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('');	
+		} else if(result.rcptYn == 'N') {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('N');
+		} else if(result.rcptYn == 'Y') {
+			$('#ITP_FORM_SETTMNG03010_DETAIL .fnRcptYnDate').text('Y (' + result.rcptDt + ')');
+		}
+		$('#ITP_FORM_SETTMNG03010_DETAIL .fnUnpaidAmt').text(itp_fn_number_comma(result.unpaidAmt));
 		
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegDttm').text(result.sysRegDttm);
 		$('#ITP_FORM_SETTMNG03010_DETAIL .fnSysRegNm').text(result.sysRegNm);

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

@@ -32,8 +32,8 @@ let ITP_FORM_STOCKMNG04010_DETAIL_IS_WRITING = false;
 let STOCKMNG04010_DETAIL_GRID_LAST_ROW_ID;
 
 /* 공통코드 리스트 */
-let ITP_COMMON_CD_STCK_DVSN = fn_make_common_cd_list(CODE_LIST, 'STCK_DVSN', true);
-let ITP_COMMON_CD_LOC_ST_CD = fn_make_common_cd_list(CODE_LIST, 'LOC_ST_CD', true);
+let ITP_COMMON_CD_STCK_DVSN = fn_make_common_cd_list(CODE_LIST, 'STCK_DVSN', false);
+let ITP_COMMON_CD_LOC_ST_CD = fn_make_common_cd_list(CODE_LIST, 'LOC_ST_CD', false);
 
 /*API URL*/
 let WHS_MNG_DETAIL_GRID_LIST = '/api/whs/mng/detail-grid-list';
@@ -642,6 +642,8 @@ let createObj = {
 			listObj.grid.search();
 		},
 		save: function() {
+			$('body').trigger('click');
+			
 			var detailViewCd = $('#ITP_FORM_STOCKMNG04010_DETAIL_VIEW_CD').val();
 			const formId = '#ITP_FORM_STOCKMNG04010_DETAIL';
 			itp_fn_form_clear_validate(null, formId);