From fac3cdf472283912df0178ad7a07dd9fbba37707 Mon Sep 17 00:00:00 2001
From: LiFan <2308045698@qq.com>
Date: 星期四, 18 七月 2024 09:56:55 +0800
Subject: [PATCH] update

---
 jrj/project/business/SystemSettings/SysUser.hpp            |    9 ++++-----
 jrj/project/business/BasicCode/basicfareTypeList.cpp       |    2 +-
 jrj/project/business/BasicCode/TestingCompanyMaint.cpp     |    2 +-
 jrj/project/business/BasicCode/SpecialDeductFeeList.cpp    |    2 +-
 jrj/project/business/BasicCode/FreightExpenseType.cpp      |    4 ++--
 jrj/project/business/BasicCode/ProfitParam.cpp             |    4 ++--
 jrj/project/business/BasicCode/ExchangeRate.cpp            |    4 ++--
 jrj/project/business/BasicCode/SKUTemplate.select.cpp      |    2 +-
 jrj/project/business/BasicCode/SourceRemark.cpp            |    2 +-
 jrj/project/business/BasicCode/ColorCardNew.cpp            |    4 ++--
 jrj/project/business/BasicCode/TypeList.maint.supplier.cpp |    2 +-
 jrj/project/business/BasicCode/SetUpRemarks.cpp            |    2 +-
 jrj/project/business/BasicCode/AccountUnitMaint.cpp        |    2 +-
 13 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/jrj/project/business/BasicCode/AccountUnitMaint.cpp b/jrj/project/business/BasicCode/AccountUnitMaint.cpp
index 25eb97f..2212b83 100644
--- a/jrj/project/business/BasicCode/AccountUnitMaint.cpp
+++ b/jrj/project/business/BasicCode/AccountUnitMaint.cpp
@@ -118,7 +118,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			
 			xaserverarg arg;
 			
diff --git a/jrj/project/business/BasicCode/ColorCardNew.cpp b/jrj/project/business/BasicCode/ColorCardNew.cpp
index d749027..d867ecd 100644
--- a/jrj/project/business/BasicCode/ColorCardNew.cpp
+++ b/jrj/project/business/BasicCode/ColorCardNew.cpp
@@ -62,7 +62,7 @@
 		arg0.AddArg(L"EntityIDName", L"ColorCardID",L"xs:xstring");
 		arg0.AddArg(L"EntityID", guid,L"xs:xstring");
 		arg0.AddArg(L"FunctionCode", comdid,L"xs:xstring");
-		xml x = new xml;
+		xml x ;
 		
 
 		if(xurl::get(L"/sale/data/Role.config/sys/sql/action", arg0.GetString(), x) != 1)
@@ -172,7 +172,7 @@
 		rec = OnPreSave();
 		if (rec == -1)	
 			return -1;
-		xml x= new xml;
+		xml x;
 		
 		dw_list.DwUpdateAllToEx(x); 
 		xaserverarg arg;
