Browse Source

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

沈静伟 4 years ago
parent
commit
17209f7ab4

+ 2 - 2
src/apps/tinvoiceapply/tinvoiceapply.java

@@ -229,7 +229,7 @@ public class tinvoiceapply extends PaoCust {
                 sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                 sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                 int n = 0;
                 int n = 0;
                 while (sainvoicedetailSet.getPao(n) != null) {
                 while (sainvoicedetailSet.getPao(n) != null) {
-                    if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("").equals("关闭")) {
+                    if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("fstatus").equals("关闭")) {
                         double famount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货金额
                         double famount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货金额
                         double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货单已开票金额
                         double finvoiceamount_sainvoice = sainvoicedetailSet.getPao(n).getDouble("famount");//发货单已开票金额
                         if (famount_sainvoice > finvoiceamount_sainvoice) {
                         if (famount_sainvoice > finvoiceamount_sainvoice) {
@@ -268,7 +268,7 @@ public class tinvoiceapply extends PaoCust {
                 sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                 sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                 int n = 0;
                 int n = 0;
                 while (sainvoicedetailSet.getPao(n) != null) {
                 while (sainvoicedetailSet.getPao(n) != null) {
-                    if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("").equals("关闭")) {
+                    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("famount");//发货单已开票金额
                         if (finvoiceamount_sainvoice > 0) {//表示已开票
                         if (finvoiceamount_sainvoice > 0) {//表示已开票
                             double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额
                             double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额

+ 1 - 1
src/apps/tinvoicebill/tinvoicebill.java

@@ -172,7 +172,7 @@ public class tinvoicebill extends PaoCust {
                                     sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                                     sainvoicedetailSet.setOrderBy("sainvoicedetailid");
                                     int n = 0;
                                     int n = 0;
                                     while (sainvoicedetailSet.getPao(n) != null) {
                                     while (sainvoicedetailSet.getPao(n) != null) {
-                                        if (sainvoicedetailSet.getPao(n).getPaoSet("SAINVOICE").getPao(0).getString("").equals("关闭")) {
+                                        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("famount");//发货单已开票金额
                                             if (finvoiceamount_sainvoice > 0) {//表示已开票
                                             if (finvoiceamount_sainvoice > 0) {//表示已开票
                                                 double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额
                                                 double fneedinvoiceamount_sainvoice = finvoiceamount_sainvoice;//发货单应减开票金额