Added if(excedAmt == 0.0 || excedAmt1.contains("-")) condition

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

webitm-dis/ibase/webitm/ejb/dis/POrderAmdConf.java

@@ -451,7 +451,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 		String specialInstr = "", benefitType = "", licenceNo = "", dutyPaid = "", formNo = "", lineNoPO = "", lineNoPO1 = "";
 
 		String lineNoTax = "", taxCode = "", taxBase = "", taxPerc = "", chgStat = "", taxSet = "", effect = "", acctCodeReco = "";
-		String cctrCodeReco = "", recoPerc = "", acctCode = "", cctrCode = "", rateType = "", round = "", roundTo = "", taxForm = "";
+		String cctrCodeReco = "", recoPerc = "", acctCode = "", cctrCode = "", rateType = "", round = "", roundTo = "", taxForm = "",excedAmt1="";
 		String acctCodeApAdv = "", cctrCodeApAdv = ""; // VALLABH KADAM Add two
 													   // new field 19/NOV/14
 		String chgUser = "", chgTerm = "", posted = "", payTax = "", orderOpt = "", bom = "", oldItem = "", lastTermLine = "",lastTermLine1 = "", lineNoPOterm ="";
@@ -827,12 +827,19 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 						excedAmt += totAmtpoamdtempold;
 					}
 					System.out.println("@@@@@@@@@@ after excedAmt["+excedAmt+"]");
-
-				  /* totAmtDetpordertot = totAmtDetpordertotNtc + totAmtDetpordertotPorcpConf - totAmtDetpordertotPorcpSer;
-								              System.out.println( totAmtDetpordertotNtc +"-" +totAmtDetpordertotPorcpConf+"-"+ totAmtDetpordertotPorcpSer);
-								              System.out.println("Consumed Amount " + totAmtDetpordertot);*/
-
-					          /* Ended by Abhijit */
+					System.out.println("excedAmt"+ excedAmt);
+					excedAmt1=String.valueOf(excedAmt);
+					System.out.println("excedAmt1"+excedAmt1);
+					System.out.println("sumQtyamd"+ sumQtyamd);
+				
+					if(excedAmt == 0.0 || excedAmt1.contains("-")) 
+					//	if(excedAmt >0.0 || excedAmt1.contains("-") || totAmtDetPoamdDetbrow < sumQtyamd ) 
+					{
+	                  break;	
+					}
+					
+			    else
+			    {
 				totAmtPoamd = totAmtnotcurr + totAmtDetpordertot + totAmtpoamdtemp;
 				System.out.println("totamtpoamd>>>>.."+totAmtPoamd);
 				System.out.println("totamtpordertot"+totAmtDetpordertot);
@@ -873,6 +880,7 @@ insert into obj_itemchange(obj_name,form_no,field_name)values('porderamd
 					
 				}
 			}
+			}
 			
 			rs.close();
 			rs = null;

webitm-dis/ibase/webitm/ejb/dis/POrderAmdIC.java

@@ -1681,29 +1681,30 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 								excedAmt1=String.valueOf(excedAmt);
 								System.out.println("excedAmt1"+excedAmt1);
 								System.out.println("totAmtDetPoamdDetbrow"+ totAmtDetPoamdDetbrow);
-								System.out.println("totAmtDetpordertot"+ sumQtyamd);
+								System.out.println("sumQtyamd"+ sumQtyamd);
 							
-								if( excedAmt == 0 || excedAmt1.contains("-") || totAmtDetPoamdDetbrow < sumQtyamd ) 
+								if(excedAmt == 0.0 || excedAmt1.contains("-")) 
+								//	if(excedAmt >0.0 || excedAmt1.contains("-") || totAmtDetPoamdDetbrow < sumQtyamd ) 
 								{
-									//System.out.println("Enter If COndition");
-									//totAmtProj = totAmtDetpordertot-sumQtyamd;
-									//System.out.println("totAmtProj"+totAmtProj);
-								//	System.out.println("approxCost"+approxCost);
-									//if (totAmtProj < approxCost)
-									//{
+									System.out.println("Enter If COndition");
+									totAmtProj = totAmtDetpordertot-sumQtyamd;
+									System.out.println("totAmtProj"+totAmtProj);
+									System.out.println("approxCost"+approxCost);
+									if (totAmtProj < approxCost)
+									{
 										break;
 
-									//}
+									}
 								}
-								else
-								{
+							else
+							   {
 								System.out.println("totAmtDetPoamdDetbrow >>>>>>>>  "+ totAmtDetPoamdDetbrow);
 								System.out.println("totAmtDetporder >>>>>>>>  "+ totAmtDetporder);
 								System.out.println("totAmtDetpordertot>>>>>>>>  "+ totAmtDetpordertot);
 								//totAmtDetPoamdDetbrow = totAmtDetPoamdDetbrow *exchRatePoAmd;
 								totAmtProj = totAmtDetPoamdDetbrow + totAmtDetporder+ totAmtDetpordertot;
 								System.out.println("totAmtProj>>>>> "+ totAmtProj);
-								if (totAmtProj > approxCost)
+								if (totAmtProj > approxCost )
 								{
 									errCode = "VTPROJCOST";
 									errList.add(errCode);
@@ -3188,8 +3189,10 @@ public class POrderAmdIC extends ValidatorEJB implements POrderAmdICLocal,POrder
 								+" ;   Current Purchase Amendment Amount :  "+ BigDecimal.valueOf(totAmtDetPoamdDetbrow).toPlainString()
 								//+" ;   Exceeded Amount :  "+ BigDecimal.valueOf( sumQtyamd + totAmtDetpordertot - approxCost).toPlainString();
 							//	+" ;   Exceeded Amount :  "+ BigDecimal.valueOf(totAmtDetpordertot - approxCost).toPlainString();
-								+" ;   Exceeded Amount :  "+ BigDecimal.valueOf(excedAmt).toPlainString();
-								
+						//if(  excedAmt > 0.0)
+					//	{
+                            	+" ; Exceeded Amount :  "+ BigDecimal.valueOf(excedAmt).toPlainString();
+					//	}		
 						System.out.println("Value ::: "+ value);
 						descrStart = descrStart.concat(value).concat(descrEnd);
 						errString = startStr.concat(descrStart).concat(endStr);