From 3364913b6f36a72b2a7292423d836af85ef02fa6 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期二, 30 三月 2021 09:46:24 +0800
Subject: [PATCH] 合并
---
WebAPI/WebAPI.csproj | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 1dba599..cf0c008 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -55,6 +55,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\DAL.dll</HintPath>
</Reference>
+ <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
+ </Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\DBUtility.dll</HintPath>
@@ -229,6 +232,7 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
+ <None Include="Properties\PublishProfiles\API.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -311,11 +315,36 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_NoPassProcController.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\SCGL\Sc_ICMOReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
+ <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
+ <Compile Include="Dapper\SqlHelper.cs" />
+ <Compile Include="Dapper\SqlPools.cs" />
<Compile Include="DbUntil\DataFormatUntil.cs" />
<Compile Include="Models\ApiConfig.cs" />
<Compile Include="Models\ApiResult.cs" />
<Compile Include="Models\DocumentsView.cs" />
+ <Compile Include="Models\LookingForBill.cs" />
+ <Compile Include="Models\M_Department.cs" />
+ <Compile Include="Models\M_ProcMul.cs" />
+ <Compile Include="Models\M_StationBillMail.cs" />
+ <Compile Include="Models\M_Process.cs" />
<Compile Include="Models\StationOutBillView.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
@@ -327,6 +356,8 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Service\ProcessDal.cs" />
+ <Compile Include="Service\YqnDal.cs" />
<Compile Include="Service\YqnQbService.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
@@ -372,7 +403,6 @@
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
<Content Include="fonts\glyphicons-halflings-regular.eot" />
<None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
- <None Include="Properties\PublishProfiles\WEBAPI.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
@@ -401,10 +431,10 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.16.80/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Static</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.16.80/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1