From b7b9d28bb091bf673b4899f50fd28fa1214ac7a3 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 26 六月 2024 18:10:37 +0800
Subject: [PATCH] GDN

---
 jrj/project/business/GDN3.maint.cpp |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index c59c3cd..60c633d 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/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)

--
Gitblit v1.9.3