开票申请，自动开票更新订单改为审核时更新，取消发票查询成功的更新逻辑

src/apps/tinvoiceapply/tinvoiceapply.java

@@ -175,34 +175,34 @@ public class tinvoiceapply extends PaoCust {
 
     public void check(boolean ischeck) throws P2Exception {
         if (ischeck) {
-            if ("手工".equalsIgnoreCase(getString("ftype"))) {
-                PaoSetRemote tinvoiceapplyorderSet = getPaoSet("tinvoiceapplyorder");
-                int i = 0;
-                PaoRemote detailpao = null;
-                while ((detailpao = tinvoiceapplyorderSet.getPao(i)) != null) {
-                    double finvoiceamount_detail = detailpao.getDouble("finvoiceamount");//本次开票金额
-                    PaoRemote saorderdetail = detailpao.getPaoSet("saorderdetail").getPao(0);
-                    double finvoiceamount_order = saorderdetail.getDouble("finvoiceamount");//订单已开票金额
-                    saorderdetail.setValue("finvoiceamount", Math.add(finvoiceamount_order, finvoiceamount_detail), 111L);
-                    i++;
-                }
+            //if ("手工".equalsIgnoreCase(getString("ftype"))) {
+            PaoSetRemote tinvoiceapplyorderSet = getPaoSet("tinvoiceapplyorder");
+            int i = 0;
+            PaoRemote detailpao = null;
+            while ((detailpao = tinvoiceapplyorderSet.getPao(i)) != null) {
+                double finvoiceamount_detail = detailpao.getDouble("finvoiceamount");//本次开票金额
+                PaoRemote saorderdetail = detailpao.getPaoSet("saorderdetail").getPao(0);
+                double finvoiceamount_order = saorderdetail.getDouble("finvoiceamount");//订单已开票金额
+                saorderdetail.setValue("finvoiceamount", Math.add(finvoiceamount_order, finvoiceamount_detail), 111L);
+                i++;
             }
+            //}
             setValue("fstatus", "审核", 11L);
             setValue("checkby", getUserName(), 11L);
             setValue("checkdate", getDateTime(), 11L);
         } else {
-            if ("手工".equalsIgnoreCase(getString("ftype"))) {
-                PaoSetRemote tinvoiceapplyorderSet = getPaoSet("tinvoiceapplyorder");
-                int i = 0;
-                PaoRemote detailpao = null;
-                while ((detailpao = tinvoiceapplyorderSet.getPao(i)) != null) {
-                    double finvoiceamount_detail = detailpao.getDouble("finvoiceamount");//本次开票金额
-                    PaoRemote saorderdetail = detailpao.getPaoSet("saorderdetail").getPao(0);
-                    double finvoiceamount_order = saorderdetail.getDouble("finvoiceamount");//订单已开票金额
-                    saorderdetail.setValue("finvoiceamount", Math.sub(finvoiceamount_order, finvoiceamount_detail), 111L);
-                    i++;
-                }
+            //if ("手工".equalsIgnoreCase(getString("ftype"))) {
+            PaoSetRemote tinvoiceapplyorderSet = getPaoSet("tinvoiceapplyorder");
+            int i = 0;
+            PaoRemote detailpao = null;
+            while ((detailpao = tinvoiceapplyorderSet.getPao(i)) != null) {
+                double finvoiceamount_detail = detailpao.getDouble("finvoiceamount");//本次开票金额
+                PaoRemote saorderdetail = detailpao.getPaoSet("saorderdetail").getPao(0);
+                double finvoiceamount_order = saorderdetail.getDouble("finvoiceamount");//订单已开票金额
+                saorderdetail.setValue("finvoiceamount", Math.sub(finvoiceamount_order, finvoiceamount_detail), 111L);
+                i++;
             }
+            // }
             setValue("fstatus", "提交", 11L);
             setValue("checkby", "", 11L);
             setValue("checkdate", "", 11L);

src/apps/tinvoicebill/tinvoicebill.java

@@ -107,9 +107,9 @@ public class tinvoicebill extends PaoCust {
      * @return
      */
     public void queryInvoice() throws P2Exception {
-        if (getString("status").equals("2")) {
-            return;
-        }
+        // if (getString("status").equals("2")) {
+        //return;
+        //}
         String finvoiceserialnum = getString("finvoiceserialnum");//·¢Æ±Á÷Ë®ºÅ
 
         JSONObject contentObject = new JSONObject();
@@ -148,22 +148,22 @@ public class tinvoicebill extends PaoCust {
                     }
                     createPrintStr(getString("invoiceCode"), getString("invoiceNo"), Double.parseDouble(resultObject.getString("orderAmount")));
                     // if ("ºì".equals(getString("frb"))) {
-                    DBConnect dbConnect = new DBConnect();
-                    Rows rows = dbConnect.runSqlQuery("select t3.saorderdetailid,sum(t2.taxincludedamount)as taxincludedamount from tinvoicebill t1\n" +
-                            "inner join tinvoicebillitem t2 on t1.siteid=t2.siteid and t1.tinvoiceapplyid=t2.tinvoiceapplyid and t1.tinvoicebillid=t2.tinvoicebillid\n" +
-                            "inner join tinvoiceapplyorder t3 on t2.siteid=t3.siteid and t2.tinvoiceapplyid=t3.tinvoiceapplyid and t2.tinvoiceapplyordid=t3.tinvoiceapplyordid\n" +
-                            "where t1.tinvoicebillid='" + getUniqueIDValue() + "' group by t3.saorderdetailid");
-                    PaoSetRemote saorderdetailSet = getPaoSet("$saorderdetail", "saorderdetail", "siteid='" + getString("siteid") + "' and saorderdetailid in " + rows.getInWhere("saorderdetailid"));
-                    int i = 0;
-                    while (saorderdetailSet.getPao(i) != null) {
-                        for (Row row : rows) {
-                            if (saorderdetailSet.getPao(i).getUniqueIDValue() == row.getInteger("saorderdetailid")) {
-                                double foldinvoiceamount = saorderdetailSet.getPao(i).getDouble("finvoiceamount");
-                                saorderdetailSet.getPao(i).setValue("finvoiceamount", Math.add(foldinvoiceamount, row.getDouble("taxincludedamount")), 11L);
-                            }
-                        }
-                        i++;
-                    }
+//                    DBConnect dbConnect = new DBConnect();
+//                    Rows rows = dbConnect.runSqlQuery("select t3.saorderdetailid,sum(t2.taxincludedamount)as taxincludedamount from tinvoicebill t1\n" +
+//                            "inner join tinvoicebillitem t2 on t1.siteid=t2.siteid and t1.tinvoiceapplyid=t2.tinvoiceapplyid and t1.tinvoicebillid=t2.tinvoicebillid\n" +
+//                            "inner join tinvoiceapplyorder t3 on t2.siteid=t3.siteid and t2.tinvoiceapplyid=t3.tinvoiceapplyid and t2.tinvoiceapplyordid=t3.tinvoiceapplyordid\n" +
+//                            "where t1.tinvoicebillid='" + getUniqueIDValue() + "' group by t3.saorderdetailid");
+//                    PaoSetRemote saorderdetailSet = getPaoSet("$saorderdetail", "saorderdetail", "siteid='" + getString("siteid") + "' and saorderdetailid in " + rows.getInWhere("saorderdetailid"));
+//                    int i = 0;
+//                    while (saorderdetailSet.getPao(i) != null) {
+//                        for (Row row : rows) {
+//                            if (saorderdetailSet.getPao(i).getUniqueIDValue() == row.getInteger("saorderdetailid")) {
+//                                double foldinvoiceamount = saorderdetailSet.getPao(i).getDouble("finvoiceamount");
+//                                saorderdetailSet.getPao(i).setValue("finvoiceamount", Math.add(foldinvoiceamount, row.getDouble("taxincludedamount")), 11L);
+//                            }
+//                        }
+//                        i++;
+//                    }
                     //}
                 }
             }