Changes Reverted for use of cust_code__bill in where condition of sql

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

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

@@ -171,10 +171,10 @@ public class PostOrdDespatchGen
 					+ "WHERE (   SORDER  .  SALE_ORDER   =   SORDDET  .  SALE_ORDER   ) "
 					+ "and  ( sorder.sale_order >= ? ) "
 					+ "AND   ( sorder.sale_order <= ? )"
-					//+ "AND   ( sorder.cust_code >= ?)" commented by abhijit Gaikwad
-					+ "AND   ( sorder.cust_code__bil >= ?)"
-					//+ "AND  ( sorder.cust_code <= ?) " commented by abhijit Gaikwad
-					+ "AND  ( sorder.cust_code__bil <= ?) "
+					+ "AND   ( sorder.cust_code >= ?)" //commented by abhijit Gaikwad  //Changes Reverted by Nandkumar Gadkari As discuss with manoharan sir on 28/08/18 
+					//+ "AND   ( sorder.cust_code__bil >= ?)" commented by Nandkumar Gadkari on 28/08/18
+					+ "AND  ( sorder.cust_code <= ?) " //commented by abhijit Gaikwad //Changes Reverted by Nandkumar Gadkari As discuss with manoharan sir on 28/08/18 
+					//+ "AND  ( sorder.cust_code__bil <= ?) "
 					+ "AND    ( sorder.due_date >= ?) "
 					+ "AND ( sorder.due_date <= ?) "
 					+ "AND   ( sorder.confirmed = 'Y' )"

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

@@ -721,16 +721,16 @@ public class PostOrderIC extends ValidatorEJB implements PostOrderICLocal, PostO
 					}
 					else if(from_trid.equalsIgnoreCase(to_trid))
 					{
-						//sql = "SELECT CUST_CODE FROM SORDER WHERE SALE_ORDER = ? ";//Commented by Ajay on 14/05/18
-						 sql = "SELECT CUST_CODE__BIL FROM SORDER WHERE SALE_ORDER = ? ";//Add by Ajay on 14/05/18
+						sql = "SELECT CUST_CODE FROM SORDER WHERE SALE_ORDER = ? "; //Changes Reverted by Nandkumar Gadkari As discuss with manoharan sir on 28/08/18 
+						 //sql = "SELECT CUST_CODE__BIL FROM SORDER WHERE SALE_ORDER = ? ";//Add by Ajay on 14/05/18
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1, to_trid);
 						rs = pstmt.executeQuery();
 						if(rs.next())
 						{
 							
-							//ls_cust_code = checkNullAndTrim(rs.getString("CUST_CODE"));//Commented by Ajay on 14/05/18
-							ls_cust_code = checkNullAndTrim(rs.getString("CUST_CODE__BIL"));//Add by Ajay on 14/05/18
+							ls_cust_code = checkNullAndTrim(rs.getString("CUST_CODE"));//changes  Nandkumar Gadkari on 28/08/18 
+							//ls_cust_code = checkNullAndTrim(rs.getString("CUST_CODE__BIL"));//Add by Ajay on 14/05/18
 						}
 						if(pstmt != null)
 						{

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

@@ -1783,10 +1783,10 @@ public class PostOrderProcess extends ProcessEJB implements PostOrderProcessLoca
 			//sqlstatement = sqlstatement +	" from sorder " ;	
 			sqlstatement = sqlstatement +	" where sale_order >= ? " ;
 			sqlstatement = sqlstatement +	" and sale_order <=  ? " ;
-			//sqlstatement = sqlstatement +	" and cust_code  >=  ? " ; commented by abhijit Gaikwad
-			//sqlstatement = sqlstatement +	" and cust_code  <=  ? " ;
-			sqlstatement = sqlstatement +	" and cust_code__bil  >=  ? " ;
-			sqlstatement = sqlstatement +	" and cust_code__bil  <=  ? " ;
+			sqlstatement = sqlstatement +	" and cust_code  >=  ? " ; //commented by abhijit Gaikwad //Changes Reverted by Nandkumar Gadkari As discuss with manoharan sir on 28/08/18 
+			sqlstatement = sqlstatement +	" and cust_code  <=  ? " ;
+			//sqlstatement = sqlstatement +	" and cust_code__bil  >=  ? " ; //commented by Nandkumar Gadkari 28/08/18 
+			//sqlstatement = sqlstatement +	" and cust_code__bil  <=  ? " ;
 			sqlstatement = sqlstatement +	" and due_date   >=  ? " ;
 			sqlstatement = sqlstatement +	" and due_date   <=  ? " ;
 			sqlstatement = sqlstatement +	" and confirmed = 'Y' and status = 'P'  " ;