chnages in function for getting invoice id

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

webitm-dis/ibase/webitm/ejb/dis/ProofOfDelivery.java

@@ -32,6 +32,7 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 {
 	String str,confirmedInv="";
 	boolean isError=false;
+	double partialQty=0;
 	GenericUtility genericUtility = GenericUtility.getInstance();
 	public static ProofOfDelivery getInstance()
 	{
@@ -152,7 +153,7 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 								if(!(status.equals("R")))
 								{
 									
-									 if(cnt1 > 0 && (!isPartialyInvoiceChk(conn,invoiceID)))
+									 if(cnt1 > 0 && (!isPartialyInvoiceChk(conn,invoiceID,"POD")))
 									{
 										//If POD for invoiceID already exist in spl_sales_por_hdr then show error
 										errCode = "VTINVIDAC"; 
@@ -566,8 +567,8 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 			{
 				for (cnt = 0; cnt < errListSize; cnt++ )
 				{
-					errCode = (String)errList.get(cnt);
-					errFldName = (String)errFields.get(cnt);
+					errCode = errList.get(cnt);
+					errFldName = errFields.get(cnt);
 					System.out.println("errCode .........."+errCode);
 					errString = getErrorString( errFldName, errCode, userId );
 					errorType =  errorType( conn, errCode );
@@ -879,8 +880,9 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 									
 				if((currentColumn.trim().equalsIgnoreCase("invoice_id")))
 				{
-					String invoiceID ="",siteCode="",custCode="",sql="",siteDescr="",custName="",currencyCode="",prdCode="";
-					double amount=0.0,exchRate=0.0;
+					String invoiceID ="",siteCode="",custCode="",sql="",siteDescr="",custName="";
+					//double amount=0.0,exchRate=0.0;
+					Map<String,String> invDetailsMap=null;
 					invoiceID = genericUtility.getColumnValue("invoice_id",dom);
 					siteCode = genericUtility.getColumnValue("site_code",dom);
 					custCode = genericUtility.getColumnValue("cust_code",dom);					
@@ -893,31 +895,22 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 	
 					if(invoiceID.length()>0 )
 					{						
-						sql="select site_code,cust_code,net_amt,curr_code,exch_rate,prd_code from invoice where invoice_id = ?";
-						pstmt=conn.prepareStatement(sql);
-						pstmt.setString(1, invoiceID);
-						rs=pstmt.executeQuery();
-						if(rs.next())
+						invDetailsMap= getDetailsFromInvoice(conn,invoiceID);
+						System.out.println("Map in invoice---->>["+invDetailsMap+"]");
+						
+						if(invDetailsMap !=null)
 						{
-							if(siteCode.length() <= 0){
-							siteCode=rs.getString(1);
-							siteCode=siteCode==null ? "" :siteCode.trim();
-							System.out.println("siteCode -----  rs :->> "+siteCode);
-							}
-							if(custCode.length() <= 0){
-							custCode=rs.getString(2);
-							custCode=custCode==null ? "" :custCode.trim();
-							}
-							amount=rs.getDouble(3);
-							currencyCode=rs.getString(4);
-							exchRate=rs.getDouble(5);	
-							prdCode=rs.getString(6);
+						if(siteCode.length() <= 0){
+						siteCode=invDetailsMap.get("site_code").toString();
+						siteCode=siteCode==null ? "" :siteCode.trim();
+						System.out.println("siteCode -----  map :->> "+siteCode);
 						}
-						prdCode=prdCode==null ? "" : prdCode.trim();
-						currencyCode=currencyCode==null ? "" : currencyCode.trim();
+						if(custCode.length() <= 0){
+							custCode=invDetailsMap.get("cust_code").toString();
+							custCode=custCode==null ? "" :custCode.trim();
+							System.out.println("custCode -----  map :->> "+custCode);
+						}						
 						
-						rs.close();pstmt.close();
-						rs=null;pstmt=null;
 						if(siteCode.length() > 0)
 						{
 							siteDescr=getNameOrDescrForCode(conn, "SITE", "DESCR", "SITE_CODE", siteCode);
@@ -927,17 +920,17 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 						{
 							custName=getNameOrDescrForCode(conn, "customer", "cust_name", "cust_code", custCode);
 						}
-						System.out.println("period code--->>"+prdCode);
+						System.out.println("period code--->>"+invDetailsMap.get("prd_code"));
 						valueXmlString.append("<site_code>").append("<![CDATA[" + siteCode + "]]>").append("</site_code>");
 						valueXmlString.append("<cust_code>").append("<![CDATA[" + custCode + "]]>").append("</cust_code>");
-						valueXmlString.append("<amount>").append("<![CDATA[" + amount + "]]>").append("</amount>");
-						valueXmlString.append("<exch_rate>").append("<![CDATA[" + exchRate + "]]>").append("</exch_rate>");
-						valueXmlString.append("<curr_code>").append("<![CDATA[" + currencyCode + "]]>").append("</curr_code>");
+						valueXmlString.append("<amount>").append("<![CDATA[" + invDetailsMap.get("amount") + "]]>").append("</amount>");
+						valueXmlString.append("<exch_rate>").append("<![CDATA[" + invDetailsMap.get("exch_rate") + "]]>").append("</exch_rate>");
+						valueXmlString.append("<curr_code>").append("<![CDATA[" + checkNull(invDetailsMap.get("curr_code") + "]]>")).append("</curr_code>");
 						valueXmlString.append("<site_descr>").append("<![CDATA[" + siteDescr + "]]>").append("</site_descr>");						
 						valueXmlString.append("<cust_name>").append("<![CDATA[" + custName+ "]]>").append("</cust_name>");
 					
-						valueXmlString.append("<prd_code>").append("<![CDATA[" + prdCode+ "]]>").append("</prd_code>");
-						System.out.println("siteCode : "+siteCode+" cust code : "+custCode+" amount : "+amount+"exchnage rate  : "+exchRate);					
+						valueXmlString.append("<prd_code>").append("<![CDATA[" + checkNull(invDetailsMap.get("prd_code"))+ "]]>").append("</prd_code>");
+						}					
 					}
 					else
 					{
@@ -1156,7 +1149,39 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 		return str;
 	}
 	
-	
+	public Map<String,String> getDetailsFromInvoice(Connection conn,String invoiceId)
+	{
+		HashMap<String,String> invDetailsMap=new HashMap<String, String>();
+		ResultSet rs=null;
+		PreparedStatement pstmt=null;
+		String sql="";
+		try{
+			sql="select site_code,cust_code,net_amt,curr_code,exch_rate,prd_code from invoice where invoice_id = ?";
+			pstmt=conn.prepareStatement(sql);
+			pstmt.setString(1, invoiceId);
+			rs=pstmt.executeQuery();
+			if(rs.next())
+			{	
+				invDetailsMap.put("site_code", rs.getString(1));
+				invDetailsMap.put("cust_code", rs.getString(2));
+				invDetailsMap.put("amount", Double.toString((rs.getDouble(3))));
+				invDetailsMap.put("curr_code", rs.getString(4));
+				invDetailsMap.put("exch_rate", Double.toString(rs.getDouble(5)));
+				invDetailsMap.put("prd_code", rs.getString(6));						
+				
+			}			
+			rs.close();
+			rs=null;
+			pstmt.close();
+			pstmt=null;
+		}
+		catch(Exception e){
+			System.out.println("Exception in getDetailsFromInvoice----------");
+			e.printStackTrace();
+		}
+		
+		return invDetailsMap;
+	}
 	
 	
 	private boolean isTotalAmountPodQtyGrt(Connection conn,String invID,double actualInvQty,double currentPodQty,String itemCodeSret)
@@ -1298,7 +1323,7 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 	
 	
 	
-	private boolean isPartialyInvoiceChk(Connection conn,String invID)
+	protected boolean isPartialyInvoiceChk(Connection conn,String invID,String transaction)
 	{
 		System.out.println("---in method isPartialyInvoiceChk ------invoice ID :["+invID+"]");
 		PreparedStatement pstmt2 = null,pstmt1=null ; 
@@ -1308,11 +1333,12 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 		
 		double qtyInv=0.0,podQty=0.0,totalPodQty=0.0;
 		
-		 sql1="select tran_id,confirmed from spl_sales_por_hdr where invoice_id = ? and wf_status <> 'R'  order by confirmed";
+		 sql1="select tran_id,confirmed from spl_sales_por_hdr where invoice_id = ? and wf_status <> ?  order by confirmed";
 		try
 		{			
 			pstmt2=conn.prepareStatement(sql1);
 			pstmt2.setString(1, invID);
+			pstmt2.setString(2, "R");
 			rs2 = pstmt2.executeQuery();
 			while(rs2.next())
 			{
@@ -1330,6 +1356,7 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 					sql1="select line_no,item_code,quantity__inv,quantity__resale from spl_sales_por_det where tran_id = ?";
 					pstmt1=conn.prepareStatement(sql1);
 					pstmt1.setString(1, tranID);
+					
 					rs1=pstmt1.executeQuery();
 					while(rs1.next())
 					{
@@ -1339,7 +1366,10 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 						System.out.println("Line no ---->"+lineNo+ " qtyInv-->>"+qtyInv+" podQty->>"+podQty);
 						totalPodQty=totalPodQty + podQty;
 						if( podQty < qtyInv)
-						       return true;		
+						{
+							partialQty= podQty;
+						    return true;
+						}
 					}
 					System.out.println("Total POD quantity --------->>"+totalPodQty);
 					System.out.println("Confirmed POD---->["+confirmed+"]");
@@ -1347,8 +1377,10 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 					rs1.close();rs1=null;
 					pstmt1.close();pstmt1=null;
 				}
+				if("POD".equalsIgnoreCase(transaction)){
 				if (confirmed.equalsIgnoreCase("N"))
 					return true;
+				}
 			}
 			
 			System.out.println("TranID in isPartialyInvoiceChk --->>["+tranID+"] confirmed -->["+confirmed+"]");
@@ -1430,7 +1462,7 @@ public class ProofOfDelivery extends ValidatorEJB implements ProofOfDeliveryLoca
 		}		
 		return msgType;
 	}
-	private String checkNull(String input)	
+	public String checkNull(String input)	
 	{
 		if (input == null)
 		{