From 22971886a0e1897aabf62b228215bbee3f2d5a6c Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期二, 24 五月 2022 13:16:31 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index 185c45f..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>
@@ -400,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>
@@ -881,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>
@@ -1074,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