From 80b493bdbde4ca63bd390b7d0ed6dc3c67879a0d Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期一, 07 四月 2025 10:25:16 +0800
Subject: [PATCH] update
---
jrj/project/business/SO3.list.cpp | 47 ++++++++++++++++++++++++-----------------------
1 files changed, 24 insertions(+), 23 deletions(-)
diff --git a/jrj/project/business/SO3.list.cpp b/jrj/project/business/SO3.list.cpp
index f5af146..343c1a4 100644
--- a/jrj/project/business/SO3.list.cpp
+++ b/jrj/project/business/SO3.list.cpp
@@ -26,6 +26,7 @@
public:
static SO3list* CreateInstance(void* implPtr, void* hWnd)
{
+
SO3list* pWin = new SO3list(implPtr, (HWND)hWnd);
return pWin;
}
@@ -46,9 +47,9 @@
if (len > 0) tv_folder.SetItemChild(hItem, 1);
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = * new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
string name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
ExpandCatChildFolder(h, e, 35);
}
return 1;
@@ -62,16 +63,16 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
string name = e.getAttribute(L"name");
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, 35);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, 35);
ExpandCatChildFolder(h, e, 35);
}
return 1;
}
//树展开
- int OnTreeExpanding(TEvent* evt, int p)
+ int OnTreeExpanding(TEvent* evt, LPARAM p)
{
NMTREEVIEW& nmtv = *(NMTREEVIEW*)evt->notify.pnmh;
HTREEITEM hItem = nmtv.itemNew.hItem;
@@ -79,7 +80,7 @@
string name = tv_folder.GetItemLabel(hTopItem);
HTREEITEM child = tv_folder.GetChildItem(hItem);
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
if (!child)ExpandFolderItem(hItem, e.getAttribute(L"no"));
return 1;
@@ -92,15 +93,15 @@
int len = nlist.length();
for (int i = 0; i < len; i++)
{
- KXMLDOMElement& e = *new KXMLDOMElement(nlist.item(i));
+ KXMLDOMElement e = nlist.item(i);
string name = e.getAttribute(L"name");
xstring sImage = e.getAttribute(L"image");
xstring child = e.getAttribute(L"child");
int image = 15;
if (sImage) image = sImage.toInt();
- HTREEITEM h = tv_folder.InsertChildItem(hItem, name, (LPARAM)&e, image);
+ HTREEITEM h = tv_folder.InsertChildItem(hItem, name, e, image);
if (child != L"no") tv_folder.SetItemChild(h, 1);
- ExpandChildFolder(h, e);
+ //ExpandChildFolder(h, e);
}
return 1;
}
@@ -134,8 +135,8 @@
int row = dw_list.GetRow();
if (row < 1) return 1;
KXMLDOMElement ele = dw_list.GetRowElement(row);
- string id = GetEntityIDName(1);
- string entity = ele.selectSingleNode(id).text();
+ xstring id = GetEntityIDName(1);
+ xstring entity = ele.selectSingleNode(id).text();
//trace(entity);
SetAgent(L"list", entity);
if (arg.GetArgString(L"state") != L"")
@@ -143,8 +144,8 @@
dw_list.SetItemString(row, L"ApplyStatus", arg.GetArgString(L"state"));
if (arg.GetArgString(L"billstatus") != L"")
{
- string billstatus = arg.GetArgString(L"billstatus");
- string statusName = GetBillStatusName(billstatus);
+ xstring billstatus = arg.GetArgString(L"billstatus");
+ xstring statusName = GetBillStatusName(billstatus);
dw_list.SetItemString(row, L"ApprovalStatus", billstatus);
dw_list.SetItemDisplayString(row, L"ApprovalStatus", statusName);
}
@@ -170,7 +171,7 @@
if (!hItem) return 1;
HCURSOR hCursor = xutil::SetCursorWait();
- KXMLDOMElement& e1 = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e1 = tv_folder.GetItemData(hItem);
string no = e1.getAttribute(L"no");
KXMLDOMDocument x = ViewObject::RetrieveData(GetServerUrl(),myDataUrl, L"no", no, L"QueryTxt", m_QueryTxt, L"rows", rows);
if (x)
@@ -285,12 +286,12 @@
return 1;
}
- int PreOnCmdDispatch(string comdid)
+ int PreOnCmdDispatch(xstring comdid)
{
if (comdid == L"action:bill.new")
{
- string s = publiccode::GetUser().id;
- string no = publiccode::GetUser().no;
+ xstring s = publiccode::GetUser().id;
+ xstring no = publiccode::GetUser().no;
if (no != L"00303" && no != L"admin")
{
KXMLDOMDocument supplier_x = ViewObject::RetrieveData(GetServerUrl(),L"/sale/data/SupplierV3/entity/FindBySaleType", L"id", s);
@@ -306,7 +307,7 @@
}
if (comdid == L"action:bill.annex")
{
- string deptname = publiccode::GetUser().deptname;
+ xstring deptname = publiccode::GetUser().deptname;
if (deptname == L"采购部")
{
return 1;
@@ -359,7 +360,7 @@
{
Content = t.selectSingleNode(L"Content").text();
}
- xaserverarg& arg = *new xaserverarg;
+ xaserverarg arg;
arg.AddArg(L"value", Content);
OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg);
@@ -406,7 +407,7 @@
{
AttachEvent(L"tv_folder", L"TVN_SELCHANGED", (FEvent)&SO3list::OnTreeSelChanged); //树选择
AttachEvent(L"dw_list", L"DWV_ROWFOCUSCHANGED", (FEvent)&SO3list::OnRowChanged);//绑定行更改触发事件OnRowChanged
- AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
+ //AttachEvent(L"dw_list", L"DWV_DOUBLECLICKED", (FEvent)&listwin::OnDoubleClicked);
AttachEvent(L"cbx_1", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDdlb);//绑定下拉框更改触发事件OnSelectDdlb
AttachEvent(L"cbx_datashow", L"CBN_SELCHANGE", (FEvent)&SO3list::OnSelectDataShowDdlb);//绑定选择数据显示下拉列表事件OnSelectDataShowDdlb
return 1;
@@ -447,7 +448,7 @@
dw_list.SetColumnState(L"SOID", false);
- string groupname = publiccode::GetUser().groupname;
+ xstring groupname = publiccode::GetUser().groupname;
if (groupname == L"采购小组")
{
dw_list.SetColumnState(L"USDAmount", false);
@@ -499,13 +500,13 @@
{
HTREEITEM hItem = tv_folder.GetCaretItem();
if (hItem ) return 1;
- KXMLDOMElement& e = *(KXMLDOMElement*)tv_folder.GetItemData(hItem);
+ KXMLDOMElement e = tv_folder.GetItemData(hItem);
xstring no = e.getAttribute(L"no");
if (no.find(L"Customer:") >= 0)
{
arg.AddArg(L"CustomerID", e.getAttribute(L"id"));
xstring name = e.getAttribute(L"name");
- if (name.find(L"(L") >= 0) name = name.left(name.find(L"(L"));
+ if (name.find(L"(") >= 0) name = name.left(name.find(L"("));
arg.AddArg(L"CustomerName", name);
}
return 1;
--
Gitblit v1.9.3