From ed566acc9b4627e37d8ca254bd66362ffb45b2ba Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期四, 07 十一月 2024 09:33:28 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/Product.list.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/jrj/project/business/Product.list.cpp b/jrj/project/business/Product.list.cpp
index 4dd240e..7325e95 100644
--- a/jrj/project/business/Product.list.cpp
+++ b/jrj/project/business/Product.list.cpp
@@ -766,7 +766,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);
}
*/
@@ -1379,7 +1379,7 @@
else
return 1;
- /* dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no).GetXmlDoc());
+ /* dw_list.SetDataObject(ProductLibraryView::GetMaintListForm3(no));
dw_list = GetControl(L"dw_list");
dw_list.Reset();
dw_list.SetReadOnly(true);
@@ -1552,7 +1552,7 @@
return 1;
}
- int OnImgDBClicked(TEvent * evt, int pr)
+ int OnImgDBClicked(TEvent * evt, LPARAM pr)
{
IMGNNMHDR& nmtv = *(IMGNNMHDR*)evt->notify.pnmh;
xstring src = nmtv.path;
--
Gitblit v1.9.3