From b1d01ea6fa62ce12c2e592b3315186f6b3c8359d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 15:20:38 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AR/ExchangeSignFast.cpp | 28 +++++++++++++++-------------
1 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/jrj/project/business/AR/ExchangeSignFast.cpp b/jrj/project/business/AR/ExchangeSignFast.cpp
index 9e874dc..63e1b6c 100644
--- a/jrj/project/business/AR/ExchangeSignFast.cpp
+++ b/jrj/project/business/AR/ExchangeSignFast.cpp
@@ -75,7 +75,7 @@
dw_list.DwUpdateAllToEx(x);
//trace(x.xml());
- xml x0 = ViewObject::MakeXml();
+ xml x0;
x0.loadXML(L"<data/>");
KXMLDOMNodeList t = x.selectNodes(L"data/Item[@update.modify or @update.delete]");
@@ -85,7 +85,7 @@
{
e1.appendChild(t.item(i));
}
- xaserverarg arg = ViewObject::MakeArg();
+ xaserverarg arg;
arg.AddArg(L"content", x0.xml());
if (xurl::get(L"/sale/data/AR/update/item", arg.GetString(), x) != 1)
@@ -127,14 +127,14 @@
return 0;
}
- int OnCombboChanged(ref TCommandEvent evt, int lParam)
+ int OnCombboChanged(TEvent * evt, int lParam)
{
xstring id = L"";
xstring name = L"";
- int h = xcombobox::GetCurSel(evt.hCtrl);
+ int h = xcombobox::GetCurSel(evt->command.hCtrl);
if (h > -1)
{
- xstring txt = xcombobox::GetLBText(evt.hCtrl, h);
+ xstring txt = xcombobox::GetLBText(evt->command.hCtrl, h);
if (txt == L"限定客户")
{
OnRetrieve(1);
@@ -152,7 +152,7 @@
dw_unexch.AcceptText();
int row = dw_unexch.GetRow();
- int hCursor = xutil::SetCursorWait();
+ HCURSOR hCursor = xutil::SetCursorWait();
double AdjustAmount = dw_unexch.GetItemDouble(row, L"AdjustAmount");//调整数
double amted = dw_unexch.GetItemDouble(row, L"实收汇金额");//往次
double samt = dw_unexch.GetItemDouble(row, L"应收汇金额");//应收汇金额
@@ -166,8 +166,8 @@
}
double amt1 = dw_obj.GetItemDouble(dw_obj.GetRow(), L"BalanceAmt");
- int v1 = (amt * 100.0).toString().toInt();
- int v2 = (amt1 * 100.0).toString().toInt();
+ int v1 = xstring(amt * 100.0).toInt();
+ int v2 = xstring(amt1 * 100.0).toInt();
if (v2 > v1)
{
dw_unexch.ItemChangeTo(row, L"Amount", xstring(amt));
@@ -246,11 +246,11 @@
if (dw_obj.GetRowCount() > 0)
dw_list.SetItemString(crow, L"SEID", dw_obj.GetGuid(dw_obj.GetRow()));
}
- dw_list.SetItemString(crow, colname, value);
+ dw_list.SetItemString(crow, colname.c_str(), value);
}
else
{
- dw_list.SetItemString(crow, colname, value);
+ dw_list.SetItemString(crow, colname.c_str(), value);
}
dw_list.Redraw();
evalExchAmt();
@@ -311,6 +311,7 @@
AttachEvent(L"dw_unexch", L"DWV_DOUBLECLICKED", (FEvent)&ExchangeSignFastWin::OnDoubleClicked);//行双击
AttachEvent(L"cbx_customer", L"CBN_SELCHANGE", (FEvent)&ExchangeSignFastWin::OnCombboChanged);//属性组切换list中列的数量变化
AttachEvent(L"dw_unexch", L"DWV_ITEMCHANGED", (FEvent)&ExchangeSignFastWin::OnItemChanged);
+ return 1;
}
@@ -347,9 +348,9 @@
xstring path1 = L"/sale/data/AR/item/exch/listwithcustomer";
if (customer == 0) path1 = L"/sale/data/AR/item/exch/list";
- arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
+ arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
arg.AddArg(L"QueryArg", GetQueryArg());
- trace(L"SEID+++L" + SEID + L"+++QueryTxt+++L" + GetControl(L"sle_search").GetText() + L"+++QueryArg+++L" + GetQueryArg());
+ trace(L"SEID+++L" + SEID + L"+++QueryTxt+++L" + xcontrol(GetControl(L"sle_search")).GetText() + L"+++QueryArg+++L" + GetQueryArg());
if (getUrl(path, arg.GetString(), x) != 1)
{
trace(L"错误信息1=L" + xstring(x.text()));
@@ -381,6 +382,7 @@
int onload()
{
+ SetArg();
dw_list = GetControl(L"dw_list");
dw_list.openUrl(L"/sale/view/AR/template/unexch");
dw_unexch = GetControl(L"dw_unexch");
@@ -404,7 +406,7 @@
/*xaserverarg arg = GetParam();
xstring CustomerIDOne = arg.GetArgString(L"CustomerID");
xstring SEIDOne = arg.GetArgString(L"SEID");*/
- if (GetWinParam())dw_obj = GetParam();
+ if (GetWinParam())dw_obj = *(xdwgrid*)GetWinParam();
OnAttachEvent();
return 1;
--
Gitblit v1.9.3