generateTranId change as per site_code__log parameter

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

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

@@ -61,7 +61,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 		double saleqty=0.0,saleretqty=0.0,unconfclaimed=0.0,confclaimed=0.0;
 		String itemCode="",lotNo="",porderNo="",porderDate= "",itemSer= "",rateContr="";
 		String errString = null,sql="";
-		String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag="";
+		String siteCode="",custCode="",tranDatestr="",tranType="",verifyFlag="",siteCodeLog="";
 		String  custCodeCredit = "",loginSite;
 		Connection conn = null;
 		ConnDriver connDriver = null;
@@ -129,13 +129,14 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 				    return errString;
 				}
 				String varflag  = "";
-				sql = " select  VERIFY_FLAG from charge_back_form where tran_id = ? ";
+				sql = " select  VERIFY_FLAG,site_code__log from charge_back_form where tran_id = ? ";
 				pStmt = conn.prepareStatement(sql);
 				pStmt.setString(1, tranId.trim());
 				rs = pStmt.executeQuery();
 				if(rs.next()) 
 				{
 					varflag  = rs.getString(1);
+					siteCodeLog  = rs.getString(2);//Added by chandrashekar on 16-12-14
 				}if(rs != null)
 					rs.close();
 				rs = null;
@@ -154,7 +155,9 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 				    return errString;
 				}
 				
-				String chbtranID = generateTranId("w_charge_back",loginSite,conn );System.out.println(" charge_back_tran_id ::"+chbtranID);
+				//String chbtranID = generateTranId("w_charge_back",loginSite,conn );
+				String chbtranID = generateTranId("w_charge_back",loginSite,siteCodeLog,conn );//added by chandrashekar on 16-12-2014
+				System.out.println(" charge_back_tran_id ::"+chbtranID);
 				sql = " SELECT TRAN_DATE,CUST_CODE__CREDIT,TRAN_TYPE,REMARKS  ,PRISE_LIST ,CURR_CODE ,EXCH_RATE,AMOUNT ,NET_AMT,NET_AMT__BC,"+
 					  "	EMP_CODE__APRV ,CHG_DATE ,CHG_USER,CHG_TERM ,TRAN_ID__CRN,EFF_DATE ,TAX_AMT,PORDER_NO ,PORDER_DATE  ,VENDOR_NO ,"+
 					  " INT_VENDOR_NO ,CUST_NAME_BAT ,CUST_PNAME_BAT  ,TEST_PROD ,CUST_CODE__SHIP ,CUST_NAME__SHIP ,CUST_CODE__END,CUST_NAME,CONTRACT_NO ,"+
@@ -440,7 +443,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 		}
 		return errString;
 	}
-	private String generateTranId( String windowName,String siteCode, Connection conn )throws ITMException
+	private String generateTranId( String windowName,String siteCode,String siteCodeLog, Connection conn )throws ITMException
     {
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -482,6 +485,7 @@ public class ChargeBackFormAccept extends ActionHandlerEJB implements ChargeBack
 			xmlValues = xmlValues +        "<tran_id></tran_id>";
 			xmlValues = xmlValues +        "<site_code>" + siteCode + "</site_code>";
 			xmlValues = xmlValues +        "<tran_date>" + currDateStr + "</tran_date>";
+			xmlValues = xmlValues +        "<site_code__log>" + siteCodeLog + "</site_code__log>";
 			xmlValues = xmlValues + "</Detail1></Root>";
 			System.out.println("xmlValues  :["+xmlValues+"]");
 			TransIDGenerator tg = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);