From ba6d2fff0224e8694c782a7e1154d0abd7a32c20 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 17 十一月 2021 08:48:34 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b9a1b09..a84bcd1 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -278,7 +278,9 @@
     <Compile Include="App_Start\RouteConfig.cs" />
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjSubController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+    <Compile Include="Controllers\BaseSet\Pay_PeriodInfoSetController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
@@ -317,6 +319,7 @@
     <Compile Include="Controllers\BLL\Xt_UserController.cs" />
     <Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
     <Compile Include="Controllers\CellWidthController.cs" />
+    <Compile Include="Controllers\CGGL\Kf_POStockInBillController.cs" />
     <Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
     <Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
     <Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -330,6 +333,7 @@
     <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_MouldMaintainRuleBillController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepInBillListController .cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldProdMoveBillListController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldMoveStockStepOutBillController.cs" />
@@ -342,11 +346,14 @@
     <Compile Include="Controllers\Open_PrintTemController.cs" />
     <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
     <Compile Include="Controllers\Pay_GroupBalBillController.cs" />
+    <Compile Include="Controllers\PurchaseOrderController.cs" />
+    <Compile Include="Controllers\QC_POStockInCheckBillController.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\GG_NoticeController.cs" />
     <Compile Include="Controllers\ReportPlatFormController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
@@ -381,6 +388,10 @@
     <Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\宸ヨ祫鍩虹璧勬枡\Gy_ProcPriceController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\鐢熶骇浠诲姟鍗昞Sc_ICMOBillController.cs" />
     <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
@@ -395,6 +406,7 @@
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
     <Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
     <Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
+    <Compile Include="DLL\ClsOA_InformBill.cs" />
     <Compile Include="DLL\ClsQC_NoPassProdCheckBill.cs" />
     <Compile Include="DLL\ClsQC_PatrolProcCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
@@ -435,6 +447,13 @@
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
     <Compile Include="Models\CheckItem.cs" />
+    <Compile Include="Models\ClsGy_DotCheck.cs" />
+    <Compile Include="Models\ClsGy_Maintain.cs" />
+    <Compile Include="Models\ClsGy_Repair.cs" />
+    <Compile Include="Models\ClsGy_RepairCheck.cs" />
+    <Compile Include="Models\ClsOA_InformBillMain.cs" />
+    <Compile Include="Models\ClsOA_InformBillSub.cs" />
+    <Compile Include="Models\Pay_PeriodInfoSet.cs" />
     <Compile Include="Models\Gy_OrderBackInfo.cs" />
     <Compile Include="Models\Gy_OrderLevList.cs" />
     <Compile Include="Models\ClsGy_EquipFileMain.cs" />
@@ -456,6 +475,9 @@
     <Compile Include="Models\ClsGy_ProcPrice.cs" />
     <Compile Include="Models\Gy_WorkType.cs" />
     <Compile Include="Models\Gy_WorkPayType.cs" />
+    <Compile Include="Models\QC_POStockInCheckBillSub.cs" />
+    <Compile Include="Models\QC_POStockInCheckBill.cs" />
+    <Compile Include="Models\UserPower.cs" />
     <Compile Include="Models\Xt_DataDictionary_Proc.cs" />
     <Compile Include="Models\Xt_DataDictionary_View.cs" />
     <Compile Include="Models\Xt_DataDictionary_Table.cs" />
@@ -539,6 +561,7 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrjSub.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />

--
Gitblit v1.9.1