Updated on [07/09/2019][changes in TRANSETUP table and payarrToProcUpdation method ]

A18FSUN004.sql
ArrearsDeletePrc.java


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

webitm-adm/module-resource/SQL/A18FSUN004.sql

@@ -78,7 +78,11 @@ Insert into MESSAGES (MSG_NO,MSG_STR,MSG_DESCR,MSG_TYPE,MSG_OPT,MSG_TIME,ALARM,E
 
 --------------------------------------------------[06/11/2019][END]
 
+--------------------------------------------------[07/11/2019][START]
 
+update TRANSETUP set EDIT_EXPR = 'or payarr_to_proc.status in(''D'')', CONFIRM_COL = 'status', CONFIRM_VAL = 'Z', EDIT_OPT = '3' where TRAN_WINDOW = 'w_payarr_to_proc';
+
+--------------------------------------------------[07/11/2019][END]
 
 
 

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

@@ -380,7 +380,11 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
 						//Modified by Poonam B[18/10/2019][END]
 					}
 					pstmt2.clearParameters();
-					errString = payarrToProcUpdation( prdCode, prdCode, empCode, empCode, type,  "w_arrears_deletion",  chgTerm , "",0.0,frDate,toDate, xtraParams,  con);
+					// Modified By Poonam B[7/11/2019][START][to insert PRD_CODE__ACC into PAYARR_TO_PROC when type is AR]
+					//errString = payarrToProcUpdation( prdCode, prdCode, empCode, empCode, type,  "w_arrears_deletion",  chgTerm , "",0.0,frDate,toDate, xtraParams,  con);
+					errString = payarrToProcUpdation( prdCode, prdCode, empCode, empCode, type,  prdCodeAcct, "w_arrears_deletion",  chgTerm , "",0.0,frDate,toDate, xtraParams,  con);
+					// Modified By Poonam B[7/11/2019][END][to insert PRD_CODE__ACC into PAYARR_TO_PROC when type is AR]
+					
 					if (errString != null && errString.trim().length() > 0)
 					{
 						errorString = itmdbAccessEJB.getErrorString("", errString, userId, "", con);
@@ -496,7 +500,9 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
 		return errorString;
 	}
 	//Added By Poonam B[26-SEP-2019][START]
-	public String payarrToProcUpdation(String periodFrom, String periodTo, String empCodeFr, String empCodeTo, String procType, String winName, String keyStr, String adCode, double amount, Timestamp effDate, Timestamp expDate, String xtraParams, Connection conn) throws ITMException
+	/*public String payarrToProcUpdation(String periodFrom, String periodTo, String empCodeFr, String empCodeTo, String procType, String winName, String keyStr, String adCode, double amount, Timestamp effDate, Timestamp expDate, String xtraParams, Connection conn) throws ITMException
+	{*/
+	public String payarrToProcUpdation(String periodFrom, String periodTo, String empCodeFr, String empCodeTo, String procType, String prdCodeAcct ,String winName, String keyStr, String adCode, double amount, Timestamp effDate, Timestamp expDate, String xtraParams, Connection conn) throws ITMException
 	{
 		String errCode = "", sqlStr = "", keyString = "";
 		String sql = "";
@@ -540,8 +546,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
 			rs = pstmt.executeQuery();
 			if(rs.next())
 			{
-				joinDate	= rs.getTimestamp("DATE_JOIN");
-
+				joinDate = rs.getTimestamp("DATE_JOIN");
 				empSite  = rs.getString("EMP_SITE");
 				workSite = rs.getString("WORK_SITE");
 				paySite  = rs.getString("PAY_SITE");
@@ -568,18 +573,33 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
 				return errCode;
 			}
 			String status = "D";
-			sql = "INSERT INTO PAYARR_TO_PROC (TRAN_ID, EMP_CODE, PRD_CODE, STATUS, PROC_TYPE, PROC_DATE, CHG_DATE, CHG_USER, CHG_TERM) " +
-					" VALUES(?,?,?,?,?,?,?,?,?)";
+			
+			// Modified By Poonam B[7/11/2019][START][to insert PRD_CODE__ACC into PAYARR_TO_PROC when type is AR]
+			/*sql = "INSERT INTO PAYARR_TO_PROC (TRAN_ID, EMP_CODE, PRD_CODE, STATUS, PROC_TYPE, PROC_DATE, CHG_DATE, CHG_USER, CHG_TERM) " +
+					" VALUES(?,?,?,?,?,?,?,?,?)";*/
+			sql = "INSERT INTO PAYARR_TO_PROC (TRAN_ID, EMP_CODE, PRD_CODE, STATUS, PRD_CODE__ACC,PROC_TYPE ,PROC_DATE, CHG_DATE, CHG_USER, CHG_TERM) " +
+					" VALUES(?,?,?,?,?,?,?,?,?,?)";
+			
 			pstmt = conn.prepareStatement(sql);
 			pstmt.setString(1,tranID);
 			pstmt.setString(2,empCodeFr);
 			pstmt.setString(3,periodFrom);
 			pstmt.setString(4,status);
-			pstmt.setString(5,procType);
-			pstmt.setTimestamp(6,expDate);
-			pstmt.setTimestamp(7,new java.sql.Timestamp(System.currentTimeMillis()));
-			pstmt.setString(8, userId);
-			pstmt.setString(9,genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
+			if("AR".equalsIgnoreCase(procType))
+			{
+				pstmt.setString(5, prdCodeAcct);
+			}
+			else
+			{
+				pstmt.setString(5, null);
+			}
+			pstmt.setString(6,procType);
+			pstmt.setTimestamp(7,expDate);
+			pstmt.setTimestamp(8,new java.sql.Timestamp(System.currentTimeMillis()));
+			pstmt.setString(9, userId);
+			pstmt.setString(10,genericUtility.getValueFromXTRA_PARAMS(xtraParams,"termId"));
+			// Modified By Poonam B[7/11/2019][END][to insert PRD_CODE__ACC into PAYARR_TO_PROC when type is AR]
+			
 			int insCnt = pstmt.executeUpdate();
 			if (insCnt == 1)
 			{
@@ -640,7 +660,7 @@ public class ArrearsDeletePrc extends ProcessEJB implements ArrearsDeletePrcRemo
 		try
 		{
 			NodeList detailList = null;
-			Node currDetail = null, reqDetail = null;
+			Node currDetail = null;
 			int detailListLength = 0;
 
 			detailList = dom.getElementsByTagName("Detail1");