*updated IT Ret Adjustment component on [17/10/19]

ItRetAdjProcPrc.java


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

webitm-adm/src/ibase/webitm/ejb/adm/ItRetAdjProcPrc.java

@@ -236,6 +236,34 @@ public class ItRetAdjProcPrc extends ProcessEJB  implements  ItRetAdjProcPrcLoca
 				}
 			}
 			
+			// Modified on 16/10/2019.Start
+			taxAdCode = checkNull(admCommon.getEnv("999999", "F16_DED",conn));
+			System.out.println("taxAdCode---["+taxAdCode+"]");
+			if(taxAdCode == null || taxAdCode.equalsIgnoreCase("NULLFOUND") || taxAdCode.trim().length() == 0)
+			{
+				errString = itmDBAccessEJB.getErrorString("","VPITRADJ04",userId,"",conn);
+				return errString;
+			}
+			else
+			{
+				int cnt = 0;
+				taxAdCode = taxAdCode.trim().toUpperCase();
+				sqlStr = "SELECT COUNT(1) AS CNT FROM ALLWDEDN WHERE AD_CODE = ?";
+				pstmt = conn.prepareStatement(sqlStr);
+				pstmt.setString(1 , taxAdCode);
+				rs = pstmt.executeQuery();
+				while (rs.next())
+				{
+					cnt = rs.getInt("CNT");
+				}
+				closeResources(pstmt, rs);
+				if(cnt == 0)
+				{
+					errString = itmDBAccessEJB.getErrorString("","VPITRADJ05",userId,"",conn);
+					return errString;
+				}
+			}
+			// Modified on 16/10/2019.End
 			
 			sqlStr = "SELECT A.PRD_CODE AS PRD_CODE__ADJ,"
 					+ " A.TRAN_ID AS TRAN_ID__REF, "
@@ -308,8 +336,12 @@ public class ItRetAdjProcPrc extends ProcessEJB  implements  ItRetAdjProcPrcLoca
 			pstmt1.setString(4, (String) prdCodes.get(qtrPrdToNo));
 			pstmt1.setString(5, siteCodeFr);
 			pstmt1.setString(6, siteCodeTo);
+			// Modified on 16/10/2019.Start
+			/*
 			pstmt1.setString(7, procGroupFr);
 			pstmt1.setString(8, procGroupTo);
+			*/
+			// Modified on 16/10/2019.End
 			rs1 = pstmt1.executeQuery();
 			System.out.println("sqlStr7::::"+sqlStr);
 			while (rs1.next())
@@ -374,7 +406,7 @@ public class ItRetAdjProcPrc extends ProcessEJB  implements  ItRetAdjProcPrcLoca
 					grSalAmt = grSalAmt - prdAmtAdjTrace;
 					if((grSalAmt <= 0d) || (taxAmount > 0 && grSalAmt <= taxAmount + 1))
 					{
-						continue;
+						continue; 
 					}
 					*/
 					grSalAmt = grSalAmt + prdAmtAdjTrace;
@@ -424,22 +456,26 @@ public class ItRetAdjProcPrc extends ProcessEJB  implements  ItRetAdjProcPrcLoca
 					}
 
 					// Modified on 16/10/2019 [To skip if access amount is les or 0].Start
-					if ((accessAmt < 0) || (accessAmt == 0 && prdAmtToBeAdj <= 0))
+					// if ((accessAmt < 0) || (accessAmt == 0 && prdAmtToBeAdj <= 0))
+					if ((accessAmt < 0) || prdAmtToBeAdj == 0 || (accessAmt == 0 && prdAmtToBeAdj <= 0))
 					{
 						continue;
 					}
-					else if (accessAmt == 0 && prdAmtToBeAdj > 0)
+					// else if (accessAmt == 0 && prdAmtToBeAdj > 0)
+					else if ( prdAmtToBeAdj > 0)
 					{
 						accessAmt = prdAmtToBeAdj;
 					}
 					// Modified on 16/10/2019 [To skip if access amount is les or 0].End
-					if(prdAmtToBeAdj <=  accessAmt)
+					if(Math.abs(prdAmtToBeAdj) <=  accessAmt)
 					{
 						accessAmt =  prdAmtToBeAdj;
 						prdAmtToBeAdj = 0d;
 					}
 					else
 					{
+						int amtSign = prdAmtToBeAdj < 0?-1:1;
+						accessAmt = accessAmt * amtSign;
 						prdAmtToBeAdj = prdAmtToBeAdj - accessAmt;
 					}
 					if(isTraceLineExisting)