From 62de1d98678b736d56ae929a5569f1c89b68cee0 Mon Sep 17 00:00:00 2001
From: lan <lan@DESKTOP-MG88OFJ>
Date: 星期六, 25 五月 2024 10:54:43 +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 b2a8e3f..cfe43c8 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -379,6 +379,7 @@
     <Compile Include="Controllers\BLL\Xt_UserController.cs" />
     <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
     <Compile Include="Controllers\CellWidthController.cs" />
+    <Compile Include="Controllers\CGGL\Cg_ContractBillController.cs" />
     <Compile Include="Controllers\CGGL\Cg_PORequestBillController.cs" />
     <Compile Include="Controllers\CGGL\Cg_PurchaseReturnController.cs" />
     <Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
@@ -485,6 +486,7 @@
     <Compile Include="Controllers\XSGL\Xs_SellOutChangeBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_CusBalanceReportController.cs" />
     <Compile Include="Controllers\XSGL\Xs_ReceivableBillController.cs" />
+    <Compile Include="Controllers\XSGL\Xs_ContractBillController.cs" />
     <Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
@@ -522,7 +524,9 @@
     <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" />
@@ -732,6 +736,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