updated schema balance logic

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

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

@@ -528,25 +528,25 @@ public class SchemaBalance extends ValidatorEJB
 				if("itm_default".equalsIgnoreCase(currentColumn))
 				{
 					//Added by Vikas on 27-dec-2018[start]
-					sql="select cust_code,site_code__pbus from customer where site_code= ? and channel_partner='Y'";
+					sql="select cust_code,site_code__pbus,cust_name from customer where site_code= ? and channel_partner=?";
 					pStmt=conn.prepareStatement(sql);
 					pStmt.setString(1, siteCode);
+					pStmt.setString(2, "Y");
 					rs=pStmt.executeQuery();
 					int count=0;
 					while(rs.next())
 					{
+						custCode=rs.getString("cust_code");
+						siteCodePbus=rs.getString("site_code__pbus");
+						custName=rs.getString("cust_name");
 						count++;
 					}
 					System.out.println("Count :::::"+count);
 					if( count == 1 )
 					{
-						if(rs.next())
-						{
-							custCode=rs.getString("cust_code");
-							siteCodePbus=rs.getString("site_code__pbus");
-							System.out.println("Cust Code 123::: ["+custCode+"]   ["+siteCodePbus+"]");
-						}
-						valueXmlString.append( "<cust_code>").append(custCode).append( "</cust_code>\r\n" );
+						valueXmlString.append( "<cust_code__repl>").append(custCode).append( "</cust_code__repl>\r\n" );
+						valueXmlString.append( "<cust_repl_name>").append(custName).append( "</cust_repl_name>\r\n" );
+						valueXmlString.append( "<site_code__repl>").append(siteCodePbus).append( "</site_code__repl>\r\n" );
 					}
 					sdf = new SimpleDateFormat(genericUtility.getApplDateFormat());
 					String loginCode=getValueFromXTRA_PARAMS(xtraParams,"loginCode");
@@ -679,28 +679,32 @@ public class SchemaBalance extends ValidatorEJB
 				}
 				//Added By Vikas L on 27-Dec-18[start]
 				else if(("CUST_CODE__REPL").equalsIgnoreCase(currentColumn))
- 				{
+				{
+					custCode="";	
 					//siteCode = genericUtility.getValueFromXTRA_PARAMS( xtraParams, "loginSiteCode" );
 					System.out.println("site_code<<<<<<<<<"+siteCode);
 					String siteCodeRepl="";
 					String cust_code_repl=E12GenericUtility.checkNull(genericUtility.getColumnValue("cust_code__repl", dom));
- 					sql= "select site_code__pbus,cust_name from customer where cust_code = ?";
- 					pStmt=conn.prepareStatement(sql);
- 					pStmt.setString(1,cust_code_repl);
- 					rs=pStmt.executeQuery();
- 					if(rs.next())
+					sql= "select site_code__pbus,cust_name from customer where cust_code = ?";
+					pStmt=conn.prepareStatement(sql);
+					pStmt.setString(1,cust_code_repl);
+					rs=pStmt.executeQuery();
+					if(rs.next())
 					{
- 						siteCodeRepl=E12GenericUtility.checkNull(rs.getString("site_code__pbus"));
- 						custName=rs.getString("cust_name");
+						siteCodeRepl=E12GenericUtility.checkNull(rs.getString("site_code__pbus"));
+						custName=rs.getString("cust_name");
 						System.out.println("site_code__pbus ::::"+siteCodeRepl);
 					}
- 					if( siteCodeRepl.equals("")) 
- 					{
- 						valueXmlString.append("<site_code__repl>").append(siteCodeRepl).append("</site_code__repl>");
- 					}
- 					valueXmlString.append("<site_code__repl>").append(siteCode).append("</site_code__repl>");
- 					valueXmlString.append("<cust_repl_name>").append(custName).append("</cust_repl_name>");
- 				}
+					if( siteCodeRepl.equals("")) 
+					{
+						valueXmlString.append("<site_code__repl>").append(siteCode).append("</site_code__repl>");
+					}
+					else
+					{
+						valueXmlString.append("<site_code__repl>").append(siteCodeRepl).append("</site_code__repl>");
+					}
+					valueXmlString.append("<cust_repl_name>").append(custName).append("</cust_repl_name>");
+				}
 				//Added By Vikas L on 27-Dec-18[start]
 
 				valueXmlString.append( "</Detail1>\r\n" );