From 81c2a1c9635bdfb714d9a04b4bb08be6e060e99c Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 16 十二月 2024 09:49:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4c53b35..f1aa900 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -439,6 +439,7 @@
     <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
     <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
     <Compile Include="Controllers\CJGL\Sc_KeyElementBindingController.cs" />
+    <Compile Include="Controllers\CJGL\Sc_OEEReportController.cs" />
     <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
     <Compile Include="Controllers\Xt_DefineBillMainSetController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldBatchWorkCheckBillController.cs" />
@@ -826,6 +827,7 @@
     <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
     <Compile Include="Models\ClsSc_MESBeginWorkBillSub_RelationBill.cs" />
     <Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
+    <Compile Include="Models\QC_OutCompCheckBillSub_ValueGrid.cs" />
     <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam_Temp.cs" />
     <Compile Include="Models\SBGL\SBBB\Sb_EquipMentCollectionTechParam.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />

--
Gitblit v1.9.1