From 956970d74fa97208d0fa873ff1f8ab7ecdc393e4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期二, 29 十月 2024 10:08:45 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c12ee54..7eaedd4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -432,18 +432,22 @@
     <Compile Include="Controllers\CGGL\Cg_PayableBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_CallGoodsBillBackController.cs" />
     <Compile Include="Controllers\CJGL\Cj_CallGoodsBillMainController.cs" />
+    <Compile Include="Controllers\CJGL\Cj_CenterCheckBillController.cs" />
     <Compile Include="Controllers\CJGL\Cj_ComplementGoodsBillController.cs" />
     <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\Sc_KeyElementBindingController.cs" />
+    <Compile Include="Controllers\CKGL\TMZD\Gy_BarCodeBillListController.cs" />
     <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
     <Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ProductionReportsController.cs" />
+    <Compile Include="Controllers\XSGL\Xs_OutDoorBillController.cs" />
     <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectBasisController.cs" />
     <Compile Include="Controllers\ZLGL\BaseSet\Gy_InspectMethodController.cs" />
     <Compile Include="Controllers\ZLGL\BaseSet\Gy_QualityController.cs" />
+    <Compile Include="Controllers\浜轰簨绠$悊\浜哄憳灞ュ巻\HR_PersonnelResumeController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\Kf_MoveStockBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\璐ㄩ噺鏈堝害鐩爣鍗昞QC_MonthTarGetBillController.cs" />
     <Compile Include="Controllers\CJGL\Qc_PreventErrMouldCheckBillController.cs" />
@@ -799,6 +803,8 @@
     <Compile Include="DLL\宸ヨ祫绠$悊\ClsPay_WorkTimesBill.cs" />
     <Compile Include="DLL\閽夐拤娑堟伅\Cls_DDMsg.cs" />
     <Compile Include="DLL\椤圭洰绠$悊\椤圭洰闃舵\ClsPM_CustomerProInfoBill_Ctl.cs" />
+    <Compile Include="Exceptions\EmptyException.cs" />
+    <Compile Include="Exceptions\ExcelException.cs" />
     <Compile Include="HttpClient.cs" />
     <Compile Include="InvokeHelper.cs" />
     <Compile Include="Log.cs" />

--
Gitblit v1.9.1