韩电条码SCM系统
parent: 85f4b040 | 补丁 | 提交 | ignore whitespace
11
jinghuanzhang
2023-04-05 33b47401378d4c6a95948dd20860001161c35067 
11
6个文件已修改
84 ■■■■■ 已修改文件
BaseSet/BaseSet.csproj 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
BaseSet/公用基础资料/Gy_ORGANIZATIONS.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DAL/ClsGy_ORGANIZATIONS_Ctl.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Model/Model.csproj 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
NETSCM/NETSCM.csproj 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
SCM.sln 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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>




 BaseSet/公用基础资料/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)


            {




 DAL/ClsGy_ORGANIZATIONS_Ctl.cs


@@ -49,8 +49,7 @@


                return true;


            }


            catch (Exception e)


            {


                oCn.RollBack();


            { 


                throw (e);


            }


        }




 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>




 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>




 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