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 | 63 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a673d05..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" />
@@ -318,15 +319,32 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_DuSubsidyItemBillController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_WorkPayTypeBillController.cs" />
+ <Compile Include="Controllers\GZGL\Gy_WorkTypeBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldProdInBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairChangeBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldRepairOutBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<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" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -349,20 +367,25 @@
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
<Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
- <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
+ <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillListController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+ <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
<Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<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\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" />
+ <Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
<Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
<Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
<Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -378,9 +401,20 @@
<Compile Include="DLL\ClsSc_MouldDotCheckBill.cs" />
<Compile Include="DLL\ClsSc_MouldLifeChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldMaintainBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldOtherOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldOtherInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMoveStockStepOutBill.cs" />
+ <Compile Include="DLL\ClsPay_SingleBalBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdBackBill.cs" />
+ <Compile Include="DLL\ClsPay_OtherBalBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldMoveStockStepInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldProdMoveBill.cs" />
<Compile Include="DLL\ClsSc_MouldProdOutBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairChangeBill.cs" />
<Compile Include="DLL\ClsSc_MouldRepairCheckBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairInBill.cs" />
+ <Compile Include="DLL\ClsSc_MouldRepairOutBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapInBill.cs" />
<Compile Include="DLL\ClsSc_MouldScrapOutBill.cs" />
<Compile Include="DLL\ClsSc_ProcessReport.cs" />
@@ -392,12 +426,36 @@
<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" />
<Compile Include="Models\ClsSb_EquipMaintainBillMain.cs" />
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldProdBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldProdBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairChangeBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairInBillMain.cs" />
+ <Compile Include="Models\ClsSc_MouldRepairInBillSub.cs" />
+ <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" />
+ <Compile Include="Models\Pay_OtherBalBillSub.cs" />
+ <Compile Include="Models\Pay_SingleBalBillSub.cs" />
+ <Compile Include="Models\ToHierarchy.cs" />
+ <Compile Include="Models\Xt_ORGANIZATIONS.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
<Compile Include="Models\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
<Compile Include="Models\ClsSc_ICMOReportBillMain.cs" />
@@ -464,6 +522,7 @@
<Compile Include="Models\WWSendOutBillViewModel.cs" />
<Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
<Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+ <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
<Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
<Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
<Compile Include="Properties\Resources.Designer.cs">
@@ -543,8 +602,10 @@
</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\" />
</ItemGroup>
<ItemGroup>
<WCFMetadata Include="Service References\" />
--
Gitblit v1.9.1