invoice inv_type condition removed in 2nd and 3rd screens

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

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

@@ -2984,7 +2984,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						" FROM invoice invoice,invoice_trace itrace WHERE invoice.invoice_id=itrace.invoice_id " +
 						" and  ( invoice.cust_code = ? ) " +
 						//"and invoice.site_code =? " +
-						"and invoice.inv_type=?" +
+						//"and invoice.inv_type=?" +
 						" and itrace.item_ser__prom in ("+resultItemSer+") and " +
 						" ( invoice.confirmed = 'Y' )  and (  (invoice.tran_date >= ? ) " +
 						" and (invoice.tran_date <= ? )  or   " +
@@ -2998,7 +2998,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						" invoice invoice,invoice_trace itrace   WHERE  cinv.invoice_id=invoice.invoice_id and  " +
 						" itrace.invoice_id=cinv.invoice_id and   " +
 						" invoice.cust_code = ?  and   itrace.item_ser__prom in ("+resultItemSer+") " +
-						" and invoice.inv_type=? and  invoice.confirmed = 'Y'" +
+						//" and invoice.inv_type=? " +
+						" and  invoice.confirmed = 'Y'" +
 						" and CASE WHEN cinv.dlv_flg IS NULL THEN 'N' ELSE cinv.dlv_flg END='N' "+
 						" UNION "+
 						"select  '' as invoice_id ,srn.tran_date,'N' as DLV_FLG,sdet.net_amt,sdet.tran_id as tran_id " +
@@ -3011,19 +3012,19 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 					
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1, custCode);
-					pstmt.setString(2, orderType);
+					//pstmt.setString(2, orderType);
 					//pstmt.setString(3, itemSer);
-					pstmt.setTimestamp(3, FromDate);
-					pstmt.setTimestamp(4, ToDate);
-					pstmt.setTimestamp(5, prdFrom);
-					pstmt.setTimestamp(6, prdTo);
-					pstmt.setString(7, custCode);
+					pstmt.setTimestamp(2, FromDate);
+					pstmt.setTimestamp(3, ToDate);
+					pstmt.setTimestamp(4, prdFrom);
+					pstmt.setTimestamp(5, prdTo);
+					pstmt.setString(6, custCode);
 					//pstmt.setString(9, itemSer);
-					pstmt.setString(8, orderType);
+					//pstmt.setString(8, orderType);
 					//pstmt.setString(11, itemSer);
