From 67d946d82c19f4a35ac6c6273ad83acfb2593e05 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 17 四月 2024 17:47:28 +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 e8d4bd1..70ecba5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -417,6 +417,7 @@
<Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldUpperBillController.cs" />
<Compile Include="Controllers\Pay_ReportController.cs" />
+ <Compile Include="Controllers\SBGL\Gy_FixCardChangeBillController.cs" />
<Compile Include="Controllers\SBGL\Gy_FixCardBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipConkBookBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
@@ -428,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" />
@@ -484,6 +486,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" />
@@ -551,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" />
@@ -568,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" />
@@ -640,11 +646,13 @@
<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" />
<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