From ce634e1c1193b2e36df65d91acf8b969629e8c8b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 18 十一月 2021 17:55:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 572e94a..a65bbd9 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -346,6 +346,7 @@
<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" />
@@ -356,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" />
@@ -385,8 +388,10 @@
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
+ <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" />
@@ -405,12 +410,15 @@
<Compile Include="DLL\ClsGy_Source_Ctl.cs" />
<Compile Include="DLL\ClsGy_WorkPayTypeBill.cs" />
<Compile Include="DLL\ClsGy_WorkTypeBill.cs" />
+ <Compile Include="DLL\ClsKf_MateOutBackBill.cs" />
+ <Compile Include="DLL\ClsKf_MateOutBill.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" />
<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" />
@@ -442,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" />
@@ -450,8 +459,19 @@
<Compile Include="Models\ClsGy_Maintain.cs" />
<Compile Include="Models\ClsGy_Repair.cs" />
<Compile Include="Models\ClsGy_RepairCheck.cs" />
+ <Compile Include="Models\ClsKf_ICStockBillMain.cs" />
+ <Compile Include="Models\ClsKf_ICStockBillScheme.cs" />
+ <Compile Include="Models\ClsKf_ICStockBillSub.cs" />
+ <Compile Include="Models\ClsKf_MateOutBillMain.cs" />
+ <Compile Include="Models\ClsKf_MateOutBillScheme.cs" />
+ <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