From 94087c7bf0e0beeeedfd4eb0feaac7b2b3d06fb8 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 01 三月 2021 09:10:21 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 39c4473..194fc8b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -232,7 +232,6 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
- <None Include="Properties\PublishProfiles\API.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -315,6 +314,10 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaintenanceModeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WorkCenterController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_CurrencyController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_UnitController.cs" />
<Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
<Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
<Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
@@ -344,6 +347,9 @@
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
+ <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
@@ -358,7 +364,9 @@
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
+ <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
+ <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
@@ -374,6 +382,9 @@
<Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
<Compile Include="Models\DocumentsView.cs" />
+ <Compile Include="Models\MaintenanceMode.cs" />
+ <Compile Include="Models\QC_ProcessCheckBillSub.cs" />
+ <Compile Include="Models\QC_ProcessCheckBillMain.cs" />
<Compile Include="Models\Gy_RoutingBillSub.cs" />
<Compile Include="Models\LookingForBill.cs" />
<Compile Include="Models\M_Department.cs" />
@@ -468,6 +479,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="Controllers\PZGL\" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
--
Gitblit v1.9.1