From 6dbb4801f817b738fddcde730919db972636544b Mon Sep 17 00:00:00 2001
From: 沈泽 <211959439@qq.com>
Date: 星期一, 30 八月 2021 08:46:33 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 16864fe..0c7809a 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -326,9 +326,7 @@
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillListController.cs" />
<Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -337,27 +335,27 @@
<Compile Include="Controllers\SBGL\Sb_EquipMaintainPlanBillController.cs" />
<Compile Include="Controllers\SBGL\Sb_EquipDotCheckPlanBillController.cs" />
<Compile Include="Controllers\Sb_CheckEqpRepairWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MaterToSourceBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESEndWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESStopWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESBeginWorkBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\QC_LastPieceCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\QC_OutCompCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_ICMOReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MaterToSourceBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESEndWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESStopWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESBeginWorkBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_LastPieceCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\QC_OutCompCheckBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.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" />
<Compile Include="Controllers\LookingForBillController.cs" />
<Compile Include="Controllers\NewApiController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_PPBomBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
<Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBackBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOutStockBillController.cs" />
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
@@ -542,6 +540,7 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
--
Gitblit v1.9.1