From 94a7ecbc10c4d136fe4681db17577e9739b907c7 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 13 九月 2024 16:25:46 +0800
Subject: [PATCH] update

---
 jrj/project/business/Quote/xmQuoteBillList.cpp |    1 +
 jrj/project/business/QuoteFile.cpp             |    3 +--
 jrj/xframe/wobject/xaserverarg.hpp             |    4 ++++
 jrj/xframe/xcontrol/xdwtable.hpp               |    2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/jrj/project/business/Quote/xmQuoteBillList.cpp b/jrj/project/business/Quote/xmQuoteBillList.cpp
index 1678667..86ca2c8 100644
--- a/jrj/project/business/Quote/xmQuoteBillList.cpp
+++ b/jrj/project/business/Quote/xmQuoteBillList.cpp
@@ -197,6 +197,7 @@
 			
 		int onload()
 		{
+			SetArg();
 			dw_list = GetControl(L"dw_list");
 			dw_list.openUrl(L"/sale/view/Quote3/template/Quote/QuoteBillList");
 		
diff --git a/jrj/project/business/QuoteFile.cpp b/jrj/project/business/QuoteFile.cpp
index dba2d82..5e89e8b 100644
--- a/jrj/project/business/QuoteFile.cpp
+++ b/jrj/project/business/QuoteFile.cpp
@@ -507,10 +507,9 @@
 
 		xaserverarg argx;
 		argx.AddArg(L"QuoteNo", dw_base.GetItemString(1, L"QuoteNo"));
-		int p1 = argx;
 		if (dw_base.GetItemString(1, L"QuoteNo") != L"")
 		{
-			OpenWindow(L"dev:xpage[xmQuoteBillList.vx]", p1);
+			OpenWindow(L"dev:xpage[xmQuoteBillList.vx]", argx);
 		}
 		if (argx.GetArgString(L"action") != L"ok") return 1;
 
diff --git a/jrj/xframe/wobject/xaserverarg.hpp b/jrj/xframe/wobject/xaserverarg.hpp
index a54aeb1..524d230 100644
--- a/jrj/xframe/wobject/xaserverarg.hpp
+++ b/jrj/xframe/wobject/xaserverarg.hpp
@@ -83,6 +83,10 @@
 	{
 		return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->AddArg(argname,val,typ);
 	}*/
+	int AddArg(string argname, xstring val) //alias "?AddArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_W00@Z";
+	{
+		return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->AddArg(argname, val.c_str(), NULL);
+	}
 	int AddArg(string argname,string val,string typ=NULL) //alias "?AddArg@IXAServerArg@XFrame@Hxsoft@@QAEHPB_W00@Z";
 	{
 		return ((Hxsoft::XFrame::IXAServerArg*)getNativePointer())->AddArg(argname,val,typ);
diff --git a/jrj/xframe/xcontrol/xdwtable.hpp b/jrj/xframe/xcontrol/xdwtable.hpp
index fe217e8..0c55768 100644
--- a/jrj/xframe/xcontrol/xdwtable.hpp
+++ b/jrj/xframe/xcontrol/xdwtable.hpp
@@ -295,7 +295,7 @@
 		return GetDwTable()->ClearAdvanceString( nRow, nCol);
 	}
 public:
-	LPCTSTR GetGuid(int nRow)
+	xstring GetGuid(int nRow)
 	{
 		return GetDwTable()->GetGuid(nRow);
 	}

--
Gitblit v1.9.3