From 16f1fe483c481641f6a8a8ae81461ae15d91e54e Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 05 十一月 2021 16:54:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index b9a1b09..54537df 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -342,11 +342,13 @@
     <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\GG_NoticeController.cs" />
     <Compile Include="Controllers\ReportPlatFormController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
@@ -381,6 +383,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 +401,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 +442,12 @@
     <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\Gy_OrderBackInfo.cs" />
     <Compile Include="Models\Gy_OrderLevList.cs" />
     <Compile Include="Models\ClsGy_EquipFileMain.cs" />
@@ -456,6 +469,8 @@
     <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" />

--
Gitblit v1.9.1