From 2f2eb9a7c4e99e663c82d156bf5af7ecdbc8fa39 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 02 九月 2024 18:02:52 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.maint.cpp | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index 9ad39fa..a9d306d 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -248,12 +248,12 @@
return 1;
}
- xstring GetEntityID(int /*param*/ pr)
+ xstring GetEntityID(LPARAM /*param*/ pr)
{
return InvoiceID;
}
- xstring GetEntityName(int /*param*/ pr)
+ xstring GetEntityName(LPARAM /*param*/ pr)
{
return L"GDN3";
}
@@ -1005,7 +1005,7 @@
KXMLDOMElement e = dw_item.GetRowElement(nRow);
KXMLDOMNode n = e.cloneNode(-1);
x.documentElement().appendChild(n);
- n.Release();
+
xstring val = x.xml();
trace(L"=======L" + val + L"=======L");
@@ -1083,7 +1083,7 @@
KXMLDOMElement e = dw_item.GetRowElement(nRow);
KXMLDOMNode n = e.cloneNode(-1);
x.documentElement().appendChild(n);
- n.Release();
+
xstring val = x.xml();
trace(L"123=======L" + val + L"=======123");
@@ -2505,6 +2505,7 @@
arg.AddArg(L"InvoiceNo", dw_base.GetItemString(1, L"InvoiceNo"));
int p = arg;
OpenWindow(L"dev:xpage[select.item.po.vx]", p);
+
xstring str = arg.GetArgString(L"items");
if (str != L"")
{
@@ -3187,7 +3188,7 @@
xaserverarg& arg2 = *new xaserverarg;
arg2.AddArg(L"InvoiceNo", dw_base.GetItemString(1, L"InvoiceNo"));
- //arg2.AddArg(L"HWND", GetHWND().toString());
+ //arg2.AddArg(L"HWND", xstring((__int64)GetHWND()));
arg2.SetParam(L"HWND", (LPARAM)GetHWND());
OpenWindow(L"dev:xpage[GDNSourcePaperCard.vx]",(LPARAM)&arg2);
}
@@ -3352,13 +3353,13 @@
if (n)
{
tax = xstring(n.text()).toDouble();
- n.Release();
+
}
n = o.selectSingleNode(L"VATRefundRate");
if (n)
{
retax = xstring(n.text()).toDouble();
- n.Release();
+
}
o.Release();
}
@@ -3678,7 +3679,7 @@
int OnAttachEvent()
{
//绑定工具条点击事件
- AttachEvent(L"WM_XCOMMAND", L"DWV_CLICKED", (FEvent)&GDN3MaintWin::OnXCommand);
+ AttachEvent(L"WM_XCOMMAND", (FEvent)&GDN3MaintWin::OnXCommand);
//获取焦点事件，用于重置工具条
AttachEvent(L"WM_SETFOCUS", (FEvent)&GDN3MaintWin::OnSetFocus);
--
Gitblit v1.9.3