From 9ac9cc9e9cd91b97d35a6e28400df71630765e40 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 21 八月 2024 14:35:51 +0800
Subject: [PATCH] Merge branch 'master' of http://116.62.18.175:6699/r/mis-prj
---
jrj/project/business/AP/list.ap.cpp | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index 11b76e5..8255260 100644
--- a/jrj/project/business/AP/list.ap.cpp
+++ b/jrj/project/business/AP/list.ap.cpp
@@ -61,12 +61,12 @@
return xcombobox::GetLBText(cbx_type.GetHWND(), h);
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"AP3";
}
- xstring GetEntityIDName(int /*param*/ pr)
+ xstring GetEntityIDName(LPARAM /*param*/ pr)
{
return L"APID";
}
@@ -162,7 +162,7 @@
if (row < 1) return 1;
KXMLDOMElement ele = dw_list.GetRowElement(row);
xstring APID = ele.selectSingleNode(L"APID").text();
- ele.Release();
+
xaserverarg arg;
arg.AddArg(L"APID", APID);
@@ -188,10 +188,10 @@
{
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 = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
apType = L"---";
if (txt == L"已付货款")
{
@@ -297,10 +297,10 @@
xstring payTypeTwo = GetPayType();
if (payTypeTwo == L"已付货款" || payTypeTwo == 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 = (string)xcombobox::GetLBText(evt->command.hCtrl, h);
if (txt == L"出运日期")
{
apType = L"000";
@@ -323,10 +323,10 @@
}
else if (payTypeTwo == L"预付货款")
{
- int h1 = xcombobox::GetCurSel(evt.hCtrl);
+ int h1 = xcombobox::GetCurSel(evt->command.hCtrl);
if (h1 > -1)
{
- xstring txt1 = xcombobox::GetLBText(evt.hCtrl, h1);
+ xstring txt1 = (string)xcombobox::GetLBText(evt->command.hCtrl, h1);
if (txt1 == L"出运日期")
{
apType = L"001";
@@ -349,10 +349,10 @@
}
else if (payTypeTwo == L"预付货款(已冲)L")
{
- int h2 = xcombobox::GetCurSel(evt.hCtrl);
+ int h2 = xcombobox::GetCurSel(evt->command.hCtrl);
if (h2 > -1)
{
- xstring txt2 = xcombobox::GetLBText(evt.hCtrl, h2);
+ xstring txt2 = (string)xcombobox::GetLBText(evt->command.hCtrl, h2);
if (txt2 == L"出运日期")
{
apType = L"001";
@@ -476,8 +476,7 @@
xaserverarg arg;
arg.AddArg(L"html", str);
- int obj = cast(dw_list as int);
- arg.AddArg(L"obj", obj.toString());
+ arg.SetParam(L"obj", &dw_list);
OpenWindow(L"dev:xpage[data.vanalysis.vx]", arg);
xutil::RestoreCursor(hCursor);
return 1;
--
Gitblit v1.9.3