From f9bfd801a3d62f02e0b714c19323fc4f3723ab79 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 09 三月 2026 08:25:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 83eef2d..18e97f5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -494,6 +494,7 @@
     <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\Gy_MaterErrorPreventionController.cs" />
     <Compile Include="Controllers\GZGL\Gy_SteppedPriceCoefficientController .cs" />
     <Compile Include="Controllers\JHGL\Gy_SourceMouldBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillController.cs" />
@@ -511,6 +512,7 @@
     <Compile Include="Controllers\SCGL\Sc_ProductionCycleBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESStopRestoreWorkBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_RepairCodeBindingController.cs" />
+    <Compile Include="Controllers\SCGL\Sc_FeedingErrorProofingBillController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
     <Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
@@ -989,6 +991,7 @@
     <Compile Include="Models\Gy_MateNumRelation_Sec.cs" />
     <Compile Include="Models\ClsQC_RequestCheckBillMain.cs" />
     <Compile Include="Models\ClsQC_RequestCheckBillSub.cs" />
+    <Compile Include="Models\WorkStationSub.cs" />
     <Compile Include="Models\Xs_SendGoodsPlanBillMain.cs" />
     <Compile Include="Models\鍩虹璧勬枡\ClsGy_EmployeeSub.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />

--
Gitblit v1.9.1