diff --git a/jrj/project/business/BasicCode/ExchangeRate.cpp b/jrj/project/business/BasicCode/ExchangeRate.cpp
index 51e0e26..0615894 100644
--- a/jrj/project/business/BasicCode/ExchangeRate.cpp
+++ b/jrj/project/business/BasicCode/ExchangeRate.cpp
@@ -55,7 +55,7 @@
 
 			int OnSave()
 			{
-				xml x = new xml;
+				xml x ;
 				
 				dw_list.AcceptText();
 				dw_list.DwUpdateAllToEx(x);
@@ -186,7 +186,7 @@
 			
 			int  OnRetrieve()
 			{
-				xml x = new xml;
+				xml x ;
 				
 				xaserverarg arg;
 				
diff --git a/jrj/project/business/BasicCode/FreightExpenseType.cpp b/jrj/project/business/BasicCode/FreightExpenseType.cpp
index b04754c..dcb271c 100644
--- a/jrj/project/business/BasicCode/FreightExpenseType.cpp
+++ b/jrj/project/business/BasicCode/FreightExpenseType.cpp
@@ -72,7 +72,7 @@
 		int OnSave()
 		{
 			dw_list.AcceptText();
-			xml x= new xml;
+			xml x;
 			
 			dw_list.DwUpdateAllToEx(x);
 			
@@ -142,7 +142,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			
 			if (getUrl(L"/sale/data/LogisticsCode/entity/freightexpensetype/list",L"",x)!=1)
 			{
diff --git a/jrj/project/business/BasicCode/ProfitParam.cpp b/jrj/project/business/BasicCode/ProfitParam.cpp
index 80468cf..b91469d 100644
--- a/jrj/project/business/BasicCode/ProfitParam.cpp
+++ b/jrj/project/business/BasicCode/ProfitParam.cpp
@@ -54,7 +54,7 @@
 		}
 		int OnSave()
 		{
-			xml x = new xml;
+			xml x ;
 			
 			dw_list.AcceptText();
 			dw_list.DwUpdateAllToEx(x);
@@ -110,7 +110,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			x = ViewObject::RetrieveData(L"/sale/data/Gdn/profit/profitParamList");
 			if(x)
 			{
diff --git a/jrj/project/business/BasicCode/SKUTemplate.select.cpp b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
index 35a9e24..655b852 100644
--- a/jrj/project/business/BasicCode/SKUTemplate.select.cpp
+++ b/jrj/project/business/BasicCode/SKUTemplate.select.cpp
@@ -61,7 +61,7 @@
 				xstring TemplateContent = e.selectSingleNode(L"TemplateContent").text+L"";
 				xstring TemplateID = e.selectSingleNode(L"TemplateID").text+L"";				
 				//trace(ItemName);
-				xml x = new xml;
+				xml x ;
 				x.setNativePointer(x.CreateInstance());
 				x.LoadXml(TemplateContent);					
 				dw_other.Retrieve(x);
diff --git a/jrj/project/business/BasicCode/SetUpRemarks.cpp b/jrj/project/business/BasicCode/SetUpRemarks.cpp
index 8652de3..d2a0ae0 100644
--- a/jrj/project/business/BasicCode/SetUpRemarks.cpp
+++ b/jrj/project/business/BasicCode/SetUpRemarks.cpp
@@ -121,7 +121,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x;
 			
 			xaserverarg arg;
 			
diff --git a/jrj/project/business/BasicCode/SourceRemark.cpp b/jrj/project/business/BasicCode/SourceRemark.cpp
index fb8bc63..29661ed 100644
--- a/jrj/project/business/BasicCode/SourceRemark.cpp
+++ b/jrj/project/business/BasicCode/SourceRemark.cpp
@@ -121,7 +121,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x;
 			
 			xaserverarg arg;
 			
diff --git a/jrj/project/business/BasicCode/SpecialDeductFeeList.cpp b/jrj/project/business/BasicCode/SpecialDeductFeeList.cpp
index 6e905b7..be15264 100644
--- a/jrj/project/business/BasicCode/SpecialDeductFeeList.cpp
+++ b/jrj/project/business/BasicCode/SpecialDeductFeeList.cpp
@@ -122,7 +122,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			
 			xaserverarg arg;
 			
diff --git a/jrj/project/business/BasicCode/TestingCompanyMaint.cpp b/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
index 7e213d1..7beecd4 100644
--- a/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
+++ b/jrj/project/business/BasicCode/TestingCompanyMaint.cpp
@@ -285,7 +285,7 @@
 
 			args.AddArg(L"CSpec", cspec);
 			args.AddArg(L"SpecRule", SpecRule);
-			xml  x = new xml;
+			xml  x;
 
 			getUrl(L"/sale/data/LogisticsCode/pref/forwarderno/check", args.GetString(), x);
 			if (x.selectSingleNode(L"root/spec"))
diff --git a/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp b/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
index ccb1969..2bae2d5 100644
--- a/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
+++ b/jrj/project/business/BasicCode/TypeList.maint.supplier.cpp
@@ -147,7 +147,7 @@
 		/*
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			x.setNativePointer(xml::CreateInstance());
 			xaserverarg arg = new xaserverarg;
 			arg.setNativePointer(arg.CreateInstance());	
diff --git a/jrj/project/business/BasicCode/basicfareTypeList.cpp b/jrj/project/business/BasicCode/basicfareTypeList.cpp
index 5988861..7698f8b 100644
--- a/jrj/project/business/BasicCode/basicfareTypeList.cpp
+++ b/jrj/project/business/BasicCode/basicfareTypeList.cpp
@@ -121,7 +121,7 @@
 		
 		int  OnRetrieve()
 		{
-			xml x = new xml;
+			xml x ;
 			
 			xaserverarg arg;
 			
diff --git a/jrj/project/business/SystemSettings/SysUser.hpp b/jrj/project/business/SystemSettings/SysUser.hpp
index 0fcf083..8fc26a6 100644
--- a/jrj/project/business/SystemSettings/SysUser.hpp
+++ b/jrj/project/business/SystemSettings/SysUser.hpp
@@ -10,7 +10,7 @@
 #include "viewobject/view.base.hpp"
 
 using xml = KXMLDOMDocument;
-class __declspec(dllexport) SysUser : public xwin
+class __declspec(dllexport) SysUser : public listwin
 {
 public:
 	xtreeview tv_usergroup;
@@ -18,7 +18,7 @@
 	xnode	m_agentNode;
 	xstring strJobID;
 public:
-	SysUser(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	SysUser(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
 public:
 	static SysUser* CreateInstance(void* implPtr, void* hWnd)
 	{
@@ -54,7 +54,7 @@
 		return 1;
 	}
 
-	int SetEntityData(param p)
+	int SetEntityData(LPARAM p)
 	{
 		xml x;
 
@@ -312,8 +312,7 @@
 	{
 		m_agentNode = new xnode;
 
-		tv_usergroup = new treeview;
-		tv_usergroup.setNativePointer(GetControl(L"tv_usergroup"));
+		tv_usergroup = GetControl(L"tv_usergroup");
 		dw_user = new xdwgrid;
 		dw_user.setNativePointer(GetControl(L"dw_user"));
 		dw_user.SetDataObject(GetServerUrl(), L"dev:sheet[SysUser.tpl/UserList]");

--
Gitblit v1.9.3