From 66350933608690dd01c29c2268c16a2b99835d97 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期五, 02 七月 2021 14:28:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 912572b..3c7f96b 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -320,6 +320,7 @@
     <Compile Include="Controllers\BaseSet\Gy_MaintenanceItemController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_MaintenanceModeController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_StockPlaceController.cs" />
+    <Compile Include="Controllers\BaseSet\Gy_EquipMentController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WorkCenterController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_CurrencyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_UnitController.cs" />
@@ -371,6 +372,7 @@
     <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
     <Compile Include="Controllers\SCGL\QC_ProcessCheckBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
+    <Compile Include="Controllers\Sc_MouldOtherInBillController.cs" />
     <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
     <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
     <Compile Include="Controllers\LMESController.cs" />
@@ -425,6 +427,14 @@
     <Compile Include="Models\ClsSc_MouldMaintainBillSub.cs" />
     <Compile Include="Models\ClsSc_MouldStockBillMain.cs" />
     <Compile Include="Models\ClsSc_MouldStockBillSub.cs" />
+    <Compile Include="Models\EquipMent.cs" />
+    <Compile Include="Models\Gy_Mould.cs" />
+    <Compile Include="Models\Gy_MouldSub.cs" />
+    <Compile Include="Models\Sc_MouldStockBillMain.cs" />
+    <Compile Include="Models\Sc_MouldStockBillSub.cs" />
+    <Compile Include="Models\Xt_AccountPeriod.cs" />
+    <Compile Include="Models\xtgnb.cs" />
+    <Compile Include="Models\SystemParameter.cs" />
     <Compile Include="Models\ClsSc_ProcessSendWorkMain.cs" />
     <Compile Include="Models\ClsWW_EntrustProcessReportBillMain.cs" />
     <Compile Include="Models\ClsWW_EntrustProcessReportBillSub.cs" />
@@ -432,11 +442,18 @@
     <Compile Include="Models\ClsWW_EntrustProcessSendOutBillSub.cs" />
     <Compile Include="Models\ClsWW_EntrustWorkOrderBillMain.cs" />
     <Compile Include="Models\ClsWW_EntrustWorkOrderBillSub.cs" />
+    <Compile Include="Models\Customer.cs" />
+    <Compile Include="Models\BillType.cs" />
+    <Compile Include="Models\QC_OutCompCheckBillMain.cs" />
+    <Compile Include="Models\QC_OutCompCheckBillSub.cs" />
+    <Compile Include="Models\Supplier.cs" />
     <Compile Include="Models\DocumentsView.cs" />
     <Compile Include="Models\Gy_Group.cs" />
     <Compile Include="Models\Gy_WorkCenter.cs" />
     <Compile Include="Models\MaintenanceAcceptItem.cs" />
     <Compile Include="Models\MaintenanceMode.cs" />
+    <Compile Include="Models\QC_LastPieceCheckBillSub.cs" />
+    <Compile Include="Models\QC_LastPieceCheckBillMain.cs" />
     <Compile Include="Models\QC_ProcessCheckBillSub.cs" />
     <Compile Include="Models\QC_ProcessCheckBillMain.cs" />
     <Compile Include="Models\Gy_RoutingBillSub.cs" />

--
Gitblit v1.9.1