From 072542b45cf7cef612f55b445461eaf8d3765a6b Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 26 三月 2024 17:12:24 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 2915276..2219531 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -409,11 +409,16 @@
<Compile Include="Controllers\CJGL\Cj_SingleStationController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
<Compile Include="Controllers\Gy_StdMinPickQtyController.cs" />
+ <Compile Include="Controllers\JHGL\Gy_MaterialTechParamBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldinventoryBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
<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" />
<Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
@@ -467,6 +472,10 @@
<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" />
<Compile Include="Controllers\XSGL\Xs_ReceivableBillController.cs" />
<Compile Include="Controllers\XSGL\YS_ContactBalController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderChangeBillController.cs" />
@@ -475,6 +484,9 @@
<Compile Include="Controllers\CGGL\YF_PayMentBackBillController.cs" />
<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" />
<Compile Include="Controllers\浜轰簨绠＄悊\鍏ヨ亴鐢宠\HR_EmpEngageRequestBillController.cs" />
@@ -502,6 +514,10 @@
<Compile Include="Controllers\鍝佽川绠＄悊\宸℃鍗昞QC_PatrolProcCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\MES_ProcessCheckBill_PDAController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityReportsController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardChangeTypeController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardStatusController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardAddressController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CardTypeController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
<Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
@@ -630,7 +646,9 @@
<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" />
<Compile Include="DLL\ClsGy_SellStyle_Ctl.cs" />
<Compile Include="DLL\ClsGy_PostSkill_Ctl.cs" />
@@ -1067,6 +1085,7 @@
<Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
<Folder Include="Views\Sc_MouldScrapRequestBill\" />
<Folder Include="Views\Sc_MouldStatusChangeBill\" />
+ <Folder Include="Views\Sc_MouldUpperBill\" />
<Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
<Folder Include="Views\Sc_ProcessSendWork\" />
<Folder Include="Views\Sc_ProcExchRecordBackBill\" />
@@ -1146,6 +1165,8 @@
<PlatformTarget>x86</PlatformTarget>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE;DEBUG</DefineConstants>
+ <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+ <RunCodeAnalysis>true</RunCodeAnalysis>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<PlatformTarget>x86</PlatformTarget>
--
Gitblit v1.9.1