From a637a8ff0609f462fad4c983dba293da340de57a Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 07 六月 2022 16:25:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebAPI.csproj | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8aca390..316c1da 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -305,7 +305,6 @@
</Content>
<None Include="Web References\WebS\Reference.map">
<Generator>MSDiscoCodeGenerator</Generator>
- <LastGenOutput>Reference.cs</LastGenOutput>
</None>
<None Include="Web References\WebS\WebService1.disco" />
<Content Include="Web.config">
@@ -381,6 +380,7 @@
<Compile Include="Controllers\SCGL\Sc_ComplementGoodBillController.cs" />
<Compile Include="Controllers\SCGL\Sc_ComplementGoodsController.cs" />
<Compile Include="Controllers\SCGL\Sc_ICBomBillController.cs" />
+ <Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormBillController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱JIT_DayPlanPlatFormImportController.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱NpoiHelper.cs" />
<Compile Include="Controllers\SCGL\鏃ヨ鍒掔鐞哱Sc_JIT_ComplementGoodBillController.cs" />
@@ -823,6 +823,7 @@
<Folder Include="Views\Gy_EquipType\" />
<Folder Include="Views\Gy_ICBomBill\" />
<Folder Include="Views\Gy_RoutingGroup\" />
+ <Folder Include="Views\JIT_DayPlanPlatFormBill\" />
<Folder Include="Views\JIT_DayPlanPlatFormImport\" />
<Folder Include="Views\KF_ICInventoryList_WMSBill\" />
<Folder Include="Views\Kf_ICStockBillMain\" />
@@ -858,10 +859,10 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
+ <WebReferenceUrl Include="http://47.96.97.237/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://47.96.97.237/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1