From fc289bda31cc9216bf57a1b41318580bc0c488ed Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 07 六月 2021 17:32:12 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API

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

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index c5dc8a7..f058c64 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -353,6 +353,7 @@
     <Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
     <Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
     <Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
+    <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
     <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
     <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
@@ -419,6 +420,7 @@
     <Compile Include="Models\WWSendOutBillViewModel.cs" />
     <Compile Include="Models\WW_EntrustProcSendWorkViewModel.cs" />
     <Compile Include="Models\WW_EntrustWorkOrderViewModel.cs" />
+    <Compile Include="Models\鍩虹璧勬枡\Warehouse.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

--
Gitblit v1.9.1