From 7b33dfdb3104e3dcdafc024b5688e87db93c579e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期四, 10 六月 2021 17:26:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 42 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 41 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 6b25678..aa5e5c3 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,11 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaintenanceAcceptItemController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.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" />
@@ -346,7 +350,20 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+ <Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipDotCheckBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipMaintainBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
+ <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
+ <Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.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\SCGL\Sc_QualityReportBillController.cs" />
<Compile Include="Controllers\Sc_ProcessMangementController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
<Compile Include="Controllers\LMESController.cs" />
@@ -361,7 +378,19 @@
<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\ClsSb_EquipConkBookBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
+ <Compile Include="DLL\ClsSc_ICMOReportBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
<Compile Include="DLL\ClsSc_ProcessSendWork.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
@@ -369,6 +398,9 @@
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
+ <Compile Include="Models\CheckItem.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
+ <Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
@@ -377,6 +409,12 @@
<Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
<Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
<Compile Include="Models\DocumentsView.cs" />
+ <Compile Include="Models\Gy_Group.cs" />
+ <Compile Include="Models\Gy_WorkCenter.cs" />
+ <Compile Include="Models\MaintenanceAcceptItem.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" />
@@ -394,6 +432,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -471,6 +510,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