From 9f2becd15f9ec5aff1b8c1e7a618df2dc543288d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期三, 23 十月 2024 18:02:52 +0800
Subject: [PATCH] update

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

diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index 72a1372..ddb7942 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -197,7 +197,7 @@
 		
 		KXMLDOMDocument xitemdoc = xitem;
 		dw_item.DwUpdateAllToEx(xitemdoc);
-		if (xitem.xml() != L"")
+		if ((xstring)xitem.xml() != L"")
 		{
 			KXMLDOMElement eitem = xitemdoc.documentElement();
 			if (eitem) ebase.appendChild(eitem);
@@ -209,7 +209,7 @@
 		dw_source.DwUpdateAllToEx(xsourcedoc);
 
 
-		if (xsource.xml() != L"")
+		if ((xstring)xsource.xml() != L"")
 		{
 			KXMLDOMElement eitem1 = xitemdoc.documentElement();
 			if (eitem1) ebase.appendChild(eitem1);
@@ -219,7 +219,7 @@
 	
 		KXMLDOMDocument xcustomdoc = xcustom;
 		dw_source.DwUpdateAllToEx(xcustomdoc);
-		if (xcustom.xml() != L"")
+		if ((xstring)xcustom.xml() != L"")
 		{
 			KXMLDOMElement eitem2 = xitemdoc.documentElement();
 			if (eitem2) ebase.appendChild(eitem2);
@@ -633,14 +633,15 @@
 			}
 		}
 		xml xcustom;
-		
+		xstring error5;
 		dw_custom.DwUpdateAllToEx(xcustom);
-		if (xcustom.xml() != L"")
+		
+		if ((xstring)xcustom.xml() != L"")
 		{
 			xcustom = CustomView::UpdateCustomItem(dw_base.GetItemString(1, L"InvoiceNo"), xcustom.xml());
 			if (!xcustom)
 			{
-				xstring error5 = xcustom.text();
+				 error5 = xcustom.text();
 			}
 			else
 			{
@@ -700,7 +701,7 @@
 		xml xcdelement ;
 		
 		dw_cdelement.DwUpdateAllToEx(xcdelement);
-		if (xcdelement.xml() != L"")
+		if ((xstring)xcdelement.xml() != L"")
 		{
 			xcdelement = CustomView::UpdateCustomElement(dw_base.GetItemString(1, L"InvoiceNo"), xcdelement.xml());
 			if (!xcdelement)
@@ -1868,7 +1869,7 @@
 		if (x == L"userSalespersonID")
 		{
 			xstring sSalespersonID = dw_base.GetItemString(1, L"SalespersonID");
-			hdr->data = sSalespersonID;
+			hdr->data = sSalespersonID.c_str(true);
 		}
 		return 1;
 	}

--
Gitblit v1.9.3