From e05f7cc8755eb7f5525e6bf86a7e5454a0c91fd0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 23 十月 2024 18:07:24 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.maint.cpp | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index b380304..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)
--
Gitblit v1.9.3