From fac7460490a706d9c0c7505246aee09ed6f0d585 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 14 七月 2021 21:43:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 3c7f96b..147469f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -343,6 +343,7 @@
<Compile Include="Controllers\BLL\Xt_SystemParameterController.cs" />
<Compile Include="Controllers\BLL\Xt_UserController.cs" />
<Compile Include="Controllers\BLL\Xt_SystemLogController.cs" />
+ <Compile Include="Controllers\CellWidthController.cs" />
<Compile Include="Controllers\CGGL\Cg_POOrderBillController.cs" />
<Compile Include="Controllers\CGGL\WW_EntrustOrderBillController.cs" />
<Compile Include="Controllers\CGGL\Cg_POInStockBillController.cs" />
@@ -353,9 +354,12 @@
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
<Compile Include="Controllers\JHGL\Gy_RoutingBillController.cs" />
+ <Compile Include="Controllers\MJGL\Sc_MouldScrapInBillController.cs" />
<Compile Include="Controllers\MJGL\Sc_MouldOtherOutBillController.cs" />
<Compile Include="Controllers\MJJY\Mj_PDA_MoudlCheckController.cs" />
+ <Compile Include="Controllers\ProductionOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
+ <Compile Include="Controllers\ReportPlatFormController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -421,6 +425,9 @@
<Compile Include="Models\ClsSb_EquipMaintainBillSub.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillMain.cs" />
<Compile Include="Models\ClsSb_EquipRepairWorkBillSub.cs" />
+ <Compile Include="Models\ClsSc_MouldScrapOutBillMain.cs">
+ <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+ </Compile>
<Compile Include="Models\ClsSc_MouldDotCheckBillMain.cs" />
<Compile Include="Models\ClsSc_MouldDotCheckBillSub.cs" />
<Compile Include="Models\ClsSc_MouldMaintainBillMain.cs" />
--
Gitblit v1.9.1