From 6f23b2a6ae7f1776816de64ca25d7c05ba5a8d6e Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 22 十月 2021 13:49:13 +0800
Subject: [PATCH] 采购经理权限Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8616f1f..19b67e6 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,6 +278,7 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_CheckItemController.cs" />
@@ -333,12 +334,14 @@
     <Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
     <Compile Include="Controllers\Open_PrintTemController.cs" />
     <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
+    <Compile Include="Controllers\Pay_GroupBalBillController.cs" />
     <Compile Include="Controllers\Pay_WorkTimesBillController.cs" />
     <Compile Include="Controllers\Pay_SingleBalBillController.cs" />
     <Compile Include="Controllers\ProductionOrderController.cs" />
     <Compile Include="Controllers\PublicPageMethodController.cs" />
     <Compile Include="Controllers\ReportFromController.cs" />
     <Compile Include="Controllers\ReportPlatFormController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
@@ -378,6 +381,7 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
     <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+    <Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
     <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
     <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
@@ -422,6 +426,7 @@
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\ClsGy_EquipFileType.cs" />
     <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillSub.cs" />
@@ -437,9 +442,13 @@
     <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
     <Compile Include="Models\ClsGy_ProcPrice.cs" />
+    <Compile Include="Models\Gy_User.cs" />
+    <Compile Include="Models\Gy_UserSupper.cs" />
     <Compile Include="Models\Menu.cs" />
     <Compile Include="Models\ModelConvertHelper.cs" />
     <Compile Include="Models\Pay_OtherBalBill.cs" />
+    <Compile Include="Models\Pay_GroupBalBill.cs" />
+    <Compile Include="Models\Pay_GroupBalBillSub.cs" />
     <Compile Include="Models\Pay_WorkTimesBillSub.cs" />
     <Compile Include="Models\Pay_WorkTimesBill.cs" />
     <Compile Include="Models\Pay_SingleBalBill.cs" />
@@ -593,6 +602,7 @@
   </ItemGroup>
   <ItemGroup>
     <Folder Include="App_Data\" />
+    <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\MoveStockBill\" />
     <Folder Include="Views\QC_Management\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />

--
Gitblit v1.9.1