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

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

@@ -1,4 +1,4 @@
-select *from saorderdetail where
+select * from saorderdetail where
 siteid=$siteid$ and
 exists(
         select *from saorder_receivedview
@@ -11,5 +11,5 @@ and exists(
         and saorderid=saorderdetail.fparentid and fpayagentnum=$fagentnum$ and finvoicetaxnumber=$finvoicetaxnumber$
 )
 and not exists(
-    select *from tinvoiceapplyorder where siteid=$siteid and tinvoiceapplyid=$tinvoiceapplyid$ and saorderdetailid=saorderdetail.saorderdetailid
+    select *from tinvoiceapplyorder where siteid=$siteid$ and tinvoiceapplyid=$tinvoiceapplyid$ and saorderdetailid=saorderdetail.saorderdetailid
 )

src/rest/openapi/restcontroller/wechatapp/tinvoiceapply/SQL/经销商发票详情查询_订单行.sql

@@ -1,10 +1,10 @@
-select tinvoiceapplyordid,
-       finvoiceamount,
-       finvoiceqty,
-       fprice,
-       funinvoiceamount,
-       saorderdetailid,
-       saorderid,
+select t1.tinvoiceapplyordid,
+       t1.finvoiceamount,
+       t1.finvoiceqty,
+       t1.fprice,
+       t1.funinvoiceamount,
+       t1.saorderdetailid,
+       t1.saorderid,
        t2.frownum,
        t2.fsonum,
        t2.fitemno,

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

@@ -66,7 +66,7 @@ public class Tinvoiceapply extends Controller {
             orderFactory.addParameter("siteid", siteid);
             row.put("orderdetails", connect.runSqlQuery(orderFactory.getSQL()));
 
-            SQLFactory invoiceFactory = new SQLFactory(this, "经销商发票详情查询_订单行");
+            SQLFactory invoiceFactory = new SQLFactory(this, "经销商发票详情查询_发票");
             invoiceFactory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
             invoiceFactory.addParameter("siteid", siteid);
             row.put("invoices", connect.runSqlQuery(invoiceFactory.getSQL()));
@@ -129,7 +129,7 @@ public class Tinvoiceapply extends Controller {
                      */
                     detailPao = tinvoiceapplyorderset.addAtEnd();
                     detailPao.setValue("siteid", siteid, 11L);
-                    detailPao.setValue("tinvoiceapplyid", tinvoiceapplyid, 11L);
+                    detailPao.setValue("tinvoiceapplyid", tinvoiceapply.getUniqueIDValue(), 11L);
                     detailPao.setValue("saorderid", saorderid, 2L);
                     detailPao.setValue("saorderdetailid", saorderdetailid, 2L);
                 }
@@ -171,6 +171,7 @@ public class Tinvoiceapply extends Controller {
             tinvoiceapply tinvoiceapply = (tinvoiceapply) tinvoiceapplySet.getPao(0);
             tinvoiceapply.submitvalidate(true);
             tinvoiceapply.submit(true);
+            tinvoiceapplySet.save();
         } catch (Exception e) {
             return getReturnObject_err(e.getMessage()).toString();
         } finally {

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

@@ -74,7 +74,7 @@ public class Tinvoiceapply_saler extends Controller {
             orderFactory.addParameter("siteid", siteid);
             row.put("orderdetails", connect.runSqlQuery(orderFactory.getSQL()));
 
-            SQLFactory invoiceFactory = new SQLFactory(this, "经销商发票详情查询_订单行");
+            SQLFactory invoiceFactory = new SQLFactory(this, "经销商发票详情查询_发票");
             invoiceFactory.addParameter("tinvoiceapplyid", tinvoiceapplyid);
             invoiceFactory.addParameter("siteid", siteid);
             row.put("invoices", connect.runSqlQuery(invoiceFactory.getSQL()));
@@ -138,7 +138,7 @@ public class Tinvoiceapply_saler extends Controller {
                      */
                     detailPao = tinvoiceapplyorderset.addAtEnd();
                     detailPao.setValue("siteid", siteid, 11L);
-                    detailPao.setValue("tinvoiceapplyid", tinvoiceapplyid, 11L);
+                    detailPao.setValue("tinvoiceapplyid", tinvoiceapply.getUniqueIDValue(), 11L);
                     detailPao.setValue("saorderid", saorderid, 2L);
                     detailPao.setValue("saorderdetailid", saorderdetailid, 2L);
                 }
@@ -180,6 +180,7 @@ public class Tinvoiceapply_saler extends Controller {
             tinvoiceapply tinvoiceapply = (tinvoiceapply) tinvoiceapplySet.getPao(0);
             tinvoiceapply.submitvalidate(true);
             tinvoiceapply.submit(true);
+            tinvoiceapplySet.save();
         } catch (Exception e) {
             return getReturnObject_err(e.getMessage()).toString();
         } finally {