remove else condition for channelPartner in autoback flush

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

webitm-dis/ibase/webitm/ejb/dis/adv/PoRcpConf.java

@@ -837,7 +837,7 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 				}
 			} 
 
-			if ( retString == null || retString.trim().length() == 0 ) 
+			if (retString == null || retString.trim().length() == 0 ) 
 			{
 				confDate =  new java.sql.Timestamp(System.currentTimeMillis());
 				sql = "UPDATE PORCP SET CONFIRMED = 'Y',CONF_DATE = ? WHERE TRAN_ID = ? ";
@@ -1377,10 +1377,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 								TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);
 								tempTranId = tg.generateTranSeqID("INVHOL", "tran_id", keyString, conn);
 								
-								
-								
-								
-								
 								System.out.println("tempTranId ["+tempTranId + "]");
 
 								sql = "insert into inv_hold (tran_id, tran_date, site_code, remarks,confirmed, chg_user, chg_date, chg_term) "
@@ -1772,7 +1768,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 						rs1 = null;
 						errString = itmDBAccessLocal.getErrorString("","VTCT3FORM1","");
 						break;
-						
 					}
 					pstmt1.close();
 					pstmt1 = null;
@@ -4024,7 +4019,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					disLink = checkNull(rs.getString("DIS_LINK"));
 					sordSite = checkNull(rs.getString("SITE_CODE__CH"));
 				}
-				else if(channelPartner == null )
+			   /*  cahnge done by sachin remove else condition on 23-9-13*/
+				if(channelPartner == null )
 				{
 					sql = "SELECT (CASE WHEN CHANNEL_PARTNER IS NULL THEN 'N' ELSE CHANNEL_PARTNER END) AS CHANNEL_PARTNER, DIS_LINK, SITE_CODE FROM  SUPPLIER WHERE SUPP_CODE = ? ";
 					pstmt1 = conn.prepareStatement(sql);
@@ -4041,6 +4037,8 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs1.close();
 					rs1=null;
 				}
+				
+				  /*  cahnge done by sachin remove else condition on 23-9-13 end*/
 				pstmt.close();
 				pstmt = null;
 				rs.close();
@@ -5999,7 +5997,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		return retString;	
 	}*/
 	
-	
 	public String createAssetInstall(String tranId, String qcOrderNo,Connection conn, String xtraParams)  throws RemoteException, ITMException
 	{
 		PreparedStatement pstmt = null,pstmt1=null, pstmtHdr=null,pstmtDet=null;
@@ -6020,17 +6017,18 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 		double rcprecoAmt = 0.0,rcptaxAmt = 0.0, exciseAmt = 0.0,  taxAmt = 0.0,  excrecoAmt = 0.0;
 		double discAmt = 0.0,taxInstallChgs = 0.0, taxAmount = 0.0,  originalValue = 0.0;  
 
-        String arrStr[]=null;
 		Timestamp tranDate = null, billDate = null,dcDate = null, invoiceDate = null;
+
+		String arrStr[]=null;
 		int len=0,count=0;
-	
+		
 		try
 		{
 			FinCommon finCommon = new FinCommon();
 			DistCommon distCommon = new DistCommon();
 			ITMDBAccessEJB itmDbAccess = new ITMDBAccessEJB();
 			GenericUtility genericUtility = GenericUtility.getInstance();
-			
+
 			loginEmpCode = genericUtility.getValueFromXTRA_PARAMS(xtraParams,"loginEmpCode");
 			DateFormat dtFormat = new SimpleDateFormat(genericUtility.getApplDateTimeFormat());
 			String today = dtFormat.format(new java.util.Date());
@@ -6624,7 +6622,6 @@ public class PoRcpConf extends ActionHandlerEJB implements PoRcpConfLocal, PoRcp
 					rs1.close();
 					rs1 = null;
 				}
-				
 			} catch (Exception e)
 			{
 				System.out.println("PoRcpConf : createAssetInstall(String tranId, String orderNo,String logEmpCode, Connection conn) :" + e.getMessage());