From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/total3/ProductNewList.cpp |   26 ++++++++++++++------------
 1 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/jrj/project/total3/ProductNewList.cpp b/jrj/project/total3/ProductNewList.cpp
index 93a0616..9834f2e 100644
--- a/jrj/project/total3/ProductNewList.cpp
+++ b/jrj/project/total3/ProductNewList.cpp
@@ -88,6 +88,7 @@
 					dw_list.SetReadOnlyColumn(i);
 			}
 			dw_list.Redraw();
+			return 1;
 		}
 
 		int OnRetrieveEx()
@@ -121,6 +122,7 @@
 					dw_list.SetReadOnlyColumn(i);
 			}
 			dw_list.Redraw();
+			return 1;
 		}
 
 		xml  GetGoodsPropList(xstring guid)
@@ -460,17 +462,16 @@
 		{
 			if (dw_list.GetItemString(dw_list.GetRow(), L"GoodsNo") != L"") return 1;
 			if (dw_list.GetRowCount() < 1) return 1;
-			xaserverarg arg ;
-			
+			xaserverarg arg;
+
 			arg.AddArg(L"EntityID", dw_list.GetGuid(dw_list.GetRow()));
 			KXMLDOMElement e = dw_list.GetRowElement(dw_list.GetRow());
-			int pr = cast(e as int);
-			arg.AddArg(L"data",xstring( pr));
-			pr = cast(dw_list as int);
-			arg.AddArg(L"dw", pr.toString());
-			arg.AddArg(L"HWND", xstring((__int64)GetHWND()));
-			OpenWindow(L"dev:xpage[ProductNewItem.vx]", arg );
+			arg.SetParam(L"data", e);
+			arg.SetParam(L"dw", dw_list);
+			arg.SetParam(L"HWND", GetHWND());
+			OpenWindow(L"dev:xpage[ProductNewItem.vx]", arg);
 			return 1;
+
 		}
 
 		//命令发布函数
@@ -505,17 +506,17 @@
 			if (comdid == L"xmDelete")
 			{
 
-				int row = listwin::dw_list.GetNextSelectRow(1);
+				int row = dw_list.GetNextSelectRow(1);
 
 				if (row < 1) {
-					row = listwin::dw_list.GetRow();
+					row = dw_list.GetRow();
 					if (row < 1) {
 						//win::MessageBox(GetHWND(),L"请选中要删除的行!",L"提示",0);
 						return -1;
 					}
 				}
 
-				KXMLDOMElement e = listwin::dw_list.GetRowElement(row);
+				KXMLDOMElement e = dw_list.GetRowElement(row);
 
 				xstring sguid = e.selectSingleNode(L"@guid").text();
 
@@ -544,7 +545,7 @@
 					else
 					{
 						MessageBox(GetHWND(), L"删除成功!", L"提示", 0);
-						listwin::dw_list.DeleteRow(row);
+						dw_list.DeleteRow(row);
 					}
 				}
 				return 1;
@@ -571,6 +572,7 @@
 			AttachEvent(L"WM_SETFOCUS", (FEvent)&ProductNewList::OnSetFocus);
 			AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&ProductNewList::OnRowChanged);
 			AttachEvent(L"im1", L"IMG_LDBCLICK", (FEvent)&ProductNewList::OnImgDBClicked);
+			return 1;
 		}
 
 		int onload()

--
Gitblit v1.9.3