Sarita : Done changes to add tran_type instead of group code on 30-sep-2019

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

webitm-fin/src/ibase/webitm/ejb/fin/AssetSalesConf.java

@@ -1628,7 +1628,7 @@ AssetSalesConfLocal,AssetSalesConfRemote
 		String lsAcctCodePl = "", lsCctrCodePl = "", lsAcctCodeTax = "", lsCctrCodeTax = "", lsVarValue = "";
 		String lsAcctCodeDrrev = "", lsCctrCodeDrrev = "", lsAcctCodeRrev = "", lsCctrCodeRrev = "";
 		String lsCreditPrd = "", lsSaleType = "";
-
+		String tranType = ""; //Modified by sarita on 30-september-2019 
 		/*java.sql.Date ldTranDate = new java.sql.Date(System.currentTimeMillis());
 		java.sql.Date ldToday = new java.sql.Date(System.currentTimeMillis());
 		java.sql.Date ldEffDate = new java.sql.Date(System.currentTimeMillis());
@@ -1686,6 +1686,16 @@ AssetSalesConfLocal,AssetSalesConfRemote
 			+ "from asset_sales_hdr a,asset_sales_det b where	a.tran_id = b.tran_id and b.tran_id = ? and b.line_no = ?";
 			 */
 
+			//Modified by sarita on 30-september-2019 to add tran_type[START]
+			/*String sql = "select  a.tran_date     , 	a.confirmed,  "+
+					"(case when b.tax_amt is null then 0 else b.tax_amt end + case when b.amount is null then 0 else b.amount end ) as total_amt, "+
+					"b.sale_amt      , 		b.tax_amt       , 	a.cust_code, "+
+					" (case when b.amount_profit = 0 then 0 - b.amount_loss else b.amount_profit end ), "+
+					" b.excreco_amt, b.asset_code, b.depr_amt_del, b.acct_code__ar , 		b.cctr_code__ar , 	b.deletion_amt, 		b.depr_amt_delrevl, "+
+					" b.acct_code__mod, 		b.cctr_code__mod, 	b.sale_type,			b.deletion_amt_revl, "+
+					" (case when b.amount_profit = 0 then b.acct_code__loss else b.acct_code__pl end ), "+
+					" (case when b.amount_profit = 0 then b.cctr_code__loss else b.cctr_code__pl end ) "
+					+ "from asset_sales_hdr a,asset_sales_det b where	a.tran_id = b.tran_id and b.tran_id = ? and b.line_no = ?";*/
 			String sql = "select  a.tran_date     , 	a.confirmed,  "+
 					"(case when b.tax_amt is null then 0 else b.tax_amt end + case when b.amount is null then 0 else b.amount end ) as total_amt, "+
 					"b.sale_amt      , 		b.tax_amt       , 	a.cust_code, "+
@@ -1694,8 +1704,10 @@ AssetSalesConfLocal,AssetSalesConfRemote
 					" b.acct_code__mod, 		b.cctr_code__mod, 	b.sale_type,			b.deletion_amt_revl, "+
 					" (case when b.amount_profit = 0 then b.acct_code__loss else b.acct_code__pl end ), "+
 					" (case when b.amount_profit = 0 then b.cctr_code__loss else b.cctr_code__pl end ) "
+					+ ", a.tran_type as tran_type " //Added by sarita on 30-september-2019
 					+ "from asset_sales_hdr a,asset_sales_det b where	a.tran_id = b.tran_id and b.tran_id = ? and b.line_no = ?";
 			//Modified by Anjali R. on[04/07/2018][Changes made in below query ,total amount will be summation of each line tax amount and amount,
+			//Modified by sarita on 30-september-2019 to add tran_type[END]
 			//sale_amt,tax_amt and excreco_amt will be taken from detail table][End]
 
 			pstmt = conn.prepareStatement(sql);
@@ -1726,7 +1738,9 @@ AssetSalesConfLocal,AssetSalesConfRemote
 				lcDeletionAmtRevl = rs.getDouble(18);
 				lsAcctCodePl = rs.getString(19);
 				lsCctrCodePl = rs.getString(20);
