发货单新增已开票金额错误修复

src/apps/tinvoiceapply/tinvoiceapply.java

@@ -227,11 +227,13 @@ public class tinvoiceapply extends PaoCust {
                  */
                 PaoSetRemote sainvoicedetailSet = saorderdetail.getPaoSet("sainvoicedetail");
                 sainvoicedetailSet.setOrderBy("sainvoicedetailid");
+                System.err.println("发货单行"+sainvoicedetailSet.count());
                 int n = 0;
                 while (sainvoicedetailSet.getPao(n) != null) {
                     if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("fstatus").equals("关闭")) {
+                        System.err.println("发货单关闭");
                         double famount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货金额
-                        double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货单已开票金额
+                        double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("finvoiceamount");//发货单已开票金额
                         if (famount_sainvoice > finvoiceamount_sainvoice) {
                             double fneedinvoiceamount_sainvoice = Math.sub(famount_sainvoice, finvoiceamount_sainvoice);//发货单应开票数
                             if (fneedinvoiceamount_sainvoice > sainvoiceamount) {
@@ -240,6 +242,7 @@ public class tinvoiceapply extends PaoCust {
                             sainvoicedetailSet.getPao(n).setValue("finvoiceamount", Math.add(finvoiceamount_sainvoice, fneedinvoiceamount_sainvoice), 11L);
                             sainvoiceamount = Math.sub(sainvoiceamount, fneedinvoiceamount_sainvoice);
                         }
+
                     }
                     n++;
                 }
@@ -269,7 +272,7 @@ public class tinvoiceapply extends PaoCust {
                 int n = 0;
                 while (sainvoicedetailSet.getPao(n) != null) {
                     if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("fstatus").equals("关闭")) {
-                        double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货单已开票金额
+                        double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("finvoiceamount");//发货单已开票金额
                         if (finvoiceamount_sainvoice > 0) {//表示已开票
                             double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额
                             if (fneedinvoiceamount_sainvoice > sainvoiceamount) {

src/apps/tinvoicebill/tinvoicebill.java

@@ -173,7 +173,7 @@ public class tinvoicebill extends PaoCust {
                                     int n = 0;
                                     while (sainvoicedetailSet.getPao(n) != null) {
                                         if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("fstatus").equals("关闭")) {
-                                            double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货单已开票金额
+                                            double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("finvoiceamount");//发货单已开票金额
                                             if (finvoiceamount_sainvoice > 0) {//表示已开票
                                                 double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额
                                                 if (fneedinvoiceamount_sainvoice > sainvoiceamount) {