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/start.vframe.vbusiness.cpp | 2 +-
jrj/project/business/BasicCode/QuickCode_Tree.cpp | 2 +-
jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp | 2 +-
jrj/project/business/EnquiryEx3.list.cpp | 0
jrj/project/business/PO/BigPictureView.Product3.cpp | 0
jrj/project/business/SystemSettings/Data.config.cpp | 4 ++--
jrj/project/vindexform.cpp | 8 ++++----
jrj/project/business/Enquiry.list.cpp | 2 +-
jrj/project/business/GDN3.maint.cpp | 15 ++++++++-------
9 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/jrj/project/business/BasicCode/QuickCode_Tree.cpp b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
index 53bcb77..c893a99 100644
--- a/jrj/project/business/BasicCode/QuickCode_Tree.cpp
+++ b/jrj/project/business/BasicCode/QuickCode_Tree.cpp
@@ -75,7 +75,7 @@
return -1;
}
//trace(x.xml());
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
{
xml xx;
xx.loadXML(L"<root/>");
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index 0896f61..54b6378 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -388,7 +388,7 @@
xml x0 ;
dw_pricelist.DwUpdateAllToEx(x0);
- if(x0.xml() !=L"")
+ if((xstring)x0.xml() !=L"")
{
xml x1;
dw_priceitem.DwUpdateAllToEx(x1);
diff --git a/jrj/project/business/EnquiryEx3.list.cpp b/jrj/project/business/EnquiryEx3.list.cpp
index 41e722c..d5c98b7 100644
--- a/jrj/project/business/EnquiryEx3.list.cpp
+++ b/jrj/project/business/EnquiryEx3.list.cpp
Binary files differ
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)
diff --git a/jrj/project/business/PO/BigPictureView.Product3.cpp b/jrj/project/business/PO/BigPictureView.Product3.cpp
index 7f78b1f..2befc95 100644
--- a/jrj/project/business/PO/BigPictureView.Product3.cpp
+++ b/jrj/project/business/PO/BigPictureView.Product3.cpp
Binary files differ
diff --git a/jrj/project/business/SystemSettings/Data.config.cpp b/jrj/project/business/SystemSettings/Data.config.cpp
index 5bda1df..4a3fe1d 100644
--- a/jrj/project/business/SystemSettings/Data.config.cpp
+++ b/jrj/project/business/SystemSettings/Data.config.cpp
@@ -98,7 +98,7 @@
return -1;
}
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
x.loadXML(L"<root><items/><roles/></root>");
xml x1;
@@ -494,7 +494,7 @@
return -1;
}
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
x.loadXML(L"<root><items/><roles/></root>");
KXMLDOMElement e = x.documentElement();
diff --git a/jrj/project/start.vframe.vbusiness.cpp b/jrj/project/start.vframe.vbusiness.cpp
index e46e9fa..79d9506 100644
--- a/jrj/project/start.vframe.vbusiness.cpp
+++ b/jrj/project/start.vframe.vbusiness.cpp
@@ -913,7 +913,7 @@
return 0;
}
//trace(L"----1111----");
- if (doc.xml() == L"")
+ if ((xstring)doc.xml() == L"")
return -1;
//trace(doc.xml());
diff --git a/jrj/project/vindexform.cpp b/jrj/project/vindexform.cpp
index 0d9f49d..05a22a6 100644
--- a/jrj/project/vindexform.cpp
+++ b/jrj/project/vindexform.cpp
@@ -48,7 +48,7 @@
xml x ;
x.load(L"cache\\config.xml");
//alert(x.GetXml());
- if (x.xml() == L"") return L"";
+ if ((xstring)x.xml() == L"") return L"";
KXMLDOMElement e = x.documentElement();
if (e.selectSingleNode(L"home"))
{
@@ -63,7 +63,7 @@
{
xml x ;
x.load(L"cache\\config.xml");
- if (x.xml() == L"")
+ if ((xstring)x.xml() == L"")
{
//alert(L"<config><home "+att+L"="+value+L"/></config>");
x.loadXML(L"<config><home " + att + L"='" + value + L"'/></config>");
@@ -312,7 +312,7 @@
//trace(x.GetXml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
if (/*m_Assignment == L"" &&*/ e.selectSingleNode(L"AssignmentID"))
{
@@ -354,7 +354,7 @@
trace(x.xml());
return -1;
}
- if (x.xml() == L"") return -1;
+ if ((xstring)x.xml() == L"") return -1;
KXMLDOMElement e = x.documentElement();
KXMLDOMNodeList li = e.selectNodes(L"item");
int i;
diff --git a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
index dea137f..695c6bf 100644
--- a/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
+++ b/jrj/xframe/vbusiness/vframe/listex.vframe.vbusiness.hpp
@@ -506,7 +506,7 @@
{
KXMLDOMDocument x;
int ret = getUrl(tpl, L"<args/>", x);
- if (ret == 1 && x.xml() != L"")
+ if (ret == 1 && (xstring)x.xml() != L"")
{
setSheetSearch(x);
}
--
Gitblit v1.9.3