From 6731f533b1abf47aec884cc10d66a2d6e790fd13 Mon Sep 17 00:00:00 2001
From: WYB <908761037@qq.com>
Date: 星期四, 08 四月 2021 21:26:10 +0800
Subject: [PATCH] LAYUI版本PDA模式：增加工序汇报单编辑模块
---
WebAPI/WebAPI.csproj | 69 ++++++++++++++++++++++++++++------
1 files changed, 57 insertions(+), 12 deletions(-)
diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj
index 0d1c0ff..f5ee9d5 100644
--- a/WebAPI/WebAPI.csproj
+++ b/WebAPI/WebAPI.csproj
@@ -55,6 +55,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\DAL.dll</HintPath>
</Reference>
+ <Reference Include="Dapper, Version=1.50.2.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Dapper.1.50.2\lib\net45\Dapper.dll</HintPath>
+ </Reference>
<Reference Include="DBUtility, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\DBUtility.dll</HintPath>
@@ -83,9 +86,8 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>DLL\Model.dll</HintPath>
</Reference>
- <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\Newtonsoft.Json.dll</HintPath>
+ <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+ <HintPath>..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Pub_Class, Version=1.0.0.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
@@ -113,14 +115,16 @@
<Reference Include="System.Net.Http">
<Private>True</Private>
</Reference>
- <Reference Include="System.Net.Http.Formatting, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\System.Net.Http.Formatting.dll</HintPath>
+ <Reference Include="System.Net.Http.Formatting, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.7\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.Serialization">
<Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel" />
+ <Reference Include="System.Web.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.Cors.5.2.7\lib\net45\System.Web.Cors.dll</HintPath>
+ </Reference>
<Reference Include="System.Web.DynamicData">
<Private>True</Private>
</Reference>
@@ -152,9 +156,11 @@
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath>
<Private>True</Private>
</Reference>
- <Reference Include="System.Web.Http, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>DLL\System.Web.Http.dll</HintPath>
+ <Reference Include="System.Web.Http, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.7\lib\net45\System.Web.Http.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Web.Http.Cors, Version=5.2.7.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.WebApi.Cors.5.2.7\lib\net45\System.Web.Http.Cors.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
@@ -226,6 +232,7 @@
<Content Include="Index.html" />
<Content Include="Views\Scripts\bootstrap.js" />
<Content Include="Views\Scripts\bootstrap.min.js" />
+ <None Include="Properties\PublishProfiles\API.pubxml" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
@@ -308,6 +315,41 @@
<Compile Include="App_Start\RouteConfig.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_BadReasonController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_CustomerController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_DepartmentController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_EmployeeController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_GroupController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_MaterialController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_ProcessController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SourceController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_SupplierController.cs" />
+ <Compile Include="Controllers\BaseSet\Gy_WarehouseController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_NoPassProcController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_StationEntrustOutBillController.cs" />
+ <Compile Include="Controllers\Sc_ProcessMangementController.cs" />
+ <Compile Include="Controllers\CJGL\Cj_StationEntrustInBillController.cs" />
+ <Compile Include="Controllers\LMESController.cs" />
+ <Compile Include="Controllers\LookingForBillController.cs" />
+ <Compile Include="Controllers\NewApiController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_ICMOReportBillController.cs" />
+ <Compile Include="Controllers\SCGL\Sc_PPBomBillController.cs" />
+ <Compile Include="Controllers\Sc_CheckToolsRepairWorkBillController.cs" />
+ <Compile Include="Dapper\SqlHelper.cs" />
+ <Compile Include="Dapper\SqlPools.cs" />
+ <Compile Include="DbUntil\DataFormatUntil.cs" />
+ <Compile Include="Models\ApiConfig.cs" />
+ <Compile Include="Models\ApiResult.cs" />
+ <Compile Include="Models\DocumentsView.cs" />
+ <Compile Include="Models\LookingForBill.cs" />
+ <Compile Include="Models\M_Department.cs" />
+ <Compile Include="Models\M_ProcMul.cs" />
+ <Compile Include="Models\M_StationBillMail.cs" />
+ <Compile Include="Models\M_Process.cs" />
+ <Compile Include="Models\Sc_ProcessPlanViewModel.cs" />
+ <Compile Include="Models\Sc_ProcessReportViewModel.cs" />
+ <Compile Include="Models\StationEntrustInBill.cs" />
+ <Compile Include="Models\StationOutBillView.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -318,6 +360,10 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
+ <Compile Include="Service\LuBaoSevice.cs" />
+ <Compile Include="Service\ProcessDal.cs" />
+ <Compile Include="Service\YqnDal.cs" />
+ <Compile Include="Service\YqnQbService.cs" />
<Compile Include="Web References\WebS\Reference.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
@@ -362,7 +408,6 @@
<Content Include="fonts\glyphicons-halflings-regular.ttf" />
<Content Include="fonts\glyphicons-halflings-regular.eot" />
<None Include="Properties\PublishProfiles\PDAWeb.pubxml" />
- <None Include="Properties\PublishProfiles\WEBAPI.pubxml" />
<Content Include="Views\Shared\Error.cshtml" />
<Content Include="Views\_ViewStart.cshtml" />
<Content Include="Views\Shared\_Layout.cshtml" />
@@ -391,10 +436,10 @@
<WebReferences Include="Web References\" />
</ItemGroup>
<ItemGroup>
- <WebReferenceUrl Include="http://192.168.16.80/WEBS-WMS/WebService1.asmx">
+ <WebReferenceUrl Include="http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx">
<UrlBehavior>Static</UrlBehavior>
<RelPath>Web References\WebS\</RelPath>
- <UpdateFromURL>http://192.168.16.80/WEBS-WMS/WebService1.asmx</UpdateFromURL>
+ <UpdateFromURL>http://124.70.129.242:9090/WEBS-WMS/WebService1.asmx</UpdateFromURL>
<ServiceLocationURL>
</ServiceLocationURL>
<CachedDynamicPropName>
--
Gitblit v1.9.1