From 9c634fd767aec36ef97c3a814bf7a29c67d20ee1 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期五, 29 三月 2024 10:57:35 +0800
Subject: [PATCH] 修改单据重复显示问题，增加工单源单id关联
---
VueWebApi/VueWebApi.csproj | 197 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 194 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/VueWebApi.csproj b/VueWebApi/VueWebApi.csproj
index 3c00bde..ef891f9 100644
--- a/VueWebApi/VueWebApi.csproj
+++ b/VueWebApi/VueWebApi.csproj
@@ -1,5 +1,6 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="..\packages\GZY.Quartz.MUI.2.3.0\build\GZY.Quartz.MUI.props" Condition="Exists('..\packages\GZY.Quartz.MUI.2.3.0\build\GZY.Quartz.MUI.props')" />
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
@@ -50,6 +51,12 @@
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942, processorArchitecture=MSIL">
<HintPath>..\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
</Reference>
+ <Reference Include="Common.Logging, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+ <HintPath>..\packages\Common.Logging.3.3.1\lib\net40\Common.Logging.dll</HintPath>
+ </Reference>
+ <Reference Include="Common.Logging.Core, Version=3.3.1.0, Culture=neutral, PublicKeyToken=af08829b84f0328e, processorArchitecture=MSIL">
+ <HintPath>..\packages\Common.Logging.Core.3.3.1\lib\net40\Common.Logging.Core.dll</HintPath>
+ </Reference>
<Reference Include="Dapper, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Dapper.2.0.123\lib\net461\Dapper.dll</HintPath>
</Reference>
@@ -59,14 +66,34 @@
<Reference Include="FastReport.Web">
<HintPath>..\..\..\FastReports\FastReport.Net\FastReport.Web.dll</HintPath>
</Reference>
+ <Reference Include="Fleck, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Fleck.1.2.0\lib\net45\Fleck.dll</HintPath>
+ </Reference>
+ <Reference Include="GetuiServerApiSDK, Version=4.0.1.5, Culture=neutral, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\GetuiServerApiSDK.dll</HintPath>
+ </Reference>
+ <Reference Include="Google.ProtocolBuffers, Version=2.4.1.473, Culture=neutral, PublicKeyToken=55f7125234beb589, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>bin\Google.ProtocolBuffers.dll</HintPath>
+ </Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.3.3.11, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.3.3\lib\net45\ICSharpCode.SharpZipLib.dll</HintPath>
+ </Reference>
+ <Reference Include="Jiguang.JPush, Version=1.2.4.0, Culture=neutral, processorArchitecture=MSIL">
+ <HintPath>..\packages\Jiguang.JPush.1.2.4\lib\net45\Jiguang.JPush.dll</HintPath>
</Reference>
<Reference Include="JWT, Version=8.0.0.0, Culture=neutral, PublicKeyToken=6f98bca0f40f2ecf, processorArchitecture=MSIL">
<HintPath>..\packages\JWT.8.9.0\lib\net46\JWT.dll</HintPath>
</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>
@@ -80,15 +107,33 @@
<Reference Include="Microsoft.AspNetCore.Routing.Abstractions, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNetCore.Routing.Abstractions.2.2.0\lib\netstandard2.0\Microsoft.AspNetCore.Routing.Abstractions.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
- <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+ <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\netstandard2.0\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
+ <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=7.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.7.0.0\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
+ </Reference>
+ <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+ <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+ </Reference>
<Reference Include="Microsoft.Extensions.Primitives, Version=2.2.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Primitives.2.2.0\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
</Reference>
<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>
@@ -105,8 +150,14 @@
<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>
+ </Reference>
+ <Reference Include="Quartz, Version=3.5.0.0, Culture=neutral, PublicKeyToken=f6b8c98a402cc8a4, processorArchitecture=MSIL">
+ <HintPath>..\packages\Quartz.3.5.0\lib\netstandard2.0\Quartz.dll</HintPath>
</Reference>
<Reference Include="ServiceStack.Common, Version=5.0.0.0, Culture=neutral, PublicKeyToken=02c12cbda47e6587, processorArchitecture=MSIL">
<HintPath>..\packages\ServiceStack.Common.5.0.0\lib\net45\ServiceStack.Common.dll</HintPath>
@@ -133,7 +184,14 @@
<Reference Include="System.CodeDom, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.CodeDom.6.0.0\lib\net461\System.CodeDom.dll</HintPath>
</Reference>
+ <Reference Include="System.Configuration.ConfigurationManager, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Configuration.ConfigurationManager.6.0.1\lib\net461\System.Configuration.ConfigurationManager.dll</HintPath>
+ </Reference>
<Reference Include="System.Data" />
+ <Reference Include="System.Data.OracleClient" />
+ <Reference Include="System.Diagnostics.DiagnosticSource, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Diagnostics.DiagnosticSource.4.7.1\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
+ </Reference>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.5.0.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
@@ -148,6 +206,7 @@
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
</Reference>
+ <Reference Include="System.Net" />
<Reference Include="System.Net.Http.Formatting, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.5.2.9\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
@@ -161,15 +220,29 @@
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
+ <Reference Include="System.Runtime.Remoting" />
+ <Reference Include="System.Security" />
+ <Reference Include="System.Security.AccessControl, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.AccessControl.6.0.0\lib\net461\System.Security.AccessControl.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Permissions, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.Permissions.6.0.0\lib\net461\System.Security.Permissions.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Security.Principal.Windows, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <HintPath>..\packages\System.Security.Principal.Windows.5.0.0\lib\net461\System.Security.Principal.Windows.dll</HintPath>
+ </Reference>
+ <Reference Include="System.ServiceProcess" />
<Reference Include="System.Text.Encodings.Web, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.4.5.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
</Reference>
+ <Reference Include="System.Threading, Version=4.0.11.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Threading.Channels, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.5.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
</Reference>
+ <Reference Include="System.Transactions" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Abstractions" />
<Reference Include="System.Web.ApplicationServices" />
@@ -242,6 +315,7 @@
<Private>True</Private>
<HintPath>..\packages\Antlr.3.5.0.2\lib\Antlr3.Runtime.dll</HintPath>
</Reference>
+ <Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform">
@@ -252,6 +326,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" />
@@ -283,6 +358,32 @@
<Compile Include="Areas\HelpPage\SampleGeneration\SampleDirection.cs" />
<Compile Include="Areas\HelpPage\SampleGeneration\TextSample.cs" />
<Compile Include="Areas\HelpPage\XmlDocumentationProvider.cs" />
+ <Compile Include="Controllers\AppAnalyticsController.cs" />
+ <Compile Include="Controllers\AppPersonalController.cs" />
+ <Compile Include="Controllers\AppProductionManagementController.cs" />
+ <Compile Include="Controllers\AppPurchManagementController.cs" />
+ <Compile Include="Controllers\AppQualityManagementController.cs" />
+ <Compile Include="Controllers\BaseDateController.cs" />
+ <Compile Include="Controllers\MessageController.cs" />
+ <Compile Include="Controllers\PurchaseOrderController.cs" />
+ <Compile Include="Controllers\ReportManagerController.cs" />
+ <Compile Include="Controllers\SendController.cs" />
+ <Compile Include="DLL\BLL\AppAnalyticsBLL.cs" />
+ <Compile Include="DLL\BLL\AppPersonalBLL.cs" />
+ <Compile Include="DLL\BLL\AppPurchManagementBLL.cs" />
+ <Compile Include="DLL\BLL\AppQualityManagementBLL.cs" />
+ <Compile Include="DLL\BLL\BaseDateBLL.cs" />
+ <Compile Include="DLL\BLL\PurchaseOrderBLL.cs" />
+ <Compile Include="DLL\BLL\ReportManagerBLL.cs" />
+ <Compile Include="DLL\DAL\AppAnalyticsDAL.cs" />
+ <Compile Include="DLL\DAL\AppPersonalDAL.cs" />
+ <Compile Include="DLL\DAL\AppPurchManagementDAL.cs" />
+ <Compile Include="DLL\DAL\AppQualityManagementDAL.cs" />
+ <Compile Include="DLL\DAL\BaseDateDAL.cs" />
+ <Compile Include="DLL\DAL\PurchaseOrderDAL.cs" />
+ <Compile Include="DLL\DAL\ReportManagerDAL.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" />
@@ -297,6 +398,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" />
@@ -310,6 +412,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" />
@@ -326,13 +429,43 @@
<Compile Include="Global.asax.cs">
<DependentUpon>Global.asax</DependentUpon>
</Compile>
+ <Compile Include="Hubs\ChatHub2.cs" />
+ <Compile Include="Log4net\ActionConverter.cs" />
+ <Compile Include="Log4net\ActionLayoutPattern.cs" />
+ <Compile Include="Log4net\ActionLoggerInfo.cs" />
+ <Compile Include="Log4net\LogUtil.cs" />
+ <Compile Include="Models\AdvancedSchedAlready.cs" />
+ <Compile Include="Models\AdvancedSchedulingDevice.cs" />
+ <Compile Include="Models\AlreadyScheduling.cs" />
+ <Compile Include="Models\AnDnDate.cs" />
+ <Compile Include="Models\AppDevicecCheck.cs" />
+ <Compile Include="Models\AppLabCode.cs" />
+ <Compile Include="Models\AppPurchOrderSave.cs" />
+ <Compile Include="Models\AppScheduleKanban.cs" />
+ <Compile Include="Models\AppVersion.cs" />
+ <Compile Include="Models\APSList.cs" />
+ <Compile Include="Models\ApsOrderSerch.cs" />
+ <Compile Include="Models\BomSub.cs" />
+ <Compile Include="Models\CapacityPlanningSetup.cs" />
+ <Compile Include="Models\CapacityPlanSect.cs" />
+ <Compile Include="Models\CapaPlan.cs" />
+ <Compile Include="Models\ChanjetEncryptMsg.cs" />
+ <Compile Include="Models\DeviceRepair.cs" />
+ <Compile Include="Models\EqpRepair.cs" />
+ <Compile Include="Models\ErpOrderBatch.cs" />
<Compile Include="Models\ExcelErro.cs" />
+ <Compile Include="Models\GroupUser.cs" />
<Compile Include="Models\MaterialRout.cs" />
<Compile Include="Models\ObjectData.cs" />
<Compile Include="Models\ObjectDataCont.cs" />
+ <Compile Include="Models\PartRout.cs" />
+ <Compile Include="Models\ReportDefectHandle.cs" />
+ <Compile Include="Models\ReportDefectList.cs" />
<Compile Include="Models\RoleUserSubmit.cs" />
<Compile Include="Models\RoutEdit.cs" />
<Compile Include="Models\ScanStartReportData.cs" />
+ <Compile Include="Models\ScanStartReportDataOut.cs" />
+ <Compile Include="Models\StandEqp.cs" />
<Compile Include="Models\StepCheck.cs" />
<Compile Include="Models\StepDefect.cs" />
<Compile Include="Models\StepEqp.cs" />
@@ -342,29 +475,44 @@
<Compile Include="Models\Uom.cs" />
<Compile Include="Models\User.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
+ <Compile Include="TimeTick\CaptureJob.cs" />
+ <Compile Include="TimeTick\QuartzUtil.cs" />
+ <Compile Include="Tools\AppLableBarCode.cs" />
+ <Compile Include="Tools\AutosCloseOrder.cs" />
<Compile Include="Tools\ChannelActionFilterAttribute.cs" />
+ <Compile Include="Tools\ChannelActionFilterAttributeApp.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" />
+ <Compile Include="Tools\GeTuiMessage.cs" />
<Compile Include="Tools\GridMessage.cs" />
<Compile Include="Tools\ImportExcel.cs" />
<Compile Include="Tools\ImportExcelData.cs" />
+ <Compile Include="Tools\JPushManage.cs" />
<Compile Include="Tools\JwtTools.cs" />
+ <Compile Include="Tools\LabCodeStatusMessage.cs" />
<Compile Include="Tools\LogHelper.cs" />
<Compile Include="Tools\NPOIHelper.cs" />
<Compile Include="Tools\PrintMessage.cs" />
<Compile Include="Tools\RedisHelper.cs" />
<Compile Include="Tools\Regedit.cs" />
<Compile Include="Tools\ScanStartReport.cs" />
+ <Compile Include="Tools\SchedulingMethod.cs" />
<Compile Include="Tools\SeachEncode.cs" />
+ <Compile Include="Tools\SeachEncodeJob.cs" />
<Compile Include="Tools\SessionControllerRouteHandler.cs" />
<Compile Include="Tools\SessionRouteHandler.cs" />
<Compile Include="Tools\TJson.cs" />
<Compile Include="Tools\ToMessage.cs" />
+ <Compile Include="Util\config.cs" />
<Compile Include="Util\EntityHelper.cs" />
+ <Compile Include="Util\Message.cs" />
+ <Compile Include="Util\OpenapiHelper.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="Areas\HelpPage\HelpPage.css" />
@@ -377,6 +525,9 @@
<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" />
@@ -389,6 +540,7 @@
<Content Include="Image\app_1.png" />
<Content Include="Image\app_1_1.png" />
<Content Include="Image\app_1_2.png" />
+ <Content Include="Image\app_1_3.png" />
<Content Include="Image\app_2.png" />
<Content Include="Image\app_3.png" />
<Content Include="Image\app_3_1.png" />
@@ -398,6 +550,7 @@
<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_4_5.png" />
<Content Include="Image\app_5.png" />
<Content Include="Image\app_5_1.png" />
<Content Include="Image\app_5_2.png" />
@@ -409,9 +562,36 @@
<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_8_1.png" />
+ <Content Include="Image\app_8_2.png" />
+ <Content Include="Image\app_8_3.png" />
+ <Content Include="Image\app_8_7.png" />
<Content Include="Image\app_9.png" />
+ <Content Include="Image\app_9_1.png" />
+ <Content Include="Image\app_9_2.png" />
+ <Content Include="Image\app_9_3.png" />
+ <Content Include="Image\app_9_4.png" />
+ <Content Include="Image\app_9_5.png" />
<Content Include="Image\index_1.png" />
<Content Include="Image\index_2.png" />
<Content Include="Scripts\bootstrap.js" />
@@ -450,11 +630,19 @@
<Content Include="Excel\缂洪櫡瀹氫箟.xls" />
<Content Include="Excel\璁惧鐐规椤圭洰.xls" />
<Content Include="Excel\璁惧淇濆吇椤圭洰.xls" />
+ <Content Include="Excel\鑺傛媿宸ヤ环.xls" />
+ <Content Include="Excel\鐗╂枡娓呭崟.xls" />
+ <Content Include="Excel\璁惧娓呭崟.xls" />
+ <Content Include="Excel\璁惧鐐规鏍囧噯.xls" />
+ <Content Include="InExcel\9\璁惧娓呭崟66.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" />
@@ -469,8 +657,10 @@
</ItemGroup>
<ItemGroup>
<Folder Include="App_Data\" />
+ <Folder Include="DeviceImage\image1\" />
+ <Folder Include="DeviceImage\image2\" />
<Folder Include="File\excel\" />
- <Folder Include="InExcel\" />
+ <Folder Include="File\newxls\" />
</ItemGroup>
<ItemGroup>
<Content Include="fonts\glyphicons-halflings-regular.woff2" />
@@ -534,6 +724,7 @@
<ErrorText>杩欏彴璁＄畻鏈轰笂缂哄皯姝ら」鐩紩鐢ㄧ殑 NuGet 绋嬪簭鍖呫�備娇鐢ㄢ�淣uGet 绋嬪簭鍖呰繕鍘熲�濆彲涓嬭浇杩欎簺绋嬪簭鍖呫�傛湁鍏虫洿澶氫俊鎭紝璇峰弬瑙� http://go.microsoft.com/fwlink/?LinkID=322105銆傜己灏戠殑鏂囦欢鏄� {0}銆�</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props'))" />
+ <Error Condition="!Exists('..\packages\GZY.Quartz.MUI.2.3.0\build\GZY.Quartz.MUI.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GZY.Quartz.MUI.2.3.0\build\GZY.Quartz.MUI.props'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
--
Gitblit v1.9.3