sales return and replacement quantity and changes sretrun item_ser to item...

sales return and replacement quantity and changes sretrun item_ser to item master item_ser condition


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

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

@@ -2844,20 +2844,22 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 								System.out.println("tranName (case 3):"+tranName);
 							
 							System.out.println("dlvFlag is :"+dlvFlag+ "invoice :"+invoiceId);
-							sreturnCnt=0;
-							sql= "SELECT count(*)  FROM sreturn WHERE tran_id=?";
+							/*sreturnCnt=0;
+							sql= "SELECT tran_id,net_amt  FROM sreturn WHERE tran_id=?";
 							pstmt1 = conn.prepareStatement(sql);
 							pstmt1.setString(1, invoiceId);
 							rs1 = pstmt1.executeQuery();
 							if(rs1.next())
 							{
-								sreturnCnt = rs1.getInt(1);
+								//sreturnCnt = rs1.getInt(1);
+								sreturnCnt=checkNull(rs1.getString("tran_id")).trim().length();
+								netAmt=rs1.getDouble("net_amt");
 								
 							}
 							rs1.close();
 							rs1 = null;
 							pstmt1.close();
-							pstmt1 = null;
+							pstmt1 = null;*/
 							netAmt=0;
 							sql= "select quantity__stduom,rate__stduom " +
 									" from invoice_trace where invoice_id=? and item_ser__prom in ("+resultItemSer+") ";
@@ -2879,6 +2881,23 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							pstmt1 = null;
 
 							System.out.println("netAmt*********>>"+netAmt);
