From 0cc0e66f5bba9ab5d011b94efe214e7c6e134c2a Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期二, 02 四月 2024 15:41:04 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 4e593ed..2602e40 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -472,6 +472,7 @@
     <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
     <Compile Include="Controllers\Sc_ProcessReportController.cs" />
     <Compile Include="Controllers\XSGL\Kf_ICStockBackBillController.cs" />
+    <Compile Include="Controllers\XSGL\Kf_SellOutEntryReportController.cs" />
     <Compile Include="Controllers\XSGL\Xs_OutDoorCheckBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SellOutChangeBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_CusBalanceReportController.cs" />
@@ -484,6 +485,7 @@
     <Compile Include="Controllers\CGGL\YF_PayMentBillController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveBackBillController.cs" />
     <Compile Include="Controllers\CGGL\YF_PayMentOtherBillController.cs" />
+    <Compile Include="Controllers\XSGL\Xs_SeReportController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveOtherBillController.cs" />
     <Compile Include="Controllers\XSGL\YS_ReceiveBillController.cs" />
     <Compile Include="Controllers\XSGL\Kf_SellOutBillController.cs" />
@@ -505,6 +507,7 @@
     <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_StockOutRequestBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\棰嗘枡鍙戣揣\Kf_MateOutRequestBillController.cs" />
     <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_StepFoldinBillController.cs" />
+    <Compile Include="Controllers\浠撳瓨绠$悊\楠屾敹鍏ュ簱\Kf_ProductInBillController.cs" />
     <Compile Include="Controllers\鍗氭棩鑷姩鎵爜绾縗ScanlineAPIController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎璐ㄦ骞冲彴\Sc_ICMOBillQualityStatus_TmpController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\浜х嚎杩斾慨骞冲彴\Sc_SourceLineRepairBillController.cs" />
@@ -567,6 +570,7 @@
     <Compile Include="Controllers\QC_POStockInCheckBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Gy_GroupEmpBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_PurchaseWallclothBillController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠$悊\HR_PostSkillBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠$悊\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
@@ -644,6 +648,7 @@
     <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />
     <Compile Include="DLL\ClsGy_AreaSet_Ctl.cs" />
     <Compile Include="DLL\ClsGy_CusType_Ctl.cs" />
+    <Compile Include="DLL\ClsGy_ErrMsgBackType_Ctl.cs" />
     <Compile Include="DLL\ClsGy_StockCheckItem_Ctl.cs" />
     <Compile Include="DLL\ClsGy_ProjectMoney_Ctl.cs" />
     <Compile Include="DLL\ClsGy_SupType_Ctl.cs" />

--
Gitblit v1.9.1