Changes came for ER5 by Tushar.

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

webitm-wms/module-resource/jrxml/window jrxml/d_er5.jrxml

 <?xml version="1.0" encoding="UTF-8"?>
 <jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="ER5" pageWidth="842" pageHeight="595" orientation="Landscape" columnWidth="802" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20">
-	<property name="ireport.zoom" value="1.5"/>
+	<property name="ireport.zoom" value="0.75"/>
 	<property name="ireport.x" value="0"/>
-	<property name="ireport.y" value="164"/>
+	<property name="ireport.y" value="0"/>
 	<parameter name="AS_SITE_CODE" class="java.lang.String"/>
 	<parameter name="FROM_DATE" class="java.util.Date"/>
 	<parameter name="TO_DATE" class="java.util.Date"/>
 	<queryString>
-		<![CDATA[SELECT  (SITE.DESCR||','||SITE.ADD1||','||SITE.CITY) AS SITEADD,
+		<![CDATA[SELECT    (SITE.DESCR||','||SITE.ADD1||','||SITE.CITY) AS SITEADD,
           BOM.BOM_CODE AS BOMCODE,
           BOMDET.ITEM_CODE,
           SITEREGNO.REG_NO AS REGNO,
@@ -19,18 +19,19 @@
           BOM.UNIT AS FG_UNIT,
           BOM.BATCH_QTY AS FG_BATCH_SIZE,
           SUM(BOMDET.QTY_PER) AS QTY_REQD
-  FROM  SITE,SITEREGNO,ITEM,BOM,BOMDET,ITEM A
-  WHERE SITEREGNO.SITE_CODE = SITE.SITE_CODE
-  AND SITEREGNO.REF_CODE    = 'EXC_ECCNO'
-  AND ITEM.ITEM_CODE        = BOMDET.ITEM_CODE
-  AND A.ITEM_CODE           = BOM.ITEM_CODE
-  AND BOMDET.BOM_CODE       = BOM.BOM_CODE
-  AND BOMDET.ITEM_CATEGORY  = 'A'
-  AND BOM.ACTIVE            = 'Y'
-  AND SITE.SITE_CODE        = $P{AS_SITE_CODE}
-  AND BOM.BOM_CODE IN ( SELECT DISTINCT BOM_CODE
-                          FROM WORKORDER
-                       WHERE REL_DATE BETWEEN $P{FROM_DATE} AND $P{TO_DATE} )
+FROM      BOM,BOMDET,SITE,SITEREGNO,ITEM,ITEM A
+where     bom.bom_code         = bomdet.bom_code
+and       bomdet.item_code     = item.item_code
+and       bom.item_code        = a.item_code
+and       bom.active           = 'Y'
+and       bom.confirmed        = 'Y'
+and       bomdet.item_category = 'A'
+and       bomdet.crit_item     = 'Y'
+and       site.site_code       = siteregno.site_code
+and       siteregno.ref_code   = 'EXC_ECCNO'
+and      (BOM.BOM_CODE,site.site_code)   IN ( SELECT DISTINCT BOM_CODE,site_code FROM WORKORDER                                               WHERE  site_code = '$P!{AS_SITE_CODE}'
+                                              and ord_DATE BETWEEN $P{FROM_DATE}
+                                                               and $P{TO_DATE})
   GROUP BY (SITE.DESCR||','||SITE.ADD1||','||SITE.CITY),
           BOM.BOM_CODE,
           BOMDET.ITEM_CODE,