From bb4f0f40f7fa7dc9ba76416876bac6d036ffde2b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 31 一月 2024 08:44:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 17bdd52..609fcda 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,8 +342,6 @@
     <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
-    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
-    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
@@ -427,6 +425,7 @@
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICMOBillWorkQtyStatus_TmpController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ICMOChangeBillController.cs" />
+    <Compile Include="Controllers\SCGL\Sc_MyTicketController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_CallGoodsBackRequestBillController.cs" />
@@ -443,8 +442,6 @@
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_WorkDemandPlanBillController.cs" />
     <Compile Include="Controllers\Sc_PckSplitBillController.cs" />
     <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
-    <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
-    <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
     <Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
     <Compile Include="Controllers\Kf_ICStockBillMainController.cs" />
     <Compile Include="Controllers\MateOutController.cs" />
@@ -467,6 +464,8 @@
     <Compile Include="Controllers\Sc_MouldRepairSendWorkBillController.cs" />
     <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
     <Compile Include="Controllers\Sc_ProcessReportController.cs" />
+    <Compile Include="Controllers\XSGL\Kf_ICStockBackBillController.cs" />
+    <Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
     <Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_ExceptiveCheckRequestBillController.cs" />
     <Compile Include="Controllers\XSGL\Xs_CusRatingChangeBillController.cs" />
@@ -531,6 +530,9 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_CheckItemBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Xt_FastICSchemeController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcCommPriceController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkTypeController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_WorkPayTypeController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjGroupController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OutApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OverApplyBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PayMentBillController.cs" />
@@ -540,7 +542,7 @@
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_ProcPriceRequestBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_MonthlySalaryReportController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_PieceRateWageReportController.cs" />
-    <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ClassTimePrjController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Gy_ClassTimePrjSubController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_OtherBalBillController.cs" />
     <Compile Include="Controllers\宸ヨ祫绠＄悊\Pay_GroupBalBillController.cs" />

--
Gitblit v1.9.1