From e5c4d6eb5a9e17ddec04647dce7e810bb4485ae4 Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期二, 12 五月 2026 15:04:40 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index f3cf18f..9ce858b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -47,6 +47,9 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
+ <Reference Include="Alex.Kingdee.Cloud.WebAPI.Client, Version=2.5.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Alex.Kingdee.Cloud.WebAPI.Client.2.5.0\lib\net45\Alex.Kingdee.Cloud.WebAPI.Client.dll</HintPath>
+ </Reference>
<Reference Include="AlibabaCloud.EndpointUtil, Version=0.1.1.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AlibabaCloud.EndpointUtil.0.1.1\lib\net45\AlibabaCloud.EndpointUtil.dll</HintPath>
</Reference>
@@ -415,6 +418,9 @@
<Content Include="Web.config">
<SubType>Designer</SubType>
</Content>
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 80脳60.zpl" />
+ <Content Include="ZPLTemplate\鐗╂枡鏉＄爜 100脳60.zpl" />
+ <Content Include="ZPLTemplate\娴嬭瘯.zpl" />
</ItemGroup>
<ItemGroup>
<Compile Include="App_Start\BundleConfig.cs" />
@@ -730,10 +736,12 @@
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_ActualItemMoneyCostController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\CB_WipProcessTableController.cs" />
<Compile Include="Controllers\鎴愭湰绠＄悊\鎴愭湰璐圭敤璋冩暣鍗昞CB_ChangeMoneyBillController.cs" />
+ <Compile Include="Controllers\鏁版嵁鍚屾\閲戣澏鍩虹璧勬枡鍚屾\KDBaseInfoSyncController.cs" />
<Compile Include="Controllers\妫�楠岀敵璇峰崟\QC_RequestCheckBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍏朵粬缁撶畻鍗昞YF_PayMentOtherBillTranController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\鍑鸿繍鍗昞WLYayBillController.cs" />
<Compile Include="Controllers\鐗╂祦绠＄悊\杩愬崟璐圭敤缁撶畻鍗昞Pay_WayBillPaymentBillController.cs" />
+ <Compile Include="Controllers\閫氱敤鏂规硶\鏂囦欢涓婁紶\WebFileController.cs" />
<Compile Include="Controllers\椤圭洰绠＄悊\宸ョ▼椤圭洰\PM_ProjectBill_WorkController.cs" />
<Compile Include="DLL\ClsGy_ItemMoney_Ctl.cs" />
<Compile Include="DLL\ClsSc_MESStopRestoreWorkBill.cs" />
--
Gitblit v1.9.1