Scheme Applicablity

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

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

@@ -4410,4 +4410,4 @@ public class PostOrdCreditChk
 			}
 			return inputStr;
 		}
-	}
+	}
\ No newline at end of file

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

@@ -93,9 +93,9 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 		try
 		{
 			System.out.println("@@@@@@@@ wfvaldata called");
-			//Changes and Commented By Bhushan on 09-06-2016 :START
-			//conn = connDriver.getConnectDB("DriverITM");
-			conn = getConnection();
+			//Changes and Commented By Bhushan on 09-06-2016 :START
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			connDriver = null;
 			userId = getValueFromXTRA_PARAMS(xtraParams,"loginCode");
@@ -322,7 +322,10 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 								errFields.add(childNodeName.toLowerCase());
 							}
 							//else if(!"E".equals(editFlag))-----By Jaffar S on 19-02-19
-							else if("A".equalsIgnoreCase(updateFlg))
+							//commented by-monika-19-july-2019
+						//	else if("A".equalsIgnoreCase(updateFlg))
+							//addedd by -monika-19-july-2019
+							if(siteCode.trim().length() > 0)//end
 							{
 								System.out.println("EditFlag value === "+editFlag);
 								System.out.println("updateFlg value === "+updateFlg);
@@ -347,7 +350,8 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 									errList.add(errCode);
 									errFields.add(childNodeName.toLowerCase());
 								}
-								else
+								//commented by-monika-19-july-2019
+								/*else
 								{
 									sql = " select count(*)  from scheme_applicability_det where scheme_code = '"+schemeCode+"'"+
 										  " and length(rtrim(site_code)) > 0 ";
@@ -367,7 +371,7 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 											errList.add(errCode);
 											errFields.add(childNodeName.toLowerCase());
 										}
-								}
+								}*///end
 								
 							}
 						}
@@ -419,7 +423,10 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 								errFields.add(childNodeName.toLowerCase());
 							}
 							//else if(!"E".equals(editFlag))-----By Jaffar S on 19-02-19
-							else if("A".equalsIgnoreCase(updateFlg))
+							//commented by-monika-19-july-2019
+						//	else if("A".equalsIgnoreCase(updateFlg))
+							//changes by-monika-19-july-2019//end
+							if(stateCode.trim().length() > 0)//end
 							{
 									sql = "select count(1)  from scheme_applicability_det where scheme_code = '"+schemeCode+"'"+
 										  " and (length(rtrim(site_code)) > 0 or length(rtrim(count_code)) > 0 ) ";
@@ -439,7 +446,8 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 										errList.add(errCode);
 										errFields.add(childNodeName.toLowerCase());
 									}
-									else
+									//commented by-monika-19 july 2019
+									/*else
 									{
 										sql = "select count(1)  from scheme_applicability_det where scheme_code = '"+schemeCode+"'"+
 											  " and length(rtrim(state_code)) > 0";
@@ -460,18 +468,15 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 											errFields.add(childNodeName.toLowerCase());
 										}
 									
-								}
-								
+								}*///end
 							}
 						}
 						else
 						{
 							errCode = "VTSTATE1";
 							errList.add(errCode);
-							errFields.add(childNodeName.toLowerCase());
-							
+							errFields.add(childNodeName.toLowerCase());	
 						}
-						
 					}
 					if(siteCode.trim().length() <= 0 && stateCode.trim().length() <= 0 && countCode.trim().length() <= 0)
 					{
@@ -775,9 +780,9 @@ public class SchemeApplIC extends ValidatorEJB implements SchemeApplICLocal, Sch
 			System.out.println("Current Date ::["+new Date()+"]");
 			System.out.println("Application date format is :=>  " + sysDate);
 
-			//Changes and Commented By Bhushan on 09-06-2016 :START
-			//conn = connDriver.getConnectDB("DriverITM");
-			conn = getConnection();
+			//Changes and Commented By Bhushan on 09-06-2016 :START
+			//conn = connDriver.getConnectDB("DriverITM");
+			conn = getConnection();
 			//Changes and Commented By Bhushan on 09-06-2016 :END 
 			conn.setAutoCommit(false);
 			connDriver = null;