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

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

@@ -17,9 +17,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG02010_SEARCH_BRAND_ID" name="sbrandId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-                                            <select id="ITP_FORM_INOUTMNG02010_SEARCH_" class="form-control itp_input" name="serviceDlvReqDt">
-												<option value="A">출하일자</option>											
-											</select>
+                                            <label>출하일자 *</label>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

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

@@ -19,9 +19,7 @@
 									<input type="hidden" id="ITP_FORM_INOUTMNG03010_DETAIL_SBRAND_ID" class="form-control itp_input" name="sbrandId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG03010_SERVICE_COL_REQ_DT" class="form-control itp_input" name="servicecolReqDt">
-												<option value="A">수거요청일*</option>											
-											</select>
+											<label>수거요청일 *</label>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

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

@@ -17,9 +17,7 @@
 								<input type="hidden" id="ITP_FORM_INOUTMNG04010_SEARCH_BRAND_ID" class="form-control itp_input" name="sbrandId" />
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_INOUTMNG04010_SERVICE_COL_REQ_DT" class="form-control itp_input" name="servicecolReqDt">
-												<option value="A">수거요청일*</option>											
-											</select>
+											<label>수거요청일 *</label>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

src/main/webapp/app/rtnmng/RTNMNG02010.html

@@ -22,9 +22,7 @@
 									<input type="hidden" id="ITP_FORM_RTNMNG02010_SEARCH_SWHS_ID" name="swhsId" value="">
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_RTNMNG02010_SEARCH_" class="form-control itp_input" name="service">
-												<option value="A">반품요청일</option>											
-											</select>
+											<label>반품요청일 *</label>
 										</div>											
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

src/main/webapp/app/rtnmng/RTNMNG04010.html

@@ -22,9 +22,7 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_RTNMNG04010_SEARCH_" class="form-control itp_input" name="service">
-												<option value="A">반품발주일자</option>											
-											</select>
+											<label>반품발주일자 *</label>
 										</div>										
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

src/main/webapp/app/rtnmng/RTNMNG05010.html

@@ -22,9 +22,7 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_RTNMNG05010_SEARCH_" class="form-control itp_input" name="service">
-												<option value="A">수거요청일</option>											
-											</select>
+											<label>수거요청일 *</label>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

src/main/webapp/app/rtnmng/RTNMNG06010.html

@@ -21,9 +21,7 @@
 								
 									<div class="form-group">
 										<div class="col-xs-2 itp_ip itp_noMar">
-											<select id="ITP_FORM_RTNMNG06010_SEARCH_" class="form-control itp_input" name="service">
-												<option value="A">수거일</option>											
-											</select>
+											<label>수거일 *</label>
 										</div>
 										<div class="col-xs-3 itp_ip itp_noMar">
 											<div class="input-daterange input-group date">

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

