From 92b924d2e9734000dd09e60f37fc24216c353f0b Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 16 七月 2024 17:49:17 +0800
Subject: [PATCH] update
---
jrj/project/business/BasicCode/ForwarderList.cpp | 2
jrj/project/business/BasicCode/CartermList.cpp | 2
jrj/project/business/BasicCode/SKUTemplate.cpp | 2
jrj/project/business/BasicCode/ShipcompanyMaint.cpp | 11 +++--
jrj/project/business/BasicCode/ExpressMaint.cpp | 10 ++--
jrj/project/business/BasicCode/TestingCompanyMaint.cpp | 11 +++--
jrj/project/business/BasicCode/CustomerMarketList.cpp | 3 +
jrj/project/business/BasicCode/ShipcompanyList.cpp | 3 +
jrj/project/business/BasicCode/FCL.cpp | 4 +-
jrj/project/business/BasicCode/BrandInforList.cpp | 3 +
jrj/project/business/BasicCode/BrandInforMaint.cpp | 6 +-
jrj/project/business/BasicCode/ForwarderMaint.cpp | 8 ++--
jrj/project/business/BasicCode/ExpressList.cpp | 2 +
jrj/project/business/BasicCode/SKUItem.cpp | 2
jrj/project/business/BasicCode/CustomerMarketMaint.cpp | 6 +-
jrj/project/business/BasicCode/PaymentTerm.list.cpp | 3 +
jrj/project/business/BasicCode/TestingCompanyList.cpp | 3 +
17 files changed, 48 insertions(+), 33 deletions(-)
diff --git a/jrj/project/business/BasicCode/BrandInforList.cpp b/jrj/project/business/BasicCode/BrandInforList.cpp
index 48538a7..4d9c6ad 100644
--- a/jrj/project/business/BasicCode/BrandInforList.cpp
+++ b/jrj/project/business/BasicCode/BrandInforList.cpp
@@ -10,7 +10,8 @@
using xml = KXMLDOMDocument;
class __declspec(dllexport) BrandInforList : public xwin
{
-
+public:
+ xdwgrid dw_list;
public:
BrandInforList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
diff --git a/jrj/project/business/BasicCode/BrandInforMaint.cpp b/jrj/project/business/BasicCode/BrandInforMaint.cpp
index 148525a..5784bec 100644
--- a/jrj/project/business/BasicCode/BrandInforMaint.cpp
+++ b/jrj/project/business/BasicCode/BrandInforMaint.cpp
@@ -64,10 +64,10 @@
/*if (!maint::m_EntityID)
{
- //xstring suserid = TApp::GetUserInfo().id;
+ //xstring suserid = publiccode::GetUser().id;
xstring suserid = xaserver::GetUserId();
- xstring susername = TApp::GetUserInfo().name;
- xstring sdate = TApp::GetCurDate();
+ xstring susername = publiccode::GetUser().name;
+ xstring sdate = publiccode::GetCurrentDate();
dw_base.SetItemString(dw_base.GetRow(),L"CreatorID",suserid);//Party
dw_base.SetItemDisplayString(dw_base.GetRow(),L"CreatorID",susername);
dw_base.SetItemString(dw_base.GetRow(),L"CreateDate",sdate);
diff --git a/jrj/project/business/BasicCode/CartermList.cpp b/jrj/project/business/BasicCode/CartermList.cpp
index dc1585c..01afbee 100644
--- a/jrj/project/business/BasicCode/CartermList.cpp
+++ b/jrj/project/business/BasicCode/CartermList.cpp
@@ -34,7 +34,7 @@
xstring GetGuid() {
- return TApp::GetGuid();
+ return publiccode::GetGuid();
}
int OnAddrow()
{
diff --git a/jrj/project/business/BasicCode/CustomerMarketList.cpp b/jrj/project/business/BasicCode/CustomerMarketList.cpp
index 7c3a0fc..cf794b4 100644
--- a/jrj/project/business/BasicCode/CustomerMarketList.cpp
+++ b/jrj/project/business/BasicCode/CustomerMarketList.cpp
@@ -10,7 +10,8 @@
using xml = KXMLDOMDocument;
class __declspec(dllexport) CustomerMarketList : public xwin
{
-
+public:
+ xdwgrid dw_list;
public:
CustomerMarketList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
diff --git a/jrj/project/business/BasicCode/CustomerMarketMaint.cpp b/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
index 1198a1b..ec84f4f 100644
--- a/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
+++ b/jrj/project/business/BasicCode/CustomerMarketMaint.cpp
@@ -56,10 +56,10 @@
dw_base.setNativePointer(GetControl(L"dw_base"));
if (!maint::m_EntityID)
{
- //xstring suserid = TApp::GetUserInfo().id;
+ //xstring suserid = publiccode::GetUser().id;
xstring suserid = xaserver::GetUserId();
- xstring susername = TApp::GetUserInfo().name;
- xstring sdate = TApp::GetCurDate();
+ xstring susername = publiccode::GetUser().name;
+ xstring sdate = publiccode::GetCurrentDate();
dw_base.SetItemString(dw_base.GetRow(), L"CreatorID", suserid);//Party
dw_base.SetItemDisplayString(dw_base.GetRow(), L"CreatorID", susername);
dw_base.SetItemString(dw_base.GetRow(), L"CreateDate", sdate);
diff --git a/jrj/project/business/BasicCode/ExpressList.cpp b/jrj/project/business/BasicCode/ExpressList.cpp
index 18d0b52..7f16177 100644
--- a/jrj/project/business/BasicCode/ExpressList.cpp
+++ b/jrj/project/business/BasicCode/ExpressList.cpp
@@ -11,6 +11,8 @@
class __declspec(dllexport) ExpressList : public xwin
{
public:
+ xdwgrid dw_list;
+public:
ExpressList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
static ExpressList* CreateInstance(void* implPtr, void* hWnd)
diff --git a/jrj/project/business/BasicCode/ExpressMaint.cpp b/jrj/project/business/BasicCode/ExpressMaint.cpp
index a58ca65..ce669d1 100644
--- a/jrj/project/business/BasicCode/ExpressMaint.cpp
+++ b/jrj/project/business/BasicCode/ExpressMaint.cpp
@@ -44,13 +44,13 @@
xstring GetGuid() {
- return TApp::GetGuid();
+ return publiccode::GetGuid();
}
int OnClear() {
if (m_EntityID == L"") {
- trace(1);
- m_userid = TApp::GetUserInfo().id;
- m_username = TApp::GetUserInfo().name;
+ //trace(1);
+ m_userid = publiccode::GetUser().id;
+ m_username = publiccode::GetUser().name;
dw_base = new xdwtable;
dw_base.setNativePointer(GetControl(L"dw_base"));
dw_base.SetItemString(1, L"PartyID", GetGuid());
@@ -64,7 +64,7 @@
dw_base.SetItemString(1, L"Type", L"8");
dw_base.SetItemString(1, L"EnterName", m_userid);
dw_base.SetItemDisplayString(1, L"EnterName", m_username);
- dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate());
+ dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
dw_base.SetItemString(1, L"PBAStatus", L"Y");
diff --git a/jrj/project/business/BasicCode/FCL.cpp b/jrj/project/business/BasicCode/FCL.cpp
index 8116240..c612560 100644
--- a/jrj/project/business/BasicCode/FCL.cpp
+++ b/jrj/project/business/BasicCode/FCL.cpp
@@ -257,7 +257,7 @@
int OnAddrow()
{
int row = dw_list.InsertRow(0);
- dw_list.SetItemString(row, L"modifieddate", TApp::GetCurDate());
+ dw_list.SetItemString(row, L"modifieddate", publiccode::GetCurrentDate());
SetPriceBaseEmpty();
return 1;
}
@@ -266,7 +266,7 @@
int row = dw_list.GetRow();
if (row < 1) return 0;
int newrow = dw_list.InsertRow(row);
- dw_list.SetItemString(newrow, L"modifieddate", TApp::GetCurDate());
+ dw_list.SetItemString(newrow, L"modifieddate", publiccode::GetCurrentDate());
SetPriceBaseEmpty();
return 1;
}
diff --git a/jrj/project/business/BasicCode/ForwarderList.cpp b/jrj/project/business/BasicCode/ForwarderList.cpp
index 434d63a..5d58f1e 100644
--- a/jrj/project/business/BasicCode/ForwarderList.cpp
+++ b/jrj/project/business/BasicCode/ForwarderList.cpp
@@ -11,7 +11,6 @@
class __declspec(dllexport) ForwarderList : public xwin
{
-
public:
//xdwpages dw_pages;
xstring m_QueryTxt;
@@ -21,6 +20,7 @@
static int dw_hWnd;
int m_pageIndex;
int m_pageNumber;
+ xdwgrid dw_list;
public:
ForwarderList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
diff --git a/jrj/project/business/BasicCode/ForwarderMaint.cpp b/jrj/project/business/BasicCode/ForwarderMaint.cpp
index 6357734..89951e0 100644
--- a/jrj/project/business/BasicCode/ForwarderMaint.cpp
+++ b/jrj/project/business/BasicCode/ForwarderMaint.cpp
@@ -45,13 +45,13 @@
}
xstring GetGuid() {
- return TApp::GetGuid();
+ return publiccode::GetGuid();
}
int OnClear() {
if (m_EntityID == L"") {
trace(1);
- m_userid = TApp::GetUserInfo().id;
- m_username = TApp::GetUserInfo().name;
+ m_userid = publiccode::GetUser().id;
+ m_username = publiccode::GetUser().name;
dw_base = new xdwtable;
dw_base.setNativePointer(GetControl(L"dw_base"));
dw_base.SetItemString(1, L"ForwarderID", GetGuid());
@@ -67,7 +67,7 @@
dw_base.SetItemString(1, L"Type", L"5");
dw_base.SetItemString(1, L"EnterName", m_userid);
dw_base.SetItemDisplayString(1, L"EnterName", m_username);
- dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate());
+ dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
/*xdwtable dw = new xdwtable;
dw.setNativePointer(dw_base.GetCurTable());
xdwtable dwcon = new xdwtable;
diff --git a/jrj/project/business/BasicCode/PaymentTerm.list.cpp b/jrj/project/business/BasicCode/PaymentTerm.list.cpp
index 17f7f10..d21425f 100644
--- a/jrj/project/business/BasicCode/PaymentTerm.list.cpp
+++ b/jrj/project/business/BasicCode/PaymentTerm.list.cpp
@@ -11,6 +11,9 @@
class __declspec(dllexport) PaymentTermlist111 : public xwin
{
public:
+
+ xdwgrid dw_list;
+public:
PaymentTermlist111(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
static PaymentTermlist111* CreateInstance(void* implPtr, void* hWnd)
diff --git a/jrj/project/business/BasicCode/SKUItem.cpp b/jrj/project/business/BasicCode/SKUItem.cpp
index aab65b9..ec0c200 100644
--- a/jrj/project/business/BasicCode/SKUItem.cpp
+++ b/jrj/project/business/BasicCode/SKUItem.cpp
@@ -226,7 +226,7 @@
}
int OnSetValue(int row) {
dw_list.SetItemString(row, L"PID", CategoryID);
- dw_list.SetItemString(row, L"ID", TApp::GetGuid());
+ dw_list.SetItemString(row, L"ID", publiccode::GetGuid());
return 1;
}
int OnAddRow()
diff --git a/jrj/project/business/BasicCode/SKUTemplate.cpp b/jrj/project/business/BasicCode/SKUTemplate.cpp
index e0e4e42..9c410fb 100644
--- a/jrj/project/business/BasicCode/SKUTemplate.cpp
+++ b/jrj/project/business/BasicCode/SKUTemplate.cpp
@@ -134,7 +134,7 @@
return 1;
}
int OnSetValue(int row) {
- dw_list.SetItemString(row, L"TemplateID", TApp::GetGuid());
+ dw_list.SetItemString(row, L"TemplateID", publiccode::GetGuid());
return 1;
}
int RemoveAttribute(xml x, xstring nodename)//根据名称删除属性节点
diff --git a/jrj/project/business/BasicCode/ShipcompanyList.cpp b/jrj/project/business/BasicCode/ShipcompanyList.cpp
index 76baf8c..fc49f1e 100644
--- a/jrj/project/business/BasicCode/ShipcompanyList.cpp
+++ b/jrj/project/business/BasicCode/ShipcompanyList.cpp
@@ -11,6 +11,9 @@
class __declspec(dllexport) ShipcompanyList : public xwin
{
public:
+
+ xdwgrid dw_list;
+public:
ShipcompanyList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
static ShipcompanyList* CreateInstance(void* implPtr, void* hWnd)
diff --git a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
index 5d399ae..1d88656 100644
--- a/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
+++ b/jrj/project/business/BasicCode/ShipcompanyMaint.cpp
@@ -46,13 +46,14 @@
SetAgent(L"maint");
return 1;
}
- xstring GetGuid() {
- return TApp::GetGuid();
+ xstring GetGuid()
+ {
+ return publiccode::GetGuid();
}
int OnClear() {
if (m_EntityID == L"") {
- m_userid = TApp::GetUserInfo().id;
- m_username = TApp::GetUserInfo().name;
+ m_userid = publiccode::GetUser().id;
+ m_username = publiccode::GetUser().name;
dw_base = new xdwtable;
dw_base.setNativePointer(GetControl(L"dw_base"));
dw_base.SetItemString(1, L"PartyID", GetGuid());
@@ -66,7 +67,7 @@
dw_base.SetItemString(1, L"PrimaryFlag", L"Y");
dw_base.SetItemString(1, L"EnterName", m_userid);
dw_base.SetItemDisplayString(1, L"EnterName", m_username);
- dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate());
+ dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
}
else
{
diff --git a/jrj/project/business/BasicCode/TestingCompanyList.cpp b/jrj/project/business/BasicCode/TestingCompanyList.cpp
index 43369c3..50c7dd3 100644
--- a/jrj/project/business/BasicCode/TestingCompanyList.cpp
+++ b/jrj/project/business/BasicCode/TestingCompanyList.cpp
@@ -11,6 +11,9 @@
class __declspec(dllexport) TestingCompanyList : public xwin
{
public:
+
+ xdwgrid dw_list;
+public:
TestingCompanyList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
public:
static TestingCompanyList* CreateInstance(void* implPtr, void* hWnd)
diff --git a/jrj/project/business/BasicCode/TestingCompanyMaint.cpp b/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
index 596dc4b..12a369a 100644
--- a/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
+++ b/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
@@ -46,13 +46,14 @@
SetAgent(L"maint");
return 1;
}
- xstring GetGuid() {
- return TApp::GetGuid();
+ xstring GetGuid()
+ {
+ return publiccode::GetGuid();
}
int OnClear() {
if (m_EntityID == L"") {
- m_userid = TApp::GetUserInfo().id;
- m_username = TApp::GetUserInfo().name;
+ m_userid = publiccode::GetUser().id;
+ m_username = publiccode::GetUser().name;
dw_base = new xdwtable;
dw_base.setNativePointer(GetControl(L"dw_base"));
dw_base.SetItemString(1, L"PartyID", GetGuid());
@@ -66,7 +67,7 @@
dw_base.SetItemString(1, L"PrimaryFlag", L"Y");
dw_base.SetItemString(1, L"EnterName", m_userid);
dw_base.SetItemDisplayString(1, L"EnterName", m_username);
- dw_base.SetItemString(1, L"CreateDate", TApp::GetCurDate());
+ dw_base.SetItemString(1, L"CreateDate", publiccode::GetCurrentDate());
}
else
{
--
Gitblit v1.9.3