From 9b3b2eb20b09e13da837a28f16e552ba70a090c4 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 24 四月 2025 14:48:21 +0800
Subject: [PATCH] update
---
jrj/project/business/Customer3.maint.cpp | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 05fec26..ff73ed9 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -51,7 +51,7 @@
return publiccode::GetGuid();
}
- int ViewUpdate(int pr,xstring updateItem,xaserverarg arg)
+ int ViewUpdate(LPARAM pr,xstring updateItem,xaserverarg arg)
{
if(updateItem==L"update")
{
@@ -81,7 +81,7 @@
e.appendChild(Item);
}
- xml x2= new xml;
+ xml x2;
dw_Meetings.DwUpdateAllTo(x2);
KXMLDOMElement e2=x2.documentElement();
@@ -93,7 +93,7 @@
e.appendChild(Item2);
}
- xml x3= new xml;
+ xml x3;
dw_MeetingsEx.DwUpdateAllTo(x3);
KXMLDOMElement e3=x3.documentElement();
@@ -140,13 +140,14 @@
xstring GetPartyID(xstring sName,xstring sType)
{
- xml x1=new xml;
+ xml x1;
xaserverarg arg;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"sname", sName);
arg.AddArg(L"type",sType);
- if(xurl::get(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname",arg.GetString(),x1)!=1)
+
+ if(xurl::get(L"/sale/data/"+GetEntityName(1)+ L"/pref/searchname",arg.GetString(),x1)!=1)
{
xstring error = x1.text();
//alert(L"/sale/data/"+GetEntityName(1)+L"/pref/searchname");
@@ -170,7 +171,7 @@
if (colname == L"CountryCode")
{
xaserverarg arg ;
- arg.setNativePointer(arg.CreateInstance());
+
arg.AddArg(L"countryCode",coldata);
xml x;
@@ -290,7 +291,7 @@
{
xdwtable dw_PartyContact1;
dw_PartyContact1 =dw_detail.FindDwTable(L"PC_OtherInfo");
- xml xx = new xml;
+ xml x
xx.setNativePointer(xml ::CreateInstance());
xaserverarg argnew = new xaserverarg;
argnew.setNativePointer(argnew.CreateInstance());
@@ -670,10 +671,10 @@
int CustomerModify()//跳到客户修改界面
{
//trace(L"asdsad");
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"EntityID", maint::m_EntityID);
- openUrl(L"/sale/view/"+GetEntityName(1)+L"/worknode/customermodify/open", &arg);
+ openUrl(L"/sale/view/"+GetEntityName(1)+L"/worknode/customermodify/open", arg);
//CloseWindow();
return 1;
}
@@ -686,26 +687,26 @@
int OnShare()
{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
int row = dw_detail.GetRow();
if(row < 1) return 0;
xstring PartyID = dw_detail.GetItemString(row,L"PartyID");
arg.AddArg(L"EntityID",PartyID);
arg.AddArg(L"EntityName", L"客户共享");
- OpenWindow(L"dev:xpage[UserGroupShare.vx]", (LPARAM) & arg);
+ OpenWindow(L"dev:xpage[UserGroupShare.vx]", arg);
return 1;
}
int OnShareMessage()
{
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
int row = dw_detail.GetRow();
if(row < 1) return 0;
xstring PartyID = dw_detail.GetItemString(row,L"PartyID");
arg.AddArg(L"PartyID",PartyID);
- OpenWindow(L"dev:xpage[XmShare.Custumer.v3.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[XmShare.Custumer.v3.vx]", arg);
return 1;
}
@@ -791,13 +792,13 @@
{
xsheet.DeleteSheet(1);
xstring xp = L"<xframe src='dev:xpage[CustomerGoodsVd.vx]' />";
- xaserverarg& arg = * new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
arg.AddArg(L"CustomerID",m_EntityID);
arg.AddArg(L"FROM", L"Customer");
arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));
arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
- //arg.AddArg(L"CustomerHWND",GetHWND().toString());
+ //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());
int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void *) &arg);
@@ -820,10 +821,9 @@
{
Content=t.selectSingleNode(L"Content").text();
}
- xaserverarg& arg1 = * new xaserverarg;
- arg1.setNativePointer(arg1.CreateInstance());
+ xaserverarg arg1;
arg1.AddArg(L"value",Content);
- OpenWindow(L"dev:xpage[memo.edit.new.vx]",(LPARAM) & arg1);
+ OpenWindow(L"dev:xpage[memo.edit.new.vx]",arg1);
return 1;
}
@@ -896,10 +896,11 @@
}
if(value == L"客户基本信息")
{
- xaserverarg& arg1 = *new xaserverarg;
+ xaserverarg arg1 = GetArg();
xstring str = dw_detail.GetItemString(1,L"BasicInformation");
arg1.AddArg(L"value",str);
- OpenWindow(L"dev:xpage[memo.edit.new.vx]", (LPARAM)&arg1);
+ OpenWindow(L"dev:xpage[memo.edit.new.vx]", arg1);
+
if(arg1.GetArgString(L"comdid")==L"xmOK")
{
str = arg1.GetArgString(L"value");
@@ -912,7 +913,7 @@
return 1;
}
- int OnItemClickEx(TEvent* evt, int pr)
+ int OnItemClickEx(TEvent* evt, LPARAM pr)
{
xdwtable dw = dw_visit.FindDwTable(L"item",0);
@@ -922,8 +923,8 @@
xstring value = hdr->data;
int row = hdr->row;
//alert(value);
- xaserverarg& arg=*new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg;
+
if(value == L"上传")
{
@@ -935,7 +936,7 @@
arg.AddArg(L"entityid",dw.GetGuid(dw.GetRow()));
- OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]", (LPARAM)&arg);
+ OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]", arg);
return 1;
}
return 1;
@@ -970,18 +971,13 @@
if(value == L"人员")
{
- xaserverarg& arg2 =* new xaserverarg;
-
+ xaserverarg arg = GetArg();
+ OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", arg);
- xaserverarg& parg2 = *(xaserverarg*)GetParam();
-
- OpenWindow(L"dev:xpage[UserGroupPersonSelect.vx]", (LPARAM)&arg2);
-
- if(arg2.GetArgString(L"comdid")==L"xmOk")
+ if(arg.GetArgString(L"comdid")==L"xmOk")
{
- xstring data = arg2.GetArgString(L"data");
+ xstring data = arg.GetArgString(L"data");
xml x2;
-
x2.loadXML(data);
KXMLDOMNodeList nodes = x2.selectNodes(L"/root/item");
trace(x2.xml());
@@ -998,7 +994,7 @@
xstring Name = t.getAttribute(L"Name");
if(Names==L"")
Names = Name;
- else if(Names.find(Name) < 0) Names+=L",L"+Name;
+ else if(Names.find(Name) < 0) Names+=L","+Name;
}
}
dw.SetItemString(dw.GetRow(),L"CMPersonnel",Names);
@@ -1020,7 +1016,7 @@
xstring value = hdr->data;
int row = hdr->row;
//alert(value);
- xaserverarg& arg=*new xaserverarg;
+ xaserverarg arg;
if(value == L"附件上传")
@@ -1033,20 +1029,18 @@
arg.AddArg(L"entityid",dw.GetGuid(dw.GetRow()));
- OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",(LPARAM)&arg);
+ OpenWindow(L"dev:xpage[maint.Document.Customer.v3.vx]",arg);
return 1;
}
if(value == L"人员")
{
- xaserverarg& arg2 = *new xaserverarg;
+ xaserverarg arg;
+ OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", arg);
- xaserverarg parg2 = *(xaserverarg*)GetParam();
- OpenWindow(L"dev:xpage[UserGroupPersonSelectEx.vx]", (LPARAM)&arg2);
-
- if(arg2.GetArgString(L"comdid")==L"xmOk")
+ if(arg.GetArgString(L"comdid")==L"xmOk")
{
- xstring data = arg2.GetArgString(L"data");
+ xstring data = arg.GetArgString(L"data");
xml x2;
x2.loadXML(data);
@@ -1065,7 +1059,7 @@
xstring Name = t.getAttribute(L"Name");
if(Names==L"")
Names = Name;
- else if(Names.find(Name) < 0) Names+=L",L"+Name;
+ else if(Names.find(Name) < 0) Names+=L","+Name;
}
}
dw.SetItemString(dw.GetRow(),L"CMPersonnel",Names);
@@ -1087,13 +1081,41 @@
return 1;
}
+ int CustomerBase(xstring ID)
+ {
+ xml x;
+ xaserverarg arg;
+
+ arg.AddArg(L"EntityID", ID);
+
+ if (getUrl(L"/sale/data/CustomerV3/entity/maint", arg.GetString(), x) != 1)
+ {
+ trace(x.text());
+ return -1;
+ }
+ else
+ {
+ dw_detail.Retrieve(x);
+ dw_detail.Redraw();
+ dw_Meetings.Retrieve(x);
+ dw_Meetings.Redraw();
+ dw_MeetingsEx.Retrieve(x);
+ dw_MeetingsEx.Redraw();
+ dw_visit.Retrieve(x);
+ dw_visit.Redraw();
+ }
+ return 1;
+ }
+
int onload()
{
- maint::onload();
+ maint::onload();
+ return 1;
}
int onloaded()
{
+ SetArg();
APP=1;
maint::onloaded();
@@ -1115,7 +1137,7 @@
arg.AddArg(L"CustomerID", this.m_EntityID);
arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));
arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsNewVd/view");
- arg.AddArg(L"CustomerHWND",this.GetHWND().toString());
+ arg.AddArg(L"CustomerHWND",this.xstring((__int64)GetHWND()));
//trace(this.m_EntityID);
int p =arg.__nativept;*/
//int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, 0);
@@ -1188,11 +1210,14 @@
}
- if (GetParam())
+
+ if (GetWinParam())
{
- int iArgs = GetParam();
- xaserverarg& args = *new xaserverarg;
-
+ xaserverarg args = GetArg();
+ if (args.GetArgString(L"PartyID") != L"")
+ {
+ CustomerBase(m_EntityID);
+ }
//alert(args.GetString());
xstring CustomerGood = args.GetArgString(L"CustomerGood");
ApplyStatus= args.GetArgString(L"CustomerGood");
@@ -1200,20 +1225,19 @@
{
xsheet.DeleteSheet(0);
xstring xp = L"<xframe src='dev:xpage[CustomerGoodsVd.vx]' />";
- xaserverarg& arg = *new xaserverarg;
- arg.setNativePointer(arg.CreateInstance());
+ xaserverarg arg ;
+
arg.AddArg(L"CustomerID", m_EntityID);
arg.AddArg(L"FROM", L"Customer");
arg.AddArg(L"CustomerName", dw_detail.GetItemString(1,L"Name"));
arg.AddArg(L"config", L"客户产品.vface/config/CustomerGoodsVdVd/view");
- //arg.AddArg(L"CustomerHWND",GetHWND().toString());
+ //arg.AddArg(L"CustomerHWND",xstring((__int64)GetHWND()));
arg.SetParam(L"CustomerHWND", (LPARAM)GetHWND());
int nIndex = xsheet.InsertSheet(-1, L"客户ID货号库", xp, (void*)&arg);
xsheet.SelectSheet(nIndex);
//xsheet.SetSheetState(0, 0);
}
-
ApplyStatus=dw_detail.GetItemString(1,L"ApplyStatus");
--
Gitblit v1.9.3