From cb55b0e814bd30b3b3d1842b61898ae6916f83ed Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期五, 19 七月 2024 13:56:47 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/GDN3.maint.cpp | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index 72aebdf..5325a11 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -956,7 +956,7 @@
bool validProfit()
{
- double amt = dw_profit.GetItemString(1, L"ProfitAmountEx");
+ double amt = dw_profit.GetItemDouble(1, L"ProfitAmountEx");
if (amt < 0.0)
{
if (dw_profit.GetItemString(1, L"Note") == L"")
@@ -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");
@@ -3187,7 +3187,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 +3352,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();
}
--
Gitblit v1.9.3