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

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2219531..70ecba5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -429,6 +429,7 @@
     <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
     <Compile Include="Controllers\SCGL\Gy_SourceWorkStationSetController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
+    <Compile Include="Controllers\SCGL\Sc_CurrentTicketController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MyTicketController.cs" />
@@ -507,6 +508,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" />
@@ -552,6 +554,8 @@
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\Gy_ShiftsController.cs" />
+    <Compile Include="Controllers\宸ヨ祫绠＄悊\HR_EmployeeSkillBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -569,6 +573,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" />
@@ -641,6 +646,7 @@
     <Compile Include="Dapper\SqlHelper.cs" />
     <Compile Include="Dapper\SqlPools.cs" />
     <Compile Include="DbUntil\DataFormatUntil.cs" />
+    <Compile Include="DLL\ClsGy_BadPhenomena_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectInstruMent_Ctl.cs" />
     <Compile Include="DLL\ClsGy_InspectBasis_Ctl.cs" />
     <Compile Include="DLL\ClsGy_PoStockStyle_Ctl.cs" />

--
Gitblit v1.9.1