From a5c827277073ba3efc8f1b4a57f32374a3d2f0d1 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 22 五月 2024 17:32:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b39d31c..f25dea4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -396,6 +396,9 @@
     <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
     <Compile Include="Controllers\CJGL\Cj_SendGoodsBillController.cs" />
     <Compile Include="Controllers\CJGL\Mes_OrderProcFlowAllReportController.cs" />
+    <Compile Include="Controllers\CJGL\Gy_MaterPreventErrMouldBillController.cs" />
+    <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
+    <Compile Include="Controllers\CJGL\Sc_WorkBeginDotCheckBillController.cs" />
     <Compile Include="Controllers\CJGL\ProductionPlanReportController.cs" />
     <Compile Include="Controllers\CJGL\Sc_ProcessExchangeBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
@@ -421,6 +424,8 @@
     <Compile Include="Controllers\PlateBindingController.cs" />
     <Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
     <Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipBeginBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipStopBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
@@ -517,13 +522,17 @@
     <Compile Include="Controllers\鍝佽川绠＄悊\瀹㈣瘔澶勭悊鍗昞Crm_CustomerAppealBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
+    <Compile Include="Controllers\鍝佽川绠＄悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
+    <Compile Include="Controllers\鍝佽川绠＄悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemMethodController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckItemClassController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
@@ -653,10 +662,13 @@
     <Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_CheckNoteItem_Ctl.cs" />
     <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />
     <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
     <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_MaintainLev_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
     <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
@@ -722,6 +734,7 @@
     <Compile Include="Models\ClsGy_SupMaterial.cs" />
     <Compile Include="Models\ClsSc_AssemblyBillMain.cs" />
     <Compile Include="Models\ClsSc_AssemblyBillSub.cs" />
+    <Compile Include="Models\Gy_MouldFileSub_SubMater.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ColorClass.cs" />
     <Compile Include="Models\Employee.cs" />
     <Compile Include="Models\Gy_UserCustomer.cs" />

--
Gitblit v1.9.1