From 005a6ed14ccad1aeaa30d6738a6b651e63ed483d Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 01 九月 2021 20:04:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0c7809a..4f78163 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -355,7 +355,7 @@
<Compile Include="Controllers\XSGL\Xs_SeOrderBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\宸ュ簭妫�楠屽崟\QC_ProcessCheckBillController.cs" />
<Compile Include="Controllers\鍝佽川绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillController.cs" />
- <Compile Include="Controllers\SCGL\Sc_QualityReportBillController.cs" />
+ <Compile Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" />
<Compile Include="Dapper\SqlHelper.cs" />
<Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.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" />
@@ -540,7 +542,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
- <Folder Include="Controllers\鐢熶骇绠＄悊\璐ㄩ噺姹囨姤鍗昞" />
<Folder Include="Views\MoveStockBill\" />
<Folder Include="Views\QC_Management\" />
</ItemGroup>
--
Gitblit v1.9.1