From d8dc41f030b35e4bf0fe7efe27ea09c45fdd54a8 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 22 四月 2025 08:44:54 +0800
Subject: [PATCH] 陈镐哲 2025/4/22 提交
---
ProM/ProM.csproj | 61 ++++++++++++++----------------
1 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index fb86a29..1a5c6aa 100644
--- a/ProM/ProM.csproj
+++ b/ProM/ProM.csproj
@@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>ProM</RootNamespace>
<AssemblyName>ProM</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
@@ -41,6 +41,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
@@ -49,6 +50,7 @@
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DebugSymbols>true</DebugSymbols>
@@ -57,6 +59,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>
@@ -65,8 +68,23 @@
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
+ <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="AxInterop.grdes6Lib">
+ <HintPath>..\OCX\AxInterop.grdes6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="AxInterop.gregn6Lib">
+ <HintPath>..\OCX\AxInterop.gregn6Lib.dll</HintPath>
+ </Reference>
+ <Reference Include="Interop.grdes6Lib">
+ <HintPath>..\OCX\Interop.grdes6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
+ <Reference Include="Interop.gregn6Lib">
+ <HintPath>..\OCX\Interop.gregn6Lib.dll</HintPath>
+ <EmbedInteropTypes>True</EmbedInteropTypes>
+ </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
@@ -104,6 +122,12 @@
</Compile>
<Compile Include="濮斿绠＄悊\WW_EntrustOrderBillQuery.designer.cs">
<DependentUpon>WW_EntrustOrderBillQuery.cs</DependentUpon>
+ </Compile>
+ <Compile Include="濮斿绠＄悊\WW_PPBomBillList.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="濮斿绠＄悊\WW_PPBomBillList.Designer.cs">
+ <DependentUpon>WW_PPBomBillList.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Cg_CgDetailReport.cs">
<SubType>Form</SubType>
@@ -344,6 +368,9 @@
<DependentUpon>WW_EntrustOrderBillQuery.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="濮斿绠＄悊\WW_PPBomBillList.resx">
+ <DependentUpon>WW_PPBomBillList.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Cg_CgDetailReport.resx">
<DependentUpon>Cg_CgDetailReport.cs</DependentUpon>
<SubType>Designer</SubType>
@@ -490,38 +517,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <COMReference Include="Axgrdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="Axgregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>aximp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="grdes6Lib">
- <Guid>{C5A16330-A084-48C9-BC0F-0D0B37A14123}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
- <COMReference Include="gregn6Lib">
- <Guid>{4018F953-1BFE-441E-8A04-DC8BA1FF060E}</Guid>
- <VersionMajor>6</VersionMajor>
- <VersionMinor>0</VersionMinor>
- <Lcid>0</Lcid>
- <WrapperTool>tlbimp</WrapperTool>
- <Isolated>False</Isolated>
- </COMReference>
<COMReference Include="stdole">
<Guid>{00020430-0000-0000-C000-000000000046}</Guid>
<VersionMajor>2</VersionMajor>
--
Gitblit v1.9.1