From 898c1d9bf2066cc323623407333857342d5eb50b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 12 一月 2023 12:16:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 939708a..f632c05 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -393,9 +393,17 @@
     <Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
     <Compile Include="Controllers\Gy_MateMouldController.cs" />
     <Compile Include="Controllers\MJGL\Sc_MouldDotCheckRuleBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldLifeUseBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldScrapRequestBillController.cs" />
+    <Compile Include="Controllers\MJGL\Sc_MouldStatusChangeBillController.cs" />
     <Compile Include="Controllers\Pay_ReportController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipSparepartsBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipSparepartsChangeBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipStatusChangeBillController.cs" />
+    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipStockInCheckBillController.cs" />
+    <Compile Include="Controllers\SBGL\SBTC\Sb_EquipWorkBeforeCheckBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipWorkBeforeCheckSBillController.cs" />
+    <Compile Include="Controllers\SBGL\Sb_EquipStockInCheckBillSController.cs" />
     <Compile Include="Controllers\SCGL\Sc_ComplementGoodBill_ZXBZController.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱DataHelper.cs" />
     <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_Cg_PODemandPlanBillController.cs" />
@@ -453,7 +461,9 @@
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_COMMONCONTACTBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_CustLocationController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_DutyBillController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_EquipStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MatePriceSupController.cs" />
+    <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_MouldStatusController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_OperatorController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_PaymentConditionListBillController.cs" />
     <Compile Include="Controllers\鍩虹璧勬枡\鍩虹璧勬枡\Gy_RateTypeController.cs" />
@@ -903,10 +913,12 @@
     <Folder Include="Views\Gy_ConkType\" />
     <Folder Include="Views\Gy_CustLocation\" />
     <Folder Include="Views\Gy_DutyBill\" />
+    <Folder Include="Views\Gy_EquipStatus\" />
     <Folder Include="Views\Gy_EquipType\" />
     <Folder Include="Views\Gy_ICBomBill\" />
     <Folder Include="Views\Gy_MateMould\" />
     <Folder Include="Views\Gy_MatePriceSup\" />
+    <Folder Include="Views\Gy_MouldStatus\" />
     <Folder Include="Views\Gy_Operator\" />
     <Folder Include="Views\Gy_PackType\" />
     <Folder Include="Views\Gy_PaymentConditionListBill\" />
@@ -943,14 +955,20 @@
     <Folder Include="Views\Sb_EquipRepairSendWorkBill\" />
     <Folder Include="Views\Sb_EquipSparepartsBill\" />
     <Folder Include="Views\Sb_EquipSparepartsChangeBill\" />
+    <Folder Include="Views\Sb_EquipStatusChangeBill\" />
+    <Folder Include="Views\Sb_EquipStockInCheckBill\" />
+    <Folder Include="Views\Sb_EquipWorkBeforeCheckBill\" />
     <Folder Include="Views\Sc_CallGoodsBackRequestBill\" />
     <Folder Include="Views\Sc_ComplementGoodBill\" />
     <Folder Include="Views\Sc_ComplementGoodBill_ZXBZ\" />
     <Folder Include="Views\Sc_ComplementGoods\" />
     <Folder Include="Views\Sc_JIT_ComplementGoodBill\" />
     <Folder Include="Views\Sc_MouldDotCheckRuleBill\" />
+    <Folder Include="Views\Sc_MouldLifeUseBill\" />
     <Folder Include="Views\Sc_MouldRepairOutBill\" />
     <Folder Include="Views\Sc_MouldRepairSendWorkBill\" />
+    <Folder Include="Views\Sc_MouldScrapRequestBill\" />
+    <Folder Include="Views\Sc_MouldStatusChangeBill\" />
     <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
     <Folder Include="Views\Sc_WorkBillSortBill\" />
     <Folder Include="Views\Sc_WorkDemandPlanBill\" />

--
Gitblit v1.9.1