Merge branch 'master' of http://211.38.140.247:3000/sgc/sgc-portal

src/main/resources/sqlmap/mappers/co/co0104/CO01040001UMapper.xml

@@ -20,6 +20,7 @@
 		     , B.CTMN_EXP_DT
 		     , TRUNC(NVL(C.DORE,0) / #{unit}) DORE
 		     , TRUNC(NVL(C.MIDORE,0) / #{unit}) MIDORE
+		     , TRUNC(SUM(NVL(C.DORE,0) + NVL(C.MIDORE,0)) OVER (ORDER BY A.STD_YM) / #{unit}) AS NON_CTMN_AMT_SUM
 		     , TRUNC(A.SALE_PYRQ_NAS_AMT / #{unit}) SALE_PYRQ_NAS_AMT
 		     , TRUNC(A.SALE_PYRQ_NAS_AMT_SUM / #{unit}) SALE_PYRQ_NAS_AMT_SUM
 		  FROM 	(
@@ -95,7 +96,7 @@
 					  		)
 					 GROUP BY CMPN_CD, STD_YM, CCGRP_CD, CC_CD, PYRQ_DGR_CN
 		  		) C ON C.CMPN_CD = A.CMPN_CD AND C.STD_YM = A.STD_YM AND C.CCGRP_CD = A.CCGRP_CD AND C.CC_CD = A.CC_CD AND B.PYRQ_DGR_CN = C.PYRQ_DGR_CN
-		 WHERE TRUNC(A.SALE_PYRQ_NAS_AMT_SUM / '1') > 0
+		 WHERE A.SALE_PYRQ_NAS_AMT_SUM <![CDATA[<>]]> 0
 		<if test="ccgrpCd != 'all'">
 		   AND A.CCGRP_CD = #{ccgrpCd}
 		</if>

src/main/webapp/ux/co/co0103/CO01030001P.xml

@@ -43,6 +43,7 @@
 						<w2:column id="ctmnExpDt" name="수금예정일" dataType="text"></w2:column>
 						<w2:column id="dore" name="도래" dataType="text"></w2:column>
 						<w2:column id="midore" name="미도래" dataType="text"></w2:column>
+						<w2:column id="nonCtmnAmtSum" name="미수금 합" dataType="text"></w2:column>
 						<w2:column id="salePyrqNasAmt" name="금액" dataType="text"></w2:column>
 						<w2:column id="salePyrqNasAmtSum" name="누계" dataType="text"></w2:column>
 					</w2:columnInfo>
@@ -272,7 +273,8 @@
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 3, "colSpan" : 1, "rowSpan" : count});		//매출액/누계
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 7, "colSpan" : 1, "rowSpan" : count});		//청구액/누계
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 10, "colSpan" : 1, "rowSpan" : count});	//수금액/누계
-				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 14, "colSpan" : 1, "rowSpan" : count});	//매출대비청구/누계
+				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 14, "colSpan" : 1, "rowSpan" : count});	//미수금/누계
+				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 15, "colSpan" : 1, "rowSpan" : count});	//매출대비청구/누계
 				    			count = 0;
 				    			yyyymm2 = yyyymm1;
 							}
@@ -388,7 +390,7 @@
 									displayMode="label" colSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column11" value="미수금" blockSelect="false"
-									displayMode="label" colSpan="3">
+									displayMode="label" colSpan="4">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column7"
 									value="매출대비청구 ( VAT 제외 )&lt;br/&gt;[ 청구(VAT제외) - 매출액 ]" blockSelect="false" displayMode="label" colSpan="1">
@@ -431,6 +433,9 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="미도래" blockSelect="false"
 									displayMode="label">
 								</w2:column>
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="합계" blockSelect="false"
+									displayMode="label">
+								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column5" value="누계" blockSelect="false"
 									displayMode="label">
 								</w2:column>
@@ -475,6 +480,9 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midore" blockSelect="false" displayMode="label"
 									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="nonCtmnAmtSum" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
+								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="salePyrqNasAmtSum" blockSelect="false"
 									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>

src/main/webapp/ux/co/co0104/CO01040001U.xml

@@ -43,6 +43,7 @@
 						<w2:column id="ctmnExpDt" name="수금예정일" dataType="text"></w2:column>
 						<w2:column id="dore" name="도래" dataType="text"></w2:column>
 						<w2:column id="midore" name="미도래" dataType="text"></w2:column>
+						<w2:column id="nonCtmnAmtSum" name="미수금 합" dataType="text"></w2:column>
 						<w2:column id="salePyrqNasAmt" name="금액" dataType="text"></w2:column>
 						<w2:column id="salePyrqNasAmtSum" name="누계" dataType="text"></w2:column>
 					</w2:columnInfo>
@@ -285,7 +286,8 @@
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 3, "colSpan" : 1, "rowSpan" : count});		//매출액/누계
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 7, "colSpan" : 1, "rowSpan" : count});		//청구액/누계
 				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 10, "colSpan" : 1, "rowSpan" : count});	//수금액/누계
-				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 14, "colSpan" : 1, "rowSpan" : count});	//매출대비청구/누계
+				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 14, "colSpan" : 1, "rowSpan" : count});	//미수금/누계
+				    			grdData1.mergeCell({"rowIndex" : i, "colIndex" : 15, "colSpan" : 1, "rowSpan" : count});	//매출대비청구/누계
 				    			count = 0;
 				    			yyyymm2 = yyyymm1;
 							}
@@ -487,7 +489,7 @@
 									displayMode="label" colSpan="3">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column11" value="미수금" blockSelect="false"
-									displayMode="label" colSpan="3">
+									displayMode="label" colSpan="4">
 								</w2:column>
 								<w2:column removeBorderStyle="false" width="100" inputType="text" id="column7"
 									value="매출대비청구 ( VAT 제외 )&lt;br/&gt;[ 청구(VAT제외) - 매출액 ]" blockSelect="false" displayMode="label" colSpan="1">
@@ -530,6 +532,9 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="미도래" blockSelect="false"
 									displayMode="label">
 								</w2:column>
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column9" value="합계" blockSelect="false"
+									displayMode="label">
+								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="column5" value="누계" blockSelect="false"
 									displayMode="label">
 								</w2:column>
@@ -574,6 +579,9 @@
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="midore" blockSelect="false" displayMode="label"
 									dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>
+								<w2:column removeBorderStyle="false" width="70" inputType="text" id="nonCtmnAmtSum" blockSelect="false" displayMode="label"
+									dataType="number" textAlign="right" displayFormat="#,###">
+								</w2:column>
 								<w2:column removeBorderStyle="false" width="70" inputType="text" id="salePyrqNasAmtSum" blockSelect="false"
 									displayMode="label" dataType="number" textAlign="right" displayFormat="#,###">
 								</w2:column>