Просмотр исходного кода

经销商及业务员开票申请bug调整

沈静伟 4 лет назад
Родитель
Сommit
524ae716cd

+ 2 - 3
src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/经销商发票列表查询.sql

@@ -14,6 +14,5 @@ from tinvoiceapply t1
          left join tinvoiceapplyorder t2 on t1.siteid = t2.siteid and t1.tinvoiceapplyid = t2.tinvoiceapplyid
          left join tagents t3 on t1.siteid=t3.siteid and t1.fagentnum=t3.fagentnum
          where t1.siteid=$siteid$ and t1.fagentnum=$fagentnum$ and $where$
-group by t1.tinvoiceapplyid, t1.fbillnum, t1.createdate, t1.submitdate, t1.checkdate, t1.finvoicetaxnumber,
-         t1.finvoicename,
-         t1.finvoiceaddress, t1.fstatus
+group by t1.tinvoiceapplyid, t1.fbillnum,t1.fagentnum, t3.fagentname,t1.createdate, t1.submitdate, t1.checkdate,
+         t1.finvoicetaxnumber,t1.finvoicename,t1.finvoiceaddress, t1.fstatus

+ 1 - 1
src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/经销商发票列表查询_业务员.sql

@@ -15,6 +15,6 @@ from tinvoiceapply t1
          left join tagents t3 on t1.siteid=t3.siteid and t1.fagentnum=t3.fagentnum
          where t1.siteid=$siteid$ and $where$
          and exists (select fagentnum from tagents_field where hrid in $hrid$ and siteid=t1.siteid and fagentnum=t1.fagentnum )
-group by t1.tinvoiceapplyid, t1.fbillnum, t1.createdate, t1.submitdate, t1.checkdate, t1.finvoicetaxnumber,
+group by t1.tinvoiceapplyid, t1.fbillnum,t1.fagentnum, t3.fagentname, t1.createdate, t1.submitdate, t1.checkdate, t1.finvoicetaxnumber,
          t1.finvoicename,
          t1.finvoiceaddress, t1.fstatus

+ 2 - 3
src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/经销商发票详情查询.sql

@@ -15,6 +15,5 @@ from tinvoiceapply t1
          left join tinvoiceapplyorder t2 on t1.siteid = t2.siteid and t1.tinvoiceapplyid = t2.tinvoiceapplyid
           left join tagents t3 on t1.siteid=t3.siteid and t1.fagentnum=t3.fagentnum
          where t1.siteid=$siteid$ and t1.tinvoiceapplyid=$tinvoiceapplyid$
-group by t1.tinvoiceapplyid, t1.fbillnum, t1.createdate, t1.submitdate, t1.checkdate, t1.finvoicetaxnumber,
-         t1.finvoicename,
-         t1.finvoiceaddress, t1.fstatus,t1.fnotes
+group by t1.tinvoiceapplyid, t1.fbillnum, t1.fagentnum,t3.fagentname, t1.createdate, t1.submitdate, t1.checkdate, t1.finvoicetaxnumber,
+         t1.finvoicename,t1.finvoiceaddress, t1.fstatus,t1.fnotes