-
+				//Added by sarita on 30-september-2019 to add tran_date [START]
+				tranType = rs.getString("tran_type"); System.out.println("SAR tranType is ["+tranType+"]");
+				//Added by sarita on 30-september-2019 to add tran_date [END]
 			}
 			rs.close();
 			rs = null;
@@ -1881,13 +1895,35 @@ AssetSalesConfLocal,AssetSalesConfRemote
 				return lsErrcode; // Modified by Piyush on 03/07/2018[Error Hndeling]
 			}
 
-			lsCctrCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"FA",lsGrpCode,conn);
-			lsCctrCode = lsCctrCode == null ? "" : lsCctrCode.trim();
-			lsCctrCodeTemp = lsCctrCode.split(",");
-			lsAcctCode = lsCctrCodeTemp[0];
-
+			//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][START]
+			//lsCctrCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"FA",lsGrpCode,conn);
+			lsCctrCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"FA",tranType,conn);			
+			if (lsCctrCode != null && lsCctrCode.trim().length() > 0) 
+			{
+				System.out.println("lsCctrCode :: ["+lsCctrCode+"]");
+				if(lsCctrCode.indexOf(",") > 0)
+				{
+					String tokens [] = lsCctrCode.split(",");
+					if ( tokens.length >= 2)
+					{
+						lsAcctCode = tokens[0];
+					}
+					else
+					{
+						lsAcctCode = tokens[0];
+					}
+				}
+				else
+				{
+					lsAcctCode = "";
+				}
+			}
+			//lsCctrCode = lsCctrCode == null ? "" : lsCctrCode.trim();
+			//lsCctrCodeTemp = lsCctrCode.split(",");
+			//lsAcctCode = lsCctrCodeTemp[0];
+			//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][END]
 			lsAcctCode = lsAcctCode == null ? "" : lsAcctCode.trim();
-
+		
 			System.out.println("lsCctrCode ["+lsCctrCode+"] \t lsAcctCode ["+lsAcctCode+"]");
 
 			if(lsAcctCode.length() == 0){
@@ -1900,11 +1936,35 @@ AssetSalesConfLocal,AssetSalesConfRemote
 			}
 
 			// for ACCDEPR  	
