added tran type parameter in generateTranId method

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

webitm-dis/src/ibase/webitm/ejb/dis/adv/SalesReturnConfirm.java

@@ -5800,8 +5800,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					tranwin = "W_DRCRRCP_DR";
 					WINDOW = "T_DRCRRCP_DRHO";
 					//tranIdAs = generateTranId("W_DRCRRCP_CR",siteCode,drcrFlag,currDateStr,conn);	
-					tranIdNew = generateTranId("w_drcrrcp_cr",siteCodeAs,drcrFlag,currDateStr,conn);	
+					tranIdNew = generateTranId("w_drcrrcp_cr",siteCodeAs,drcrFlag,currDateStr,tranType,conn);   //added tran type by manish mhatre on 28-feb-2020	
 					//System.out.println("tran id auto generated>>>>>"+tranIdNew);
+					
 			}
 			else if ("C".equalsIgnoreCase(drcrFlag))
 			{
@@ -5809,8 +5810,9 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					tranwin = "W_DRCRRCP_CR";
 					WINDOW = "T_DRCRRCP_CRHO";
 					//tranIdAs = generateTranId("W_DRCRRCP_CR",siteCode,drcrFlag,currDateStr,conn);	
-					tranIdNew = generateTranId("w_drcrrcp_cr",siteCodeAs,drcrFlag,currDateStr,conn);	
+					tranIdNew = generateTranId("w_drcrrcp_cr",siteCodeAs,drcrFlag,currDateStr,tranType,conn);	 //added tran type by manish mhatre on 28-feb-2020
 					//System.out.println("tran id auto generated>>>>>"+tranIdNew);
+					
 			}
 
 			/*	if ("D".equalsIgnoreCase(drcr_flag)) 
@@ -6675,7 +6677,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					tranwin = "W_MISC_DRCR_RCP_DR";
 					window = "T_MISC_DRCR_RCP_DRHO";
 					//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);	
-					tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCodeAs,drcrFlag,currDateStr,conn);
+					tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCodeAs,drcrFlag,currDateStr,tranType,conn);       //added tran type by manish mhatre on 28-feb-2020
+					
 
 			}
 			else if ("C".equalsIgnoreCase(drcrFlag))
@@ -6684,8 +6687,8 @@ public class SalesReturnConfirm extends ActionHandlerEJB implements SalesReturnC
 					tranwin = "W_MISC_DRCR_RCP_CR";
 					window = "T_MISC_DRCR_RCP_CRHO";
 					//ls_auto_tran_id = generateTranId("w_misc_drcr_rcp_cr",as_site_code,ls_drcr_flag,currDateStr,conn);	
-					tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCodeAs,drcrFlag,currDateStr,conn);
-
+					tranIdNew = generateTranId("w_misc_drcr_rcp_cr",siteCodeAs,drcrFlag,currDateStr,tranType,conn);     //added tran type by manish mhatre on 28-feb-2020
+					
 			}
 	
 			sql="select key_string  from transetup where upper(tran_window) = ? " ;
@@ -7400,7 +7403,7 @@ return errString;
 
 
 	}  //end manish
-	private String generateTranId(String windowName, String siteCode,String ls_drcr_flag, String tranDateStr, Connection conn) throws ITMException
+	private String generateTranId(String windowName, String siteCode,String ls_drcr_flag, String tranDateStr,String tranType, Connection conn) throws ITMException         //added tran type by manish mhatre on 28-feb-2020
 	{
 		PreparedStatement pstmt = null;
 		ResultSet rs = null;
@@ -7441,6 +7444,7 @@ return errString;
 			xmlValues = xmlValues + "<site_code>" + siteCode + "</site_code>";
 			xmlValues = xmlValues + "<tran_date>" + tranDateStr + "</tran_date>";
 			xmlValues = xmlValues + "<drcr_flag>" + ls_drcr_flag + "</drcr_flag>";
+			xmlValues = xmlValues + "<tran_type>" + tranType + "</tran_type>";      //added by manish mhatre on 28-feb-2020
 			xmlValues = xmlValues + "</Detail1></Root>";
 			System.out.println("xmlValues :[" + xmlValues + "]");
 			TransIDGenerator generatedTranid = new TransIDGenerator(xmlValues, "BASE", CommonConstants.DB_NAME);