From 770c739aeadfd1025bd6b64aa6790201b0b1047d Mon Sep 17 00:00:00 2001 From: wtt <1985833171@qq.com> Date: 星期二, 22 四月 2025 13:02:59 +0800 Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API --- BaseSet/BaseSet.csproj | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/BaseSet/BaseSet.csproj b/BaseSet/BaseSet.csproj index 4751d46..7e74db1 100644 --- a/BaseSet/BaseSet.csproj +++ b/BaseSet/BaseSet.csproj @@ -10,7 +10,7 @@ <AppDesignerFolder>Properties</AppDesignerFolder> <RootNamespace>BaseSet</RootNamespace> <AssemblyName>BaseSet</AssemblyName> - <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> + <TargetFrameworkVersion>v4.5</TargetFrameworkVersion> <FileUpgradeFlags> </FileUpgradeFlags> <UpgradeBackupLocation> @@ -42,6 +42,7 @@ <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> <PlatformTarget>x86</PlatformTarget> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <DebugType>pdbonly</DebugType> @@ -50,6 +51,7 @@ <DefineConstants>TRACE</DefineConstants> <ErrorReport>prompt</ErrorReport> <WarningLevel>4</WarningLevel> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' "> <DebugSymbols>true</DebugSymbols> @@ -58,6 +60,7 @@ <DebugType>full</DebugType> <PlatformTarget>x86</PlatformTarget> <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' "> <OutputPath>bin\x86\Release\</OutputPath> @@ -66,6 +69,7 @@ <DebugType>pdbonly</DebugType> <PlatformTarget>x86</PlatformTarget> <ErrorReport>prompt</ErrorReport> + <Prefer32Bit>false</Prefer32Bit> </PropertyGroup> <ItemGroup> <Reference Include="AxInterop.gregn6Lib"> @@ -194,6 +198,12 @@ </Compile> <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.designer.cs"> <DependentUpon>Gy_ConveyComp.cs</DependentUpon> + </Compile> + <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.designer.cs"> + <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon> </Compile> <Compile Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.cs"> <SubType>Form</SubType> @@ -1564,6 +1574,12 @@ <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_WorkCenter.designer.cs"> <DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon> </Compile> + <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.cs"> + <SubType>Form</SubType> + </Compile> + <Compile Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.Designer.cs"> + <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon> + </Compile> </ItemGroup> <ItemGroup> <COMReference Include="stdole"> @@ -1638,6 +1654,10 @@ </EmbeddedResource> <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_ConveyComp.resx"> <DependentUpon>Gy_ConveyComp.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_FactoryDayOff.resx"> + <DependentUpon>Gy_FactoryDayOff.cs</DependentUpon> <SubType>Designer</SubType> </EmbeddedResource> <EmbeddedResource Include="鍏敤璧勬枡\鍏敤鍩虹璧勬枡\Gy_EntryComp.resx"> @@ -2551,6 +2571,10 @@ <SubType>Designer</SubType> <DependentUpon>Gy_DataIn_WorkCenter.cs</DependentUpon> </EmbeddedResource> + <EmbeddedResource Include="瀵煎叆妯℃澘\Gy_DataIn_StdWorkTimes.resx"> + <DependentUpon>Gy_DataIn_StdWorkTimes.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> </ItemGroup> <ItemGroup> <Folder Include="CLOUD鍩虹璧勬枡\" /> -- Gitblit v1.9.1