From 502ef949a7f5f681225695c116a40ccc8d438434 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 08 七月 2024 11:16:36 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj

---
 jrj/project/business/AR/ExchageFile.cpp |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index 1516d05..0824aad 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -1,6 +1,7 @@
 #include <wobject/xstring.hpp>
 #include <xcontrol/xtreeview.hpp>
 #include <xcontrol/xdwgrid.hpp>
+#include <xcontrol/xcell.hpp>
 
 #include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
@@ -318,9 +319,9 @@
 			if (filename == L"" || saveas)
 			{
 				xaserverarg arg ;
-				arg.setNativePointer(arg.CreateInstance());
+				
 				arg.AddArg(L"src", L"data/SettleExchange");
-				OpenWindow(L"dev:xpage[trade.document.saveas.vx]", cast(arg as int));
+				OpenWindow(L"dev:xpage[trade.document.saveas.vx]",arg);
 				if (arg.GetArgString(L"result") == L"ok")
 				{
 					sfilename = arg.GetArgString(L"filename");
@@ -346,7 +347,7 @@
 			xml x;
 			
 			xaserverarg args ;
-			args.setNativePointer(args.CreateInstance());
+			
 			args.AddArg(L"myurl", myurl);
 			args.AddArg(L"name", sfilename);
 			args.AddArg(L"filepath", sname);
@@ -383,10 +384,10 @@
 			if (comdid == L"xmFileOpen")
 			{
 				xaserverarg args ;
-				args.setNativePointer(args.CreateInstance());
+			
 				args.AddArg(L"src", L"data/SettleExchange");
 				args.AddArg(L"process", L"path");
-				OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]", cast(args as int));
+				OpenWindow(L"dev:xpage[trade.document.selectdlg.vx]",args);
 				if (args.GetArgString(L"result") == L"ok")
 				{
 					xstring u = args.GetArgString(L"src");

--
Gitblit v1.9.3