From 395ec86989550441a751832d3d2f0e8ddd822a12 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 30 七月 2024 16:55:16 +0800
Subject: [PATCH] update
---
jrj/project/business/AP/APNew3.warizd.cpp | 9 +++++----
jrj/project/business/Company/HrOrg.cpp | 2 +-
jrj/project/business/SystemSettings/BugMaint.Developer.hxsoft.cpp | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/jrj/project/business/AP/APNew3.warizd.cpp b/jrj/project/business/AP/APNew3.warizd.cpp
index a22bcaa..d6a2c6f 100644
--- a/jrj/project/business/AP/APNew3.warizd.cpp
+++ b/jrj/project/business/AP/APNew3.warizd.cpp
@@ -380,7 +380,7 @@
else if (comdid == L"xmFilter") return OnFilter();
else if (comdid == L"xmQuery")
{
-
+
index = m_layer.GetSheetIndex();
index++;
OnRetrieve();
@@ -575,11 +575,11 @@
arg.AddArg(L"QueryTxt", xcontrol(GetControl(L"sle_search")).GetText());
xcombobox cbx_type = GetControl(L"cbx_ship");
- int h = xcombobox::GetCurSel(cbx_type.GetHWND());
+ int h = cbx_type.GetCurSel();
if (h < 0) return 1;
- xstring str = xcombobox::GetItemData(cbx_type.GetHWND());
+ xstring str = (string)cbx_type.GetItemData(h);
arg.AddArg(L"ShipDays", str);
- trace(str);
+
if (getUrl(L"/sale/data/AP/list101", arg.GetString(), x) != 1)
{
trace(x.text());
@@ -588,6 +588,7 @@
}
else
{
+
dw_1.Retrieve(x);
dw_1.Redraw();
}
diff --git a/jrj/project/business/Company/HrOrg.cpp b/jrj/project/business/Company/HrOrg.cpp
index baceac9..5dfe6b7 100644
--- a/jrj/project/business/Company/HrOrg.cpp
+++ b/jrj/project/business/Company/HrOrg.cpp
@@ -131,7 +131,7 @@
return 1;
- xstring id = tv_org.GetItemData(sitem);
+ xstring id = (string)tv_org.GetItemData(sitem);
HCURSOR hCursor = xutil::SetCursorWait();
OnCreateTree(id, sitem);
xutil::RestoreCursor(hCursor);
diff --git a/jrj/project/business/SystemSettings/BugMaint.Developer.hxsoft.cpp b/jrj/project/business/SystemSettings/BugMaint.Developer.hxsoft.cpp
index ec10349..fbd16e2 100644
--- a/jrj/project/business/SystemSettings/BugMaint.Developer.hxsoft.cpp
+++ b/jrj/project/business/SystemSettings/BugMaint.Developer.hxsoft.cpp
@@ -176,7 +176,7 @@
for(i=0; i<s; i++)
{
xstring tmp = m_cb.GetLBText( i);
- xstring tmp2 = m_cb.GetItemData(i);
+ xstring tmp2 = (string)m_cb.GetItemData(i);
KXMLDOMElement e = x.createElement(L"item");
e.setAttribute(L"name", L""+tmp);
e.setAttribute(L"file", L""+tmp2);
--
Gitblit v1.9.3