@@ -100,21 +100,21 @@ const gridColModel = {
 		{
 			index: 'SHMT_QTY', name: 'rtnQty',
 			label: ITP_MSG_LOCALE.label.rtnQty,				// 반품발주수량
-			width: '8', fixed: false, align: 'rigth',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'WHS_QTY', name: 'colQty',
 			label: ITP_MSG_LOCALE.label.colQty,		// 수거수량
-			width: '8', fixed: false, align: 'rigth',
+			width: '8', fixed: false, align: 'right',
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }
 		},
 		{
 			index: 'SHMT_AMT', name: 'colAmt',
 			label: ITP_MSG_LOCALE.label.colAmt,				// 수거금액
-			width: '8', fixed: false, align: 'rigth',
+			width: '8', fixed: false, align: 'right',
 			minwidth: 80,
 			sortable: false, hidden: false,
 			formatter: 'integer', formatoptions: { defaultValue: '', thousandsSeparator: ',' }

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

@@ -16,7 +16,7 @@ require(['config'], function() {
  * let modifyObj = {}		: 수정화면 Object			*
  * let createObj = {}		: 신규화면 Object			*
  *******************************************************/
-
+console.log(CONN_KEY)
 /*화면 변수*/
 const POMNG01010_DETAIL_GRID_ID = '#ITP_POMNG01010_DETAIL_jqGrid';
 const POMNG01010_DETAIL_GRID_LIST = '#ITP_POMNG01010_DETAIL_jqGrid_list';
@@ -363,11 +363,14 @@ let createObj = {
 					var mallId = $('#ITP_FORM_POMNG01010_DETAIL_MALL_ID').val();
 					
 					let pchActAtmNum;
-					if(pchActAtm == '0' || pchActAtm == 0 || pchActAtm == Infinity || pchActAtm == 'Infinity') {
-						pchActAtmNum = 'Infinity';
-					} else {
-						pchActAtmNum = pchActAtm
+					if (loanDvsn == 'loanDvsn') {
+						if(pchActAtm == '0' || pchActAtm == 0 || pchActAtm == Infinity || pchActAtm == 'Infinity') {
+							pchActAtmNum = 'Infinity';
+						} else {
+							pchActAtmNum = pchActAtm
+						}
 					}
+					
 					if (parseFloat(pchActAtmNum) < parseFloat(pchReqAtm)) {
 						dlvReqAmt = itp_fn_number_comma(String(parseInt(pchReqAtm) - parseInt(pchActAtm)));
 						

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

@@ -191,7 +191,7 @@ let viewObj = {
 		$('#ITP_FORM_STINFO02011_VIEW .fnStoreAcctInfo').text(result.storeBnkNm + ' ' + result.storeAcctNo + ' ' + result.storeOwacNm);
 		$('#ITP_FORM_STINFO02011_VIEW .fnLoanDvsn').text(result.loanDvsnNm + " - (" + itp_fn_number_comma(result.limitAmt) + "원)");
 		$('#ITP_FORM_STINFO02011_VIEW .fnBrandAcctInfo').text(result.brandBnkNm + ' ' + result.brandAcctNo + ' ' + result.brandOwacNm);
-		$('#ITP_FORM_STINFO02011_VIEW .fnAcctBal').text(result.acctBal);
+		$('#ITP_FORM_STINFO02011_VIEW .fnAcctBal').text(itp_fn_number_comma(result.acctBal));
 		$('#ITP_FORM_STINFO02011_VIEW .fnWhsUseYn').text(result.whsUseYn);
 		$('#ITP_FORM_STINFO02011_VIEW .fnLimitAmt').text(result.limitAmt);
 		$('#ITP_FORM_STINFO02011_VIEW .fnSysRegDttm').text(result.sysRegDttm);

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

@@ -417,8 +417,8 @@ let viewObj = {
 		$('#ITP_FORM_STINFO05010_VIEW .fnLeadTime').text(result.leadTime);
 		$('#ITP_FORM_STINFO05010_VIEW .fnUnit').text(result.unit);
 		$('#ITP_FORM_STINFO05010_VIEW .fnCurr').text(result.curr);
-		$('#ITP_FORM_STINFO05010_VIEW .fnUnitAmt').text(result.unitAmt);
-		$('#ITP_FORM_STINFO05010_VIEW .fnStoreSaleUnitAmt').text(result.storeSaleUnitAmt);
+		$('#ITP_FORM_STINFO05010_VIEW .fnUnitAmt').text(result.unitAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));
+		$('#ITP_FORM_STINFO05010_VIEW .fnStoreSaleUnitAmt').text(result.storeSaleUnitAmt.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ','));
 		$('#ITP_FORM_STINFO05010_VIEW .fnRegId').text(result.sysRegId);
 		$('#ITP_FORM_STINFO05010_VIEW .fnRegDt').text(result.sysRegDttm);
 		$('#ITP_FORM_STINFO05010_VIEW .fnChgId').text(result.sysChgId);