From 6b8782c6810660751b40d284d40ea7a13656c5b7 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 05 九月 2022 20:04:13 +0800
Subject: [PATCH] 设备点检记录功能、大岛车间综合看板接口变更、工单批量关闭查询，提交
---
VueWebApi/VueWebApi.csproj | 112 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 97 insertions(+), 15 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 1b62773..8aff6d7 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -39,7 +39,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
+ <Optimize>false</Optimize>
<OutputPath>bin\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
@@ -56,20 +56,6 @@
<Reference Include="FastReport">
<HintPath>..\..\..\FastReports\FastReport.Net\FastReport.dll</HintPath>
</Reference>
- <Reference Include="FastReport.Bars, Version=2014.2.3.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Users\YL\Desktop\鎵撳嵃\鎵撳嵃\Rework\Rework\bin\Debug\FastReport.Bars.dll</HintPath>
- </Reference>
- <Reference Include="FastReport.Editor, Version=2014.2.3.0, Culture=neutral, PublicKeyToken=db7e5ce63278458c, processorArchitecture=MSIL">
- <SpecificVersion>False</SpecificVersion>
- <HintPath>C:\Users\YL\Desktop\鎵撳嵃\鎵撳嵃\Rework\Rework\bin\Debug\FastReport.Editor.dll</HintPath>
- </Reference>
- <Reference Include="FastReport.Service">
- <HintPath>C:\Users\YL\Desktop\鎵撳嵃\鎵撳嵃\Rework\Rework\bin\Debug\FastReport.Service.dll</HintPath>
- </Reference>
- <Reference Include="FastReport.VSDesign">
- <HintPath>C:\Users\YL\Desktop\鎵撳嵃\鎵撳嵃\Rework\Rework\bin\Debug\FastReport.VSDesign.dll</HintPath>
- </Reference>
<Reference Include="FastReport.Web">
<HintPath>..\..\..\FastReports\FastReport.Net\FastReport.Web.dll</HintPath>
</Reference>
@@ -81,6 +67,12 @@
</Reference>
<Reference Include="log4net, Version=2.0.14.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<HintPath>..\packages\log4net.2.0.14\lib\net45\log4net.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.2.2\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.AspNet.SignalR.SystemWeb, Version=2.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.AspNet.SignalR.SystemWeb.2.2.2\lib\net45\Microsoft.AspNet.SignalR.SystemWeb.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNetCore.Http.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNetCore.Http.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Http.Abstractions.dll</HintPath>
@@ -104,6 +96,18 @@
<Reference Include="Microsoft.Net.Http.Headers, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Net.Http.Headers.2.2.0\lib\netstandard2.0\Microsoft.Net.Http.Headers.dll</HintPath>
</Reference>
+ <Reference Include="Microsoft.Owin, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.4.0.0\lib\net451\Microsoft.Owin.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Cors, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Cors.4.0.0\lib\net451\Microsoft.Owin.Cors.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Host.SystemWeb, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Host.SystemWeb.4.0.0\lib\net451\Microsoft.Owin.Host.SystemWeb.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Owin.Security, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Owin.Security.4.0.0\lib\net451\Microsoft.Owin.Security.dll</HintPath>
+ </Reference>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
@@ -118,6 +122,9 @@
</Reference>
<Reference Include="NPOI.OpenXmlFormats, Version=2.5.6.0, Culture=neutral, PublicKeyToken=0df73ec7942b34e1, processorArchitecture=MSIL">
<HintPath>..\packages\NPOI.2.5.6\lib\net45\NPOI.OpenXmlFormats.dll</HintPath>
+ </Reference>
+ <Reference Include="Owin, Version=1.0.0.0, Culture=neutral, PublicKeyToken=f0ebd12fd5e55cc5, processorArchitecture=MSIL">
+ <HintPath>..\packages\Owin.1.0\lib\net40\Owin.dll</HintPath>
</Reference>
<Reference Include="Pipelines.Sockets.Unofficial, Version=1.0.0.0, Culture=neutral, PublicKeyToken=42ea0a778e13fbe2, processorArchitecture=MSIL">
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
@@ -266,6 +273,7 @@
<Compile Include="App_Start\BundleConfig.cs" />
<Compile Include="App_Start\FilterConfig.cs" />
<Compile Include="App_Start\RouteConfig.cs" />
+ <Compile Include="App_Start\Startup.cs" />
<Compile Include="App_Start\SwaggerConfig.cs" />
<Compile Include="App_Start\SwaggerControllerDescProvider.cs" />
<Compile Include="App_Start\WebApiConfig.cs" />
@@ -297,6 +305,8 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Hubs\ChatHub.cs" />
+ <Compile Include="Controllers\AppDeviceManageController.cs" />
<Compile Include="Controllers\BasicSettingController.cs" />
<Compile Include="Controllers\DeviceManagerController.cs" />
<Compile Include="Controllers\ErpSyncMesController.cs" />
@@ -311,6 +321,7 @@
<Compile Include="Controllers\SystemSettingController.cs" />
<Compile Include="Controllers\ValuesController.cs" />
<Compile Include="DDKanBanModel\ShopTopLeft.cs" />
+ <Compile Include="DLL\BLL\AppDeviceManageBLL.cs" />
<Compile Include="DLL\BLL\BasicSettingBLL.cs" />
<Compile Include="DLL\BLL\DeviceManagerBLL.cs" />
<Compile Include="DLL\BLL\ErpSyncMesBLL.cs" />
@@ -324,6 +335,7 @@
<Compile Include="DLL\BLL\QualityManagementBLL.cs" />
<Compile Include="DLL\BLL\SystemSettingBLL.cs" />
<Compile Include="DLL\BLL\UserDataBLL.cs" />
+ <Compile Include="DLL\DAL\AppDeviceManageDAL.cs" />
<Compile Include="DLL\DAL\BasicSettingDAL.cs" />
<Compile Include="DLL\DAL\DeviceManagerDAL.cs" />
<Compile Include="DLL\DAL\ErpSyncMesDAL.cs" />
@@ -340,13 +352,17 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\EqpRepair.cs" />
<Compile Include="Models\ExcelErro.cs" />
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
+ <Compile Include="Models\ReportDefectHandle.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
<Compile Include="Models\RoutEdit.cs" />
<Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\StandEqp.cs" />
<Compile Include="Models\StepCheck.cs" />
<Compile Include="Models\StepDefect.cs" />
<Compile Include="Models\StepEqp.cs" />
@@ -357,9 +373,11 @@
<Compile Include="Models\User.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tools\ChannelActionFilterAttribute.cs" />
+ <Compile Include="Tools\DALSkillCondition.cs" />
<Compile Include="Tools\DapperHelper.cs" />
<Compile Include="Tools\DataOperator.cs" />
<Compile Include="Tools\DBHelper.cs" />
+ <Compile Include="Tools\DownLoad.cs" />
<Compile Include="Tools\Encrypt.cs" />
<Compile Include="Tools\ExcelList.cs" />
<Compile Include="Tools\ExcelModelCheck.cs" />
@@ -391,6 +409,64 @@
<Content Include="Global.asax" />
<Content Include="Grid\grwebapp.js" />
<Content Include="Grid\webapp-ws-tutorial.htm" />
+ <Content Include="Hubs\HubsMessage2.html" />
+ <Content Include="Hubs\HubsMessage1.html" />
+ <Content Include="Hubs\HubsMessage.html" />
+ <Content Include="Image\1.png" />
+ <Content Include="Image\2.png" />
+ <Content Include="Image\3.png" />
+ <Content Include="Image\4.png" />
+ <Content Include="Image\5.png" />
+ <Content Include="Image\6.png" />
+ <Content Include="Image\7.png" />
+ <Content Include="Image\8.png" />
+ <Content Include="Image\9.png" />
+ <Content Include="Image\app_1.png" />
+ <Content Include="Image\app_1_1.png" />
+ <Content Include="Image\app_1_2.png" />
+ <Content Include="Image\app_2.png" />
+ <Content Include="Image\app_3.png" />
+ <Content Include="Image\app_3_1.png" />
+ <Content Include="Image\app_3_2.png" />
+ <Content Include="Image\app_4.png" />
+ <Content Include="Image\app_4_1.png" />
+ <Content Include="Image\app_4_2.png" />
+ <Content Include="Image\app_4_3.png" />
+ <Content Include="Image\app_4_4.png" />
+ <Content Include="Image\app_5.png" />
+ <Content Include="Image\app_5_1.png" />
+ <Content Include="Image\app_5_2.png" />
+ <Content Include="Image\app_5_3.png" />
+ <Content Include="Image\app_5_4.png" />
+ <Content Include="Image\app_5_5.png" />
+ <Content Include="Image\app_5_6.png" />
+ <Content Include="Image\app_5_7.png" />
+ <Content Include="Image\app_5_8.png" />
+ <Content Include="Image\app_5_9.png" />
+ <Content Include="Image\app_6.png" />
+ <Content Include="Image\app_6_1.png" />
+ <Content Include="Image\app_6_10.png" />
+ <Content Include="Image\app_6_11.png" />
+ <Content Include="Image\app_6_12.png" />
+ <Content Include="Image\app_6_13.png" />
+ <Content Include="Image\app_6_14.png" />
+ <Content Include="Image\app_6_2.png" />
+ <Content Include="Image\app_6_3.png" />
+ <Content Include="Image\app_6_4.png" />
+ <Content Include="Image\app_6_5.png" />
+ <Content Include="Image\app_6_6.png" />
+ <Content Include="Image\app_6_7.png" />
+ <Content Include="Image\app_6_8.png" />
+ <Content Include="Image\app_6_9.png" />
+ <Content Include="Image\app_7.png" />
+ <Content Include="Image\app_7_1.png" />
+ <Content Include="Image\app_7_2.png" />
+ <Content Include="Image\app_7_3.png" />
+ <Content Include="Image\app_7_4.png" />
+ <Content Include="Image\app_8.png" />
+ <Content Include="Image\app_9.png" />
+ <Content Include="Image\index_1.png" />
+ <Content Include="Image\index_2.png" />
<Content Include="Scripts\bootstrap.js" />
<Content Include="Scripts\bootstrap.min.js" />
<Content Include="Areas\HelpPage\Views\Web.config" />
@@ -424,11 +500,16 @@
<Content Include="Excel\浠撳簱搴撲綅娓呭崟.xls" />
<Content Include="Excel\寰�鏉ュ崟浣�.xls" />
<Content Include="grf\Rework.frx" />
+ <Content Include="Excel\缂洪櫡瀹氫箟.xls" />
+ <Content Include="Excel\璁惧鐐规椤圭洰.xls" />
+ <Content Include="Excel\璁惧淇濆吇椤圭洰.xls" />
<None Include="Scripts\jquery-3.4.1.intellisense.js" />
<Content Include="Scripts\jquery-3.4.1.js" />
<Content Include="Scripts\jquery-3.4.1.min.js" />
<Content Include="Scripts\jquery-3.4.1.slim.js" />
<Content Include="Scripts\jquery-3.4.1.slim.min.js" />
+ <Content Include="Scripts\jquery.signalR-2.2.2.js" />
+ <Content Include="Scripts\jquery.signalR-2.2.2.min.js" />
<Content Include="Scripts\modernizr-2.8.3.js" />
<Content Include="Scripts\swagger_lang.js" />
<Content Include="Web.config" />
@@ -444,6 +525,7 @@
<ItemGroup>
<Folder Include="App_Data\" />
<Folder Include="File\excel\" />
+ <Folder Include="File\newxls\" />
<Folder Include="InExcel\" />
</ItemGroup>
<ItemGroup>
--
Gitblit v1.9.3