+							sreturnCnt=0;
+							sql= "SELECT tran_id,net_amt  FROM sreturn WHERE tran_id=?";
+							pstmt1 = conn.prepareStatement(sql);
+							pstmt1.setString(1, invoiceId);
+							rs1 = pstmt1.executeQuery();
+							if(rs1.next())
+							{
+								//sreturnCnt = rs1.getInt(1);
+								sreturnCnt=checkNull(rs1.getString("tran_id")).trim().length();
+								netAmt=rs1.getDouble("net_amt");
+								
+							}
+							rs1.close();
+							rs1 = null;
+							pstmt1.close();
+							pstmt1 = null;
+							System.out.println("netAmt***after sreturn******>>"+netAmt);
 							/*netAmtStr = Double.toString(netAmt);
 							String[] arrStr =netAmtStr.split("\\.");
 							decimalNumber = Integer.parseInt(arrStr[1]);
@@ -2923,7 +2942,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							valueXmlString.append("<dlv_flg>").append("<![CDATA["+dlvFlag+"]]>").append("</dlv_flg>");
 							}
 							//valueXmlString.append("<net_amt>").append("<![CDATA["+netAmtFinal+"]]>").append("</net_amt>");
-							valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(netAmt)+"]]>").append("</net_amt>");
+							//valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(netAmt)+"]]>").append("</net_amt>");
 							
 							valueXmlString.append("<lr_no>").append("<![CDATA["+lrNo+"]]>").append("</lr_no>");
 							if(lrDate != null)
@@ -2940,9 +2959,11 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							if(sreturnCnt>0)
 							{
 								valueXmlString.append("<invoice_flag>").append("<![CDATA[RET]]>").append("</invoice_flag>");
+								valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(netAmt)+"]]>").append("</net_amt>");
 							}else
 							{
 								valueXmlString.append("<invoice_flag>").append("<![CDATA[INV]]>").append("</invoice_flag>");
+								valueXmlString.append("<net_amt>").append("<![CDATA["+(long)Math.round(netAmt)+"]]>").append("</net_amt>");
 							}
 							valueXmlString.append("</Detail2>");
 							
@@ -3050,11 +3071,13 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 						" 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,srn.net_amt,sdet.tran_id as tran_id " +
-						"from sreturn srn,sreturndet sdet where srn.tran_id=sdet.tran_id " +
+						"from sreturn srn,sreturndet sdet,item itm where srn.tran_id=sdet.tran_id " +
 						//"and srn.site_code= ? " +
-						"and srn.item_ser in ("+resultItemSer+") " +
+						//"and srn.item_ser in ("+resultItemSer+") " +
+						" and sdet.item_code=itm.item_code "+
+						"and itm.item_ser in ("+resultItemSer+") " +
 						"and srn.tran_date >= ? and srn.tran_date <= ? " +
-						"and sdet.ret_rep_flag in ('P') and srn.cust_code=? and srn.confirmed='Y' ORDER BY invoice_date";
+						"and sdet.ret_rep_flag in ('R') and srn.cust_code=? and srn.confirmed='Y' ORDER BY invoice_date";
 					
 					
 					pstmt = conn.prepareStatement(sql);
@@ -3161,6 +3184,22 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 							pstmt1.close();
 							pstmt1 = null;
 							System.out.println("netAmt@@@@@@@@@"+netAmt);
+							
+							sql= "SELECT net_amt  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");
+								
+							}
+							rs1.close();
+							rs1 = null;
+							pstmt1.close();
+							pstmt1 = null;
+							System.out.println("netAmt@@@@sreturnAdd@@@@@"+netAmt);
 							netAmtFinal=getRequiredDecimal(netAmt,2);
 							System.out.println("netAmtFinal@@@@@@@@@"+netAmtFinal);
 							//netAmtStr = Double.toString(netAmtFinal);
@@ -4737,7 +4776,7 @@ public class CustStockGWTIC extends ValidatorEJB implements CustStockGWTICLocal,
 				if (currentColumn.trim().equalsIgnoreCase("itm_default_add"))
 				{
 					System.out.println("itm_default_add  called");
-					Node detail1Node = dom2.getElementsByTagName("Detail2").item(0);
+					Node detail1Node = dom2.getElementsByTagName("Detail1").item(0);
 					tranIdNew = checkNull(genericUtility.getColumnValueFromNode("tran_id", detail1Node));
 					System.out.println("tranIdNew for add new record>>>"+tranIdNew);
 					
@@ -7230,8 +7269,8 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 					//" and srn.item_ser in ("+itemSer+") " +
 					"and srn.tran_date >= ? " +
 					"and srn.tran_date <= ? " +
-					"and ( srn.item_ser in ("+itemSer+") OR((srn.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('P') " +
+					"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 srn.cust_code=? ";
 			
 			
@@ -8213,15 +8252,17 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 				sql =" SELECT A.TRAN_ID,B.QUANTITY__STDUOM QUANTITY,B.RATE__STDUOM RATE, B.ITEM_CODE ITEM_CODE, "
 						+ " A.SITE_CODE SITE_CODE, B.LOC_CODE LOC_CODE, "
 						+ " B.LOT_NO LOT_NO, B.LOT_SL LOT_SL, B.RET_REP_FLAG RET_REP_FLAG,B.line_type "
-						+ " FROM  SRETURN A, SRETURNDET B "
-						+ " WHERE A.TRAN_ID = B.TRAN_ID "
+						+ " FROM  SRETURN A, SRETURNDET B ,ITEM ITEM "
+						+ " WHERE A.TRAN_ID = B.TRAN_ID " 
+						+ " AND ITEM.ITEM_CODE=B.ITEM_CODE "
 						+ " AND A.CUST_CODE = ? "
 						+ " AND A.TRAN_DATE >= ? "
 						+ " AND A.TRAN_DATE <= ? "
 						+ " AND B.ITEM_CODE = ? "
 						//+ " AND A.SITE_CODE = ? "
 						//+"	  and a.item_ser in ("+itemSer+") ";
-						+ " and ( A.item_ser in ("+itemSer+") OR((A.item_ser,B.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN("+itemSer+") )) ) " ;
+						//+ " and ( A.item_ser in ("+itemSer+") OR((A.item_ser,B.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN("+itemSer+") )) ) " ;
+						+ " and ( ITEM.item_ser in ("+itemSer+") OR((ITEM.item_ser,B.ITEM_CODE) IN (select item_ser,item_code from item_credit_perc WHERE item_ser  NOT IN("+itemSer+") )) ) " ;
 						pstmt = conn.prepareStatement(sql);
 						pstmt.setString(1,custCode);
 						pstmt.setTimestamp(2,fromDate );
@@ -8256,7 +8297,7 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							lineTypeAll = ( lineTypeAll == null || lineTypeAll.trim().length() == 0 ) ? "" : lineTypeAll.trim();
 							System.out.println("retRepFlagAll :"+retRepFlagAll);
 							
-							selQuery = "SELECT INV_STAT FROM STOCK  "
+							/*selQuery = "SELECT INV_STAT FROM STOCK  "
 									+ " WHERE ITEM_CODE = ? "
 									+ " AND SITE_CODE = ? "
 									+ " AND LOC_CODE  = ? "
@@ -8295,7 +8336,26 @@ private double GetFreeQty(String custCode,String itemCode,String itemSer,String
 							rs1.close();
 							rs1 = null;
 							pstmt1.close();
-							pstmt1 = null;
+							pstmt1 = null;*/
+							
+
+							if(isSelected(selectedInvList,sretunTranId) && "P".equalsIgnoreCase(retRepFlagAll.trim()) )
+							{
+								 returnReciptRepl+= sretQtyAll;
+							}
+							if (isSelected(selectedInvList,sretunTranId) && "R".equalsIgnoreCase(retRepFlagAll.trim())  )
+							{
+								billRetQty += sretQtyAll;
+								
+							} 
+							if(isSelected(transitInvList,sretunTranId) && "P".equalsIgnoreCase(retRepFlagAll.trim()) )
+							{
+								 returnTransitRepl+= sretQtyAll;
+							} 
+							if (isSelected(selectedInvList,sretunTranId) && "F".equalsIgnoreCase(lineTypeAll.trim()) && "R".equalsIgnoreCase(retRepFlagAll.trim()) )
+							{
+								billRetQtyBonus += sretQtyAll;
+							}	
 							
 						}