changes in pophelp query

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

webitm-dis/module-resource/sql/DI3HSUN008.sql

@@ -346,17 +346,36 @@ values
 
 
 update pophelp set sql_str= 
-'select distinct invoice_id from(
-  select case when nvl(tt.quantity,0) <> nvl(dt.quantity,0) then 
-tt.invoice_id else ''NOT'' end invoice_id from ( select inv.invoice_id,tr.item_code,tr.lot_no,tr.lot_sl,tr.inv_line_no,sum(nvl(tr.quantity,0)) quantity
-    from invoice_trace tr join invoice inv on inv.invoice_id = tr.invoice_id and inv.site_code = ''?'' and  
- inv.cust_code__bil = ''?'' group by inv.invoice_id,tr.item_code,tr.lot_no,tr.lot_sl,tr.inv_line_no
-  ) tt  left outer join (select substr(rcp.remarks,-10) remarks,drcp.item_code,drcp.lot_no,drcp.lot_sl,drcp.line_no__invtrace,sum(nvl(drcp.quantity,0)) quantity
-    from misc_drcr_rcp rcp join misc_drcr_rdet drcp on drcp.tran_id = rcp.tran_id where drcp.item_code is not null 
-    group by substr(rcp.remarks,-10),drcp.item_code,drcp.lot_no,drcp.lot_sl,drcp.line_no__invtrace
-  ) dt on dt.remarks = tt.invoice_id and tt.item_code = dt.item_code and 
-tt.lot_no = dt.lot_no and tt.lot_sl = dt.lot_sl and tt.inv_line_no =
-dt.line_no__invtrace 
+'select distinct invoice_id
+from
+(
+  select case when nvl(tt.quantity,0) <> nvl(dt.quantity,0) then tt.invoice_id else ''NOT'' end invoice_id 
+  from
+  (
+    select inv.invoice_id,tr.item_code,tr.lot_no,tr.lot_sl,tr.inv_line_no,sum(nvl(tr.quantity,0)) quantity 
+    from invoice_trace tr 
+    join invoice inv on inv.invoice_id = tr.invoice_id and inv.site_code = ''?'' and inv.cust_code__bil = ''?'' 
+    group by inv.invoice_id, tr.item_code, tr.lot_no, tr.lot_sl, tr.inv_line_no 
+  ) tt 
+  left outer join 
+  (
+    select max(quantity) quantity,remarks,item_code,lot_no,lot_sl,line_no__trace 
+    from 
+    (
+      select rcp.invoice_id remarks,drcp.item_code,drcp.lot_no,drcp.lot_sl,drcp.line_no__trace,sum(nvl(drcp.quantity__resale,0)) quantity 
+      from spl_sales_por_hdr rcp 
+      join spl_sales_por_det drcp on drcp.tran_id = rcp.tran_id 
+      where drcp.line_no__trace is not null 
+      group by rcp.invoice_id, drcp.item_code, drcp.lot_no, drcp.lot_sl, drcp.line_no__trace 
+      union all 
+      select substr(rcp.remarks,-10) remarks,drcp.item_code,drcp.lot_no,drcp.lot_sl,drcp.line_no__invtrace,sum(nvl(drcp.quantity,0)) quantity 
+      from misc_drcr_rcp rcp 
+      join misc_drcr_rdet drcp on drcp.tran_id = rcp.tran_id 
+      where drcp.line_no__invtrace is not null 
+      group by substr(rcp.remarks,-10),drcp.item_code,drcp.lot_no,drcp.lot_sl,drcp.line_no__invtrace 
+    ) inner 
+    group by remarks,item_code,lot_no,lot_sl,line_no__trace 
+  ) dt on dt.remarks = tt.invoice_id and tt.item_code = dt.item_code and tt.lot_no = dt.lot_no and tt.lot_sl = dt.lot_sl and tt.inv_line_no = dt.line_no__trace  
 ) datatable 
 where invoice_id <> ''NOT'' 
 order by invoice_id'