GDN

LiFan

2024-06-26 b7b9d28bb091bf673b4899f50fd28fa1214ac7a3

GDN

 jrj/project/business/GDN3.maint.cpp

@@ -3883,12 +3883,12 @@
        if (dw_billnote.GetRowCount() < 1)
        {
            xstring billnote = L"<GDN><DocInfo><data><Item Name='报关发票' Field='Remark'></Item>" +
                xstring("<Item Name='报关箱单' Field='Remark'></Item>") +
                xstring("<Item Name='议付发票' Field='Remark'></Item>") +
                xstring("<Item Name='议付箱单' Field='Remark'></Item>") +
                xstring("<Item Name='装船通知' Field='Remark'></Item>") +
                xstring("<Item Name='加拿大海关发票' Field='Remark'></Item>") +
                xstring("<Item Name='FORMA' Field='Remark'></Item></data></DocInfo></GDN>");
                "<Item Name='报关箱单' Field='Remark'></Item>" +
                "<Item Name='议付发票' Field='Remark'></Item>" +
                "<Item Name='议付箱单' Field='Remark'></Item>" +
                "<Item Name='装船通知' Field='Remark'></Item>" +
                "<Item Name='加拿大海关发票' Field='Remark'></Item>") +
                "<Item Name='FORMA' Field='Remark'></Item></data></DocInfo></GDN>");
            x.loadXML(billnote);
            dw_billnote.Retrieve(x);
        }
@@ -3964,10 +3964,10 @@
            dPackages = dQty / sPRate.toDouble();
        }

        if ((dPackages * 1000).toInt() > dPackages.toInt() * 1000)
        if (((int)dPackages * 1000) > (int)dPackages * 1000)
            dPackages = dPackages + 1;

        return dPackages.toInt();
        return (int)dPackages;
    }

    xstring GetInvoiceID(xstring InvoiceNo)