From 3e154206139f2fc8aeeab61c12c38717e55b3fc6 Mon Sep 17 00:00:00 2001
From: qianxj2004 <qianxj15@sina.com>
Date: 星期二, 10 六月 2025 11:44:09 +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 670b9c1..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"); 
@@ -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;				
@@ -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"")
@@ -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")
 		{
@@ -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