From cf8dba7748cc9826d744069b5063a14e3fcd2fa8 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 13 三月 2025 10:48:17 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/SO/Product.Select.SO.cpp |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/SO/Product.Select.SO.cpp b/jrj/project/business/SO/Product.Select.SO.cpp
index bbcb0f7..f34daab 100644
--- a/jrj/project/business/SO/Product.Select.SO.cpp
+++ b/jrj/project/business/SO/Product.Select.SO.cpp
@@ -538,7 +538,7 @@
 				OpenWindow(L"dev:xpage[PackSchemaMaint.goodslib.vx]");
 			}else
 			{
-				int pr = g_xdoc_product;
+				LPARAM  pr = g_xdoc_product;
 				OpenWindow(L"dev:xpage[ProductLibraryItemMaint.vx]",pr);
 			}
 			*/
@@ -1100,7 +1100,7 @@
 						no = e.getAttribute(L"guid");
 					}
 
-					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).xml());
+					dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no));
 					dw_list = GetControl(L"dw_list");
 					dw_list.SetReadOnly(true);
 
@@ -1284,7 +1284,7 @@
 			}
 			InitialFolder();
 
-			dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L"").xml());
+			dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(L""));
 			dw_list = GetControl(L"dw_list");
 			dw_list.SetReadOnly(true);
 

--
Gitblit v1.9.3