From 07968530fd2a7c0d818adc8a89c96a9499dbbee6 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 19 一月 2026 16:17:38 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b2d90d4..0e98afc 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -87,6 +87,12 @@
<Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
</Reference>
+ <Reference Include="GetuiServerApiSDK">
+ <HintPath>DLL\GetuiServerApiSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.ProtocolBuffers">
+ <HintPath>DLL\Google.ProtocolBuffers.dll</HintPath>
+ </Reference>
<Reference Include="Grpc.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=d754f35622e28bad, processorArchitecture=MSIL">
<HintPath>..\packages\Grpc.Core.2.45.0\lib\net45\Grpc.Core.dll</HintPath>
</Reference>
@@ -480,6 +486,7 @@
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBill_TKController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Xs_SendGoodsPlanBillController.cs" />
<Compile Include="Controllers\WLGL\Cg_CarTrajectoryBillController.cs" />
+ <Compile Include="Controllers\Sc_EmployeeSignInNoteBillController.cs" />
<Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />
@@ -675,6 +682,7 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ShelfLifeNearExpiryController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
+ <Compile Include="Controllers\鐗╂祦绠＄悊\杩愬崟璐圭敤缁撶畻鍗昞Pay_WayBillPaymentBillController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
@@ -1185,6 +1193,7 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Service\GeTuiService.cs" />
<Compile Include="Service\LuBaoSevice.cs" />
<Compile Include="Service\ProcessDal.cs" />
<Compile Include="Service\YqnDal.cs" />
@@ -1225,7 +1234,7 @@
<DependentUpon>Reference.map</DependentUpon>
</Compile>
<Compile Include="WebServer.cs" />
- <Compile Include="WebSocketServer.cs" />
+ <Compile Include="Service\WebSocketServer.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="packages.config">
--
Gitblit v1.9.1