From 16c3bb84eacc3326afad9a44e6dcb1ad1ca4967f Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期三, 31 三月 2021 17:48:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-API
---
WebAPI/WebAPI.csproj | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index bb88e6e..cf0c008 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -232,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>
@@ -314,9 +315,25 @@
<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" />
@@ -386,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" />
@@ -415,10 +431,10 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://124.70.129.242/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://124.70.129.242/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1