Sales Return sum of eff_net_amt set as net amount in invoice screen

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

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

@@ -2785,7 +2785,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 					pstmt.close();
 					pstmt = null;
 					System.out.println("tranIdNew(case 3) :"+tranIdNew);
-					resultItemSer=getItemSerListInv(itemSer,conn);
+					//resultItemSer=getItemSerListInv(itemSer,conn);
+					resultItemSer=getItemSerList(itemSer,conn);
 					if(tranIdNew.trim().length() > 0)
 					{
 						
@@ -2890,13 +2891,40 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							{
 								//sreturnCnt = rs1.getInt(1);
 								sreturnCnt=checkNull(rs1.getString("tran_id")).trim().length();
-								netAmt=rs1.getDouble("net_amt");
+								//netAmt=rs1.getDouble("net_amt");
 								
 							}
 							rs1.close();
 							rs1 = null;
 							pstmt1.close();
 							pstmt1 = null;
+							//Start added by chandrashekar on 09-sep-206
+							if(sreturnCnt>0)
+							{
+								sql= "select  SUM(sdet.eff_net_amt) as net_amt from sreturn srn,sreturndet sdet,item itm" +
+										" where srn.tran_id=sdet.tran_id and sdet.item_code=itm.item_code  " +
+										" and ( itm.item_ser in ("+resultItemSer+") OR((itm.item_ser,itm.ITEM_CODE) " +
+										" IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN ("+resultItemSer+"))) )" +
+										" and srn.tran_date >= ? and srn.tran_date <= ? " +
+										" and sdet.ret_rep_flag in ('R','P') and srn.cust_code=? " +
+										" and srn.confirmed='Y' and sdet.tran_id =? ";
+								pstmt1 = conn.prepareStatement(sql);
+								pstmt1.setTimestamp(1, FromDate);
+								pstmt1.setTimestamp(2, ToDate);
+								pstmt1.setString(3, custCode);
+								pstmt1.setString(4, invoiceId);
+								rs1 = pstmt1.executeQuery();
+								if(rs1.next())
+								{
+									netAmt=rs1.getDouble("net_amt");
+								}
+								rs1.close();
+								rs1 = null;
+								pstmt1.close();
+								pstmt1 = null;
+							}
+							
+							//End added by chandrashekar on 09-sep-206
 							System.out.println("netAmt***after sreturn******>>"+netAmt);
 							/*netAmtStr = Double.toString(netAmt);
 							String[] arrStr =netAmtStr.split("\\.");
@@ -3053,8 +3081,10 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						" and  ( invoice.cust_code = ? ) " +
 						//"and invoice.site_code =? " +
 						//"and invoice.inv_type=?" +
-						" and itrace.item_ser__prom in ("+resultItemSer+") and " +
-						" ( invoice.confirmed = 'Y' )  and (  (invoice.tran_date >= ? ) " +
+						//" and itrace.item_ser__prom in ("+resultItemSer+")  " +
+						" and( itrace.item_ser__prom in ("+resultItemSer+") OR((itrace.item_ser__prom,itrace.ITEM_CODE) " +
+						" IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN ("+resultItemSer+") )) ) "+
+						" 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 " +
@@ -3075,9 +3105,11 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						//"and srn.site_code= ? " +
 						//"and srn.item_ser in ("+resultItemSer+") " +
 						" and sdet.item_code=itm.item_code "+
-						"and itm.item_ser in ("+resultItemSer+") " +
+						//"and itm.item_ser in ("+resultItemSer+") " +
+						" and ( itm.item_ser in ("+resultItemSer+") OR((itm.item_ser,itm.ITEM_CODE)  " +
+						" IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN ("+resultItemSer+"))) ) "+
 						"and srn.tran_date >= ? and srn.tran_date <= ? " +
-						"and sdet.ret_rep_flag in ('R') and srn.cust_code=? and srn.confirmed='Y' ORDER BY invoice_date";
+						"and sdet.ret_rep_flag in ('R','P') and srn.cust_code=? and srn.confirmed='Y' ORDER BY invoice_date";
 					
 					
 					pstmt = conn.prepareStatement(sql);
@@ -3185,20 +3217,45 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							pstmt1 = null;
 							System.out.println("netAmt@@@@@@@@@"+netAmt);
 							
-							sql= "SELECT net_amt  FROM sreturn WHERE tran_id=?";
+							sql= "SELECT count(*) as cnt  FROM sreturn WHERE tran_id=?";
 							pstmt1 = conn.prepareStatement(sql);
 							pstmt1.setString(1, invoiceId);
 							rs1 = pstmt1.executeQuery();
 							if(rs1.next())
 							{
-								//sreturnCnt = rs1.getInt(1);
-								netAmt=rs1.getDouble("net_amt");
+								sreturnCnt = rs1.getInt(1);
 								
 							}
 							rs1.close();
 							rs1 = null;
 							pstmt1.close();
 							pstmt1 = null;
+							
+							if(sreturnCnt >0)
+							{
+
+								sql = "select  SUM(sdet.eff_net_amt) as net_amt from sreturn srn,sreturndet sdet,item itm" 
+									+ " where srn.tran_id=sdet.tran_id and sdet.item_code=itm.item_code  " 
+									+ " and ( itm.item_ser in (" + resultItemSer + ") OR((itm.item_ser,itm.ITEM_CODE) " 
+									+ " IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN (" + resultItemSer + "))) )" 
+									+ " and srn.tran_date >= ? and srn.tran_date <= ? " 
+									+ " and sdet.ret_rep_flag in ('R','P') and srn.cust_code=? " 
+									+ " and srn.confirmed='Y' and sdet.tran_id =? ";
+								pstmt1 = conn.prepareStatement(sql);
+								pstmt1.setTimestamp(1, FromDate);
+								pstmt1.setTimestamp(2, ToDate);
+								pstmt1.setString(3, custCode);
+								pstmt1.setString(4, invoiceId);
+								rs1 = pstmt1.executeQuery();
+								if (rs1.next())
+								{
+									netAmt = rs1.getDouble("net_amt");
+								}
+								rs1.close();
+								rs1 = null;
+								pstmt1.close();
+								pstmt1 = null;
+							}
 							System.out.println("netAmt@@@@sreturnAdd@@@@@"+netAmt);
 							netAmtFinal=getRequiredDecimal(netAmt,2);
 							System.out.println("netAmtFinal@@@@@@@@@"+netAmtFinal);
@@ -3768,6 +3825,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 								returnTransitRepl=0.0;
 								billRetQtyBonus=0.0;
 								retFreeQtyAll=0.0;
+								returnTransitRepl=0;
+								returnReciptRepl=0;
 								replQtyList=null;
 								replQtyList = GetReplacementList(custCodeHd,orderType,itemSerHd,siteCodeHd,selectedInvList,transitInvList,itemCodeLast,frmDateTstmp,toDateTstmp,prdFrmDateTstmp,prdtoDateTstmp,conn);
 								returnReciptRepl=replQtyList.get(0);
@@ -3777,7 +3836,8 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 								sretRate=replQtyList.get(4);
 								sretRate=getRequiredDcml(sretRate,3);
 								System.out.println("replQtyAll>>>>>>"+replQtyAll+">>>>>>"+itemCode);
-								sretQtyAllTot= billRetQty - replQtyAll -retFreeQtyAll ;
+								//sretQtyAllTot= billRetQty - replQtyAll -retFreeQtyAll ;
+								sretQtyAllTot= billRetQty - returnReciptRepl -billRetQtyBonus ;
 								System.out.println("sretQtyAllTot @@@@@@@@@@@!!!!!!:"+sretQtyAllTot);
 								
 							
@@ -7268,9 +7328,9 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					//"and srn.site_code= ? " +
 					//" and srn.item_ser in ("+itemSer+") " +
 					"and srn.tran_date >= ? " +
-					"and srn.tran_date <= ? " +
+					"and srn.tran_date <= ? and srn.confirmed='Y' " +
 					"and ( item.item_ser in ("+itemSer+") OR((item.item_ser,item.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN("+itemSer+") )) ) " +
-					"and sdet.ret_rep_flag in('R') " +
+					"and sdet.ret_rep_flag in('R','P') " +
 					"and srn.cust_code=? ";