订单详情发票及操作日志更新

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单主界面查询_发票.sql

@@ -9,6 +9,7 @@ from tinvoiceapplyorder t1
                                            t1.tinvoiceapplyordid = t2.tinvoiceapplyordid
          inner join tinvoicebill t3 on t2.siteid = t3.siteid and t2.tinvoiceapplyid = t3.tinvoiceapplyid and
                                        t2.tinvoicebillid = t3.tinvoicebillid
-where t3.status = 2
+         inner join tinvoiceapply t4 on t1.tinvoiceapplyid=t4.tinvoiceapplyid
+where (t3.status = 2 or t4.ftype='ÊÖ¹¤' )and t4.fstatus='ÉóºË'
   and t1.siteid =$siteid$
-  and t1.saorderid=$saorderid$
+  and t1.saorderid=$saorderid$

src/rest/openapi/restcontroller/wechatapp/saorder/SQL/订单操作日志查询.sql

@@ -74,7 +74,7 @@ from tinvoiceapply t1
                     on t2.siteid = t3.siteid and t2.tinvoiceapplyid = t3.tinvoiceapplyid and
                        t2.tinvoiceapplyordid = t3.tinvoiceapplyordid
          inner join tinvoicebill t4 on t3.siteid = t4.siteid and t3.tinvoiceapplyid = t4.tinvoiceapplyid and
-                                       t3.tinvoicebillid = t4.tinvoicebillid and t4.status = 2
+                                       t3.tinvoicebillid = t4.tinvoicebillid and (t4.status = 2 or t1.ftype='ÊÖ¹¤')
 where t1.fstatus = 'ÉóºË'
   and t1.siteid =$siteid$
   and t2.saorderid=$saorderid$