From 33b47401378d4c6a95948dd20860001161c35067 Mon Sep 17 00:00:00 2001
From: jinghuanzhang <jinghz@oceic.com>
Date: 星期三, 05 四月 2023 12:37:04 +0800
Subject: [PATCH] 11
---
DAL/ClsGy_ORGANIZATIONS_Ctl.cs | 3 -
BaseSet/公用基础资料/Gy_ORGANIZATIONS.cs | 8 ++--
Model/Model.csproj | 19 +++++++++
SCM.sln | 18 +++++----
BaseSet/BaseSet.csproj | 18 +++++++++
NETSCM/NETSCM.csproj | 18 +++++++++
6 files changed, 70 insertions(+), 14 deletions(-)
diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj
index c7242d6..a51c64a 100644
--- a/BaseSet/BaseSet.csproj
+++ b/BaseSet/BaseSet.csproj
@@ -36,6 +36,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="BLL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
diff --git "a/BaseSet/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ORGANIZATIONS.cs" "b/BaseSet/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ORGANIZATIONS.cs"
index 5f588c4..3fd503c 100644
--- "a/BaseSet/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ORGANIZATIONS.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_ORGANIZATIONS.cs"
@@ -301,10 +301,10 @@
private bool Save()
{
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
- {
- return false;
- }
+ //if (!ClsPub.Security_Log(ModRightNameEdit, 1, true, DBUtility.ClsPub.CurUserName))
+ //{
+ // return false;
+ //}
//
if (InputMode == DBUtility.ClsPub.Enum_InputMode.InputMode_AddNew)
{
diff --git a/DAL/ClsGy_ORGANIZATIONS_Ctl.cs b/DAL/ClsGy_ORGANIZATIONS_Ctl.cs
index 74db7c2..26d9996 100644
--- a/DAL/ClsGy_ORGANIZATIONS_Ctl.cs
+++ b/DAL/ClsGy_ORGANIZATIONS_Ctl.cs
@@ -49,8 +49,7 @@
return true;
}
catch (Exception e)
- {
- oCn.RollBack();
+ {
throw (e);
}
}
diff --git a/Model/Model.csproj b/Model/Model.csproj
index 4f95997..7b39f8b 100644
--- a/Model/Model.csproj
+++ b/Model/Model.csproj
@@ -25,6 +25,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <PlatformTarget>x86</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -34,6 +35,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
diff --git a/NETSCM/NETSCM.csproj b/NETSCM/NETSCM.csproj
index c8c37ac..7931919 100644
--- a/NETSCM/NETSCM.csproj
+++ b/NETSCM/NETSCM.csproj
@@ -34,6 +34,24 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\x86\Debug\</OutputPath>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DebugType>full</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+ <OutputPath>bin\x86\Release\</OutputPath>
+ <DefineConstants>TRACE</DefineConstants>
+ <Optimize>true</Optimize>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>x86</PlatformTarget>
+ <LangVersion>7.3</LangVersion>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
<ItemGroup>
<Reference Include="BaseSet, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
diff --git a/SCM.sln b/SCM.sln
index 540675d..c2221c9 100644
--- a/SCM.sln
+++ b/SCM.sln
@@ -21,8 +21,8 @@
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|Any CPU.Build.0 = Debug|x86
{194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|x86.ActiveCfg = Debug|x86
{194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Debug|x86.Build.0 = Debug|x86
{194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -31,19 +31,20 @@
{194A4F82-DCB5-4A28-8CBF-47BE90DE15A6}.Release|x86.Build.0 = Release|x86
{EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|x86.ActiveCfg = Debug|Any CPU
- {EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|x86.Build.0 = Debug|Any CPU
+ {EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|x86.ActiveCfg = Debug|x86
+ {EF5A1176-41C0-42A9-801D-E08D9C74939B}.Debug|x86.Build.0 = Debug|x86
{EF5A1176-41C0-42A9-801D-E08D9C74939B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EF5A1176-41C0-42A9-801D-E08D9C74939B}.Release|Any CPU.Build.0 = Release|Any CPU
{EF5A1176-41C0-42A9-801D-E08D9C74939B}.Release|x86.ActiveCfg = Release|Any CPU
{65568D21-C65C-4796-8826-DF4A083BF500}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{65568D21-C65C-4796-8826-DF4A083BF500}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {65568D21-C65C-4796-8826-DF4A083BF500}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {65568D21-C65C-4796-8826-DF4A083BF500}.Debug|x86.ActiveCfg = Debug|x86
+ {65568D21-C65C-4796-8826-DF4A083BF500}.Debug|x86.Build.0 = Debug|x86
{65568D21-C65C-4796-8826-DF4A083BF500}.Release|Any CPU.ActiveCfg = Release|Any CPU
{65568D21-C65C-4796-8826-DF4A083BF500}.Release|Any CPU.Build.0 = Release|Any CPU
{65568D21-C65C-4796-8826-DF4A083BF500}.Release|x86.ActiveCfg = Release|Any CPU
- {7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|Any CPU.ActiveCfg = Debug|x86
+ {7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|Any CPU.Build.0 = Debug|x86
{7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|x86.ActiveCfg = Debug|x86
{7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Debug|x86.Build.0 = Debug|x86
{7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -52,7 +53,8 @@
{7C30E3C9-58B7-420A-AB92-0A5117B82DDA}.Release|x86.Build.0 = Release|x86
{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Debug|x86.ActiveCfg = Debug|x86
+ {1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Debug|x86.Build.0 = Debug|x86
{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|Any CPU.Build.0 = Release|Any CPU
{1EAB90A5-F2E0-4E1F-A787-ABE182EDB86E}.Release|x86.ActiveCfg = Release|Any CPU
--
Gitblit v1.9.1