From 77162bdc19b49d5bb86661f3c4f679df71cc7202 Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 16 四月 2023 21:53:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 39 +++++++++++++--------------------------
1 files changed, 13 insertions(+), 26 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8719e11..d4467a4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -256,11 +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" />
<Content Include="Web References\WebS\ClsCLD_Customer_Model.datasource">
<DependentUpon>Reference.map</DependentUpon>
</Content>
@@ -280,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">
@@ -318,11 +316,10 @@
<Content Include="Web References\WebS\ClsKf_ICStockBill_WMS.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>
- <None Include="Web References\WebS2\WebService1.wsdl" />
+ </Content>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
<SubType>Designer</SubType>
@@ -402,6 +399,9 @@
<Compile Include="Controllers\CJGL\Cj_StationOutBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationInBillController.cs" />
<Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchRecordBackBillController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcessSendWorkController.cs" />
+ <Compile Include="Controllers\CJGL\Sc_ProcExchSendWorkBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_ProcExchWorkBackBillController.cs" />
<Compile Include="Controllers\CJGL\Sc_WorkBillAutoSortBillMainController.cs" />
<Compile Include="Controllers\Gy_MateMouldController.cs" />
@@ -883,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>
@@ -996,6 +991,9 @@
<Folder Include="Views\Sc_MouldScrapRequestBill\" />
<Folder Include="Views\Sc_MouldStatusChangeBill\" />
<Folder Include="Views\Sc_ProcessExchangeIssueBill\" />
+ <Folder Include="Views\Sc_ProcessSendWork\" />
+ <Folder Include="Views\Sc_ProcExchRecordBackBill\" />
+ <Folder Include="Views\Sc_ProcExchSendWorkBill\" />
<Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
<Folder Include="Views\Sc_WorkBillSortBill\" />
<Folder Include="Views\Sc_WorkDemandPlanBill\" />
@@ -1047,27 +1045,16 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://47.96.97.237/WEBS-WMS/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