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 | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index e57ce48..d4467a4 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -81,6 +81,7 @@
<Private>True</Private>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
<HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NPOI, Version=2.5.5.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
@@ -276,6 +277,9 @@
<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">
<DependentUpon>Reference.map</DependentUpon>
</Content>
@@ -395,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" />
@@ -618,6 +625,7 @@
<Compile Include="Models\Employee.cs" />
<Compile Include="Models\Gy_UserCustomer.cs" />
<Compile Include="Models\Gy_UserMater.cs" />
+ <Compile Include="Models\Gy_UserProcess.cs" />
<Compile Include="Models\Gy_UserUser.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillMain.cs" />
<Compile Include="Models\JIT_Cg_PODemandPlanBillSub.cs" />
@@ -983,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\" />
@@ -1034,10 +1045,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://localhost:8098/WebService1.asmx">
+ <WebReferenceUrl Include="http://192.168.63.3/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Dynamic</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://localhost:8098/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://192.168.63.3/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1