From 39a43039bbb6491f33783fb675a111c61e749891 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 11 七月 2024 12:52:03 +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 29f3c14..0e4d2d8 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -537,6 +537,7 @@
     <Compile Include="Controllers\鍝佽川绠$悊\宸℃鍗昞QC_PatrolProcCheckOtherBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\搴撳瓨妫�楠屽崟\QC_StockCheckBillController.cs" />
+    <Compile Include="Controllers\鍝佽川绠$悊\妫�楠屽彇鏍疯繕鏍峰崟\QC_TakeSampleCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\杞﹂棿鑷鍗昞QC_WorkSelfCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
@@ -573,6 +574,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowProgressBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
@@ -582,6 +584,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsController.cs" />
     <Compile Include="Controllers\澶忓疂鍞悗鎺ュ彛\ASSController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\HR_EmployeeSkillBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\HR_EmployeeSkillExamBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OutApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_OverApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PayMentBillController.cs" />

--
Gitblit v1.9.1