Made changes in sql.

git-svn-id: http://15.206.35.175/svn/proteus/business-java/trunk@216938 ce508802-f39f-4f6c-b175-0d175dae99d5

webitm-adm/src/ibase/webitm/ejb/adm/adv/PayrollPostAccMiscPrc.java

@@ -1222,14 +1222,14 @@ public class PayrollPostAccMiscPrc extends ProcessEJB
 			System.out.println("#### mtype "+mtype);
 			if("PP".equalsIgnoreCase(mtype))
 			{
-				StringBuilder = new StringBuilder("SELECT PD.PRD_CODE,PD.EMP_CODE,PD.AD_CODE,PD.SEQ_NO,PD.TYPE,PD.PAYABLE,PD.BASE_AMT,");
-				StringBuilder.append("PD.SLAB_AMT,PD.RESULT_AMT,PD.POST_YN,PD.CALC_AMT,PD.RND_OFF,PD.RND_TO,PD.AMOUNT,A.DESCR,P.VOUCHER_NO,");
-				StringBuilder.append("PD.REF_TYPE,PD.REF_NO  FROM PAYROLLDET PD,ALLWDEDN A,PAYROLL P,EMPLOYEE E ");
-				StringBuilder.append("WHERE ( PD.AD_CODE = A.AD_CODE ) and  ( P.PRD_CODE = PD.PRD_CODE ) and  ( P.EMP_CODE = PD.EMP_CODE ) and");
-				StringBuilder.append("(( PD.prd_code >= ?) AND (PD.prd_code <= ?) AND  (PD.emp_code >= ?) AND  ");
-				StringBuilder.append("(PD.emp_code <= ?) AND (P.voucher_no is null) AND (P.site_code__pay >= ?) AND ");
-				StringBuilder.append("(P.site_code__pay <= ?) AND (P.voucher_no is null)  AND (E.proc_group >= ?) AND  ");
-				StringBuilder.append("(E.proc_group <= ?)) ORDER BY PD.PRD_CODE ASC,PD.EMP_CODE ASC,PD.SEQ_NO ASC");
+				//d_payrolldet_post.srd
+				StringBuilder = new StringBuilder("SELECT PD.PRD_CODE, PD.EMP_CODE, PD.AD_CODE, PD.SEQ_NO, PD.TYPE, PD.PAYABLE,PD.BASE_AMT, PD.SLAB_AMT, PD.RESULT_AMT,");
+				StringBuilder.append("PD.POST_YN, PD.CALC_AMT, PD.RND_OFF,PD.RND_TO, PD.AMOUNT,ALLWDEDN.DESCR, PAYROLL.VOUCHER_NO,PD.REF_TYPE, PD.REF_NO");
+				StringBuilder.append("FROM PAYROLLDET PD, ALLWDEDN, PAYROLL, EMPLOYEE WHERE ( PD.AD_CODE = ALLWDEDN.AD_CODE ) and  ( PAYROLL.PRD_CODE = PD.PRD_CODE ) AND ");
+				StringBuilder.append("( PAYROLL.EMP_CODE = PD.EMP_CODE ) AND  ( PD.EMP_CODE = EMPLOYEE.EMP_CODE ) AND  ( ( PD.PRD_CODE >= ? ) AND");
+				StringBuilder.append("( PD.PRD_CODE <= ?) AND  ( PD.EMP_CODE >= ? ) AND ( PD.EMP_CODE <= ? ) AND ( PAYROLL.VOUCHER_NO IS NULL )");
+				StringBuilder.append("AND ( PAYROLL.SITE_CODE__PAY >= ? ) AND  ( PAYROLL.SITE_CODE__PAY <= ? ) AND ( PAYROLL.VOUCHER_NO IS NULL ) ");
+				StringBuilder.append("AND (EMPLOYEE.PROC_GROUP >= ?) AND (EMPLOYEE.PROC_GROUP <= ?))  ORDER BY PD.PRD_CODE ASC, PD.EMP_CODE ASC,PD.SEQ_NO ASC ");
 				try 
 				{
 					reUsblepStmt = conn.prepareStatement(StringBuilder.toString());
@@ -1255,14 +1255,15 @@ public class PayrollPostAccMiscPrc extends ProcessEJB
 				}	
 			}else
 			{
-				StringBuilder = new StringBuilder("SELECT AD.AMOUNT, AD.BASE_AMT,AD.SLAB_AMT, AD.RESULT_AMT, AD.PRD_CODE__ACC,AD.DIFF_BASE_AMT, ");
-				StringBuilder.append("AD.PRD_CODE,AD.EMP_CODE,AD.AD_CODE,AD.SEQ_NO,AD.TYPE,AD.PAYABLE,AD.POST_YN,AD.CALC_AMT, AD.RND_OFF,AD.RND_TO,");
-				StringBuilder.append("ALD.DESCR,AD.PREV_AMT,AD.DIFF_AMT, AD.DIFF_SLAB_AMT,AD.DIFF_RESULT_AMT,AD.REF_TYPE,AD.REF_NO ");
-				StringBuilder.append(" FROM ARREARDET AD, ALLWDEDN ALD, ARREARS A WHERE ( AD.AD_CODE = ALD.AD_CODE) AND (AD.PRD_CODE = A.PRD_CODE) AND ");
-				StringBuilder.append("(AD.PRD_CODE__ACC = A.PRD_CODE__ACC) AND (AD.EMP_CODE = A.EMP_CODE) AND (AD.prd_code = ?) AND ");
-				StringBuilder.append("(AD.prd_code__acc = ?) AND (AD.emp_code >= ?) AND (AD.emp_code <= ?) AND ");
-				StringBuilder.append("(A.site_code__pay >= ?) AND (A.site_code__pay <= ?) AND (A.voucher_no is null) ");
-				StringBuilder.append("ORDER BY AD.EMP_CODE ASC,AD.PRD_CODE ASC,AD.PRD_CODE__ACC ASC,AD.SEQ_NO ASC");
+				//d_arreardet_post_acc_nvo.srd
+				StringBuilder = new StringBuilder("SELECT ARREARDET.PRD_CODE,ARREARDET.EMP_CODE,ARREARDET.AD_CODE,ARREARDET.SEQ_NO, ARREARDET.TYPE,ARREARDET.PAYABLE,");
+				StringBuilder.append(" ARREARDET.POST_YN,ARREARDET.CALC_AMT,ARREARDET.RND_OFF,ARREARDET.RND_TO,ALLWDEDN.DESCR,ARREARDET.PREV_AMT,ARREARDET.DIFF_AMT,");
+				StringBuilder.append(" ARREARDET.PRD_CODE__ACC,ARREARDET.DIFF_BASE_AMT,ARREARDET.DIFF_SLAB_AMT,ARREARDET.DIFF_RESULT_AMT,ARREARDET.REF_TYPE, ARREARDET.REF_NO"); 
+				StringBuilder.append(" FROM ARREARDET,ALLWDEDN, ARREARS WHERE ( ARREARDET.AD_CODE = ALLWDEDN.AD_CODE ) AND ( ARREARDET.PRD_CODE = ARREARS.PRD_CODE ) AND"); 
+				StringBuilder.append(" ( ARREARDET.PRD_CODE__ACC = ARREARS.PRD_CODE__ACC ) AND ( ARREARDET.EMP_CODE = ARREARS.EMP_CODE ) AND  ( ARREARDET.PRD_CODE = ? )"); 
+				StringBuilder.append(" AND ( ARREARDET.PRD_CODE__ACC = ? ) AND ( ARREARDET.EMP_CODE >= ? ) AND ( ARREARDET.EMP_CODE <= ? ) AND ");
+				StringBuilder.append(" ( ARREARS.SITE_CODE__PAY >= ? ) AND ( ARREARS.SITE_CODE__PAY <= ? ) AND ");
+				StringBuilder.append(" ( ARREARS.VOUCHER_NO IS NULL ) ORDER BY ARREARDET.EMP_CODE ASC,ARREARDET.PRD_CODE ASC,ARREARDET.PRD_CODE__ACC ASC,ARREARDET.SEQ_NO ASC");
 				try
 				{
 					reUsblepStmt = conn.prepareStatement(StringBuilder.toString());