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 |   59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 59 insertions(+), 0 deletions(-)

diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index ff9d4eb..0bd33f7 100644
--- a/WorkM/WorkM.csproj
+++ b/WorkM/WorkM.csproj
@@ -107,6 +107,18 @@
     <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>
@@ -161,6 +173,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>
@@ -190,6 +214,12 @@
     </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>
@@ -382,6 +412,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>
@@ -863,6 +899,14 @@
       <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>
@@ -897,6 +941,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>
@@ -915,6 +967,9 @@
     <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>
@@ -1045,6 +1100,10 @@
       <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>

--
Gitblit v1.9.1