From 1fec2f9ed5f7a8b1c4a6feddc585dba88ed6b3c9 Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期五, 19 十一月 2021 08:22:12 +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 7505380..a65bbd9 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -357,6 +357,8 @@
     <Compile Include="Controllers\ReportPlatFormController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" />
     <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipDotCheckRuleBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipMaintainRuleBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" />
     <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" />
@@ -389,6 +391,7 @@
     <Compile Include="Controllers\浠撳瓨绠$悊\Kf_MateOutBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
     <Compile Include="Controllers\鍝佽川绠$悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_ConkReasonBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DotCheckBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MaintainBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RepairBillController.cs" />
@@ -415,6 +418,7 @@
     <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" />
     <Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipMaintainBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" />
     <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" />
     <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" />
     <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" />
@@ -446,6 +450,7 @@
     <Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
     <Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
     <Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+    <Compile Include="DLL\ClsSb_EquipDotCheckRuleBill.cs" />
     <Compile Include="LogService.cs" />
     <Compile Include="Models\ApiConfig.cs" />
     <Compile Include="Models\ApiResult.cs" />
@@ -462,6 +467,11 @@
     <Compile Include="Models\ClsKf_MateOutBillSub.cs" />
     <Compile Include="Models\ClsOA_InformBillMain.cs" />
     <Compile Include="Models\ClsOA_InformBillSub.cs" />
+    <Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" />
+    <Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" />
+    <Compile Include="Models\ClsSb_EquipMaintainRuleBillMain.cs" />
+    <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub.cs" />
+    <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub_Item.cs" />
     <Compile Include="Models\Pay_PeriodInfoSet.cs" />
     <Compile Include="Models\Gy_OrderBackInfo.cs" />
     <Compile Include="Models\Gy_OrderLevList.cs" />

--
Gitblit v1.9.1