From 845fa14c8ee11773429575214f8c6e8b5834c683 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 25 七月 2024 15:50:54 +0800
Subject: [PATCH] update
---
jrj/project/viewobject/customer.view.hpp | 2 +-
jrj/project/business/VATNotify/list.vatinvoice.cpp | 4 ++--
jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp | 4 ++--
jrj/project/business/Expense/FreightExpenseList.cpp | 0
jrj/project/business/PO/Maint.PurcherItem.cpp | 0
jrj/project/business/Expense/maint.samplesequest.cpp | 0
jrj/project/business/AP/list.ap.cpp | 4 ++--
jrj/project/business/Expense/FreightExpenseInput.cpp | 0
jrj/project/business/PO/Maint.PaperCard.PO.hpp | 0
jrj/project/business/Expense/list.manage.ap.cpp | 0
jrj/project/total3/viewex.total2.cpp | 2 ++
jrj/project/viewobject/supplier.view.hpp | 2 +-
jrj/project/viewobject/purchaseorder.view.hpp | 2 +-
jrj/project/business/Expense/TestExpense.cpp | 0
jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp | 4 ++--
jrj/project/business/GDN/AdvanceChargeList.cpp | 0
jrj/project/business/Expense/SampleFee.cpp | 0
jrj/project/business/GDN3.maint.cpp | 4 ++--
jrj/project/business/Expense/SampleRequestForm.cpp | 0
jrj/project/business/SO/Apply.SOItem.cpp | 4 ++--
20 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
index 90965b8..cbc4166 100644
--- a/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
+++ b/jrj/project/business/AP/list.RefundGDNLine.Entity.xarch.cpp
@@ -46,12 +46,12 @@
return 1;
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"RefundGDNLine";
}
- xstring GetEntityID(int pr)
+ xstring GetEntityID(LPARAM pr)
{
int row = dw_list.GetRow();
xstring id = dw_list.GetItemString(row,m_entityid.c_str());
diff --git a/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp b/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp
index dfc36ed..90e0f15 100644
--- a/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp
+++ b/jrj/project/business/AP/list.RefundSourcingLine.Entity.xarch.cpp
@@ -83,12 +83,12 @@
return 1;
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"RefundSourcingLine";
}
- xstring GetEntityID(int pr)
+ xstring GetEntityID(LPARAM pr)
{
int row = dw_list.GetRow();
xstring id = dw_list.GetItemString(row,m_entityid.c_str());
diff --git a/jrj/project/business/AP/list.ap.cpp b/jrj/project/business/AP/list.ap.cpp
index fd27ed8..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";
}
diff --git a/jrj/project/business/Expense/FreightExpenseInput.cpp b/jrj/project/business/Expense/FreightExpenseInput.cpp
index ac449c3..f4ad582 100644
--- a/jrj/project/business/Expense/FreightExpenseInput.cpp
+++ b/jrj/project/business/Expense/FreightExpenseInput.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/FreightExpenseList.cpp b/jrj/project/business/Expense/FreightExpenseList.cpp
index 6a53577..4dc0767 100644
--- a/jrj/project/business/Expense/FreightExpenseList.cpp
+++ b/jrj/project/business/Expense/FreightExpenseList.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleFee.cpp b/jrj/project/business/Expense/SampleFee.cpp
index 80cad5d..ffeee54 100644
--- a/jrj/project/business/Expense/SampleFee.cpp
+++ b/jrj/project/business/Expense/SampleFee.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/SampleRequestForm.cpp b/jrj/project/business/Expense/SampleRequestForm.cpp
index 75dc44d..0058041 100644
--- a/jrj/project/business/Expense/SampleRequestForm.cpp
+++ b/jrj/project/business/Expense/SampleRequestForm.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/TestExpense.cpp b/jrj/project/business/Expense/TestExpense.cpp
index b381fac..d385587 100644
--- a/jrj/project/business/Expense/TestExpense.cpp
+++ b/jrj/project/business/Expense/TestExpense.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/list.manage.ap.cpp b/jrj/project/business/Expense/list.manage.ap.cpp
index 52f73f3..75a4c4f 100644
--- a/jrj/project/business/Expense/list.manage.ap.cpp
+++ b/jrj/project/business/Expense/list.manage.ap.cpp
Binary files differ
diff --git a/jrj/project/business/Expense/maint.samplesequest.cpp b/jrj/project/business/Expense/maint.samplesequest.cpp
index 4995b51..30d2d1c 100644
--- a/jrj/project/business/Expense/maint.samplesequest.cpp
+++ b/jrj/project/business/Expense/maint.samplesequest.cpp
Binary files differ
diff --git a/jrj/project/business/GDN/AdvanceChargeList.cpp b/jrj/project/business/GDN/AdvanceChargeList.cpp
index 9fdba08..f6ebf5e 100644
--- a/jrj/project/business/GDN/AdvanceChargeList.cpp
+++ b/jrj/project/business/GDN/AdvanceChargeList.cpp
Binary files differ
diff --git a/jrj/project/business/GDN3.maint.cpp b/jrj/project/business/GDN3.maint.cpp
index be0976b..a6286d9 100644
--- a/jrj/project/business/GDN3.maint.cpp
+++ b/jrj/project/business/GDN3.maint.cpp
@@ -248,12 +248,12 @@
return 1;
}
- xstring GetEntityID(int /*param*/ pr)
+ xstring GetEntityID(LPARAM /*param*/ pr)
{
return InvoiceID;
}
- xstring GetEntityName(int /*param*/ pr)
+ xstring GetEntityName(LPARAM /*param*/ pr)
{
return L"GDN3";
}
diff --git a/jrj/project/business/PO/Maint.PaperCard.PO.hpp b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
index 5f259b7..df02308 100644
--- a/jrj/project/business/PO/Maint.PaperCard.PO.hpp
+++ b/jrj/project/business/PO/Maint.PaperCard.PO.hpp
Binary files differ
diff --git a/jrj/project/business/PO/Maint.PurcherItem.cpp b/jrj/project/business/PO/Maint.PurcherItem.cpp
index 1fabb53..6579bd8 100644
--- a/jrj/project/business/PO/Maint.PurcherItem.cpp
+++ b/jrj/project/business/PO/Maint.PurcherItem.cpp
Binary files differ
diff --git a/jrj/project/business/SO/Apply.SOItem.cpp b/jrj/project/business/SO/Apply.SOItem.cpp
index fcb2a91..925ca2d 100644
--- a/jrj/project/business/SO/Apply.SOItem.cpp
+++ b/jrj/project/business/SO/Apply.SOItem.cpp
@@ -58,12 +58,12 @@
return 1;
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"SaleItem3";
}
- xstring GetEntityID(int pr)
+ xstring GetEntityID(LPARAM pr)
{
int row = dw_list.GetRow();
xstring id = dw_list.GetGuid(row);
diff --git a/jrj/project/business/VATNotify/list.vatinvoice.cpp b/jrj/project/business/VATNotify/list.vatinvoice.cpp
index efbd86c..676622e 100644
--- a/jrj/project/business/VATNotify/list.vatinvoice.cpp
+++ b/jrj/project/business/VATNotify/list.vatinvoice.cpp
@@ -52,12 +52,12 @@
return 1;
}
- xstring GetEntityName(int pr)
+ xstring GetEntityName(LPARAM pr)
{
return L"VATInvoice3";
}
- xstring GetEntityIDName(int /*param*/ pr)
+ xstring GetEntityIDName(LPARAM /*param*/ pr)
{
return L"VTAInvoiceID";
}
diff --git a/jrj/project/total3/viewex.total2.cpp b/jrj/project/total3/viewex.total2.cpp
index c4986d4..1d8f15a 100644
--- a/jrj/project/total3/viewex.total2.cpp
+++ b/jrj/project/total3/viewex.total2.cpp
@@ -111,7 +111,9 @@
if (argStr != L"")
ar.AddArg(L"arg", argStr);
OpenWindow(L"dev:xpage[view.total.arg.vx]", ar);
+
xstring arstr = ar.GetArgString(L"arg");
+ //alert(arstr);
if (arstr != L"" && ar.GetArgString(L"action") == L"ok")
{
argStr = arstr;
diff --git a/jrj/project/viewobject/customer.view.hpp b/jrj/project/viewobject/customer.view.hpp
index 4e6d8db..6773035 100644
--- a/jrj/project/viewobject/customer.view.hpp
+++ b/jrj/project/viewobject/customer.view.hpp
@@ -12,7 +12,7 @@
class CustomerView: public ViewObject
{
public:
- static string GetEntityName(int pr)
+ static string GetEntityName(LPARAM pr)
{
return L"CustomerV3";
}
diff --git a/jrj/project/viewobject/purchaseorder.view.hpp b/jrj/project/viewobject/purchaseorder.view.hpp
index 23d805c..4959c14 100644
--- a/jrj/project/viewobject/purchaseorder.view.hpp
+++ b/jrj/project/viewobject/purchaseorder.view.hpp
@@ -12,7 +12,7 @@
class PurchaseOrderView: public ViewObject
{
public:
- static xstring GetEntityName(int pr)
+ static xstring GetEntityName(LPARAM pr)
{
return L"PurchaseOrder";
}
diff --git a/jrj/project/viewobject/supplier.view.hpp b/jrj/project/viewobject/supplier.view.hpp
index 29fd329..b7947dc 100644
--- a/jrj/project/viewobject/supplier.view.hpp
+++ b/jrj/project/viewobject/supplier.view.hpp
@@ -12,7 +12,7 @@
class SupplierView: public ViewObject
{
public:
- static string GetEntityName(int pr)
+ static string GetEntityName(LPARAM pr)
{
return L"SupplierV3";
}
--
Gitblit v1.9.3