From c48c7746efa89e3cbf38e089d20cd9029c2ce1c8 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 07 六月 2024 09:52:37 +0800
Subject: [PATCH] 模具点检单PDA 扫条码没有返回数据,核对匹配字段

---
 WorkM/WorkM.csproj |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 112 insertions(+), 1 deletions(-)

diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index b25e612..fe5b10d 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -81,6 +81,9 @@
       <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" />
@@ -100,6 +103,30 @@
     </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>
@@ -155,6 +182,18 @@
     <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>
@@ -184,6 +223,30 @@
     </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>
@@ -376,6 +439,12 @@
     </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>
@@ -853,6 +922,22 @@
       <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>
     </EmbeddedResource>
@@ -887,6 +972,14 @@
     <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>
@@ -905,6 +998,18 @@
     <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>
@@ -1033,6 +1138,10 @@
     </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">
@@ -1338,7 +1447,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