From ba6d2fff0224e8694c782a7e1154d0abd7a32c20 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:48:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/WorkM.csproj | 96 ++++++++++++++++++++++++++++++++----------------
1 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index fda2dd1..17e6b4b 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.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" />
@@ -80,6 +94,12 @@
</Compile>
<Compile Include="Form2.Designer.cs">
<DependentUpon>Form2.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\DefectiveDetailedYieldReport.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\DefectiveDetailedYieldReport.designer.cs">
+ <DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.cs">
<SubType>Form</SubType>
@@ -134,6 +154,12 @@
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.Designer.cs">
<DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.designer.cs">
+ <DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
</Compile>
<Compile Include="鎶ヨ〃鍒嗘瀽\Mes_WIPSumReportDateReport.cs">
<SubType>Form</SubType>
@@ -344,6 +370,24 @@
</Compile>
<Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBill.designer.cs">
<DependentUpon>MES_StationOutBill.cs</DependentUpon>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_BaoFei.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_BaoFei.designer.cs">
+ <DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_GeLi.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_GeLi.designer.cs">
+ <DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_Bad.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_Bad.designer.cs">
+ <DependentUpon>MES_StationOutBillList_Bad.cs</DependentUpon>
</Compile>
<Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList.cs">
<SubType>Form</SubType>
@@ -785,38 +829,6 @@
</Compile>
</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>
@@ -830,6 +842,10 @@
<EmbeddedResource Include="Form2.resx">
<SubType>Designer</SubType>
<DependentUpon>Form2.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\DefectiveDetailedYieldReport.resx">
+ <DependentUpon>DefectiveDetailedYieldReport.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.resx">
<DependentUpon>Mes_ProductionLinePackagingList.cs</DependentUpon>
@@ -864,6 +880,10 @@
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.resx">
<DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
+ </EmbeddedResource>
+ <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WIPProcReport _WIP.resx">
+ <DependentUpon>MES_WIPProcReport _WIP.cs</DependentUpon>
+ <SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_WIPSumReportDateReport.resx">
<DependentUpon>Mes_WIPSumReportDateReport.cs</DependentUpon>
@@ -1005,6 +1025,18 @@
<DependentUpon>MES_StationOutBill.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
+ <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_BaoFei.resx">
+ <DependentUpon>MES_StationOutBillList_BaoFei.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_GeLi.resx">
+ <DependentUpon>MES_StationOutBillList_GeLi.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
+ <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_Bad.resx">
+ <DependentUpon>MES_StationOutBillList_Bad.cs</DependentUpon>
+ <SubType>Designer</SubType>
+ </EmbeddedResource>
<EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList.resx">
<DependentUpon>MES_StationOutBillList.cs</DependentUpon>
<SubType>Designer</SubType>
--
Gitblit v1.9.1