From 9b3b2eb20b09e13da837a28f16e552ba70a090c4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 24 四月 2025 14:48:21 +0800
Subject: [PATCH] update
---
jrj/project/business/AR/ExchageFile.cpp | 32 +++++++++++++++++---------------
1 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/jrj/project/business/AR/ExchageFile.cpp b/jrj/project/business/AR/ExchageFile.cpp
index 1516d05..e560696 100644
--- a/jrj/project/business/AR/ExchageFile.cpp
+++ b/jrj/project/business/AR/ExchageFile.cpp
@@ -1,6 +1,8 @@
#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
+#include <xcontrol/xcell.hpp>
+#include <adt/xarray.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -72,7 +74,7 @@
const xstring data;
int anchorrow;
int anchorcol;*/
- if (hdr.currentcol == 1 && hdr.data != L"")
+ if (hdr.col == 1 && hdr.data != L"")
{
//dw_exchangefile.SetItemString(hdr.currentrow,hdr.currentcol, L"");
}
@@ -125,20 +127,19 @@
val = dw_exchangefile.GetItemString(1, col);
val = val.trim();
if (val == L"")continue;
- if (val.find(L"(L") >= 0) val = val.left(val.find(L"(L"));
+ if (val.find(L"(") >= 0) val = val.left(val.find(L"("));
if (val.find(L"（") >= 0) val = val.left(val.find(L"（"));
if (val.find(L"[") >= 0) val = val.left(val.find(L"["));
if (val.find(L"【") >= 0) val = val.left(val.find(L"【"));
if (val.find(L"/") >= 0) val = val.left(val.find(L"/"));
if (val.find(L"\r") >= 0) val = val.left(val.find(L"\r"));
if (val.find(L"\n") >= 0) val = val.left(val.find(L"\n"));
- if (head == L"") head = val; else head += L",L" + val;
+ if (head == L"") head = val; else head += L"," + val;
}
xml x;
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
arg.AddArg(L"head", head);
//alert(head);
if (getUrl(L"/sale/data/AR/match/bank", arg.GetString(), x) != 1)return 1;
@@ -151,8 +152,8 @@
KXMLDOMNodeList items = n.selectNodes(L"Item");
int len = items.length();
- IntegerArray indexs = IntegerArray::make();
- StringArray columns = StringArray::make();
+ xarray<int> indexs;
+ xarray<xstring> columns;
xstring bank = n.selectSingleNode(L"@name").text();
for (int i = 0; i < len; i++)
{
@@ -232,13 +233,13 @@
if (n1)
{
//alert(n1.xml);
- if (n1.selectSingleNode(L"DataColumn"))dw_exch.SetItemString(curRow, columns.item(k), n1.selectSingleNode(L"DataColumn").text());
- if (n1.selectSingleNode(L"DataColumn/@_displaystring"))dw_exch.SetItemDisplayString(curRow, columns.item(k), n1.selectSingleNode(L"DataColumn/@_displaystring").text());
+ if (n1.selectSingleNode(L"DataColumn"))dw_exch.SetItemString(curRow, columns.item(k).c_str(), n1.selectSingleNode(L"DataColumn").text());
+ if (n1.selectSingleNode(L"DataColumn/@_displaystring"))dw_exch.SetItemDisplayString(curRow, columns.item(k).c_str(), n1.selectSingleNode(L"DataColumn/@_displaystring").text());
}
}
}
else
- dw_exch.SetItemString(curRow, columns.item(k), val);
+ dw_exch.SetItemString(curRow, columns.item(k).c_str(), val);
}
}
xutil::RestoreCursor(hCursor);
@@ -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);
@@ -372,9 +373,10 @@
int SendCtrlCmd(xcontrol xc, xstring cmd)
{
- SendMessage(xc.GetId(), 0x401, cmd, 0);
+ SendMessage(xc.GetHWND(), 0x401, (WPARAM)cmd.c_str(), 0);
return 1;
}
+
//命令发布函数
@@ -383,10 +385,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