From c39c6bce6d945bd0878d82a5eca4c39f15a09301 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 11:21:24 +0800
Subject: [PATCH] update
---
jrj/project/business/Enquiry.list.cpp | 22 ++++++++++++----------
1 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/jrj/project/business/Enquiry.list.cpp b/jrj/project/business/Enquiry.list.cpp
index e07aea8..091b778 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");
@@ -164,7 +164,7 @@
{
KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
ExpandCatChildFolder(tv_folder,h,e,35);
}
return 1;
@@ -181,7 +181,7 @@
{
KXMLDOMElement e = nlist.item(i);
xstring name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e,35);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e,35);
ExpandCatChildFolder(tv_folder,h,e,35);
}
return 1;
@@ -196,7 +196,7 @@
xstring name = tv_folder.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder,hItem,e.getAttribute(L"no"));
return 1;
@@ -212,7 +212,7 @@
xstring name = tv_folder_pricebill.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder_pricebill.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder_pricebill.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder_pricebill.GetItemData(hItem);
if (!child)ExpandFolderItem(tv_folder_pricebill,hItem,e.getAttribute(L"no"));
return 1;
@@ -232,7 +232,7 @@
int image = 15;
if(sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
if(child !=L"no" ) tv_folder.SetItemChild(h,1);
ExpandChildFolder(tv_folder,h,e);
}
@@ -359,7 +359,7 @@
xml x ;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
dw_pricelistex.DwUpdateAllToEx(x);
if(x.xml()!=L"")
@@ -1023,12 +1023,13 @@
int OnTech(xdwgrid dw_term)
{
- xaserverarg arg;
+ xaserverarg arg=GetArg();
int row = dw_term.GetRow();
if(row < 1) return 0;
xstring str = dw_term.GetItemString(row,L"TechNote");
arg.AddArg(L"value",str);
OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg);
+
if(arg.GetArgString(L"comdid")==L"xmOK")
{
str = arg.GetArgString(L"value");
@@ -1515,6 +1516,7 @@
}
int onload()
{
+ SetArg();
state1=-1;
state2=-1;
@@ -1668,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