-					pstmt.setTimestamp(9, FromDate);
-					pstmt.setTimestamp(10, ToDate);
-					pstmt.setString(11, custCode);
+					pstmt.setTimestamp(7, FromDate);
+					pstmt.setTimestamp(8, ToDate);
+					pstmt.setString(9, custCode);
 					rs = pstmt.executeQuery();
 					while(rs.next())
 					{
@@ -7118,8 +7119,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					" FROM invoice invoice ,invoice_trace itrace WHERE" +
 					" invoice.invoice_id=itrace.invoice_id and  ( invoice.cust_code = ? ) " +
 					//" and invoice.site_code =? " +
-					"and invoice.inv_type=?  and " +
-					" itrace.item_ser__prom in ("+itemSer+") and  ( invoice.confirmed = 'Y' )  and" +
+					//"and invoice.inv_type=?   " +
+					" and itrace.item_ser__prom in ("+itemSer+") and  ( invoice.confirmed = 'Y' )  and" +
 					" (  (invoice.tran_date >=?) and (invoice.tran_date <= ? ) " +
 					"or ((invoice.tran_date >=? ) and (invoice.tran_date <= ? ) ) " +
 					"and(exists (SELECT cust_stock_inv.invoice_id  FROM cust_stock_inv cust_stock_inv " +
@@ -7129,7 +7130,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					" SELECT distinct cinv.invoice_id  FROM CUST_STOCK_INV cinv ," +
 					" invoice invoice,invoice_trace invtrace  WHERE  cinv.invoice_id=invoice.invoice_id " +
 					" and  invtrace.invoice_id=cinv.invoice_id and " +
-					" invoice.cust_code = ? and invoice.inv_type = ? " +
+					" invoice.cust_code = ? " +
+					//" and invoice.inv_type = ? " +
 					" and  invtrace.item_ser__prom in ("+itemSer+") " +
 					"and  invoice.confirmed = 'Y' and CASE WHEN cinv.dlv_flg IS NULL " +
 					"THEN 'N' ELSE cinv.dlv_flg END='N') " +
@@ -7150,20 +7152,20 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 			pstmt = conn.prepareStatement( sql );
 			pstmt.setString(1, custCode);
 			//pstmt.setString(2, siteCode);
-			pstmt.setString(2, orderType);
+			//pstmt.setString(2, orderType);
 			//pstmt.setString(3, itemSer);
-			pstmt.setTimestamp(3, frmDateTstmp);
-			pstmt.setTimestamp(4, toDateTstmp);
-			pstmt.setTimestamp(5, prdFrDateTstmp);
-			pstmt.setTimestamp(6, prdToDateTstmp);
-			pstmt.setString(7, custCode);
-			pstmt.setString(8, orderType);
+			pstmt.setTimestamp(2, frmDateTstmp);
+			pstmt.setTimestamp(3, toDateTstmp);
+			pstmt.setTimestamp(4, prdFrDateTstmp);
+			pstmt.setTimestamp(5, prdToDateTstmp);
+			pstmt.setString(6, custCode);
+			//pstmt.setString(8, orderType);
 			//pstmt.setString(10, itemSer);
 			//pstmt.setString(12, siteCode);//start added by chandrashekar
 			//pstmt.setString(11, itemSer);
-			pstmt.setTimestamp(9, frmDateTstmp);
-			pstmt.setTimestamp(10, toDateTstmp);
-			pstmt.setString(11, custCode);
+			pstmt.setTimestamp(7, frmDateTstmp);
+			pstmt.setTimestamp(8, toDateTstmp);
+			pstmt.setString(9, custCode);
 			
 			rs = pstmt.executeQuery();
 			while( rs.next() )
@@ -7941,7 +7943,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							" invoice invoice,invoice_trace itrace " +
 							" 	where invoice.invoice_id=itrace.invoice_id  AND  invoice.cust_code = ? " +
 							//" 	and invoice.site_code = ? " +
-							" and invoice.inv_type=? and itrace.item_ser__prom in("+itemSer+")  "+
+							//" and invoice.inv_type=? " +
+							" and itrace.item_ser__prom in("+itemSer+")  "+
 							 //" and invoice.tran_date between ? and ? " +
 							" AND itrace.RATE__STDUOM>0.001 "
 							+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+") " ;
@@ -7951,7 +7954,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							" invoice invoice,invoice_trace itrace " +
 							" 	where invoice.invoice_id=itrace.invoice_id  AND  invoice.cust_code = ? " +
 							//" 	and invoice.site_code = ? " +
-							"  and invoice.inv_type=? and itrace.item_ser__prom in("+itemSer+")   "
+							//"  and invoice.inv_type=? " +
+							" and itrace.item_ser__prom in("+itemSer+")   "
 							+ //" and invoice.tran_date between ? and ? " +
 							" AND itrace.RATE__STDUOM>0.001 "
 							+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
@@ -7960,11 +7964,11 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, custCode );
 					//pstmt.setString( 2, siteCode );
-					pstmt.setString( 2, orderType );
+					//pstmt.setString( 2, orderType );
 					//pstmt.setString( 3, itemSer);
 					//pstmt.setTimestamp( 5, fromDate );
 					//pstmt.setTimestamp( 6, toDate );
-					pstmt.setString( 3, itenmCode );
+					pstmt.setString( 2, itenmCode );
 					rs = pstmt.executeQuery();
 					double rcpCur =0, rcpPre = 0, totRcp = 0;
 					while (rs.next())
@@ -8253,7 +8257,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							" invoice invoice,invoice_trace itrace " +
 							" 	where invoice.invoice_id=itrace.invoice_id  AND  invoice.cust_code = ? " +
 							//" 	and invoice.site_code = ? " +
-							" and invoice.inv_type=? and itrace.item_ser__prom in ("+itemSer+")  "
+							//" and invoice.inv_type=? " +
+							" and itrace.item_ser__prom in ("+itemSer+")  "
 							+ " and invoice.tran_date between ? and ?  AND itrace.RATE__STDUOM>0 "
 							+ " and itrace.item_code = ? and itrace.invoice_id in("+selectedInvList+") " ;
 							//  "group by itrace.RATE__STDUOM ";
@@ -8263,7 +8268,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							" invoice invoice,invoice_trace itrace " +
 							" 	where invoice.invoice_id=itrace.invoice_id  AND  invoice.cust_code = ? " +
 							//" 	and invoice.site_code = ? " +
-							" and invoice.inv_type=? and itrace.item_ser__prom in ("+itemSer+")  "
+							//" and invoice.inv_type=? " +
+							" and itrace.item_ser__prom in ("+itemSer+")  "
 							+ " and invoice.tran_date between ? and ? AND itrace.RATE__STDUOM>0 "
 							+ " and itrace.item_code = ? and itrace.invoice_id in("+transitInvList+") " ;
 							 // "group by itrace.RATE__STDUOM ";
