From 3d0568d206f913ddcbc9cb8df956af8619df2242 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 07 八月 2023 14:41:58 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 65d99ec..9fad71c 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -241,6 +241,7 @@
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
<Content Include="Config\kdapi.config" />
+ <Content Include="libman.json" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -383,6 +384,8 @@
<Compile Include="Controllers\CGGL\Kf_POStockInBackBillController.cs" />
<Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
+ <Compile Include="Controllers\CGGL\Sup_AskPriceBillController.cs" />
+ <Compile Include="Controllers\CGGL\Sup_QuotePriceBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBackBillController.cs" />
@@ -401,6 +404,7 @@
<Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchWWSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
@@ -457,6 +461,9 @@
<Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\Sc_ProcessReportController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\绂昏亴鐢宠\HR_EmpDimissionBillController.cs" />
+ <Compile Include="Controllers\浜轰簨绠＄悊\鑱屽憳寮傚姩鍗昞HR_EmpChangeBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\濮斿鐢ㄦ枡\WW_PPBomBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍\KF_PonderationBillController.cs" />
<Compile Include="Controllers\浠撳瓨绠＄悊\鏉＄爜鍑哄叆搴撹褰昞Kf_ICStockInOutBillController.cs" />
@@ -497,6 +504,14 @@
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_WorkStationBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckFlowBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_SalaryCalculateController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_DuSubsidyItemBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ErrWorkTimesRequestBillController.cs" />
+ <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
<Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
@@ -1000,9 +1015,12 @@
<Folder Include="Views\Sc_ProcessSendWork\" />
<Folder Include="Views\Sc_ProcExchRecordBackBill\" />
<Folder Include="Views\Sc_ProcExchSendWorkBill\" />
+ <Folder Include="Views\Sc_ProcExchWWSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
+ <Folder Include="Views\Sup_AskPriceBill\" />
+ <Folder Include="Views\Sup_QuotePriceBill\" />
<Folder Include="Views\Xt_BillSubType\" />
<Folder Include="Views\Xt_CheckFlowBill\" />
<Folder Include="Views\Xt_CheckItem\" />
--
Gitblit v1.9.1