From 0b8444d0eef50d1ee4e0d0b51e174fa5b447d802 Mon Sep 17 00:00:00 2001
From: xj qian <qianxj15@sina.com>
Date: 星期三, 17 七月 2024 17:50:35 +0800
Subject: [PATCH] base code

---
 jrj/project/business/BasicCode/BrandInforList.cpp  |    8 ++++----
 jrj/project/business/BasicCode/BrandInforMaint.cpp |   19 ++++++++-----------
 jrj/project/business/BasicCode/AddUomGroup.cpp     |    6 ++----
 jrj/project/business/BasicCode/CartermList.cpp     |   15 +++++----------
 jrj/ext-jrj/ext-jrj.vcxproj                        |    8 ++++----
 5 files changed, 23 insertions(+), 33 deletions(-)

diff --git a/jrj/ext-jrj/ext-jrj.vcxproj b/jrj/ext-jrj/ext-jrj.vcxproj
index 580b054..ce8244c 100644
--- a/jrj/ext-jrj/ext-jrj.vcxproj
+++ b/jrj/ext-jrj/ext-jrj.vcxproj
@@ -291,19 +291,19 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\AddUomGroup.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\basicfareTypeList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\brand.regtype.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\BrandInforList.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\BrandInforMaint.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\project\business\BasicCode\CartermList.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
diff --git a/jrj/project/business/BasicCode/AddUomGroup.cpp b/jrj/project/business/BasicCode/AddUomGroup.cpp
index 2327ddd..de861fc 100644
--- a/jrj/project/business/BasicCode/AddUomGroup.cpp
+++ b/jrj/project/business/BasicCode/AddUomGroup.cpp
@@ -41,8 +41,7 @@
 			CloseWindow();
 		else if (comdid == L"cb_ok")
 		{
-			control xc = new control;
-			xc.setNativePointer(GetControl(L"Txt"));
+			xcontrol xc = GetControl(L"Txt");
 			xstring name = xc.GetText();
 			xaserverarg arg;
 
@@ -96,8 +95,7 @@
 				if (note == L"修改")
 				{
 					xstring name = arg.GetArgString(L"GroupName");
-					control xc = new control;
-					xc.setNativePointer(GetControl(L"Txt"));
+					xcontrol xc = GetControl(L"Txt");
 					xc.SetText(name);
 				}
 				xstring id = arg.GetArgString(L"m_id");
diff --git a/jrj/project/business/BasicCode/BrandInforList.cpp b/jrj/project/business/BasicCode/BrandInforList.cpp
index 4d9c6ad..d444b26 100644
--- a/jrj/project/business/BasicCode/BrandInforList.cpp
+++ b/jrj/project/business/BasicCode/BrandInforList.cpp
@@ -8,12 +8,12 @@
 #include "viewobject/view.base.hpp"
 
 using xml = KXMLDOMDocument;
-class __declspec(dllexport) BrandInforList : public xwin
+class __declspec(dllexport) BrandInforList : public listwin
 {
 public:
 	xdwgrid	dw_list;
 public:
-	BrandInforList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	BrandInforList(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
 public:
 	static BrandInforList* CreateInstance(void* implPtr, void* hWnd)
 	{
@@ -22,7 +22,7 @@
 	}
 
 
-	int ViewUpdate(param pr, xstring updateItem, xaserverarg  arg)
+	int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg  arg)
 	{
 		if (updateItem == L"del") {
 			int DelRow = dw_list.GetRow();
@@ -32,7 +32,7 @@
 	}
 	int onload()
 	{
-		list::onload();
+		listwin::onload();
 		return -1;
 	}
 
diff --git a/jrj/project/business/BasicCode/BrandInforMaint.cpp b/jrj/project/business/BasicCode/BrandInforMaint.cpp
index 5784bec..85bd9f6 100644
--- a/jrj/project/business/BasicCode/BrandInforMaint.cpp
+++ b/jrj/project/business/BasicCode/BrandInforMaint.cpp
@@ -3,12 +3,13 @@
 #include <xcontrol/xdwgrid.hpp>
 #include <wobject/xdouble.hpp>
 #include <xcontrol/xlayersheet.hpp>
+#include <xcontrol/xcell.hpp>
 
-#include "vbusiness/vframe/listwin.vframe.vbusiness.hpp"
+#include "vbusiness/vframe/maint.vframe.vbusiness.hpp"
 #include "viewobject/view.base.hpp"
 
 using xml = KXMLDOMDocument;
-class __declspec(dllexport) BrandInforMaint : public xframe
+class __declspec(dllexport) BrandInforMaint : public maint
 {
 public:
 
@@ -19,20 +20,15 @@
 	xdwtable dw_base;
 	xcell dw_cell;
 public:
-	BrandInforMaint(void* implPtr, HWND hWnd) :xframe(implPtr, hWnd) {}
+	BrandInforMaint(void* implPtr, HWND hWnd) :maint(implPtr, hWnd) {}
 public:
 	static BrandInforMaint* CreateInstance(void* implPtr, void* hWnd)
 	{
 		BrandInforMaint* pWin = new BrandInforMaint(implPtr, (HWND)hWnd);
 		return pWin;
 	}
-	int alert(xstring str)
-	{
-		//win::MessageBox(GetHWND(),str,L"提示22:",0);
-		TApp::alert(this, str);
-		return 0;
-	}
-	int ViewUpdate(param pr, xstring updateItem, xaserverarg  arg)
+	
+	int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg  arg)
 	{
 		if (updateItem == L"update")
 		{
@@ -41,7 +37,7 @@
 			return 1;
 		}
 	}
-	xstring GetEntityData(param pr)
+	xstring GetEntityData(LPARAM pr)
 	{
 		xml x;
 
@@ -61,6 +57,7 @@
 
 		dw_base.SetScrollState(false);
 
+		return 1;
 
 		/*if (!maint::m_EntityID)
 		{
diff --git a/jrj/project/business/BasicCode/CartermList.cpp b/jrj/project/business/BasicCode/CartermList.cpp
index 01afbee..bea3f5c 100644
--- a/jrj/project/business/BasicCode/CartermList.cpp
+++ b/jrj/project/business/BasicCode/CartermList.cpp
@@ -8,7 +8,7 @@
 #include "viewobject/view.base.hpp"
 
 using xml = KXMLDOMDocument;
-class __declspec(dllexport) CartermList : public xwin
+class __declspec(dllexport) CartermList : public listwin
 {
 public:
 	xdwgrid	dw_list;
@@ -18,19 +18,14 @@
 	static int dw_hWnd;
 
 public:
-	CartermList(void* implPtr, HWND hWnd) :xwin(implPtr, hWnd) {}
+	CartermList(void* implPtr, HWND hWnd) :listwin(implPtr, hWnd) {}
 public:
 	static CartermList* CreateInstance(void* implPtr, void* hWnd)
 	{
 		CartermList* pWin = new CartermList(implPtr, (HWND)hWnd);
 		return pWin;
 	}
-	int alert(xstring str)
-	{
-		//win::MessageBox(GetHWND(),str,L"提示22:",0);
-		TApp::alert(this, str);
-		return 0;
-	}
+
 
 
 	xstring GetGuid() {
@@ -61,7 +56,7 @@
 		dw_list.SetItemString(row, L"Type", L"7");
 	}
 
-	int ViewUpdate(param pr, xstring updateItem, xaserverarg   arg)
+	int ViewUpdate(LPARAM pr, xstring updateItem, xaserverarg   arg)
 	{
 		if (updateItem == L"del")
 		{
@@ -162,7 +157,7 @@
 	int onload()
 	{
 		OnAttachEvent();
-		list::onload();
+		listwin::onload();
 		dw_list.SetReadOnly(false);
 		return -1;
 	}

--
Gitblit v1.9.3