From 54aa6f0768d1d78e54513aa1ac89a310a53db13d Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期五, 05 七月 2024 12:05:33 +0800
Subject: [PATCH] update
---
jrj/project/business/AP/APNew3.warizd.cpp | 11 ++++++-----
jrj/project/business/AP/maint.ap.cpp | 5 +++--
jrj/project/business/VATNotify/list.vatnotify.cpp | 10 +++++-----
jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp | 8 ++++----
jrj/project/business/VATNotify/simple.maint.vatnotify.cpp | 8 ++++----
jrj/project/business/Supplier/maint.Document.Supplier.cpp | 0
jrj/ext-jrj/ext-jrj.vcxproj | 2 +-
jrj/project/business/AP/list.ap.cpp | 8 ++++----
8 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index d2d3c21..612904d 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -243,7 +243,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\project\business\AP\APBank.cpp">
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\project\business\AP\APNew3.warizd.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/jrj/project/business/AP/APNew3.warizd.cpp b/jrj/project/business/AP/APNew3.warizd.cpp
index 3858b6e..5beeecb 100644
--- a/jrj/project/business/AP/APNew3.warizd.cpp
+++ b/jrj/project/business/AP/APNew3.warizd.cpp
@@ -1,6 +1,7 @@
#include <wobject/xstring.hpp>
#include <xcontrol/xtreeview.hpp>
#include <xcontrol/xdwgrid.hpp>
+#include <wobject/xdouble.hpp>
#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
#include "viewobject/view.base.hpp"
@@ -79,7 +80,7 @@
{
double Amount1 = dw_3.GetItemDouble(hdr.row, L"Amount");
double PrePayAmount = dw_3.GetItemDouble(hdr.row, L"PrePayAmount");
- dw_3.SetItemDouble(hdr.row, L"PayedAmount", (Amount - PrePayAmount).round(2));
+ dw_3.SetItemDouble(hdr.row, L"PayedAmount", xdouble(Amount - PrePayAmount).round(2));
}
return 1;
}
@@ -112,7 +113,7 @@
/*}*/
if (inserted)
{
- xstring sdate = win32::GetLocalDate();
+ xstring sdate = publiccode::GetCurrentDate();
dw_3.SetItemString(row, L"APDate", sdate);
dw_3.SetItemString(row, L"CreateDate", sdate);
@@ -429,7 +430,7 @@
int row = hdr.row;
OnPrepayRetrieve(row, bstart);
- xml x = ViewObject::RetrieveData(L"/sale/data/AP/list/invoice/supplier", L"InvoiceNo", dw_1.GetItemString(row, L"InvoiceNo"),
+ xml x = ViewObject::RetrieveData( L"/sale/data/AP/list/invoice/supplier", L"InvoiceNo", dw_1.GetItemString(row, L"InvoiceNo"),
"SupplierID", dw_1.GetItemString(row, L"SupplierID"));
if (x) dw_101.Retrieve(x);
@@ -577,9 +578,9 @@
arg.AddArg(L"QueryTxt", GetControl(L"sle_search").GetText());
xcombobox cbx_type = GetControl(L"cbx_ship");
- int h = xcombobox::GetCurSel(cbx_type.GetId());
+ int h = xcombobox::GetCurSel(cbx_type.GetHWND());
if (h < 0) return 1;
- xstring str = xcombobox::GetItemData(cbx_type.GetId());
+ xstring str = xcombobox::GetItemData(cbx_type.GetHWND());
arg.AddArg(L"ShipDays", str);
trace(str);
if (getUrl(L"/sale/data/AP/list101", arg.GetString(), x) != 1)
diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index 3d185f7..520605a 100644
--- a/jrj/project/business/AP/list.ap.cpp
+++ b/jrj/project/business/AP/list.ap.cpp
@@ -56,9 +56,9 @@
xstring GetPayType()
{
xcombobox cbx_type = GetControl(L"cbx_type");
- int h = xcombobox::GetCurSel(cbx_type.GetId());
- if (h < 0) return "";
- return xcombobox::GetLBText(cbx_type.GetId(), h);
+ int h = xcombobox::GetCurSel(cbx_type.GetHWND());
+ if (h < 0) return L"";
+ return xcombobox::GetLBText(cbx_type.GetHWND(), h);
}
xstring GetEntityName(int pr)
@@ -168,7 +168,7 @@
arg.AddArg(L"APID", APID);
arg.AddArg(L"APType", apType);
- OpenWindow(L"dev:xpage[maint.ap.vx]", pa);
+ OpenWindow(L"dev:xpage[maint.ap.vx]", arg);
return 1;
}
if (comdid.find(L"action:", 0) >= 0)
diff --git a/jrj/project/business/AP/maint.ap.cpp b/jrj/project/business/AP/maint.ap.cpp
index 02e4f58..3af3a4b 100644
--- a/jrj/project/business/AP/maint.ap.cpp
+++ b/jrj/project/business/AP/maint.ap.cpp
@@ -13,7 +13,7 @@
xstring APType;
xdwtable dw_base;
xnode m_agentNode; //Agent Condition
- int hObject = 0;
+ HWND hObject = 0;
public:
MaintAP(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
public:
@@ -115,7 +115,8 @@
dw_base.ResetUpdateStatus();
updateAdvance();
alert(L"保存成功!");
- SendMessage(hObject, 0x401, L"xmRefresh", 0);
+
+ SendMessage(hObject, 0x401, (LPARAM)L"xmRefresh", 0);
CloseWindow();
}
else
diff --git a/jrj/project/business/Supplier/maint.Document.Supplier.cpp b/jrj/project/business/Supplier/maint.Document.Supplier.cpp
index 0a14c38..a384429 100644
--- a/jrj/project/business/Supplier/maint.Document.Supplier.cpp
+++ b/jrj/project/business/Supplier/maint.Document.Supplier.cpp
Binary files differ
diff --git a/jrj/project/business/VATNotify/list.vatnotify.cpp b/jrj/project/business/VATNotify/list.vatnotify.cpp
index 28986e4..418ef5b 100644
--- a/jrj/project/business/VATNotify/list.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/list.vatnotify.cpp
@@ -90,7 +90,7 @@
int OnPrint()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -110,13 +110,13 @@
arg.AddArg(L"VATNotifyID", L"");
trace(InvoiceNo + L"==1" + NInvoiceNoEx + L"==2" + SupplierID + L"==3" + dw_list.GetGuid(dw_list.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -136,7 +136,7 @@
arg.AddArg(L"VATNotifyID", dw_list.GetGuid(dw_list.GetRow()));
trace(L"=====L" + InvoiceNo + L"=====L" + SupplierID + L"=====L" + dw_list.GetGuid(dw_list.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
@@ -169,7 +169,7 @@
arg.AddArg(L"SupplierID", supplierID);
arg.AddArg(L"CName", cname);
- OpenWindow(L"dev:xpage[maint.papercard.vatnotify.vx]", p);
+ OpenWindow(L"dev:xpage[maint.papercard.vatnotify.vx]", arg);
return 1;
}
diff --git a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
index d942af0..a308683 100644
--- a/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/maint.papercard.vatnotify.cpp
@@ -56,25 +56,25 @@
int OnPrint()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
arg.AddArg(L"EntityNo", dw_item.GetItemString(1, L"InvoiceNo"), L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
diff --git a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
index f60c9b4..21fb64f 100644
--- a/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
+++ b/jrj/project/business/VATNotify/simple.maint.vatnotify.cpp
@@ -63,7 +63,7 @@
int OnPrint()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify");
arg.AddArg(L"EntityID", L"", L"");
@@ -74,13 +74,13 @@
arg.AddArg(L"SupplierID", SupplierID);
arg.AddArg(L"VATNotifyID", L"");
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", arg);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
int OnPrintItem()
{
- xaserverarg arg;
+ xaserverarg& arg = *new xaserverarg;
arg.AddArg(L"EntityName", L"VATNotify", L"");
arg.AddArg(L"EntityID", L"", L"");
@@ -92,7 +92,7 @@
arg.AddArg(L"VATNotifyID", dw_item.GetGuid(dw_item.GetRow()));
trace(InvoiceNo + L"====L" + dw_item.GetGuid(dw_item.GetRow()));
- openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", p);
+ openUrl(L"/sale/view/view.base/xpage/Template/PrintViewEx", &arg);
return 1;
}
--
Gitblit v1.9.3