From 81db5004dec768f2f06b1277c81b13f1043e1bd5 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期二, 09 七月 2024 16:04:00 +0800
Subject: [PATCH] update

---
 jrj/project/business/Customer3.maint.cpp |   77 ++++++++++++++++++++++++--------------
 1 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/jrj/project/business/Customer3.maint.cpp b/jrj/project/business/Customer3.maint.cpp
index 6a7b2c2..936c46f 100644
--- a/jrj/project/business/Customer3.maint.cpp
+++ b/jrj/project/business/Customer3.maint.cpp
@@ -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();
@@ -290,7 +290,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());	
@@ -797,7 +797,7 @@
 				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);
@@ -970,18 +970,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());
@@ -1020,7 +1015,7 @@
 		xstring value = hdr->data;
 		int row = hdr->row;
 		//alert(value);
-		xaserverarg& arg=*new xaserverarg;
+		xaserverarg arg;
 						
 		
 		if(value == L"附件上传")
@@ -1033,20 +1028,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);
@@ -1087,6 +1080,32 @@
 		return 1;
 	}
 	
+	int CustomerBase(xstring ID)
+	{
+		xml x;
+		xaserverarg arg;
+		arg.setNativePointer(arg.CreateInstance());
+		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();
@@ -1116,7 +1135,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);
@@ -1189,11 +1208,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");
@@ -1207,14 +1229,13 @@
 				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