From a791fe4183fd04c67ed2277303a56fd646583d88 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期三, 23 十月 2024 16:46:29 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8d4d4d5..e55bde4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -132,6 +132,7 @@
<Reference Include="System.Buffers, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.4.0\lib\netstandard1.1\System.Buffers.dll</HintPath>
</Reference>
+ <Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Data.DataSetExtensions">
<Private>True</Private>
</Reference>
@@ -431,14 +432,20 @@
<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\SBGL\SBBB\Sb_EquipMentCollectionTechParamController.cs" />
<Compile Include="Controllers\SBGL\SBBB\Sb_EquipMentCollectionTechParam_TempController.cs" />
<Compile Include="Controllers\SCGL\Sc_ProductionReportsController.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" />
@@ -593,6 +600,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DisposeWayController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ProcMulController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ScrapReasonController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_TemporaryAreaController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
@@ -719,6 +727,7 @@
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
+ <Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />
<Compile Include="DLL\ClsGy_TechnologyParameterType_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
<Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
@@ -792,6 +801,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