From 16aeec2027a7321898998a3e5bcd4ddddc9926d0 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 15 七月 2024 16:54:10 +0800
Subject: [PATCH] update 参数转换

---
 jrj/project/business/Product.list.cpp |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/jrj/project/business/Product.list.cpp b/jrj/project/business/Product.list.cpp
index d543a68..ca9b3d6 100644
--- a/jrj/project/business/Product.list.cpp
+++ b/jrj/project/business/Product.list.cpp
@@ -1112,12 +1112,12 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			xstring name = e.getAttribute(L"CName");
 			xstring no = e.getAttribute(L"CategoryNo");
 			xstring label = no.trim() + L" " + name;
 
-			HTREEITEM h = tv_folder.InsertChildItem(hItem, label, (LPARAM)& e, 15);
+			HTREEITEM h = tv_folder.InsertChildItem(hItem, label, e, 15);
 			xstring child = e.getAttribute(L"Childs");
 			if (child == L"")
 				tv_folder.SetItemChild(h, 1);
@@ -1137,12 +1137,12 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = * new KXMLDOMElement(nlist.item(i));
+			KXMLDOMElement e = nlist.item(i);
 			xstring name = e.getAttribute(L"CName");
 			xstring no = e.getAttribute(L"CategoryNo");
 			xstring label = no.trim() + L" " + name;
 
-			HTREEITEM h = tv_folder.InsertChildItem(hItem, label, (LPARAM)&e, 15);
+			HTREEITEM h = tv_folder.InsertChildItem(hItem, label, e, 15);
 			xstring child = e.getAttribute(L"Childs");
 			if (child == L"")
 				tv_folder.SetItemChild(h, 1);
@@ -1160,9 +1160,9 @@
 		if (len > 0) tv_folder.SetItemChild(hItem, 1);
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			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(h, e, 35);
 		}
 		return 1;
@@ -1175,9 +1175,9 @@
 		int len = nlist.length();
 		for (int i = 0; i < len; i++)
 		{
-			KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+			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(h, e, 35);
 		}
 		return 1;
@@ -1369,6 +1369,8 @@
 					KXMLDOMElement e = tv_folder.GetItemData(hItem);
 					no = e.getAttribute(L"guid");
 				}
+				else
+					return 1;
 
 				/*	dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).GetXmlDoc());
 					dw_list = GetControl(L"dw_list");
@@ -1389,7 +1391,10 @@
 							dw_list.Retrieve(ProductLibraryView::GetMaintList3(no, queryString, L""));
 					}
 					else
+					{
+						if (no == L"N000005") return 1;
 						dw_list.Retrieve(ProductLibraryView::GetMaintList3(no));
+					}
 				}
 				//dw_list.PostRetrieve();
 				dw_list.Redraw();

--
Gitblit v1.9.3