@@ -8279,11 +8285,11 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					pstmt = conn.prepareStatement( sql );
 					pstmt.setString( 1, custCode );
 					//pstmt.setString( 2, siteCode );
-					pstmt.setString( 2, orderType );
+					//pstmt.setString( 2, orderType );
 					//pstmt.setString( 3, itemSer);
-					pstmt.setTimestamp( 3, fromDate );
-					pstmt.setTimestamp( 4, toDate );
-					pstmt.setString( 5, itenmCode );
+					pstmt.setTimestamp( 2, fromDate );
+					pstmt.setTimestamp( 3, toDate );
+					pstmt.setString( 4, itenmCode );
 					rs = pstmt.executeQuery();
 					double rcpCur =0, rcpPre = 0, totRcp = 0;
 					while (rs.next())
@@ -8343,12 +8349,14 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 						"from ( select invoice.invoice_id as invoice_id,0 quantity, max(rate__stduom) " +
 						"rate from invoice invoice,invoice_trace itrace  where invoice.invoice_id= Itrace.invoice_id " +
 						"and invoice.invoice_id in("+selectedInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom in ("+itemSer+") " +
-						" and invoice.inv_type='"+orderType+"'  and rate__stduom>0.001 group by invoice.invoice_id " +
+						//" and invoice.inv_type='"+orderType+"' " +
+						" and rate__stduom>0.001 group by invoice.invoice_id " +
 						"union all" +
 						" select invoice.invoice_id as invoice_id,quantity__stduom quantity, 0 rate from " +
 						"invoice invoice,invoice_trace itrace  where invoice.invoice_id= Itrace.invoice_id and " +
 						"invoice.invoice_id in("+selectedInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom in ("+itemSer+") " +
-						" and invoice.inv_type='"+orderType+"'  and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;		
+						//" and invoice.inv_type='"+orderType+"'  " +
+						" and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;		
 				
 				}else  if("T".equalsIgnoreCase(quantityFlag))
 				{
@@ -8358,12 +8366,14 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 						"from ( select invoice.invoice_id as invoice_id,0 quantity, max(rate__stduom) " +
 						"rate from invoice invoice,invoice_trace itrace  where invoice.invoice_id= Itrace.invoice_id " +
 						"and invoice.invoice_id in("+transitInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom in ("+itemSer+") " +
-						" and invoice.inv_type='"+orderType+"'  and rate__stduom>0.001 group by invoice.invoice_id " +
+						//" and invoice.inv_type='"+orderType+"' " +
+						" and rate__stduom>0.001 group by invoice.invoice_id " +
 						"union all" +
 						" select invoice.invoice_id as invoice_id,quantity__stduom quantity, 0 rate from " +
 						"invoice invoice,invoice_trace itrace  where invoice.invoice_id= Itrace.invoice_id and " +
 						"invoice.invoice_id in("+transitInvList+") and item_code='"+itemCode+"' and itrace.item_ser__prom in ("+itemSer+")" +
-						" and invoice.inv_type='"+orderType+"'  and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;		
+						//" and invoice.inv_type='"+orderType+"'  " +
+						" and rate__stduom<=0.001 ) group by invoice_id ) HAVING sum(totFreeValue) >0 AND sum(totfreeQty)>0 " ;		
 					
 				}
 				
@@ -8809,14 +8819,15 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					sql =  " SELECT itrace.RATE__STDUOM as RATE__STDUOM FROM" +
 							" invoice invoice,invoice_trace itrace " +
 							" 	where invoice.invoice_id=itrace.invoice_id  AND  invoice.cust_code = ? " +
-							" and invoice.inv_type=? and itrace.item_ser__prom in("+itemSerHeaderSplit+")  "+
+							//" and invoice.inv_type=? " +
+							" and itrace.item_ser__prom in("+itemSerHeaderSplit+")  "+
 							" AND itrace.RATE__STDUOM>0.001 "+ 
 							" and itrace.item_code = ? " +
 							"and itrace.invoice_id in("+selectedInvList+") ORDER BY invoice.tran_date DESC " ;
 					pstmt = conn.prepareStatement(sql);
 					pstmt.setString(1,custCode  );
-					pstmt.setString(2, orderType );
-					pstmt.setString(3, itemCode );
+					//pstmt.setString(2, orderType );
+					pstmt.setString(2, itemCode );
 					rs = pstmt.executeQuery( );
 					if( rs.next() )
 					{