Jelajahi Sumber

开票订单行选择错误修复

沈静伟 4 tahun lalu
induk
melakukan
07b4c93f48

+ 3 - 3
src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/开票订单行选择查询_审核订单.sql

@@ -1,6 +1,6 @@
 select
 select
 t1.fsonum,t1.saorderdetailid,sa.saorderid,t1.frownum,t1.fitemno,t1.fitemname,t1.fmodel,t1.fspec,t1.frateamount,t1.frateprice,t1.fwriteoffamount
 t1.fsonum,t1.saorderdetailid,sa.saorderid,t1.frownum,t1.fitemno,t1.fitemname,t1.fmodel,t1.fspec,t1.frateamount,t1.frateprice,t1.fwriteoffamount
-,t2.freceivedamount,tp.fprojectname,sdate.closedate1,(isnull(t1.frateamount,0)-isnull(t1.finvoiceamount,0)-isnull(t3.finvoiceamount,0)) as fcaninvoiceamount from saorderdetail t1
+,t2.freceivedamount,tp.fprojectname,sdate.closedate1,(isnull(t1.frateamount,0)-isnull(t1.finvoiceamount,0)-isnull(t4.finvoiceamount,0)) as fcaninvoiceamount from saorderdetail t1
 left join saorder_receivedview t2 on t1.siteid=t2.siteid and t1.saorderdetailid=t2.saorderdetailid
 left join saorder_receivedview t2 on t1.siteid=t2.siteid and t1.saorderdetailid=t2.saorderdetailid
 inner join tagents t3 on t1.siteid=t3.siteid and t3.fagentnum=$fagentnum$ and fcheckordermakeinv=1
 inner join tagents t3 on t1.siteid=t3.siteid and t3.fagentnum=$fagentnum$ and fcheckordermakeinv=1
 inner join saorder sa on t1.fparentid = sa.saorderid and sa.fpayagentnum=$fagentnum$ and sa.fstatus in('ÉóºË','¹Ø±Õ')
 inner join saorder sa on t1.fparentid = sa.saorderid and sa.fpayagentnum=$fagentnum$ and sa.fstatus in('ÉóºË','¹Ø±Õ')
@@ -11,8 +11,8 @@ left join (
     inner join tinvoiceapplyorder t2 on  t1.siteid=t2.siteid and t1.saorderdetailid=t2.saorderdetailid
     inner join tinvoiceapplyorder t2 on  t1.siteid=t2.siteid and t1.saorderdetailid=t2.saorderdetailid
     inner join tinvoiceapply t3 on t2.siteid=t3.siteid and t2.tinvoiceapplyid=t3.tinvoiceapplyid
     inner join tinvoiceapply t3 on t2.siteid=t3.siteid and t2.tinvoiceapplyid=t3.tinvoiceapplyid
     where t3.fstatus='Ìá½»' and t1.siteid=$siteid$ group by t1.saorderdetailid
     where t3.fstatus='Ìá½»' and t1.siteid=$siteid$ group by t1.saorderdetailid
-) t3 on t1.saorderdetailid=t3.saorderdetailid
+) t4 on t1.saorderdetailid=t4.saorderdetailid
 where t1.siteid=$siteid$ and isnull(t1.frateamount,0)>isnull(t1.finvoiceamount,0)
 where t1.siteid=$siteid$ and isnull(t1.frateamount,0)>isnull(t1.finvoiceamount,0)
 and not exists(
 and not exists(
     select *from tinvoiceapplyorder where siteid=$siteid$ and tinvoiceapplyid=$tinvoiceapplyid$ and saorderdetailid=t1.saorderdetailid
     select *from tinvoiceapplyorder where siteid=$siteid$ and tinvoiceapplyid=$tinvoiceapplyid$ and saorderdetailid=t1.saorderdetailid
-) and $where$ and (isnull(t2.freceivedamount,0)-isnull(t1.finvoiceamount,0)-isnull(t3.finvoiceamount,0))>0
+) and $where$ and (isnull(t2.freceivedamount,0)-isnull(t1.finvoiceamount,0)-isnull(t4.finvoiceamount,0))>0