Updated updatedwhsalesSumEjb

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

webitm-dashboard/ibase/dashboard/fin/ejb/UpdateDWHSalesSum.java

@@ -77,19 +77,19 @@ public class UpdateDWHSalesSum implements Schedule
 						.append(" ITEM_CODE, DOC_DATE,POS_CODE,SALES_QTY, GROSS_SALES_VALUE,FREE_QTY,FREE_SALES_VALUE, NET_SALES_QTY, ") 
 						.append("NET_SALES_VALUE, REPL_QTY, SALEABLE_RETURN_QTY, SALEABLE_RETURN_AMT, BREAKAGE_RETURN_QTY, BREAKAGE_RETURN_AMT, ") 
 						.append("EXPIRY_RETURN_QTY, EXPIRY_RETURN_AMT, CORRECTION_RETURN_QTY, CORRECTION_RETURN_AMT, REPL_RETURN_QTY, " ) 
-						.append("REPL_RETURN_VALUE, RETURN_QTY, GROSS_RETURN_VALUE, NET_RETURN_VALUE, HSN_CODE, PACK,DUE_DATE,REF_SER,CITY,ITEM_BRAND")
+						.append("REPL_RETURN_VALUE, RETURN_QTY, GROSS_RETURN_VALUE, NET_RETURN_VALUE, HSN_CODE, PACK,DUE_DATE,REF_SER,CITY,ITEM_BRAND,ITEM_SER")
 						.append(" ) ") 
-						.append("SELECT SUM(CGST_AMT) AS cgst_amt, ")
-						.append("  CGST_RATE, " )
-						.append("  SGST_RATE, " )
-						.append("  SUM(SGST_AMT) AS SGST_AMT, "  )
-						.append("  SUM(DISC_AMT) AS DISC_AMT, "  )
-						.append("  IGST_RATE, "  )
-						.append("  SUM(IGST_AMT), "  )
-						.append("  MRP, " )
-						.append("  PTR, " )
-						.append("  PTS, "  )
-						.append("  TRAN_ID,  "  )
+						.append("SELECT SUM(A.CGST_AMT) AS cgst_amt, ")
+						.append("  A.CGST_RATE, " )
+						.append("  A.SGST_RATE, " )
+						.append("  SUM(A.SGST_AMT) AS SGST_AMT, "  )
+						.append("  SUM(A.DISC_AMT) AS DISC_AMT, "  )
+						.append("  A.IGST_RATE, "  )
+						.append("  SUM(A.IGST_AMT), "  )
+						.append("  A.MRP, " )
+						.append("  A.PTR, " )
+						.append("  A.PTS, "  )
+						.append("  A.TRAN_ID,  "  )
 						.append("  A.SITE_CODE   AS SITE_CODE, " )
 						.append("  A.CUST_CODE   AS CUST_CODE, " ) 
 						.append("  A.ITEM_CODE   AS ITEM_CODE, " )
@@ -118,7 +118,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  A.HSN_CODE,A.PACK,A.DUE_DATE, "  ) 
 						.append("  '"+refSer+"' AS REF_SER, "  ) 
 						.append("  DC.CITY, "  ) 
-						.append("  ITEM_BRAND "  ) 
+						.append("  A.ITEM_BRAND, A.ITEM_SER "  ) 
 						.append(" FROM "  )
 						.append("  (SELECT NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS CHAR(3)),'CGST_TAX',' ',' ','T'),0) AS CGST_AMT, "   ) 
 						.append(" NVL(FN_RGET_TAX_NEW('S-INV',INVOICE_TRACE.INVOICE_ID,CAST(INVOICE_TRACE.line_no AS       CHAR(3)),'CGST_TAX',' ',' ','P'),0) AS CGST_RATE, "  ) 
@@ -141,6 +141,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  ITEM.HSN_NO   AS HSN_CODE, "   )
 						.append("  PACKING.DESCR AS PACK, "   )
 						.append("  ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, "   )
+						.append("  ITEM.ITEM_SER, "   )
 						.append("  TO_CHAR(INVOICE.DUE_DATE) AS DUE_DATE, "   )
 						.append(" ( "   )
 						.append(" CASE "   )
@@ -228,6 +229,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append(" ITEM.HSN_NO AS HSN_CODE, "  ) 
 						.append(" PACKING.DESCR AS PACK, "  ) 
 						.append(" ITEM.PHY_ATTRIB_2 AS ITEM_BRAND, "  ) 
+						.append("  ITEM.ITEM_SER, "   )
 						.append(" '' DUE_DATE, "  )
 						.append("  0 AS SALES_QTY, "  )
 						.append(" 0 AS GROSS_SALES_VALUE, "  )  
@@ -423,7 +425,7 @@ public class UpdateDWHSalesSum implements Schedule
 						.append("  A.PTR, " ) 
 						.append("  A.PTS,")
 						.append("  A.TRAN_ID,")
-						.append("  A.HSN_CODE,A.PACK, A.DUE_DATE,DC.CITY  ,A.ITEM_BRAND, A.IGST_RATE ");
+						.append("  A.HSN_CODE,A.PACK, A.DUE_DATE,DC.CITY  ,A.ITEM_BRAND, A.IGST_RATE,A.ITEM_SER ");
 	
 						pstmt = userDbConn.prepareStatement(sql.toString());
 						rs    = pstmt.executeQuery();