changes done for D-ISS & S-DSP

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

webitm-mfg/module-resource/sql/M17FSHL001/demandsupplyDetOracle.sql

@@ -25,6 +25,25 @@ select item_code, due_date, round(sum(demand)+ fn_get_sampleqty(item_code ,'@sit
           ( dist_demand.due_date <= to_date('@todate@')) AND 
           ( 0 = @madetostock@ ) 
          Group By dist_demand.tran_id ,'D-DEM' ,item.item_code__plan,dist_demand.due_date ,dist_demand.site_code 
+
+UNION ALL 
+         
+select invtrace.tran_id||'@'||invtrace.ref_id||'@'||invtrace.ref_line tran_id,invtrace.ref_ser as tran_ser, item.item_code__plan as item_code, invtrace.tran_date as due_date, sum(invtrace.eff_qty) as demand, 
+      0 as supply , 0 as stock_qty, 0 as oth_supply, 0 as pending_po, 0 as pending_do, 0 as pending_indent, 0 as pending_dr , invtrace.SITE_CODE 
+  from invtrace, item, location, invstat 
+  where ( invtrace.item_code = item.item_code ) and 
+			( location.loc_code = invtrace.loc_code)  and
+			( invstat.inv_stat = location.inv_stat) and
+			( invstat.stat_type <> 'S' ) and
+			nvl( invstat.plan_prod,'N')  =  'Y'  and
+			( invtrace.site_code in ('@sitecode@') ) and   
+			( item.item_code__plan = '@itemcode@') and 
+			( invtrace.tran_date >= to_date('@fromdate@'))   and 
+			( invtrace.tran_date <= to_date('@todate@'))   and 
+			( invtrace.ref_ser in ('D-ISS','S-DSP') )
+group by invtrace.tran_id||'@'||invtrace.ref_id||'@'||invtrace.ref_line,invtrace.ref_ser ,item.item_code__plan,invtrace.tran_date,invtrace.SITE_CODE 
+        
+         
 UNION ALL          
 
    SELECT  sales_demand.tran_id,'S-DEM' as tran_ser, item.item_code__plan as item_code, sales_demand.due_date as due_date, 

webitm-mfg/module-resource/sql/M17FSHL001/demandsupplyOracle.sql

@@ -26,7 +26,22 @@
           ( 0 = @madetostock@ ) 
 		 and trim(nvl((select si.mfg_type from siteitem si where si.site_code = dist_demand.site_code and si.item_code = item.item_code ),' ')) not in  ('O','D')		  
          Group By item.item_code__plan,dist_demand.due_date 
-	 
+UNION ALL
+   SELECT  item.item_code__plan  as item_code,invtrace.tran_date as due_date, 
+          sum(invtrace.eff_qty) as demand, 
+          0 as supply , 0 as stock_qty, 0 as oth_supply, 0 as pending_po, 0 as pending_do, 0 as pending_indent, 0 as pending_dr 
+     FROM invtrace, item, location, invstat 
+     WHERE ( invtrace.item_code = item.item_code ) and 
+			( location.loc_code = invtrace.loc_code)  and
+			( invstat.inv_stat = location.inv_stat) and
+			( invstat.stat_type <> 'S' ) and
+			NVL( invstat.plan_prod,'N')  =  'Y'  and
+			( invtrace.site_code in ('@sitecode@') ) AND   
+			( item.item_code__plan = '@itemcode@') AND 
+			( invtrace.tran_date >= to_date('@fromdate@'))   and 
+			( invtrace.tran_date <= to_date('@rundate@'))   and 
+			( invtrace.ref_ser in ('D-ISS','S-DSP') )
+         Group By item.item_code__plan,invtrace.tran_date 	 
  UNION ALL 
          SELECT   item.item_code__plan  as item_code,sales_demand.due_date as due_date, 
          sum(fn_get_avgpotency('@itemcode@' ,'@sitecode@',case when sales_demand.quantity__std_uom is null then 0 else sales_demand.quantity__std_uom end  - case when sales_demand.consumed_qty is null then 0 else sales_demand.consumed_qty end )) as demand , 
@@ -130,7 +145,6 @@ sum(pending_dr) pending_dr from
  0 as oth_supply, 0 as pending_po, 0 as pending_do, 0 as pending_indent, 0 as pending_dr 		   
  FROM   STOCK a, INVSTAT b , LOCATION c,item d 
  WHERE  a.loc_code = c.loc_code
- and fn_nearexp(a.item_code,a.site_code,a.loc_code,a.lot_no,a.lot_sl) = 'N'  
  AND    b.inv_stat = c.inv_stat
  AND    NVL(b.stat_type, ' ') <> 'S'
  AND   a.site_code = '@sitecode@'