From d1cfe6ed4a9ea812f7b3f1c1094be54ffb11cd73 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期五, 14 四月 2023 15:33:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 36 +++++++-----------------------------
1 files changed, 7 insertions(+), 29 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index a4edc77..d4467a4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -256,12 +256,6 @@
<Content Include="Views\Scripts\jquery.validate.unobtrusive.js" />
<Content Include="Views\Scripts\jquery.validate.unobtrusive.min.js" />
<Content Include="Views\Scripts\modernizr-2.6.2.js" />
- <Content Include="Web References\WebS2\Reference.map">
- <Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference.cs</LastGenOutput>
- </Content>
- <None Include="Web References\WebS2\WebService1.disco" />
- <None Include="Web References\WebS2\WebService1.wsdl" />
<Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
@@ -281,6 +275,9 @@
<DependentUpon>Reference.map</DependentUpon>
</Content>
<Content Include="Web References\WebS\ClsGy_BadReason_Model.datasource">
+ <DependentUpon>Reference.map</DependentUpon>
+ </Content>
+ <Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
<Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model_View.datasource">
@@ -319,13 +316,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
- <Content Include="Web References\WebS\ClsGy_BarCodeBill_WMS_Model.datasource">
- <DependentUpon>Reference.map</DependentUpon>
- </Content>
- <None Include="Web References\WebS\Reference.map">
+ <Content Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
<LastGenOutput>Reference.cs</LastGenOutput>
- </None>
+ </Content>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -889,11 +883,6 @@
<Compile Include="Models\JsonResult.cs" />
<Compile Include="Models\Pensen.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
- <Compile Include="Web References\WebS2\Reference.cs">
- <AutoGen>True</AutoGen>
- <DesignTime>True</DesignTime>
- <DependentUpon>Reference.map</DependentUpon>
- </Compile>
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -1056,27 +1045,16 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://122.227.133.186:8090/WEBS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://122.227.133.186:8090/WEBS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
</CachedDynamicPropName>
<CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
<CachedSettingsPropName>WebAPI_WebS_WebService1</CachedSettingsPropName>
- </WebReferenceUrl>
- <WebReferenceUrl Include="http://localhost:9099/WebService1.asmx">
- <UrlBehavior>Dynamic</UrlBehavior>
- <RelPath>Web References\WebS2\</RelPath>
- <UpdateFromURL>http://localhost:9099/WebService1.asmx</UpdateFromURL>
- <ServiceLocationURL>
- </ServiceLocationURL>
- <CachedDynamicPropName>
- </CachedDynamicPropName>
- <CachedAppSettingsObjectName>Settings</CachedAppSettingsObjectName>
- <CachedSettingsPropName>WebAPI_WebS2_WebService1</CachedSettingsPropName>
</WebReferenceUrl>
</ItemGroup>
<PropertyGroup>
--
Gitblit v1.9.1