From 15316f51a5e129c2ebcf8dabff4ac30c1ee1dc32 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 17 三月 2025 19:22:23 +0800
Subject: [PATCH] 提料报表添加供应商过滤

---
 WorkM/WorkM.csproj |  225 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 191 insertions(+), 34 deletions(-)

diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index fda2dd1..768d92b 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -10,7 +10,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WorkM</RootNamespace>
     <AssemblyName>WorkM</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,26 @@
     <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="S7.Net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=d5812d469e84c693, processorArchitecture=MSIL">
+      <HintPath>..\packages\S7netplus.0.1.9\lib\net40\S7.Net.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -80,6 +101,36 @@
     </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="鎶ヨ〃鍒嗘瀽\JIT_GetPPBomInfo.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\JIT_GetPPBomInfo.designer.cs">
+      <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.designer.cs">
+      <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.designer.cs">
+      <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.designer.cs">
+      <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon>
     </Compile>
     <Compile Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.cs">
       <SubType>Form</SubType>
@@ -135,6 +186,24 @@
     <Compile Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.Designer.cs">
       <DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
     </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.designer.cs">
+      <DependentUpon>MES_TOBEReceived.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.designer.cs">
+      <DependentUpon>MES_WORKINProcess.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>
     </Compile>
@@ -152,6 +221,36 @@
     </Compile>
     <Compile Include="鎶ヨ〃鍒嗘瀽\ProductionOrder_ExecutionReport.designer.cs">
       <DependentUpon>ProductionOrder_ExecutionReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\EAM_SourceRuningStatus.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\EAM_SourceRuningStatus.designer.cs">
+      <DependentUpon>EAM_SourceRuningStatus.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.designer.cs">
+      <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.Designer.cs">
+      <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.Designer.cs">
+      <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.Designer.cs">
+      <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
     </Compile>
     <Compile Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.cs">
       <SubType>Form</SubType>
@@ -344,6 +443,30 @@
     </Compile>
     <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBill.designer.cs">
       <DependentUpon>MES_StationOutBill.cs</DependentUpon>
+    </Compile>
+    <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.designer.cs">
+      <DependentUpon>MES_StationOutBillList_LastProc.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 +908,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 +921,26 @@
     <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="鎶ヨ〃鍒嗘瀽\JIT_GetPPBomInfo.resx">
+      <DependentUpon>JIT_GetPPBomInfo.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_ProcExchangeNoInReport.resx">
+      <DependentUpon>Sc_ProcExchangeNoInReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_ProdHoursSumReport.resx">
+      <DependentUpon>MES_ProdHoursSumReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_StationOutProcSumReport.resx">
+      <DependentUpon>MES_StationOutProcSumReport.cs</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_ProductionLinePackagingList.resx">
       <DependentUpon>Mes_ProductionLinePackagingList.cs</DependentUpon>
@@ -865,6 +976,18 @@
     <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Mes_TraceabilityList.resx">
       <DependentUpon>Mes_TraceabilityList.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_TOBEReceived.resx">
+      <DependentUpon>MES_TOBEReceived.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\MES_WORKINProcess.resx">
+      <DependentUpon>MES_WORKINProcess.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </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>
     </EmbeddedResource>
@@ -875,6 +998,22 @@
     <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\ProductionOrder_ExecutionReport.resx">
       <DependentUpon>ProductionOrder_ExecutionReport.cs</DependentUpon>
       <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\EAM_SourceRuningStatus.resx">
+      <DependentUpon>EAM_SourceRuningStatus.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Pt_RadiumCarvingCodeBillList.resx">
+      <DependentUpon>Pt_RadiumCarvingCodeBillList.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WareHouseReport.resx">
+      <DependentUpon>Sc_WareHouseReport.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_OverProdReport.resx">
+      <DependentUpon>Sc_OverProdReport.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\Sc_WorkShopReport.resx">
+      <DependentUpon>Sc_WorkShopReport.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.resx">
       <DependentUpon>WMS_BarCodeBackInfoReport.cs</DependentUpon>
@@ -1003,6 +1142,22 @@
     </EmbeddedResource>
     <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBill.resx">
       <DependentUpon>MES_StationOutBill.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="娴佽浆鍗＄鐞哱MES_StationOutBillList_LastProc.resx">
+      <DependentUpon>MES_StationOutBillList_LastProc.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">
@@ -1296,7 +1451,9 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
       <Visible>False</Visible>

--
Gitblit v1.9.1