From 718ec9a3caa04bd2f1585e6f48e843e610efd1cf Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 31 八月 2021 17:42:07 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 20 +++++++++++---------
1 files changed, 11 insertions(+), 9 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index eadd6d4..4f78163 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -326,7 +326,7 @@
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportFromController.cs" />
<Compile Include="Controllers\ReportPlatFormController.cs" />
- <Compile Include="Controllers\鐢熶骇绠＄悊\Sc_MESProductReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" />
<Compile Include="Controllers\Sc_MouldController.cs" />
<Compile Include="Controllers\Sc_GroupOrderBillController.cs" />
<Compile Include="Controllers\QC_ManagementController.cs" />
@@ -335,20 +335,20 @@
<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" />
@@ -387,6 +387,7 @@
<Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" />
<Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" />
<Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" />
+ <Compile Include="LogService.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\CheckItem.cs" />
@@ -419,6 +420,7 @@
<Compile Include="Models\Gy_Mould.cs" />
<Compile Include="Models\Gy_MouldSub.cs" />
<Compile Include="Models\Sc_MouldStockBillMain.cs" />
+ <Compile Include="Models\Sc_ICMOBillQualityStatus_Tmp.cs" />
<Compile Include="Models\Sc_MouldStockBillSub.cs" />
<Compile Include="Models\Xt_AccountPeriod.cs" />
<Compile Include="Models\xtgnb.cs" />
--
Gitblit v1.9.1