From 1d521ea0a9dbb49ed018cb0c13455ebdf5c73206 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 08 一月 2025 17:48:42 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4c53b35..5522c4a 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" />
@@ -717,8 +718,10 @@
     <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESReturnStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_MESStopStepWorkBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠$悊\鎶ュ伐鍙板伐搴廫Sc_QualityReportStepBillController.cs" />
+    <Compile Include="Controllers\鐢熶骇绠$悊\鐝寮�鐝崟\Sc_ShiftsBeginInfoBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠$悊\鐢熶骇鎶ヨ〃\Sc_ProductReportController.cs" />
+    <Compile Include="Controllers\鐢熶骇绠$悊\璁惧鐘舵�佸垎姝Sc_HEquipStateDistributionController.cs" />
     <Compile Include="Controllers\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
     <Compile Include="Controllers\鐪嬫澘绠$悊\KB_CSGLController.cs" />
     <Compile Include="Controllers\鐪嬫澘绠$悊\Kf_XSFHController.cs" />
@@ -826,8 +829,10 @@
     <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\Sc_StationOutBillSub_Sup.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
     <Compile Include="Models\Employee.cs" />
     <Compile Include="Models\Gy_UserCustomer.cs" />

--
Gitblit v1.9.1