From 1b927a9f703dbcb4bfe041ee409e216c221a9157 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 08 七月 2022 09:06:31 +0800
Subject: [PATCH] 合并

---
 WebAPI/WebAPI.csproj |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 8aca390..40f23cb 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -233,6 +233,7 @@
     <Content Include="Index.html" />
     <Content Include="Views\Scripts\bootstrap.js" />
     <Content Include="Views\Scripts\bootstrap.min.js" />
+    <Content Include="Config\kdapi.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -305,7 +306,7 @@
     </Content>
     <None Include="Web References\WebS\Reference.map">
       <Generator>MSDiscoCodeGenerator</Generator>
-      <LastGenOutput>Reference.cs</LastGenOutput>
+      <LastGenOutput>Reference1.cs</LastGenOutput>
     </None>
     <None Include="Web References\WebS\WebService1.disco" />
     <Content Include="Web.config">
@@ -350,6 +351,7 @@
     <Compile Include="Controllers\BaseSet\Gy_PropertyController.cs" />
     <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_DataDictionary_ViewController.cs" />
+    <Compile Include="Controllers\BaseSet\Xt_grdAlignment_WMESController.cs" />
     <Compile Include="Controllers\BaseSet\Xt_ORGANIZATIONSController.cs" />
     <Compile Include="Controllers\BLL\Xt_AccountPeriodController.cs" />
     <Compile Include="Controllers\BLL\Xt_BillTypeController.cs" />
@@ -381,6 +383,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" />
@@ -752,6 +755,7 @@
     <Compile Include="Service\ProcessDal.cs" />
     <Compile Include="Service\YqnDal.cs" />
     <Compile Include="Service\YqnQbService.cs" />
+    <Compile Include="Utility\Util.cs" />
     <Compile Include="Web References\WebS\Reference.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -823,6 +827,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\" />
@@ -844,6 +849,7 @@
     <Folder Include="Views\Sc_WorkBillAutoSortBillMain\" />
     <Folder Include="Views\Sc_WorkBillSortBill\" />
     <Folder Include="Views\Sc_WorkDemandPlanBill\" />
+    <Folder Include="Views\Xt_grdAlignment_WMES\" />
   </ItemGroup>
   <ItemGroup>
     <WCFMetadata Include="Service References\" />
@@ -858,10 +864,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