From 0fb2957ffd729c1f09b51a73aa2af1c3d39fdcad Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 03 八月 2023 10:19:22 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
ProM/ProM.csproj | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/ProM/ProM.csproj b/ProM/ProM.csproj
index fb86a29..9cb544a 100644
--- a/ProM/ProM.csproj
+++ b/ProM/ProM.csproj
@@ -67,6 +67,20 @@
<ErrorReport>prompt</ErrorReport>
</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 +118,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 +364,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 +513,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