开票申请，选择订单时取消税号过滤

src/apps/tinvoiceapply/tinvoiceapplyMlt.java

@@ -15,8 +15,10 @@ public class tinvoiceapplyMlt extends MultiselectDataBeanCust {
             String finvoicetaxnumber = pao.getString("finvoicetaxnumber");
             PaoSetRemote detailset = pao.getPaoSet("tinvoiceapplyorder");
             paoSet.setWhere("exists(select *from SAORDER_RECEIVEDVIEW where siteid=saorderdetail.siteid and saorderid=saorderdetail.fparentid and saorderdetailid=saorderdetail.saorderdetailid and isnull(freceivedamount,0)>isnull(saorderdetail.finvoiceamount,0) ) and " +
-                    "exists(select * from saorder where fstatus in('ÉóºË','¹Ø±Õ') and siteid=saorderdetail.siteid and saorderid=saorderdetail.fparentid and fpayagentnum='" + fagentnum +
-                    "' and finvoicetaxnumber='" + finvoicetaxnumber + "') and " +
+                    "exists(select * from saorder where fstatus in('ÉóºË','¹Ø±Õ') and siteid=saorderdetail.siteid and saorderid=saorderdetail.fparentid and fpayagentnum='" + fagentnum + "' " +
+                    //"and finvoicetaxnumber='" + finvoicetaxnumber + "'" +
+                    ") " +
+                    "and " +
                     getworlds(detailset, "saorderdetailid", "saorderdetailid"));
         } catch (Exception e) {
             paoSet.setWhere("1=2");

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/开票订单行选择查询.sql

@@ -10,7 +10,7 @@ exists(
 and exists(
         select * from saorder
         where fstatus in('ÉóºË','¹Ø±Õ') and siteid=t1.siteid
-        and saorderid=t1.fparentid and fpayagentnum=$fagentnum$ and finvoicetaxnumber=$finvoicetaxnumber$
+        and saorderid=t1.fparentid and fpayagentnum=$fagentnum$ --and finvoicetaxnumber=$finvoicetaxnumber$
 )
 and not exists(
     select *from tinvoiceapplyorder where siteid=$siteid$ and tinvoiceapplyid=$tinvoiceapplyid$ and saorderdetailid=t1.saorderdetailid

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/Tinvoiceapply.java

@@ -223,12 +223,12 @@ public class Tinvoiceapply extends Controller {
      * @return
      */
     public String querySaorderDetail() {
-        String finvoicetaxnumber = content.getString("finvoicetaxnumber");
+        //String finvoicetaxnumber = content.getString("finvoicetaxnumber");
         long tinvoiceapplyid = content.getLong("tinvoiceapplyid");
         SQLFactory factory = new SQLFactory(this, "¿ªÆ±¶©µ¥ÐÐÑ¡Ôñ²éѯ");
         factory.addParameter("siteid", siteid);
         factory.addParameter("fagentnum", fagentnum);
-        factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
+        //factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
         factory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
 
         DBConnect connect = new DBConnect();

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/Tinvoiceapply_saler.java

@@ -258,12 +258,12 @@ public class Tinvoiceapply_saler extends Controller {
      */
     public String querySaorderDetail() {
         String fagentnum = content.getString("fagentnum");
-        String finvoicetaxnumber = content.getString("finvoicetaxnumber");
+        //String finvoicetaxnumber = content.getString("finvoicetaxnumber");
         long tinvoiceapplyid = content.getLong("tinvoiceapplyid");
         SQLFactory factory = new SQLFactory(this, "¿ªÆ±¶©µ¥ÐÐÑ¡Ôñ²éѯ");
         factory.addParameter("siteid", siteid);
         factory.addParameter("fagentnum", fagentnum);
-        factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
+        //factory.addParameter("finvoicetaxnumber", finvoicetaxnumber);
         factory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
 
         DBConnect connect = new DBConnect();