Egalware/NKC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into SDK

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-08-06 15:51:46 +02:00
parent 2c9c2c9f5a 4fbd9b0713
commit aabe2472d8
20 changed files with 453 additions and 251 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=308']) {
withEnv(['NEXT_BUILD_NUMBER=309']) {
// env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.versionNumberBeta = VersionNumber(versionNumberString : '1.1.${BUILD_DATE_FORMATTED, "yyMM"}-beta.${BUILDS_ALL_TIME}', projectStartDate : '2019-07-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
NKC_WF/NKC_WF.csproj
+89 -21
View File
@@ -67,8 +67,8 @@
<Reference Include="Crc32C.NET, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Crc32C.NET.1.0.5.0\lib\net20\Crc32C.NET.dll</HintPath>
</Reference>
<Reference Include="DnsClient, Version=1.2.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.2.0\lib\net45\DnsClient.dll</HintPath>
<Reference Include="DnsClient, Version=1.3.1.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.3.1\lib\net45\DnsClient.dll</HintPath>
</Reference>
<Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
@@ -82,6 +82,9 @@
<Reference Include="Microsoft.AspNet.Web.Optimization.WebForms, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Web.Optimization.WebForms.1.1.3\lib\net45\Microsoft.AspNet.Web.Optimization.WebForms.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.1.1.1\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.1\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>
@@ -89,14 +92,14 @@
<Reference Include="Microsoft.Web.RedisSessionStateProvider, Version=4.0.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.4.0.1\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.10.2\lib\net452\MongoDB.Bson.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.11.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.11.0\lib\net452\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.10.2\lib\net452\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.11.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.11.0\lib\net452\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.10.2.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.10.2\lib\net452\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="MongoDB.Driver.Core, Version=2.11.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.11.0\lib\net452\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.0.0\lib\net452\MongoDB.Libmongocrypt.dll</HintPath>
@@ -105,7 +108,7 @@
<HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.6.8\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.3\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="PdfSharp, Version=1.50.5147.0, Culture=neutral, PublicKeyToken=f94615aa0424f9eb, processorArchitecture=MSIL">
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.dll</HintPath>
@@ -114,7 +117,7 @@
<HintPath>..\packages\PDFsharp.1.50.5147\lib\net20\PdfSharp.Charting.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.1.1\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.1.16\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.24.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.24.0\lib\net45\SharpCompress.dll</HintPath>
@@ -123,13 +126,13 @@
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.0.601\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.1.58\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=3.5.2002.721, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.3.5.2002.721\lib\net462\SteamWare.dll</HintPath>
<Reference Include="SteamWare, Version=4.0.2003.734, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.4.0.2003.734\lib\net462\SteamWare.dll</HintPath>
</Reference>
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
<HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
@@ -139,14 +142,22 @@
<Reference Include="System.Diagnostics.PerformanceCounter, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.4.7.0\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
<Reference Include="System.IO.Pipelines, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.4.7.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.Pipelines, Version=4.0.2.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.4.7.1\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net.Http, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<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>
@@ -155,7 +166,7 @@
<HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
</Reference>
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.0\lib\netstandard2.0\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
<HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.4.7.1\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
</Reference>
<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>
@@ -163,12 +174,32 @@
<Private>True</Private>
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security.Cryptography.Algorithms, Version=4.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Algorithms.4.3.0\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Encoding, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Encoding.4.3.0\lib\net46\System.Security.Cryptography.Encoding.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Primitives, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Primitives.4.3.0\lib\net46\System.Security.Cryptography.Primitives.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.0\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Threading.Channels, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.4.7.0\lib\netstandard2.0\System.Threading.Channels.dll</HintPath>
<HintPath>..\packages\System.Threading.Channels.4.7.1\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.3\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
<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.Extensions" />
@@ -253,6 +284,9 @@
<Content Include="Content\SheetColor.min.css">
<DependentUpon>SheetColor.css</DependentUpon>
</Content>
<Content Include="Core\Compression\Snappy\lib\win\snappy32.dll" />
<Content Include="Core\Compression\Snappy\lib\win\snappy64.dll" />
<Content Include="Core\Compression\Zstandard\lib\win\libzstd.dll" />
<Content Include="Default.aspx" />
<Content Include="ErrorPages\Oops.aspx" />
<Content Include="export\BunkDetail.aspx" />
@@ -377,12 +411,14 @@
<Content Include="site\LabelsPrint.aspx" />
<Content Include="site\Login.aspx" />
<Content Include="site\MachineLoad.aspx" />
<Content Include="site\MachineLoadSmart.aspx" />
<Content Include="site\MachineOffline.aspx" />
<Content Include="site\MachineUnload.aspx" />
<Content Include="site\MachineUnloadSmart.aspx" />
<Content Include="site\OrderManager.aspx" />
<Content Include="site\OrderScheduler.aspx" />
<Content Include="site\Painting.aspx" />
<Content Include="site\PaintingSmart.aspx" />
<Content Include="site\PartValidation.aspx" />
<Content Include="site\Reordering.aspx" />
<Content Include="site\SecondScreen.aspx" />
@@ -427,6 +463,7 @@
<Content Include="WebUserControls\cmp_labelsPrint.ascx" />
<Content Include="WebUserControls\cmp_login.ascx" />
<Content Include="WebUserControls\cmp_ML_ShDet.ascx" />
<Content Include="WebUserControls\cmp_ML_smart.ascx" />
<Content Include="WebUserControls\cmp_MU_carts.ascx" />
<Content Include="WebUserControls\cmp_MU_Items.ascx" />
<Content Include="WebUserControls\cmp_MU_singleStat.ascx" />
@@ -441,6 +478,7 @@
<Content Include="WebUserControls\cmp_orderRunning.ascx" />
<Content Include="WebUserControls\cmp_orderSched.ascx" />
<Content Include="WebUserControls\cmp_painting.ascx" />
<Content Include="WebUserControls\cmp_paintingSmart.ascx" />
<Content Include="WebUserControls\cmp_paint_bins.ascx" />
<Content Include="WebUserControls\cmp_scrapList.ascx" />
<Content Include="WebUserControls\cmp_searchItems.ascx" />
@@ -737,6 +775,13 @@
<Compile Include="site\MachineLoad.aspx.designer.cs">
<DependentUpon>MachineLoad.aspx</DependentUpon>
</Compile>
<Compile Include="site\MachineLoadSmart.aspx.cs">
<DependentUpon>MachineLoadSmart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\MachineLoadSmart.aspx.designer.cs">
<DependentUpon>MachineLoadSmart.aspx</DependentUpon>
</Compile>
<Compile Include="site\MachineOffline.aspx.cs">
<DependentUpon>MachineOffline.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -779,6 +824,13 @@
<Compile Include="site\Painting.aspx.designer.cs">
<DependentUpon>Painting.aspx</DependentUpon>
</Compile>
<Compile Include="site\PaintingSmart.aspx.cs">
<DependentUpon>PaintingSmart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\PaintingSmart.aspx.designer.cs">
<DependentUpon>PaintingSmart.aspx</DependentUpon>
</Compile>
<Compile Include="site\PartValidation.aspx.cs">
<DependentUpon>PartValidation.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1136,6 +1188,13 @@
<Compile Include="WebUserControls\cmp_ML_ShDet.ascx.designer.cs">
<DependentUpon>cmp_ML_ShDet.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_ML_smart.ascx.cs">
<DependentUpon>cmp_ML_smart.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_ML_smart.ascx.designer.cs">
<DependentUpon>cmp_ML_smart.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_MU_carts.ascx.cs">
<DependentUpon>cmp_MU_carts.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1234,6 +1293,13 @@
<Compile Include="WebUserControls\cmp_painting.ascx.designer.cs">
<DependentUpon>cmp_painting.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_paintingSmart.ascx.cs">
<DependentUpon>cmp_paintingSmart.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\cmp_paintingSmart.ascx.designer.cs">
<DependentUpon>cmp_paintingSmart.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\cmp_paint_bins.ascx.cs">
<DependentUpon>cmp_paint_bins.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1499,6 +1565,7 @@
<Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.8\build\Microsoft.NetCore.Analyzers.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.8\build\Microsoft.NetFramework.Analyzers.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.8\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.11.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.11.0\build\MongoDB.Driver.Core.targets'))" />
</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.
@@ -1521,4 +1588,5 @@
</Target>
<Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.0.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.11.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.11.0\build\MongoDB.Driver.Core.targets')" />
</Project>
NKC_WF/Web.config
+13 -5
View File
@@ -36,7 +36,7 @@
<add name="ErrorFilter" type="Elmah.ErrorFilterModule, Elmah"/>
</httpModules>
<customErrors mode="On" defaultRedirect="~/site/Default"/>
<!--<customErrors mode="Off"/>-->
<!--<customErrors mode="Off" />-->
</system.web>
<appSettings>
<!--Configurazioni generali-->
@@ -363,6 +363,14 @@
<assemblyIdentity name="SharpCompress" publicKeyToken="afb0a02973931d96" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-0.24.0.0" newVersion="0.24.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Compression" publicKeyToken="b77a5c561934e089" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Net.Http" publicKeyToken="b03f5f7f11d50a3a" culture="neutral"/>
<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
</dependentAssembly>
</assemblyBinding>
</runtime>
<system.codedom>
@@ -396,7 +404,7 @@
</system.webServer>
<elmah>
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on remote access and securing ELMAH.
-->
<security allowRemoteAccess="false"/>
@@ -414,13 +422,13 @@
<httpHandlers>
<add verb="POST,GET,HEAD" path="elmah.axd" type="Elmah.ErrorLogPageFactory, Elmah"/>
</httpHandlers>
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
<!--
See http://code.google.com/p/elmah/wiki/SecuringErrorLogPages for
more information on using ASP.NET authorization securing ELMAH.
<authorization>
<allow roles="admin" />
<deny users="*" />
<deny users="*" />
</authorization>
-->
</system.web>
NKC_WF/WebUserControls/cmp_ML_smart.ascx
+17
View File
@@ -0,0 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ML_smart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_ML_smart" %>
<div class="mx-0">
<div class="card text-center" style="width: 100%;">
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("MachineLoadSmart") %></h4>
<div class="card-body py-1">
<div class="row mt-2" style="min-height: 25rem;">
<div class="col-12 px-0">
BARCODE
</div>
<div class="col-12 px-0">
out messages
</div>
</div>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_ML_smart.ascx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_ML_smart : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
NKC_WF/WebUserControls/cmp_ML_smart.ascx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_ML_smart
{
}
}
NKC_WF/WebUserControls/cmp_labelsPrint.ascx.cs
+6 -188
View File
@@ -196,12 +196,14 @@ namespace NKC_WF.WebUserControls
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
break;
case codeType.ItemGeneric:
cmp_barcode.showOutput("badge badge-success", $"Valid IG Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
cmp_barcode.showOutput("badge badge-success", $"IG Code - ignored: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.OtherItem:
cmp_barcode.showOutput("badge badge-success", $"Valid Generic PART Code: {decoData.rawData}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
cmp_barcode.showOutput("badge badge-success", $"Generic PART Code - ignored: {decoData.rawData}");
resetDisplay(true);
doRaiseEv = true;
break;
case codeType.Material:
cmp_barcode.showOutput("badge badge-warning", $"MATERIAL - ignored: {decoData.description}");
@@ -226,10 +228,6 @@ namespace NKC_WF.WebUserControls
case codeType.Cart:
cmp_barcode.showOutput("badge badge-warning", $"CART - ignored: {decoData.description}");
resetDisplay(true);
#if false
cmp_barcode.showOutput("badge badge-success", $"Valid CR Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
#endif
doRaiseEv = true;
break;
case codeType.Bin:
@@ -240,10 +238,6 @@ namespace NKC_WF.WebUserControls
case codeType.BinProcessed:
cmp_barcode.showOutput("badge badge-warning", $"BIN PAINTED - ignored: {decoData.description}");
resetDisplay(true);
#if false
cmp_barcode.showOutput("badge badge-success", $"Valid BP Code: {decoData.description}");
processItemSuggestion(decoData.codeType, decoData.rawData, decoData.codeInt);
#endif
doRaiseEv = true;
break;
default:
@@ -282,68 +276,6 @@ namespace NKC_WF.WebUserControls
// mostro print!
lbtPrintLabels.Visible = true;
break;
case codeType.ItemGeneric:
//// PRIMA CERCA SE ne ho in stato 1..3
//tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 3);
//if (tabItem.Count == 0)
//{
// // se NON ne trovo cerci FINO a stato 5...
// tabItem = DataLayer.man.taIL.getBySearch(0, rawData, 1, 5);
//}
//if (tabItem.Count == 1)
//{
// showItemDetail(true, tabItem[0], false);
//}
//else if (tabItem.Count == 0)
//{
// showItemDetail(false, null, true);
//}
// mostro print!
lbtPrintLabels.Visible = true;
break;
case codeType.OtherItem:
#if false
// recupero la tab OKOI x iniziare a controllare i dati...
var tabOKOI = DataLayer.man.taOKOI.getByOtherItemDtmx(rawData);
// PRIMO: verifico SE ho delle righe valide...
if (tabOKOI.Count == 0)
{
displError($"PART: Code not found {rawData}, please retry", true);
// reset preliminare
resetOtherItem();
}
else
{
var listAvailable = tabOKOI.Where(x => x.IsOnCartDateNull()).ToList();
if (listAvailable.Count == 0)
{
displError($"PART: No item available for pickup on target CART for code {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}, please retry", true);
// reset preliminare
resetOtherItem();
}
else
{
// verifico SE ci sia ALMENO UN CART in postazione (iniziato KIT ma NON finito)...
var listCartAvailable = tabOKOI.Where(x => !x.IsCartKitStartNull() && x.IsCartKitEndNull()).ToList();
if (listCartAvailable.Count == 0)
{
displError($"PART: No CART available to proceed: {rawData} | item {tabOKOI[0].OtherItemDesc} | order {tabOKOI[0].OrderExtCode}", true);
// reset preliminare
resetOtherItem();
}
else
{
// mostro OtherItem!
setOtherItem(rawData, codeInt);
}
}
}
#endif
// mostro print!
lbtPrintLabels.Visible = true;
break;
default:
lastObject = "";
// nascondo print!
@@ -372,80 +304,6 @@ namespace NKC_WF.WebUserControls
raiseEvent();
}
/// <summary>
/// Imposta il codice OtherItem sugli oggetti dipendenti
/// </summary>
/// <param name="rawData"></param>
/// <param name="codeInt"></param>
private void setOtherItem(string rawData, int codeInt)
{
#if false
cmp_KS_OtherItemsCart.OtherItemID = codeInt;
cmp_KS_OtherItemsCart.OtherItemDtmx = rawData;
cmp_KS_OtherItemsCart.doUpdate();
#endif
fixVisibility();
}
/// <summary>
/// Imposta il bin sugli oggetti dipendenti
/// </summary>
/// <param name="rawData"></param>
/// <param name="codeInt"></param>
private void setBin(string rawData, int codeInt)
{
#if false
cmp_KS_BinCart.BinID = codeInt;
cmp_KS_BinCart.BinDtmx = rawData;
cmp_KS_BinCart.doUpdate();
#endif
fixVisibility();
}
/// <summary>
/// Imposta il cart sugli oggetti dipendenti
/// </summary>
/// <param name="rawData"></param>
/// <param name="codeInt"></param>
private void setCart(string rawData, int codeInt)
{
#if false
cmp_KS_BinCart.CartID = codeInt;
cmp_KS_BinCart.CartDtmx = rawData;
cmp_KS_BinCart.doUpdate();
cmp_KS_OtherItemsCart.CartID = codeInt;
cmp_KS_OtherItemsCart.CartDtmx = rawData;
cmp_KS_OtherItemsCart.doUpdate();
cmp_KS_Cart.CartID = codeInt;
cmp_KS_Cart.CartDtmx = rawData;
cmp_KS_Cart.doUpdate();
#endif
fixVisibility();
}
private void resetBin()
{
#if false
cmp_KS_BinCart.BinID = 0;
#endif
fixVisibility();
}
private void resetCart()
{
#if false
cmp_KS_BinCart.CartID = 0;
cmp_KS_OtherItemsCart.CartID = 0;
cmp_KS_Cart.CartID = 0;
#endif
fixVisibility();
}
private void resetOtherItem()
{
#if false
cmp_KS_OtherItemsCart.OtherItemID = 0;
#endif
fixVisibility();
}
/// <summary>
/// Mostra errore ed effettua reset vari...
@@ -508,39 +366,6 @@ namespace NKC_WF.WebUserControls
lblItemDesc.Text = itemRow.ItemDesc;
lblItemDtmx.Text = itemRow.ItemDtmx;
itemIdSelected = itemRow.ItemID;
// CONTROLLO SIA in stato 1 --> worked, 2--> selected, 100--> parked...
switch (itemRow.StatusID)
{
case 0:
displError("ERROR: Item not ready", false);
break;
case 1:
case 2:
case 100:
// salvo che è in STATO 2 (picked up)
DataLayer.man.taIL.updateStatus(itemRow.ItemID, 2, PlaceId);
doUpdate();
break;
case 3:
displError("Item already on CART!", false);
break;
case 4:
// fino a concorrenza qta richiesta sposto, POI do errori
displError("ALL Item already scanned on BIN!", false);
break;
case 5:
displError("Item already at KIT STATION!", false);
break;
case 990:
displError("Item declared SCRAP!", false);
break;
case 991:
displError("Item declared SCRAP with CNC program created!", false);
break;
default:
displError("ERROR: Item status UNKNOWN!", false);
break;
}
}
lbtResetSel.Visible = (itemIdSelected != 0);
}
@@ -594,13 +419,6 @@ namespace NKC_WF.WebUserControls
private void fixVisibility()
{
// reset grafico
#if false
cmp_KS_Cart.Visible = cmp_KS_Cart.CartID > 0 && (cmp_KS_BinCart.BinID + cmp_KS_OtherItemsCart.OtherItemID == 0);
cmp_KS_BinCart.Visible = cmp_KS_BinCart.BinID > 0;
cmp_KS_OtherItemsCart.Visible = cmp_KS_OtherItemsCart.OtherItemID > 0;
#endif
// fix btn reset!
lbtResetSel.Visible = (itemIdSelected != 0);
}
NKC_WF/WebUserControls/cmp_painting.ascx
+13 -14
View File
@@ -3,20 +3,19 @@
<%@ Register Src="~/WebUserControls/cmp_barcode.ascx" TagPrefix="uc1" TagName="cmp_barcode" %>
<div class="row text-center">
<div class="col-4">
<uc1:cmp_paint_bins runat="server" ID="cmp_paint_binsIN" titleText="BINS IN" titleClass="text-light" ShowComplete="true" ShowPainted="false" ShowBinDtmx="true" ShowBatch="true" />
</div>
<div class="col-4">
READER<br />
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
<asp:HiddenField runat="server" ID="hfLastBCode" />
<asp:HiddenField runat="server" ID="hfLastValidBCode" />
<div class="col-4">
<uc1:cmp_paint_bins runat="server" ID="cmp_paint_binsIN" titleText="BINS IN" titleClass="text-light" ShowComplete="true" ShowPainted="false" ShowBinDtmx="true" ShowBatch="true" />
</div>
<div class="col-4">
READER<br />
<uc1:cmp_barcode runat="server" ID="cmp_barcode" />
<asp:HiddenField runat="server" ID="hfLastBCode" />
<asp:HiddenField runat="server" ID="hfLastValidBCode" />
<asp:LinkButton runat="server" ID="lbtConfirmPaint" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtConfirmPaint_Click"><i class="fa fa-paint-brush" aria-hidden="true"></i> <%: traduci("ConfirmPaint") %></asp:LinkButton>
</div>
<div class="col-4">
<uc1:cmp_paint_bins runat="server" ID="cmp_paint_binsOUT" titleText="BINS OUT" titleClass="text-warning" ShowComplete="true" ShowPainted="true" ShowBinDtmx="true" ShowBatch="true" />
</div>
<asp:LinkButton runat="server" ID="lbtConfirmPaint" CssClass="btn btn-block btn-warning text-uppercase" OnClick="lbtConfirmPaint_Click"><i class="fa fa-paint-brush" aria-hidden="true"></i> <%: traduci("ConfirmPaint") %></asp:LinkButton>
</div>
<div class="col-4">
<uc1:cmp_paint_bins runat="server" ID="cmp_paint_binsOUT" titleText="BINS OUT" titleClass="text-warning" ShowComplete="true" ShowPainted="true" ShowBinDtmx="true" ShowBatch="true" />
</div>
</div>
NKC_WF/WebUserControls/cmp_paintingSmart.ascx
+17
View File
@@ -0,0 +1,17 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_paintingSmart.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_paintingSmart" %>
<div class="mx-0">
<div class="card text-center" style="width: 100%;">
<h4 class="card-header p-1 bg-secondary text-light"><%: traduci("PaintingSmart") %></h4>
<div class="card-body py-1">
<div class="row mt-2" style="min-height: 25rem;">
<div class="col-12 px-0">
BARCODE
</div>
<div class="col-12 px-0">
out messages
</div>
</div>
</div>
</div>
</div>
NKC_WF/WebUserControls/cmp_paintingSmart.ascx.cs
+17
View File
@@ -0,0 +1,17 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_paintingSmart : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
{
}
}
}
NKC_WF/WebUserControls/cmp_paintingSmart.ascx.designer.cs
Generated
+17
View File
@@ -0,0 +1,17 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_paintingSmart
{
}
}
NKC_WF/packages.config
+20 -13
View File
@@ -7,7 +7,7 @@
<package id="AspNet.ScriptManager.jQuery" version="3.4.1" targetFramework="net462" />
<package id="bootstrap" version="4.4.1" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="DnsClient" version="1.2.0" targetFramework="net462" />
<package id="DnsClient" version="1.3.1" targetFramework="net462" />
<package id="elmah" version="1.2.2" targetFramework="net462" />
<package id="elmah.corelibrary" version="1.2.2" targetFramework="net462" />
<package id="FontAwesome" version="4.7.0" targetFramework="net462" />
@@ -32,6 +32,7 @@
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost.it" version="5.2.7" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.2.7" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="1.1.1" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.FxCopAnalyzers" version="2.9.8" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.CodeAnalysis.VersionCheckAnalyzer" version="2.9.8" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.1" targetFramework="net462" />
@@ -42,29 +43,35 @@
<package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.10.2" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.11.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.11.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.11.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.0.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="12.0.3" targetFramework="net462" />
<package id="NLog" version="4.6.8" targetFramework="net462" />
<package id="NLog" version="4.7.3" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.1" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.1.16" targetFramework="net462" />
<package id="popper.js" version="1.16.1" targetFramework="net462" />
<package id="SharpCompress" version="0.24.0" targetFramework="net462" />
<package id="SharpZipLib" version="1.2.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.0.601" targetFramework="net462" />
<package id="SteamWare" version="3.5.2002.721" targetFramework="net462" />
<package id="System.Buffers" version="4.5.0" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.1.58" targetFramework="net462" />
<package id="SteamWare" version="4.0.2003.734" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.7.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="4.7.1" targetFramework="net462" />
<package id="System.Memory" version="4.5.3" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.0" targetFramework="net462" />
<package id="System.Runtime.CompilerServices.Unsafe" version="4.7.1" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="4.7.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.3" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="4.7.1" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="WebGrease" version="1.6.0" targetFramework="net462" />
</packages>
NKC_WF/site/MachineLoadSmart.aspx
+10
View File
@@ -0,0 +1,10 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="MachineLoadSmart.aspx.cs" Inherits="NKC_WF.site.MachineLoadSmart" %>
<%@ Register Src="~/WebUserControls/cmp_ML_smart.ascx" TagPrefix="uc1" TagName="cmp_ML_smart" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container px-1">
<uc1:cmp_ML_smart runat="server" id="cmp_ML_smart" />
</div>
</asp:Content>
NKC_WF/site/MachineLoadSmart.aspx.cs
+62
View File
@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class MachineLoadSmart : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
#if false
doUpdate();
#endif
}
}
#if false
/// <summary>
/// Batch corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// Aggiorna componente principale e child components
/// </summary>
private void doUpdate()
{
setCurrData();
// aggiorno child
cmp_unloadSmart.BatchId = BatchId;
}
/// <summary>
/// Imposta dati correnti (Bunk / Sheet)
/// </summary>
private void setCurrData()
{
// recupero bunk corrente...
DS_App.StackListRow currBunk = ComLib.getCurrBunk();
if (currBunk != null)
{
BatchId = currBunk.BatchID;
}
}
#endif
}
}
NKC_WF/site/MachineLoadSmart.aspx.designer.cs
Generated
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class MachineLoadSmart
{
/// <summary>
/// Controllo cmp_ML_smart.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_ML_smart cmp_ML_smart;
}
}
NKC_WF/site/Painting.aspx
+10 -8
View File
@@ -4,14 +4,16 @@
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="card text-center" style="width: 100%;">
<h3 class="card-header bg-dark text-warning text-uppercase"><%: traduci("Painting") %></h3>
<div class="card-body py-1">
<div class="row">
<div class="col-12 mb-2">
<uc1:cmp_painting runat="server" ID="cmp_painting" />
<div class="mx-0">
<div class="card text-center" style="width: 100%;">
<h4 class="card-header bg-dark text-warning text-uppercase"><%: traduci("Painting") %></h4>
<div class="card-body py-1">
<div class="row">
<div class="col-12 mb-2">
<uc1:cmp_painting runat="server" ID="cmp_painting" />
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</asp:Content>
NKC_WF/site/Painting.aspx.cs
+4 -1
View File
@@ -6,7 +6,10 @@ namespace NKC_WF
{
protected void Page_Load(object sender, EventArgs e)
{
((SiteContent)this.Master).showSearch = false;
if (!Page.IsPostBack)
{
((SiteContent)this.Master).showSearch = false;
}
}
}
}
NKC_WF/site/PaintingSmart.aspx
+9
View File
@@ -0,0 +1,9 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PaintingSmart.aspx.cs" Inherits="NKC_WF.site.PaintingSmart" %>
<%@ Register Src="~/WebUserControls/cmp_paintingSmart.ascx" TagPrefix="uc1" TagName="cmp_paintingSmart" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<div class="container px-1">
<uc1:cmp_paintingSmart runat="server" id="cmp_paintingSmart" />
</div>
</asp:Content>
NKC_WF/site/PaintingSmart.aspx.cs
+62
View File
@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class PaintingSmart : BasePage
{
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
#if false
doUpdate();
#endif
}
}
#if false
/// <summary>
/// Batch corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// Aggiorna componente principale e child components
/// </summary>
private void doUpdate()
{
setCurrData();
// aggiorno child
cmp_unloadSmart.BatchId = BatchId;
}
/// <summary>
/// Imposta dati correnti (Bunk / Sheet)
/// </summary>
private void setCurrData()
{
// recupero bunk corrente...
DS_App.StackListRow currBunk = ComLib.getCurrBunk();
if (currBunk != null)
{
BatchId = currBunk.BatchID;
}
}
#endif
}
}
NKC_WF/site/PaintingSmart.aspx.designer.cs
Generated
+26
View File
@@ -0,0 +1,26 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class PaintingSmart
{
/// <summary>
/// Controllo cmp_paintingSmart.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_paintingSmart cmp_paintingSmart;
}
}