Fixed scheme setting as per order types.

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

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

@@ -2136,6 +2136,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 							{
 								if (itemCode==null || itemCode.length() == 0)
 								{
+									System.out.println("VTITEM81");
 									errCode = "VTITEM8";
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
@@ -2158,6 +2159,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 									if(cnt==0)
 									{
+										System.out.println("VTITEM82");
 										errCode = "VTITEM8";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
@@ -2177,6 +2179,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										lsApplicableOrdTypes = checkNull(rs.getString("order_type"));
 										if(dueDate.before(appFrom) || dueDate.after(validUpto))
 										{
+											System.out.println("VTITEM83");
 											errCode = "VTITEM8";
 											errList.add(errCode);
 											errFields.add(childNodeName.toLowerCase());
@@ -2184,6 +2187,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									}
 									else
 									{
+										System.out.println("VTITEM84");
 										errCode = "VTITEM8";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
@@ -2197,6 +2201,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 
 									if("NE".equalsIgnoreCase(orderType) && ((lsApplicableOrdTypes==null || lsApplicableOrdTypes.trim().length()==0)))
 									{
+										System.out.println("VTITEM85");
 										errCode = "VTITEM8";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
@@ -2206,13 +2211,14 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										lbProceed=false;
 										String lsApplicableOrdTypesArr[]=lsApplicableOrdTypes.split(",");
 										ArrayList<String>applicableOrdTypes= new ArrayList<String>(Arrays.asList(lsApplicableOrdTypesArr));
-										if(applicableOrdTypes.contains(orderType))
+										if(applicableOrdTypes.contains(orderType.trim()))
 										{
 											lbProceed=true;
 //											break;
 										}
 										if(!lbProceed)
 										{
+											System.out.println("VTITEM86");
 											errCode = "VTITEM8";
 											errList.add(errCode);
 											errFields.add(childNodeName.toLowerCase());
@@ -2223,14 +2229,16 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									{
 										lbProceed=false;
 										String applyCustListArr[]=applyCustList.split(",");
+										System.out.println("Custcode111"+custCode);
 										ArrayList<String>ApplyCustList=new ArrayList<String>(Arrays.asList(applyCustListArr));
-										if(ApplyCustList.contains(custCode))
+										if(ApplyCustList.contains(custCode.trim()))
 										{
 											lbProceed=true;
 											break;
 										}
 										if(!lbProceed)
 										{
+											System.out.println("VTITEM87");
 											errCode = "VTITEM8";
 											errList.add(errCode);
 											errFields.add(childNodeName.toLowerCase());
@@ -2248,6 +2256,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 										}
 										if(!lbProceed)
 										{
+											System.out.println("VTITEM88");
 											errCode = "VTITEM8";
 											errList.add(errCode);
 											errFields.add(childNodeName.toLowerCase());
@@ -2290,6 +2299,7 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 									}
 									if(cnt==0)
 									{
+										System.out.println("VTITEM89");
 										errCode = "VTITEM8";
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
@@ -8335,16 +8345,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 								} 
 								else if (lsApplicableordtypes != null && lsApplicableordtypes.trim().length() > 0)
 								{
+									System.out.println("lsApplicableordtypes"+lsApplicableordtypes+":::");
 									lbProceed = false;
 									String lsApplicableordtypesArr[] = lsApplicableordtypes.split(",");
 									ArrayList<String> applicableordtypesList=new ArrayList<String>(Arrays.asList(lsApplicableordtypesArr));
-									if(applicableordtypesList.contains(lsOrderType))
+									if(applicableordtypesList.contains(lsOrderType.trim()))
 									{
+										System.out.println("Inside lbProceeed"+lbProceed);
 										lbProceed = true;
 										//break;
 									}
 									if (!lbProceed)
 									{
+										
+										System.out.println("Inside continue");
 										lsSchemeCode="";
 										// goto Nextrec
 										continue;
@@ -12757,16 +12771,20 @@ public class SalesOrderIC extends ValidatorEJB implements SalesOrderICLocal, Sal
 						// goto Nextrec
 					} else if (lsApplicableOrdTypes != null && lsApplicableOrdTypes.trim().length() > 0)
 					{
+						System.out.println("lsApplicableOrdTypes1"+lsApplicableOrdTypes+":::");
 						lbProceed = false;
 						String lsApplicableOrdTypesArr[] = lsApplicableOrdTypes.split(",");
 						ArrayList<String> applicableOrdTypes= new ArrayList<String>(Arrays.asList(lsApplicableOrdTypesArr));
 						if(applicableOrdTypes.contains(lsOrderType))
 						{
+							System.out.println("lbProceed"+lbProceed);
 							lbProceed = true;
 //							break;
 						}
 						if (!lbProceed)
 						{
+							System.out.println("Inside lbproceed");
+							continue;
 							// goto Nextrec
 						}
 					}