misc. vouch confirm

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

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

@@ -270,6 +270,11 @@ public String process(Document dom, Document dom2, String windowName, String xtr
 		System.out.println("inv45dayList-->>["+inv45dayList+"]");
 		PodHdrInvList=getDoneInvoiceIDFromPODHdr(conn,inv45dayList);
 		System.out.println("POD header123---->>["+PodHdrInvList+"]");
+		if(PodHdrInvList.contains("Error")){
+			errCode="VTPRCNCP"; 
+			errorString = itmdbAccess.getErrorString("", errCode, "", "", conn);
+			return errorString;
+		}
 		/*Iterator<String> it1 = podProcessInvIDList.iterator();
 		if(miscDrCrInvList.size() > 0){
 			while (it1.hasNext()) {
@@ -287,6 +292,11 @@ public String process(Document dom, Document dom2, String windowName, String xtr
 		miscDrCrInvList=getDoneInvoiceIDFromMiscDrCrRcp(conn, PodHdrInvList);
 		System.out.println("miscDrCrInvList---->>["+miscDrCrInvList+"]");
 		}
+		if(miscDrCrInvList.contains("Error")){
+			errCode="VTPRCNCP"; 
+			errorString = itmdbAccess.getErrorString("", errCode, "", "", conn);
+			return errorString;
+		}
 		//podProcessInvIDList.clear();	
 		System.out.println("miscDrCrInvList size-->>["+miscDrCrInvList.size()+"]");
 		if(miscDrCrInvList.size() > 0){
@@ -1145,13 +1155,14 @@ private ArrayList<String> getDoneInvoiceIDFromPODHdr(Connection conn,ArrayList<S
 	catch(Exception e)
 	{
 		e.printStackTrace();
+		inv45dayListL.add("Error");
 	}
 	System.out.println("inv45dayListL addAll--->>["+inv45dayListL+"]");
 	return inv45dayListL;
 }
 private ArrayList<String> getDoneInvoiceIDFromMiscDrCrRcp(Connection conn,ArrayList<String>inv45dayListL)
 {
-	System.out.println("------in getDoneInvoiceIDFromMiscDrCrRcp------");
+	System.out.println("------in getDoneInvoiceIDFromMiscDrCrRcp1234------");
 	PreparedStatement pstmt=null,pstmt1=null;
 	ResultSet rs=null,rs1=null;
 	String sql="",remarks="",subInvId="",TranId="",sql1="",itemCode="",itemCodeM="",confirmed="";
@@ -1162,27 +1173,29 @@ private ArrayList<String> getDoneInvoiceIDFromMiscDrCrRcp(Connection conn,ArrayL
 	ArrayList<String> InvIDList=new ArrayList <String>();
 	ArrayList<String> InvIDTemp=new ArrayList <String>();
 	ProofOfDelivery podL=ProofOfDelivery.getInstance();
+	boolean isDuplicate=false,isDuplicate1=false;
 	try{		
 		Iterator<String> it=inv45dayListL.iterator();		
 		while(it.hasNext())
 		{	
 			String id=it.next();
-			confirmed=podL.getColumnDescr(conn,"confirmed","spl_sales_por_hdr","invoice_id",id);
+			/*confirmed=podL.getColumnDescr(conn,"confirmed","spl_sales_por_hdr","invoice_id",id);
 			confirmed=confirmed==null ? "N" :confirmed.trim();
-			System.out.println("confirmed-->["+confirmed+" invID-->["+id+"]");
-			if("Y".equalsIgnoreCase(confirmed)){
+			System.out.println("confirmed-->["+confirmed+" invID-->["+id+"]");*/
+			 
 			sql="select sum(quantity),item_code from invoice_trace where invoice_id = ? group by item_code,invoice_id";
 			pstmt=conn.prepareStatement(sql);
 			pstmt.setString(1, id);
 			rs=pstmt.executeQuery();
 			while(rs.next()){
 				//lineNoTrace=rs.getInt(1);
+				isDuplicate=false;
 				qty=rs.getDouble(1);
 				itemCode=rs.getString(2);
 				
-				sql1="seleline_no__invtracect d.,d.item_code,d.quantity,h.remarks from "
-						+ "misc_drcr_rcp h,misc_drcr_rdet d where h.tran_id=d.tran_id and h.remarks "
-						+ "like ? order by line_no__invtrace";
+				sql1="select sum(nvl(d.quantity,0)) as Quantity,d.item_code" 
+						 +" from misc_drcr_rcp h,misc_drcr_rdet d where h.tran_id=d.tran_id and h.remarks" 
+						 +" like ? and Quantity <> 0 group by d.item_code";
 				/*sql1="select sum(nvl(d.quantity__resale,0)),d.item_code from spl_sales_por_hdr h,spl_sales_por_det d "
 						+ "where h.tran_id = d.tran_id and h.invoice_id = ? group by d.item_code";*/
 				pstmt1=conn.prepareStatement(sql1);
@@ -1202,9 +1215,16 @@ private ArrayList<String> getDoneInvoiceIDFromMiscDrCrRcp(Connection conn,ArrayL
 					}else{
 						it.remove();
 						inv45dayListL.remove(id);
+						isDuplicate=true;
 						break;
 					}
 				}
+				if(isDuplicate){
+					System.out.println("isDuplicate continue......isDuplicate true");
+					isDuplicate1=true;
+					break;
+				}
+					
 				if(rs1!=null){
 					rs1.close();
 					rs1=null;
@@ -1212,7 +1232,10 @@ private ArrayList<String> getDoneInvoiceIDFromMiscDrCrRcp(Connection conn,ArrayL
 				
 			}
 			System.out.println("InvTemp --->>["+InvIDTemp+"]");			
-		}	//confirmed id cond. end	
+			if(isDuplicate1){
+				System.out.println("isDuplicate1 continue......isDuplicate true");			
+				continue;
+			}
 			
 		}
 		System.out.println("unqInvID addAll--->>["+unqInvID+"]");	
@@ -1244,6 +1267,8 @@ private ArrayList<String> getDoneInvoiceIDFromMiscDrCrRcp(Connection conn,ArrayL
 	catch(Exception e)
 	{
 		e.printStackTrace();
+		inv45dayListL.clear();
+		inv45dayListL.add("Error");
 	}
 	System.out.println("inv45dayListL addAll--->>["+inv45dayListL+"]");
 	return inv45dayListL;
@@ -1805,3 +1830,4 @@ public double getPriceListRate(String priceList, java.util.Date tranDate, String
 
 
 }
+