From 5cdcde592ae19de697c4bf16dce08838065987e3 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 22 八月 2023 16:01:23 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/SRM-WEBAPI
---
WebAPI/WebAPI.csproj | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e2d02bb..7d2421f 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -46,9 +46,9 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
- <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
+ <Reference Include="DAL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
+ <HintPath>..\..\..\SRM-MES\SRM-MES\DAL\bin\Debug\DAL.dll</HintPath>
</Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -210,6 +210,7 @@
<Compile Include="Code\Common.cs" />
<Compile Include="Code\Test2.cs" />
<Compile Include="Code\TestDAL.cs" />
+ <Compile Include="Controllers\QuotePriceBilController.cs" />
<Compile Include="Controllers\BarCodeController.cs" />
<Compile Include="Controllers\NpoiHelper.cs" />
<Compile Include="Controllers\POInStockBackController.cs" />
@@ -217,9 +218,11 @@
<Compile Include="Controllers\PODemandPlanController.cs" />
<Compile Include="Controllers\EntrustOrderController.cs" />
<Compile Include="Controllers\POOrderBillExcelController.cs" />
+ <Compile Include="Controllers\AskPriceBillController.cs" />
<Compile Include="Controllers\POOrderController.cs" />
<Compile Include="Controllers\PublicPageMethodController.cs" />
<Compile Include="Controllers\ReportController.cs" />
+ <Compile Include="Controllers\Xt_grdAlignment_WMESController.cs" />
<Compile Include="DLL\ClsCg_POInStockBills.cs" />
<Compile Include="HttpClient.cs" />
<Compile Include="InvokeHelper.cs" />
@@ -239,6 +242,7 @@
<Compile Include="MyHub.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Startup.cs" />
+ <Compile Include="Utility\HttpHelper.cs" />
<Compile Include="Utility\Util.cs" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.1