From d6b40e55405f2814e4663a3a4e537de57c48c20f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 11 八月 2022 19:57:54 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WorkM/WorkM.csproj |  129 +++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 129 insertions(+), 0 deletions(-)

diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index b7c1a36..0bd33f7 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -95,6 +95,30 @@
     <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="鎶ヨ〃鍒嗘瀽\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>
     </Compile>
@@ -149,6 +173,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>
@@ -166,6 +208,18 @@
     </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="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.cs">
       <SubType>Form</SubType>
@@ -358,6 +412,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>
@@ -813,6 +891,22 @@
       <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="鎶ヨ〃鍒嗘瀽\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>
@@ -847,6 +941,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>
@@ -857,6 +963,13 @@
     <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="鎶ヨ〃鍒嗘瀽\WMS_BarCodeBackInfoReport.resx">
       <DependentUpon>WMS_BarCodeBackInfoReport.cs</DependentUpon>
@@ -987,6 +1100,22 @@
       <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">
       <DependentUpon>MES_StationOutBillList.cs</DependentUpon>
       <SubType>Designer</SubType>

--
Gitblit v1.9.1