-			lsCctrAccCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"ACCDEPR",lsGrpCode,conn);
-			lsCctrAccCode = lsCctrAccCode == null ? "" : lsCctrAccCode.trim();
+			//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][START]
+			//lsCctrAccCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"ACCDEPR",lsGrpCode,conn);
+			lsCctrAccCode = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"ACCDEPR",tranType,conn);
+			System.out.println("lsCctrCode is 55 --["+lsCctrAccCode+"]");
+			if (lsCctrAccCode != null && lsCctrAccCode.trim().length() > 0) 
+			{
+				System.out.println("lsCctrAccCode :: ["+lsCctrAccCode+"]");
+				if(lsCctrAccCode.indexOf(",") > 0)
+				{
+					String tokens [] = lsCctrAccCode.split(",");
+					if ( tokens.length >= 2)
+					{
+						lsAcctAccCode = tokens[0];
+					}
+					else
+					{
+						lsAcctAccCode = "";
+					}
+				}
+				else
+				{
+					lsAcctAccCode = "";
+				}
+			}
+			/*lsCctrAccCode = lsCctrAccCode == null ? "" : lsCctrAccCode.trim();
 			lsCctrAccCodeTemp = lsCctrAccCode.split(",");
-			lsAcctAccCode = lsCctrAccCodeTemp[0];
-
+			lsAcctAccCode = lsCctrAccCodeTemp[0];*/
+			//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][END]
+			
 			if(lsAcctAccCode.length() == 0){
 				lsErrcode = "VTACCTCD1";
 				return lsErrcode; // Modified by Piyush on 03/07/2018[Error Hndeling]
@@ -2315,11 +2375,34 @@ AssetSalesConfLocal,AssetSalesConfRemote
 
 			if(lcDeprAmtRevl2 != 0){
 				//Get Depr. reserv revalue account code
-				lsCctrCodeDrrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"DRREV",lsGrpCode,conn);
-				lsCctrCodeDrrev = lsCctrCodeDrrev == null ? "" : lsCctrCodeDrrev.trim();
-				lsCctrCodeDrrevTemp = lsCctrCodeDrrev.split(",");
-				lsAcctCodeDrrev = lsCctrAccCodeTemp[0];
-
+				//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][START]
+				//lsCctrCodeDrrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"DRREV",lsGrpCode,conn);
+				lsCctrCodeDrrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"DRREV",tranType,conn);
+				if (lsCctrCodeDrrev != null && lsCctrCodeDrrev.trim().length() > 0) 
+				{
+					System.out.println("lsCctrCodeDrrev :: ["+lsCctrCodeDrrev+"]");
+					if(lsCctrCodeDrrev.indexOf(",") > 0)
+					{
+						String tokens [] = lsCctrCodeDrrev.split(",");
+						if ( tokens.length >= 2)
+						{
+							lsAcctCodeDrrev = tokens[0];
+						}
+						else
+						{
+							lsAcctCodeDrrev = tokens[0];
+						}
+					}
+					else
+					{
+						lsAcctCodeDrrev = "";
+					}
+				}
+				//lsCctrCodeDrrev = lsCctrCodeDrrev == null ? "" : lsCctrCodeDrrev.trim();
+				//lsCctrCodeDrrevTemp = lsCctrCodeDrrev.split(",");
+				//lsAcctCodeDrrev = lsCctrAccCodeTemp[0];
+				//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][END]
+				
 				if(lsAcctCodeDrrev.length() == 0){
 					lsErrcode = "VTACCTCD1";
 					return lsErrcode;
@@ -2360,10 +2443,34 @@ AssetSalesConfLocal,AssetSalesConfRemote
 
 			if(lcRevalueAmt != 0){
 				//Get Depr. Reserv Revalue account code
-				lsCctrCodeRrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"AREV",lsGrpCode,conn);
-				lsCctrCodeRrev = lsCctrCodeRrev == null ? "" : lsCctrCodeRrev.trim();
-				lsCctrCodeRrevTemp = lsCctrCodeRrev.split(",");
-				lsAcctCodeRrev = lsCctrCodeRrevTemp[0];
+				//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination] [START]
+				//lsCctrCodeRrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"AREV",lsGrpCode,conn);
+				lsCctrCodeRrev = finCommon.getAcctDetrTtype(lsItemCode,lsItemSer,"AREV",tranType,conn);
+				if (lsCctrCodeRrev != null && lsCctrCodeRrev.trim().length() > 0) 
+				{
+					System.out.println("lsCctrCodeRrev :: ["+lsCctrCodeRrev+"]");
+					if(lsCctrCodeRrev.indexOf(",") > 0)
+					{
+						String tokens [] = lsCctrCodeRrev.split(",");
+						if ( tokens.length >= 2)
+						{
+							lsAcctCodeRrev = tokens[0];
+						}
+						else
+						{
+							lsAcctCodeRrev = tokens[0];
+						}
+					}
+					else
+					{
+						lsAcctCodeRrev = "";
+					}
+				}
+				//lsCctrCodeRrev = lsCctrCodeRrev == null ? "" : lsCctrCodeRrev.trim();
+				//lsCctrCodeRrevTemp = lsCctrCodeRrev.split(",");
+				//lsAcctCodeRrev = lsCctrCodeRrevTemp[0];
+				//Modified by sarita on 30-september-2019 [changes in asset sales confirmation to pass tran_type instead of group code to fetch accounts from item account determination][END]
+				
 				if(lsCctrCodeRrev.length() == 0){
 					lsErrcode = "VTACCTCD1";
 					return lsErrcode;
@@ -3283,6 +3390,12 @@ AssetSalesConfLocal,AssetSalesConfRemote
 					}
 				}
 			}
+			//Added by sarita on 30-september-2019 [START]
+			else
+			{
+				errId = retXml;
+			}
+			//Added by sarita on 30-september-2019 [END]
 		}
 		catch(Exception e)
 		{