From a4344c9bada0722c6ef7fac5d95f29a110eea0f1 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 21 四月 2025 10:32:05 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Enquiry.list.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index dc72830..54b6378 100644
--- a/jrj/project/business/Enquiry.list.cpp
+++ b/jrj/project/business/Enquiry.list.cpp
@@ -76,8 +76,8 @@
xml x ;
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"scene",scene,L"xs:xstring");
arg.AddArg(L"EntityID",EntityID,L"xs:xstring");
arg.AddArg(L"EntityName",GetEntityName(1),L"xs:xstring");
@@ -359,7 +359,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
dw_pricelistex.DwUpdateAllToEx(x);
if(x.xml()!=L"")
@@ -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);
@@ -447,7 +447,7 @@
return 1;
}
- int ViewUpdate(int pr,xstring updateItem,xaserverarg arg)
+ int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg)
{
if( updateItem==L"del")
{
@@ -1670,7 +1670,7 @@
{
arg.AddArg(L"CustomerID",e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if(name.find(L"(L")>=0) name = name.left(name.find(L"(L"));
+ if(name.find(L"(")>=0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName",name);
}
}
--
Gitblit v1.9.3