From 5ec48dc417b2d99a8686f5833c575914b4bd5334 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 10 七月 2023 13:15:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WorkM/WorkM.csproj | 77 ++++++++++++++++++++++++++++++++++++++
1 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/WorkM/WorkM.csproj b/WorkM/WorkM.csproj
index 0046d6a..1a5def4 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>
@@ -196,6 +220,24 @@
</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>
@@ -388,6 +430,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>
@@ -869,6 +917,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>
@@ -903,6 +959,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>
@@ -924,6 +988,15 @@
</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>
@@ -1054,6 +1127,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