From e0f1e38e04ca7debc900e0e91d87b6b5b67c6a76 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 05 十一月 2021 15:46:06 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/WebAPI.csproj |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index d153499..28bdd20 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -279,8 +279,11 @@
     <Compile Include="App_Start\SwaggerConfig.cs" />
     <Compile Include="App_Start\WebApiConfig.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ClassTimePrjController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderBackInfoController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_OrderLevController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkTypeController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_WorkPayTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ProcController.cs" />
-    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_TableController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_ModelTypeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_QCCheckClassController.cs" />
@@ -304,6 +307,7 @@
     <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
     <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
     <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -338,12 +342,14 @@
     <Compile Include="Controllers\Open_PrintTemController.cs" />
     <Compile Include="Controllers\Pay_OtherBalBillController.cs" />
     <Compile Include="Controllers\Pay_GroupBalBillController.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\ReportPlatFormController.cs" />
+    <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
@@ -376,6 +382,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" />
@@ -384,6 +394,7 @@
     <Compile Include="DbUntil\DataFormatUntil.cs" />
     <Compile Include="DLL\ClsGy_BadReason_Ctl.cs" />
     <Compile Include="DLL\ClsGy_DuSubsidyItemBill.cs" />
+    <Compile Include="DLL\ClsGy_EquipFileMain.cs" />
     <Compile Include="DLL\ClsGy_EquipTypeBill.cs" />
     <Compile Include="DLL\ClsGy_Material_Ctl.cs" />
     <Compile Include="DLL\ClsGy_Source_Ctl.cs" />
@@ -429,6 +440,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\Gy_OrderBackInfo.cs" />
+    <Compile Include="Models\Gy_OrderLevList.cs" />
+    <Compile Include="Models\ClsGy_EquipFileMain.cs" />
     <Compile Include="Models\ClsGy_EquipFileType.cs" />
     <Compile Include="Models\ClsGy_Material_Model.cs" />
     <Compile Include="Models\ClsSb_EquipDotCheckBillMain.cs" />
@@ -445,6 +463,10 @@
     <Compile Include="Models\ClsSc_MouldRepairOutBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldRepairOutBillSub.cs" />
     <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\Xt_DataDictionary_Proc.cs" />
     <Compile Include="Models\Xt_DataDictionary_View.cs" />
     <Compile Include="Models\Xt_DataDictionary_Table.cs" />
@@ -528,6 +550,7 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Employee.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_Process.cs" />
     <Compile Include="Models\鍩虹璧勬枡\Gy_ClassTimePrj.cs" />

--
Gitblit v1.9.1