Analysis Code set from item_acct_analysis

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

webitm-fin/ibase/webitm/ejb/fin/MiscDrCrRcpConf.java

@@ -264,6 +264,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
 		int upd=0;
 		boolean status=false ,flg = true;
 		int[] batchCount;
+		String itemCode="";
+		String acctAnalysis="";
+		String[] analysisStr =null;
+		String analysis1__acct="",analysis2__acct="",analysis3__acct="" ;
 		try{
 			System.out.println("<!@#> In gbfRetrieveMiscDrcrRcp :::::::::::::::::::::::::::::::");
 			
@@ -430,7 +434,7 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
 			
 		//taking details for particular tran_id
 			sql =" select line_no,acct_code,cctr_code,amount,anal_code,emp_code,net_amt,tax_amt,tax_class,tax_chap, "
-					+" tax_env,reas_code,ref_no,item_code,quantity,rate,line_no__sret,line_no__invtrace,lot_no,lot_sl,analysis1,analysis2,analysis3 "  
+					+" tax_env,reas_code,ref_no,item_code,quantity,rate,line_no__sret,line_no__invtrace,lot_no,lot_sl,analysis1,analysis2,analysis3,item_code "  
 					+" from misc_drcr_rdet "
 					+" where tran_id = ? ";
 				pstmt = conn.prepareStatement(sql);
@@ -458,9 +462,10 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
 					lineNoInvtrace = rs.getString("line_no__invtrace");
 					detLotNo = rs.getString("lot_no");
 					detLotSl = rs.getString("lot_sl");
-					analysis1 = rs.getString("analysis1");
-					analysis2 = rs.getString("analysis2");
-					analysis3 = rs.getString("analysis3");
+					analysis1 = (rs.getString("analysis1")==null?"":rs.getString("analysis1"));
+					analysis2 = (rs.getString("analysis2")==null?"":rs.getString("analysis2"));
+					analysis3 = (rs.getString("analysis3")==null?"":rs.getString("analysis3"));
+					itemCode = rs.getString("item_code");
 					
 					miscRdetMap = new HashMap();
 					miscRdetMap.put("line_no",lineNo);
@@ -483,9 +488,101 @@ public class MiscDrCrRcpConf extends ActionHandlerEJB implements MiscDrCrRcpConf
 					miscRdetMap.put("line_no__invtrace",lineNoInvtrace);
 					miscRdetMap.put("lot_no",detLotNo);
 					miscRdetMap.put("lot_sl",detLotSl);
-					miscRdetMap.put("analysis1",analysis1);
+					/*miscRdetMap.put("analysis1",analysis1);
 					miscRdetMap.put("analysis2",analysis2);
-					miscRdetMap.put("analysis3",analysis3);
+					miscRdetMap.put("analysis3",analysis3);*/
+					
+					
+					InvAcct invacct=new InvAcct();
+					
+					if(drcrFlag!=null)
+					{
+						if("D".equalsIgnoreCase(drcrFlag.trim()))
+						{
+							acctAnalysis=invacct.AcctAnalysisType(itemCode, tranSer, tranType, "CR", conn);		
+						}
+						else if("C".equalsIgnoreCase(drcrFlag.trim()))
+						{
+							acctAnalysis=invacct.AcctAnalysisType(itemCode, tranSer, tranType, "DR", conn);
+						}
+					}
+					
+					System.out.println("@@@@CR return analysis["+acctAnalysis+"]");
+					
+					analysisStr = acctAnalysis.split("@");
+					int len = analysisStr.length-1;
+					//System.out.println("@@@cr len["+len+"]");
+					if( len > -1 )
+					{
+						analysis1__acct = analysisStr[0];
+					}
+					else
+					{
+						analysis1__acct = "";	
+					}	
+					if( len > 0 )
+					{
+						analysis2__acct = analysisStr[1];	
+					}
+					else
+					{	
+						analysis2__acct = "";
+					}
+					if( len > 1)
+					{
+						analysis3__acct = analysisStr[2];
+					}
+					else
+					{
+						analysis3__acct ="";	
+					}
+					
+					
+					if(analysis1__acct==null || "".equalsIgnoreCase(analysis1__acct.trim()))
+							{
+								analysis1__acct=analysis1;
+							}
+					if(analysis2__acct==null || "".equalsIgnoreCase(analysis2__acct.trim()))
+					{
+						analysis2__acct=analysis2;
+					}
+					if(analysis3__acct==null || "".equalsIgnoreCase(analysis3__acct.trim()))
+					{
+						analysis3__acct=analysis3;
+					}
+						
+					//analysisStr = acctAnalysis.split("@");
+					//int len = analysisStr.length-1;
+					//System.out.println("@@@cr len["+len+"]");
+					/*if( len > -1 )
+					{
+						analysis1__acct = analysisStr[0];
+					}
+					else
+					{
+						analysis1__acct = analysis1;	
+					}	
+					if( len > 0 )
+					{
+						analysis2__acct = analysisStr[1];	
+					}
+					else
+					{	
+					  analysis2__acct = analysis2;
+					}
+					if( len > 1)
+					{
+					analysis3__acct = analysisStr[2];
+					}
+					else
+					{
+						analysis3__acct =analysis3;	
+					}
+					*/
+					System.out.println("Setting value from item_acct_analysis---"+analysis1__acct+"---"+analysis2__acct+"---"+analysis3__acct);
+					miscRdetMap.put("analysis1",analysis1__acct);
+					miscRdetMap.put("analysis2",analysis2__acct);
+					miscRdetMap.put("analysis3",analysis3__acct);
 					miscRdetList.add(miscRdetMap);		
 				}
 				rs.close();