From c0e503107d910761bb8ceb287bc3dfbab44d8ae5 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 17 七月 2024 11:34:55 +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 de33dc0..a1fd20d 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -539,6 +539,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" />
@@ -574,6 +575,7 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TaxRateBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_UnitConvertRateController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowProgressBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
@@ -686,6 +688,7 @@
     <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_RestDay_Ctl.cs" />
     <Compile Include="DLL\ClsGy_PreventErrMould_Ctl.cs" />
     <Compile Include="DLL\ClsGy_TaskClass_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectClass_Ctl.cs" />

--
Gitblit v1.9.1