Compare commits

...

48 Commits

Author SHA1 Message Date
Samuele Locatelli 5254bd8429 Merge tag 'AddCheckRebalanceError01' into develop
Aggiunto controllo (bloccante) in caso di errori rebalance
2024-09-20 09:41:08 +02:00
Samuele Locatelli 794a6641ec Merge branch 'release/AddCheckRebalanceError01' 2024-09-20 09:40:30 +02:00
Samuele Locatelli a667f8e22f Update gestione display errori rebalance... 2024-09-20 09:40:16 +02:00
Samuele Locatelli af21406d87 Merge tag 'UpdateStoredUploadBatch02' into develop
Aggiunta gestione condizionale impiego delle 2 stored alternative
normale e light
2024-07-22 11:09:18 +02:00
Samuele Locatelli 0e0c1d8a94 Merge branch 'release/UpdateStoredUploadBatch02' 2024-07-22 11:08:55 +02:00
Samuele Locatelli 59bb86e17d Update x impiego stored accelerata in elenco upload batch condizionale da config 2024-07-22 11:08:37 +02:00
Samuele Locatelli 60f9d783db Merge tag 'UpdateStoredUploadBatch' into develop
iUpdate stored lettura stato batch x pagina upload
2024-07-22 09:40:41 +02:00
Samuele Locatelli b1f02e969f Merge branch 'release/UpdateStoredUploadBatch' 2024-07-22 09:39:50 +02:00
Samuele Locatelli f8eb636133 Impiego nuova stored x calcolo batch list x evitare lock DB 2024-07-22 09:21:31 +02:00
Samuele Locatelli bc78540bcd Merge tag 'UpdateTimerManagement02' into develop
Modifiche ulteriori x timer e metodi lettura forzata refresh
2024-06-14 09:20:18 +02:00
Samuele Locatelli 950c31c1b2 Merge branch 'release/UpdateTimerManagement02' 2024-06-14 09:20:02 +02:00
Samuele Locatelli bd2ea7dab0 Ancora spostamento timers vari in tab config 2024-06-14 09:18:36 +02:00
Samuele Locatelli 53c8620be0 Merge tag 'UpdateTimerManagement01' into develop
Gestione timer pagina unload rivista:
- timer separati da tab config
- gestione refresh migliorata
2024-06-13 19:08:22 +02:00
Samuele Locatelli 834f4517e3 Merge branch 'release/UpdateTimerManagement01' 2024-06-13 19:07:52 +02:00
Samuele Locatelli 601b3937f9 Update gestione separata 3 timers x pagina unload (pesante):
timerCss
timerStatus
timerUnload
2024-06-13 19:07:15 +02:00
Samuele Locatelli 721ddaae22 Merge tag 'UpdateNuget01' into develop
Update massiva nuget packages
2024-05-31 16:22:44 +02:00
Samuele Locatelli 7f81b29afc Merge branch 'release/UpdateNuget01' 2024-05-31 16:22:32 +02:00
Samuele Locatelli 5570712970 update nuget:
- compression
2024-05-31 16:22:06 +02:00
Samuele Locatelli 602b271d6b Update nuget vari:
- Microsoft.*
- AWS.*
2024-05-31 16:15:18 +02:00
Samuele Locatelli 07b3473341 Update nuget vari:
- Redis
- System.*
- Mongo
- NLog
2024-05-31 16:03:13 +02:00
Samuele Locatelli cb75d386d2 Update nuget vari
- system*
- aspnet.mvc
2024-05-31 15:43:27 +02:00
Samuele Locatelli b741ab3231 Fix pacchetti deprecati 2024-05-31 15:40:33 +02:00
Samuele Locatelli c3fefe2abc Merge tag 'AddCheckPartMiaOnPackList01' into develop
Aggiunto controllo partMIA x PackList (mostra button solo se presenti)
2024-05-31 15:36:57 +02:00
Samuele Locatelli 03c7470057 Merge branch 'release/AddCheckPartMiaOnPackList01' 2024-05-31 15:36:31 +02:00
Samuele Locatelli f2e03b6702 Aggiunta visibilità MIA packList condizionale 2024-05-31 15:35:48 +02:00
Samuele Locatelli 99d615aee7 Merge tag 'AddSearchInfoPart' into develop
Aggiunta info data-ora in ricerca part
2024-05-17 07:51:31 +02:00
Samuele Locatelli 005ae3a51e Update display info x ricerca DMTX estesa (macchina, data-ora lav) 2024-05-17 07:50:54 +02:00
Samuele Locatelli 8c0a550465 Bozza pagina ricerca estesa 2024-05-08 11:42:00 +02:00
Samuele Locatelli 6448210ab0 Merge branch 'develop' 2024-03-20 08:55:22 +01:00
Samuele Locatelli acd603ba23 Fix js missing 2024-03-20 08:55:14 +01:00
Samuele Locatelli ac28d5fd62 Merge tag 'FixReportsChartJs01' into develop
Update in produzione grafici
2024-03-20 08:46:11 +01:00
Samuele Locatelli bad086334e Merge branch 'release/FixReportsChartJs01' 2024-03-20 08:36:06 +01:00
Samuele Locatelli 010a05377e Completata semplificazione pagine reports 2024-03-20 08:33:41 +01:00
Samuele Locatelli 7539c6f985 refresh display 2024-03-20 07:27:02 +01:00
Samuele Locatelli 2d7cbf7d60 Completo review pagine x gestioen report su pag diverse 2024-03-20 07:18:34 +01:00
Samuele Locatelli 1d3ef90402 Inizio fix gestione report su pagine distinte 2024-03-20 07:18:24 +01:00
Samuele Locatelli c7463e4358 Fix test grafici 2024-03-19 18:13:51 +01:00
Samuele Locatelli a85ec6aefb Merge tag 'FixSentinelLocalhost' into develop
Fix gestione sentinel da localhost x deploy
2024-03-16 12:10:42 +01:00
Samuele Locatelli 768bcd91e7 Merge branch 'release/FixSentinelLocalhost' 2024-03-16 12:10:25 +01:00
Samuele Locatelli 86024d8dbc Fix conf x sentinel locale 2024-03-16 12:09:52 +01:00
Samuele Locatelli 0c17ea9f9b Test configurazione REDIS
- webconfig --> tramite redis sentinel (su redis01)
2024-03-15 15:05:16 +01:00
Samuele Locatelli ba8bb7d085 Merge tag 'AddSheetMissingDateProcess02' into develop
Fix loggin + process x NKC in caso di date missing
2024-03-08 17:19:29 +01:00
Samuele Locatelli 07bae712b8 Merge branch 'release/AddSheetMissingDateProcess02' 2024-03-08 17:19:17 +01:00
Samuele Locatelli df7fa95a62 Miglioramento fase di log in caso errori dal PROD 2024-03-08 17:19:02 +01:00
Samuele Locatelli 405e55b2c7 Merge tag 'AddSheetMissingDateProcess01' into develop
Aggiunta gestione date missing da sheets, per intercettare errori invio
da prod parziale
2024-03-08 16:50:47 +01:00
Samuele Locatelli f60c91bca5 Merge branch 'release/AddSheetMissingDateProcess01' 2024-03-08 16:50:31 +01:00
Samuele Locatelli 1977490dc0 Merge branch 'develop' of https://gitlab.steamware.net/steamware/NKC into develop 2024-03-08 16:48:05 +01:00
Samuele Locatelli d653d614a3 Update x logging & fix data-ora su avanzamento fogli se ci fossero mancanti 2024-03-08 16:48:02 +01:00
92 changed files with 3375 additions and 2082 deletions
+52 -47
View File
@@ -57,8 +57,14 @@
<Reference Include="AjaxControlToolkit, Version=20.1.0.0, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
<HintPath>..\packages\AjaxControlToolkit.20.1.0\lib\net40\AjaxControlToolkit.dll</HintPath>
</Reference>
<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 Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.Core.3.7.304.8\lib\net45\AWSSDK.Core.dll</HintPath>
</Reference>
<Reference Include="AWSSDK.SecurityToken, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.SecurityToken.3.7.300.99\lib\net45\AWSSDK.SecurityToken.dll</HintPath>
</Reference>
<Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
<HintPath>..\packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
</Reference>
<Reference Include="DnsClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.7.0\lib\net45\DnsClient.dll</HintPath>
@@ -67,8 +73,17 @@
<HintPath>..\packages\SharpZipLib.1.4.0\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="IronSnappy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b1d4b1dc83bdcf31, processorArchitecture=MSIL">
<HintPath>..\packages\IronSnappy.1.3.1\lib\netstandard2.0\IronSnappy.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ReportViewer.Common, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ReportViewer.Runtime.Common.12.0.2402.15\lib\Microsoft.ReportViewer.Common.dll</HintPath>
@@ -82,23 +97,23 @@
<Reference Include="Microsoft.ReportViewer.WinForms, Version=12.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.ReportViewer.Runtime.WinForms.12.0.2402.15\lib\Microsoft.ReportViewer.WinForms.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.15.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.25.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.15.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.25.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.15.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="MongoDB.Driver.Core, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.25.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.3.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
<Reference Include="MongoDB.Libmongocrypt, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.9.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.4\lib\net46\NLog.dll</HintPath>
<HintPath>..\packages\NLog.5.3.2\lib\net46\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>
@@ -107,17 +122,17 @@
<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.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.32.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.32.2\lib\net461\SharpCompress.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Snappy.NET, Version=1.1.1.8, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
<Reference Include="Snappier, Version=1.0.0.0, Culture=neutral, PublicKeyToken=a1b25124e6e13a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Snappier.1.0.0\lib\netstandard2.0\Snappier.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.6.70\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.7.33\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
@@ -133,8 +148,8 @@
</Reference>
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.Drawing" />
<Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -142,8 +157,8 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.IO.Pipelines, Version=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
@@ -175,8 +190,8 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Pkcs, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.6.0.1\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</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>
@@ -187,11 +202,11 @@
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\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>
@@ -207,6 +222,9 @@
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Xml" />
<Reference Include="ZstdSharp, Version=0.7.3.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
<HintPath>..\packages\ZstdSharp.Port.0.7.3\lib\net461\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\VersGen\VersGen.cs">
@@ -246,17 +264,13 @@
<None Include="app.config" />
<None Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="App_Readme\SteamWare_demo\example-NLog.config" />
<None Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<None Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<None Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<None Include="Core\Compression\Zstandard\lib\osx\libzstd.dylib" />
<None Include="DS_App.xsc">
<DependentUpon>DS_App.xsd</DependentUpon>
</None>
<None Include="DS_App.xsd">
<SubType>Designer</SubType>
<Generator>MSDataSetGenerator</Generator>
<LastGenOutput>DS_App.Designer.cs</LastGenOutput>
<LastGenOutput>DS_App2.Designer.cs</LastGenOutput>
</None>
<None Include="DS_App.xss">
<DependentUpon>DS_App.xsd</DependentUpon>
@@ -272,10 +286,6 @@
<None Include="DS_Report.xss">
<DependentUpon>DS_Report.xsd</DependentUpon>
</None>
<None Include="libsnappy64.dylib" />
<None Include="libsnappy64.so" />
<None Include="libzstd.dylib" />
<None Include="libzstd.so" />
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
@@ -292,13 +302,10 @@
<Content Include="App_Readme\README_SteamWare.txt" />
<Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
<Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
<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="libzstd.dll" />
<Content Include="mongocrypt.dll" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\AWSSDK.SecurityToken.3.7.300.99\analyzers\dotnet\cs\AWSSDK.SecurityToken.CodeAnalysis.dll" />
<Analyzer Include="..\packages\AWSSDK.SecurityToken.3.7.300.99\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -306,10 +313,8 @@
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets'))" />
</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.3.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets')" />
</Project>
+1 -1
View File
@@ -3502,7 +3502,7 @@ namespace AppData
protected static void setCurrSheetTab(string machine, DS_App.SheetListDataTable tabella)
{
string rawData = JsonConvert.SerializeObject(tabella);
// TTL 2 sec
// TTL 1 sec
memLayer.ML.setRSV(redCurrSheetTabKey(machine), rawData, 1);
}
Binary file not shown.
Binary file not shown.
+309 -101
View File
@@ -11656,6 +11656,8 @@ namespace AppData {
private global::System.Data.DataColumn columnOnCartDate;
private global::System.Data.DataColumn columnPaintingReq;
private global::System.Data.DataColumn columnMatExtCode;
private global::System.Data.DataColumn columnMatDesc;
@@ -11680,6 +11682,12 @@ namespace AppData {
private global::System.Data.DataColumn columnDueDate;
private global::System.Data.DataColumn columnPlaceCod;
private global::System.Data.DataColumn columnWrkEnd;
private global::System.Data.DataColumn columnUnlEnd;
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public ItemSearchDetailDataTable() {
@@ -11833,6 +11841,14 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn PaintingReqColumn {
get {
return this.columnPaintingReq;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn MatExtCodeColumn {
@@ -11929,6 +11945,30 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn PlaceCodColumn {
get {
return this.columnPlaceCod;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn WrkEndColumn {
get {
return this.columnWrkEnd;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public global::System.Data.DataColumn UnlEndColumn {
get {
return this.columnUnlEnd;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Browsable(false)]
@@ -11982,6 +12022,7 @@ namespace AppData {
string CadFilePath,
string PdfFilePath,
System.DateTime OnCartDate,
int PaintingReq,
int MatExtCode,
string MatDesc,
string KitExtCode,
@@ -11993,7 +12034,10 @@ namespace AppData {
int BinID,
string BinDtmx,
int BinIndex,
System.DateTime DueDate) {
System.DateTime DueDate,
string PlaceCod,
System.DateTime WrkEnd,
System.DateTime UnlEnd) {
ItemSearchDetailRow rowItemSearchDetailRow = ((ItemSearchDetailRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
ItemID,
@@ -12011,6 +12055,7 @@ namespace AppData {
CadFilePath,
PdfFilePath,
OnCartDate,
PaintingReq,
MatExtCode,
MatDesc,
KitExtCode,
@@ -12022,7 +12067,10 @@ namespace AppData {
BinID,
BinDtmx,
BinIndex,
DueDate};
DueDate,
PlaceCod,
WrkEnd,
UnlEnd};
rowItemSearchDetailRow.ItemArray = columnValuesArray;
this.Rows.Add(rowItemSearchDetailRow);
return rowItemSearchDetailRow;
@@ -12067,6 +12115,7 @@ namespace AppData {
this.columnCadFilePath = base.Columns["CadFilePath"];
this.columnPdfFilePath = base.Columns["PdfFilePath"];
this.columnOnCartDate = base.Columns["OnCartDate"];
this.columnPaintingReq = base.Columns["PaintingReq"];
this.columnMatExtCode = base.Columns["MatExtCode"];
this.columnMatDesc = base.Columns["MatDesc"];
this.columnKitExtCode = base.Columns["KitExtCode"];
@@ -12079,6 +12128,9 @@ namespace AppData {
this.columnBinDtmx = base.Columns["BinDtmx"];
this.columnBinIndex = base.Columns["BinIndex"];
this.columnDueDate = base.Columns["DueDate"];
this.columnPlaceCod = base.Columns["PlaceCod"];
this.columnWrkEnd = base.Columns["WrkEnd"];
this.columnUnlEnd = base.Columns["UnlEnd"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -12114,6 +12166,8 @@ namespace AppData {
base.Columns.Add(this.columnPdfFilePath);
this.columnOnCartDate = new global::System.Data.DataColumn("OnCartDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnOnCartDate);
this.columnPaintingReq = new global::System.Data.DataColumn("PaintingReq", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPaintingReq);
this.columnMatExtCode = new global::System.Data.DataColumn("MatExtCode", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnMatExtCode);
this.columnMatDesc = new global::System.Data.DataColumn("MatDesc", typeof(string), null, global::System.Data.MappingType.Element);
@@ -12138,6 +12192,12 @@ namespace AppData {
base.Columns.Add(this.columnBinIndex);
this.columnDueDate = new global::System.Data.DataColumn("DueDate", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnDueDate);
this.columnPlaceCod = new global::System.Data.DataColumn("PlaceCod", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnPlaceCod);
this.columnWrkEnd = new global::System.Data.DataColumn("WrkEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnWrkEnd);
this.columnUnlEnd = new global::System.Data.DataColumn("UnlEnd", typeof(global::System.DateTime), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnUnlEnd);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnItemID}, true));
this.columnItemID.AllowDBNull = false;
@@ -12161,19 +12221,24 @@ namespace AppData {
this.columnCadFilePath.MaxLength = 500;
this.columnPdfFilePath.AllowDBNull = false;
this.columnPdfFilePath.MaxLength = 500;
this.columnOnCartDate.ReadOnly = true;
this.columnPaintingReq.ReadOnly = true;
this.columnMatExtCode.AllowDBNull = false;
this.columnMatDesc.AllowDBNull = false;
this.columnMatDesc.MaxLength = 500;
this.columnKitExtCode.MaxLength = 250;
this.columnOrderExtCode.MaxLength = 250;
this.columnCartID.ReadOnly = true;
this.columnCartDtmx.ReadOnly = true;
this.columnCartDtmx.MaxLength = 10;
this.columnCartDtmx.MaxLength = 50;
this.columnBinID.ReadOnly = true;
this.columnBinDtmx.ReadOnly = true;
this.columnBinDtmx.MaxLength = 10;
this.columnBinDtmx.MaxLength = 50;
this.columnBinIndex.ReadOnly = true;
this.columnDueDate.ReadOnly = true;
this.columnPlaceCod.AllowDBNull = false;
this.columnPlaceCod.MaxLength = 50;
this.columnWrkEnd.ReadOnly = true;
this.columnUnlEnd.ReadOnly = true;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -25178,6 +25243,22 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public int PaintingReq {
get {
try {
return ((int)(this[this.tableItemSearchDetail.PaintingReqColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'PaintingReq\' in table \'ItemSearchDetail\' is DBNull.", e);
}
}
set {
this[this.tableItemSearchDetail.PaintingReqColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public int MatExtCode {
@@ -25268,11 +25349,11 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string CartDtmx {
get {
try {
return ((string)(this[this.tableItemSearchDetail.CartDtmxColumn]));
if (this.IsCartDtmxNull()) {
return string.Empty;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'CartDtmx\' in table \'ItemSearchDetail\' is DBNull.", e);
else {
return ((string)(this[this.tableItemSearchDetail.CartDtmxColumn]));
}
}
set {
@@ -25316,11 +25397,11 @@ namespace AppData {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string BinDtmx {
get {
try {
return ((string)(this[this.tableItemSearchDetail.BinDtmxColumn]));
if (this.IsBinDtmxNull()) {
return string.Empty;
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'BinDtmx\' in table \'ItemSearchDetail\' is DBNull.", e);
else {
return ((string)(this[this.tableItemSearchDetail.BinDtmxColumn]));
}
}
set {
@@ -25360,6 +25441,49 @@ namespace AppData {
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public string PlaceCod {
get {
return ((string)(this[this.tableItemSearchDetail.PlaceCodColumn]));
}
set {
this[this.tableItemSearchDetail.PlaceCodColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public System.DateTime WrkEnd {
get {
try {
return ((global::System.DateTime)(this[this.tableItemSearchDetail.WrkEndColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'WrkEnd\' in table \'ItemSearchDetail\' is DBNull.", e);
}
}
set {
this[this.tableItemSearchDetail.WrkEndColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public System.DateTime UnlEnd {
get {
try {
return ((global::System.DateTime)(this[this.tableItemSearchDetail.UnlEndColumn]));
}
catch (global::System.InvalidCastException e) {
throw new global::System.Data.StrongTypingException("The value for column \'UnlEnd\' in table \'ItemSearchDetail\' is DBNull.", e);
}
}
set {
this[this.tableItemSearchDetail.UnlEndColumn] = value;
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsKitIDNull() {
@@ -25396,6 +25520,18 @@ namespace AppData {
this[this.tableItemSearchDetail.OnCartDateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsPaintingReqNull() {
return this.IsNull(this.tableItemSearchDetail.PaintingReqColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetPaintingReqNull() {
this[this.tableItemSearchDetail.PaintingReqColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsKitExtCodeNull() {
@@ -25515,6 +25651,30 @@ namespace AppData {
public void SetDueDateNull() {
this[this.tableItemSearchDetail.DueDateColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsWrkEndNull() {
return this.IsNull(this.tableItemSearchDetail.WrkEndColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetWrkEndNull() {
this[this.tableItemSearchDetail.WrkEndColumn] = global::System.Convert.DBNull;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public bool IsUnlEndNull() {
return this.IsNull(this.tableItemSearchDetail.UnlEndColumn);
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
public void SetUnlEndNull() {
this[this.tableItemSearchDetail.UnlEndColumn] = global::System.Convert.DBNull;
}
}
/// <summary>
@@ -30780,7 +30940,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
private void InitCommandCollection() {
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[32];
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[33];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT *\r\nFROM v_BatchList";
@@ -30858,125 +31018,134 @@ namespace AppData.DS_AppTableAdapters {
this._commandCollection[11].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[12].Connection = this.Connection;
this._commandCollection[12].CommandText = "dbo.stp_Batch_getCurrentByMachine";
this._commandCollection[12].CommandText = "dbo.stp_Batch_getByStatus_Light";
this._commandCollection[12].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SearchVal", global::System.Data.SqlDbType.NVarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@ShowSplit", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[12].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PartValid", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[13] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[13].Connection = this.Connection;
this._commandCollection[13].CommandText = "dbo.stp_Batch_getDescendantByKey";
this._commandCollection[13].CommandText = "dbo.stp_Batch_getCurrentByMachine";
this._commandCollection[13].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[13].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[14] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[14].Connection = this.Connection;
this._commandCollection[14].CommandText = "dbo.stp_Batch_getForBunkMan";
this._commandCollection[14].CommandText = "dbo.stp_Batch_getDescendantByKey";
this._commandCollection[14].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxPosition", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[15] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[15].Connection = this.Connection;
this._commandCollection[15].CommandText = "dbo.stp_Batch_getLastByTakt";
this._commandCollection[15].CommandText = "dbo.stp_Batch_getForBunkMan";
this._commandCollection[15].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[15].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MaxPosition", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[16] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[16].Connection = this.Connection;
this._commandCollection[16].CommandText = "dbo.stp_Batch_getNestRunning";
this._commandCollection[16].CommandText = "dbo.stp_Batch_getLastByTakt";
this._commandCollection[16].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[16].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[17].Connection = this.Connection;
this._commandCollection[17].CommandText = "dbo.stp_Batch_getNextAvailable";
this._commandCollection[17].CommandText = "dbo.stp_Batch_getNestRunning";
this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[18].Connection = this.Connection;
this._commandCollection[18].CommandText = "dbo.stp_Batch_getRunning";
this._commandCollection[18].CommandText = "dbo.stp_Batch_getNextAvailable";
this._commandCollection[18].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[19] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[19].Connection = this.Connection;
this._commandCollection[19].CommandText = "dbo.stp_Batch_getSched";
this._commandCollection[19].CommandText = "dbo.stp_Batch_getRunning";
this._commandCollection[19].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[19].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[20] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[20].Connection = this.Connection;
this._commandCollection[20].CommandText = "dbo.stp_Batch_getSplitByKey";
this._commandCollection[20].CommandText = "dbo.stp_Batch_getSched";
this._commandCollection[20].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[20].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[21] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[21].Connection = this.Connection;
this._commandCollection[21].CommandText = "dbo.stp_Batch_invalidateRunning";
this._commandCollection[21].CommandText = "dbo.stp_Batch_getSplitByKey";
this._commandCollection[21].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[21].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[22] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[22].Connection = this.Connection;
this._commandCollection[22].CommandText = "dbo.stp_Batch_makeDescendantByKey";
this._commandCollection[22].CommandText = "dbo.stp_Batch_invalidateRunning";
this._commandCollection[22].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[22].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCodAnces", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[23] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[23].Connection = this.Connection;
this._commandCollection[23].CommandText = "dbo.stp_Batch_redoPartValid";
this._commandCollection[23].CommandText = "dbo.stp_Batch_makeDescendantByKey";
this._commandCollection[23].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[23].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCodAnces", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[24] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[24].Connection = this.Connection;
this._commandCollection[24].CommandText = "dbo.stp_Batch_refuseNesting";
this._commandCollection[24].CommandText = "dbo.stp_Batch_redoPartValid";
this._commandCollection[24].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[24].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Takt", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[25] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[25].Connection = this.Connection;
this._commandCollection[25].CommandText = "dbo.stp_Batch_resetAllNesting";
this._commandCollection[25].CommandText = "dbo.stp_Batch_refuseNesting";
this._commandCollection[25].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[25].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@userName", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[26] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[26].Connection = this.Connection;
this._commandCollection[26].CommandText = "dbo.stp_Batch_resetPartUnValid";
this._commandCollection[26].CommandText = "dbo.stp_Batch_resetAllNesting";
this._commandCollection[26].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[26].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[26].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[27] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[27].Connection = this.Connection;
this._commandCollection[27].CommandText = "dbo.stp_zzz_resetProdCall";
this._commandCollection[27].CommandText = "dbo.stp_Batch_resetPartUnValid";
this._commandCollection[27].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[27].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[28] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[28].Connection = this.Connection;
this._commandCollection[28].CommandText = "dbo.stp_Batch_resetTree";
this._commandCollection[28].CommandText = "dbo.stp_zzz_resetProdCall";
this._commandCollection[28].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[28].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[29] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[29].Connection = this.Connection;
this._commandCollection[29].CommandText = "dbo.stp_Batch_updatePlaceCod";
this._commandCollection[29].CommandText = "dbo.stp_Batch_resetTree";
this._commandCollection[29].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[29].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[30] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[30].Connection = this.Connection;
this._commandCollection[30].CommandText = "dbo.stp_Batch_updateSchedPrior";
this._commandCollection[30].CommandText = "dbo.stp_Batch_updatePlaceCod";
this._commandCollection[30].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[30].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@PlaceCod", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[31].Connection = this.Connection;
this._commandCollection[31].CommandText = "dbo.stp_Batch_updateStatus";
this._commandCollection[31].CommandText = "dbo.stp_Batch_updateSchedPrior";
this._commandCollection[31].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[31].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SchedPrio", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[32] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[32].Connection = this.Connection;
this._commandCollection[32].CommandText = "dbo.stp_Batch_updateStatus";
this._commandCollection[32].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[32].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[32].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@BatchID", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[32].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Status", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[32].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@EnvNum", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[32].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TotalTime", global::System.Data.SqlDbType.Decimal, 9, global::System.Data.ParameterDirection.Input, 18, 6, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -31076,8 +31245,43 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getCurrentByMachine(string PlaceCod) {
public virtual DS_App.BatchListDataTable getByStatusLight(global::System.Nullable<int> Status, string SearchVal, global::System.Nullable<bool> ShowSplit, global::System.Nullable<int> PartValid) {
this.Adapter.SelectCommand = this.CommandCollection[12];
if ((Status.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(Status.Value));
}
else {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
if ((SearchVal == null)) {
this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value;
}
else {
this.Adapter.SelectCommand.Parameters[2].Value = ((string)(SearchVal));
}
if ((ShowSplit.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[3].Value = ((bool)(ShowSplit.Value));
}
else {
this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value;
}
if ((PartValid.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[4].Value = ((int)(PartValid.Value));
}
else {
this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value;
}
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getCurrentByMachine(string PlaceCod) {
this.Adapter.SelectCommand = this.CommandCollection[13];
if ((PlaceCod == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31094,7 +31298,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getDescendByKey(global::System.Nullable<int> BatchID) {
this.Adapter.SelectCommand = this.CommandCollection[13];
this.Adapter.SelectCommand = this.CommandCollection[14];
if ((BatchID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31111,7 +31315,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getForBunkMan(global::System.Nullable<int> MaxPosition) {
this.Adapter.SelectCommand = this.CommandCollection[14];
this.Adapter.SelectCommand = this.CommandCollection[15];
if ((MaxPosition.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(MaxPosition.Value));
}
@@ -31128,7 +31332,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getLastByTakt(string Takt) {
this.Adapter.SelectCommand = this.CommandCollection[15];
this.Adapter.SelectCommand = this.CommandCollection[16];
if ((Takt == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31145,7 +31349,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getNestRunning() {
this.Adapter.SelectCommand = this.CommandCollection[16];
this.Adapter.SelectCommand = this.CommandCollection[17];
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -31156,7 +31360,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getNextAvailable(string PlaceCod) {
this.Adapter.SelectCommand = this.CommandCollection[17];
this.Adapter.SelectCommand = this.CommandCollection[18];
if ((PlaceCod == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31173,17 +31377,6 @@ namespace AppData.DS_AppTableAdapters {
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getRunning() {
this.Adapter.SelectCommand = this.CommandCollection[18];
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getSched() {
this.Adapter.SelectCommand = this.CommandCollection[19];
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
@@ -31194,8 +31387,19 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getSplitByKey(global::System.Nullable<int> BatchID) {
public virtual DS_App.BatchListDataTable getSched() {
this.Adapter.SelectCommand = this.CommandCollection[20];
DS_App.BatchListDataTable dataTable = new DS_App.BatchListDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_App.BatchListDataTable getSplitByKey(global::System.Nullable<int> BatchID) {
this.Adapter.SelectCommand = this.CommandCollection[21];
if ((BatchID.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31447,7 +31651,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int invalidateRunning() {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[21];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[22];
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
@@ -31469,7 +31673,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int makeDescendantByKey(global::System.Nullable<int> BatchID, string PlaceCodAnces) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[22];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[23];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31503,7 +31707,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int redoPartValid(string Takt) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[23];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[24];
if ((Takt == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
}
@@ -31531,7 +31735,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int refuseNesting(global::System.Nullable<int> BatchID, string userName) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[24];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[25];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31565,7 +31769,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetNesting(global::System.Nullable<int> BatchID) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[25];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[26];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31593,28 +31797,6 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetPartUnValid() {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[26];
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
command.Connection.Open();
}
int returnValue;
try {
returnValue = command.ExecuteNonQuery();
}
finally {
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
command.Connection.Close();
}
}
return returnValue;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetProdCall() {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[27];
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
@@ -31636,8 +31818,30 @@ namespace AppData.DS_AppTableAdapters {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetTree(global::System.Nullable<int> Original_BatchID) {
public virtual int resetProdCall() {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[28];
global::System.Data.ConnectionState previousConnectionState = command.Connection.State;
if (((command.Connection.State & global::System.Data.ConnectionState.Open)
!= global::System.Data.ConnectionState.Open)) {
command.Connection.Open();
}
int returnValue;
try {
returnValue = command.ExecuteNonQuery();
}
finally {
if ((previousConnectionState == global::System.Data.ConnectionState.Closed)) {
command.Connection.Close();
}
}
return returnValue;
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int resetTree(global::System.Nullable<int> Original_BatchID) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[29];
if ((Original_BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_BatchID.Value));
}
@@ -31665,7 +31869,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updatePlaceCod(global::System.Nullable<int> Original_BatchID, string PlaceCod) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[29];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[30];
if ((Original_BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(Original_BatchID.Value));
}
@@ -31699,7 +31903,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updateSchedPrior(global::System.Nullable<int> BatchID, global::System.Nullable<int> SchedPrio) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[30];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[31];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -31733,7 +31937,7 @@ namespace AppData.DS_AppTableAdapters {
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "17.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int updateStatus(global::System.Nullable<int> BatchID, global::System.Nullable<int> Status, string EnvNum, global::System.Nullable<decimal> TotalTime) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[31];
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[32];
if ((BatchID.HasValue == true)) {
command.Parameters[1].Value = ((int)(BatchID.Value));
}
@@ -41103,6 +41307,7 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
tableMapping.ColumnMappings.Add("CadFilePath", "CadFilePath");
tableMapping.ColumnMappings.Add("PdfFilePath", "PdfFilePath");
tableMapping.ColumnMappings.Add("OnCartDate", "OnCartDate");
tableMapping.ColumnMappings.Add("PaintingReq", "PaintingReq");
tableMapping.ColumnMappings.Add("MatExtCode", "MatExtCode");
tableMapping.ColumnMappings.Add("MatDesc", "MatDesc");
tableMapping.ColumnMappings.Add("KitExtCode", "KitExtCode");
@@ -41115,6 +41320,9 @@ SELECT RemnantID, BatchID, MatID, SheetID, DimX, DimY, Available FROM Remnants W
tableMapping.ColumnMappings.Add("BinDtmx", "BinDtmx");
tableMapping.ColumnMappings.Add("BinIndex", "BinIndex");
tableMapping.ColumnMappings.Add("DueDate", "DueDate");
tableMapping.ColumnMappings.Add("PlaceCod", "PlaceCod");
tableMapping.ColumnMappings.Add("WrkEnd", "WrkEnd");
tableMapping.ColumnMappings.Add("UnlEnd", "UnlEnd");
this._adapter.TableMappings.Add(tableMapping);
}
+501 -473
View File
File diff suppressed because it is too large Load Diff
+33 -33
View File
@@ -4,19 +4,19 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="433" ViewPortY="488" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-53" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:BatchList" ZOrder="12" X="325" Y="437" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:StackList" ZOrder="13" X="618" Y="961" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:SheetList" ZOrder="10" X="300" Y="824" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OrderList" ZOrder="22" X="284" Y="61" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:BatchList" ZOrder="13" X="325" Y="437" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:StackList" ZOrder="14" X="618" Y="961" Height="381" Width="268" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:SheetList" ZOrder="11" X="300" Y="824" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OrderList" ZOrder="23" X="284" Y="61" Height="343" Width="198" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:ItemList" ZOrder="48" X="853" Y="87" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Materials" ZOrder="3" X="1227" Y="25" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Bins" ZOrder="21" X="1257" Y="597" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Materials" ZOrder="4" X="1227" Y="25" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:Bins" ZOrder="22" X="1257" Y="597" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Carts" ZOrder="47" X="592" Y="408" Height="286" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:OfflineOrderList" ZOrder="46" X="921" Y="934" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:OffOrd2Item" ZOrder="45" X="1023" Y="728" Height="134" Width="219" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:KitList" ZOrder="4" X="634" Y="129" Height="248" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:KitList" ZOrder="5" X="634" Y="129" Height="248" Width="194" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Nesting" ZOrder="44" X="863" Y="526" Height="153" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:ImportLog" ZOrder="43" X="593" Y="701" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:BinList" ZOrder="42" X="1256" Y="391" Height="134" Width="216" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
@@ -28,31 +28,31 @@
<Shape ID="DesignTable:PartValidPareto" ZOrder="36" X="316" Y="1303" Height="153" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:UnloadStats" ZOrder="35" X="629" Y="1362" Height="172" Width="215" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Remnants" ZOrder="34" X="904" Y="1256" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:CartOnKit" ZOrder="2" X="1311" Y="988" Height="343" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackList" ZOrder="1" X="1246" Y="1358" Height="362" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:CartOnKit" ZOrder="3" X="1311" Y="988" Height="343" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackList" ZOrder="2" X="1246" Y="1358" Height="362" Width="297" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:OtherItem" ZOrder="33" X="636" Y="1822" Height="210" Width="204" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ItemSearchDetail" ZOrder="32" X="1513" Y="102" Height="381" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackListDet" ZOrder="31" X="931" Y="1520" Height="343" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackLog" ZOrder="30" X="1224" Y="1751" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:PackCheck" ZOrder="29" X="636" Y="1560" Height="229" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:OKIB" ZOrder="28" X="33" Y="1493" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKIB_Sum" ZOrder="27" X="42" Y="1891" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI" ZOrder="26" X="334" Y="1485" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI_sum" ZOrder="25" X="330" Y="1890" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="16" X="911" Y="1873" Height="286" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:CartIRK" ZOrder="24" X="640" Y="2064" Height="305" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:FileValidation" ZOrder="20" X="488" Y="-38" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:SheetsPreview" ZOrder="23" X="65" Y="839" Height="210" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:OrderListTree" ZOrder="19" X="3" Y="-43" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Places" ZOrder="14" X="862" Y="2175" Height="172" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:StatusLog" ZOrder="17" X="1116" Y="2180" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:StatusDecode" ZOrder="15" X="849" Y="2353" Height="172" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:UpdMan" ZOrder="11" X="636" Y="2374" Height="191" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:SheetStats" ZOrder="9" X="20" Y="2307" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:BatchStats" ZOrder="8" X="369" Y="2276" Height="305" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:ProductionStatsDay" ZOrder="7" X="870" Y="2556" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:PlantList" ZOrder="5" X="25" Y="2608" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:SpecialParts" ZOrder="6" X="370" Y="2611" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:ItemSearchDetail" ZOrder="1" X="1513" Y="102" Height="381" Width="244" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackListDet" ZOrder="32" X="931" Y="1520" Height="343" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:PackLog" ZOrder="31" X="1224" Y="1751" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:PackCheck" ZOrder="30" X="636" Y="1560" Height="229" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:OKIB" ZOrder="29" X="33" Y="1493" Height="324" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKIB_Sum" ZOrder="28" X="42" Y="1891" Height="362" Width="220" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI" ZOrder="27" X="334" Y="1485" Height="324" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:OKOI_sum" ZOrder="26" X="330" Y="1890" Height="362" Width="246" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:Pack2Cart" ZOrder="17" X="911" Y="1873" Height="286" Width="203" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:CartIRK" ZOrder="25" X="640" Y="2064" Height="305" Width="188" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:FileValidation" ZOrder="21" X="488" Y="-38" Height="191" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:SheetsPreview" ZOrder="24" X="65" Y="839" Height="210" Width="228" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:OrderListTree" ZOrder="20" X="3" Y="-43" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:Places" ZOrder="15" X="862" Y="2175" Height="172" Width="180" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:StatusLog" ZOrder="18" X="1116" Y="2180" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:StatusDecode" ZOrder="16" X="849" Y="2353" Height="172" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:UpdMan" ZOrder="12" X="636" Y="2374" Height="191" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:SheetStats" ZOrder="10" X="20" Y="2307" Height="248" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:BatchStats" ZOrder="9" X="369" Y="2276" Height="305" Width="206" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:ProductionStatsDay" ZOrder="8" X="870" Y="2556" Height="267" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:PlantList" ZOrder="6" X="25" Y="2608" Height="172" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:SpecialParts" ZOrder="7" X="370" Y="2611" Height="210" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_ItemList_Materials1" ZOrder="59" LineWidth="11">
@@ -191,7 +191,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_StatusLog_Places" ZOrder="18" LineWidth="11">
<Connector ID="DesignRelation:FK_StatusLog_Places" ZOrder="19" LineWidth="11">
<RoutePoints>
<Point>
<X>1042</X>
+2 -2
View File
@@ -12,7 +12,7 @@ namespace AppData.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.10.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -27,7 +27,7 @@ namespace AppData.Properties {
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.ConnectionString)]
[global::System.Configuration.DefaultSettingValueAttribute("Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User" +
" ID=sa;Password=keyhammer16")]
" ID=sa;Password=keyhammer16;TrustServerCertificate=True;")]
public string Sauder_NKCConnectionString {
get {
return ((string)(this["Sauder_NKCConnectionString"]));
+3 -3
View File
@@ -4,11 +4,11 @@
<Settings>
<Setting Name="Sauder_NKCConnectionString" Type="(Connection string)" Scope="Application">
<DesignTimeValue Profile="(Default)">&lt;?xml version="1.0" encoding="utf-16"?&gt;
&lt;SerializableConnectionString xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"&gt;
&lt;ConnectionString&gt;Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16&lt;/ConnectionString&gt;
&lt;SerializableConnectionString xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"&gt;
&lt;ConnectionString&gt;Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;&lt;/ConnectionString&gt;
&lt;ProviderName&gt;System.Data.SqlClient&lt;/ProviderName&gt;
&lt;/SerializableConnectionString&gt;</DesignTimeValue>
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16</Value>
<Value Profile="(Default)">Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;</Value>
</Setting>
</Settings>
</SettingsFile>
+9 -5
View File
@@ -3,7 +3,7 @@
<configSections>
</configSections>
<connectionStrings>
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16" providerName="System.Data.SqlClient" />
<add name="AppData.Properties.Settings.Sauder_NKCConnectionString" connectionString="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;TrustServerCertificate=True;" providerName="System.Data.SqlClient" />
</connectionStrings>
<runtime>
<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
@@ -13,7 +13,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.3" newVersion="6.0.0.3" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -33,7 +33,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.InteropServices.RuntimeInformation" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -57,7 +57,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="ICSharpCode.SharpZipLib" publicKeyToken="1b03e6acf1164f73" culture="neutral" />
@@ -69,7 +69,11 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-8.0.0.1" newVersion="8.0.0.1" />
</dependentAssembly>
</assemblyBinding>
</runtime>
+22 -16
View File
@@ -2,31 +2,36 @@
<packages>
<package id="AIM" version="1.1.0" targetFramework="net462" />
<package id="AjaxControlToolkit" version="20.1.0" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="AWSSDK.Core" version="3.7.304.8" targetFramework="net462" />
<package id="AWSSDK.SecurityToken" version="3.7.300.99" targetFramework="net462" />
<package id="Crc32.NET" version="1.2.0" targetFramework="net462" />
<package id="DnsClient" version="1.7.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="6.0.6" targetFramework="net462" />
<package id="IronSnappy" version="1.3.1" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net462" />
<package id="Microsoft.ReportViewer.Runtime.Common" version="12.0.2402.15" targetFramework="net462" />
<package id="Microsoft.ReportViewer.Runtime.WinForms" version="12.0.2402.15" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.3.0" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.9.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.2.4" targetFramework="net462" />
<package id="NLog" version="5.3.2" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="SharpCompress" version="0.32.2" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.6.70" targetFramework="net462" />
<package id="Snappier" version="1.0.0" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.7.33" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.3" targetFramework="net462" />
<package id="System.IO.Pipelines" version="8.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" targetFramework="net462" />
<package id="System.Net.Http" version="4.3.4" targetFramework="net462" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net462" />
@@ -34,11 +39,12 @@
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="6.0.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="8.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
<package id="ZstdSharp.Port" version="0.7.3" targetFramework="net462" />
</packages>
+1 -1
View File
@@ -47,7 +47,7 @@
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.4\lib\net46\NLog.dll</HintPath>
<HintPath>..\packages\NLog.5.3.2\lib\net46\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
+62
View File
@@ -923,6 +923,27 @@ namespace NKC_SDK
/// </summary>
public int SheetIndex { get; set; }
/// <summary>
/// Indica che tutte le date (printing, working, unloading) sono vuote = Waiting / NON iniziato
/// </summary>
public bool Waiting
{
get
{
return Printing.Waiting && Machining.Waiting && Unloading.Waiting;
}
}
/// <summary>
/// Indica che tutte le date (printing, working, unloading) sono VALIDE = completato
/// </summary>
public bool Done
{
get
{
return Printing.Done && Machining.Done && Unloading.Done;
}
}
#endregion Public Properties
}
@@ -1011,6 +1032,47 @@ namespace NKC_SDK
return answ;
}
}
/// <summary>
/// Verifica data Start
/// </summary>
public bool OkS
{
get
{
return DtStart != null;
}
}
/// <summary>
/// Verifica data End
/// </summary>
public bool OkE
{
get
{
return DtEnd != null;
}
}
/// <summary>
/// Tutte date null --> in attesa
/// </summary>
public bool Waiting
{
get
{
return DtStart == null && DtEnd == null;
}
}
/// <summary>
/// Tutte date NOT null --> completato
/// </summary>
public bool Done
{
get
{
return DtStart != null && DtEnd != null;
}
}
#endregion Public Properties
}
+1 -1
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.2.4" targetFramework="net462" />
<package id="NLog" version="5.3.2" targetFramework="net462" />
</packages>
+29
View File
@@ -0,0 +1,29 @@
Test gestione nuova conf redis con sentinel:
cambiato in web.config vari i parametri da sostituire con i nuovi tramite sentinel:
in particolare
- niente pwd
- tramite sentinel (su redis01 x ora)
- su ambiente devel
quindi diventa
* localhost:26379,serviceName=devel
oppure se non ci fosse sentinel locale
* redis01.ufficio:26379,serviceName=devel
nuovi:
<add key="RedisConn" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
vecchi:
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
file interessati:
- Web.Debug.config
- Web.Debug-Lele.config
- Web.Debug-Prod.config
- Web.Release.config
Binary file not shown.
+17
View File
@@ -4,6 +4,7 @@ using NKC_SDK;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Web;
namespace NKC_WF
{
@@ -58,6 +59,22 @@ namespace NKC_WF
}
}
/// <summary>
/// pagina corrente...
/// </summary>
public string currPage
{
get
{
string url = HttpContext.Current.Request.Url.PathAndQuery;
if (url.Contains("?"))
{
url = url.Substring(0, url.IndexOf("?"));
}
return url;
}
}
#endregion Public Properties
#region Public Methods
+15
View File
@@ -22,6 +22,21 @@ body {
.textBig {
font-size: 1.5em;
}
.fs-1 {
font-size: 2em;
}
.fs-2 {
font-size: 1.7em;
}
.fs-3 {
font-size: 1.5em;
}
.fs-4 {
font-size: 1.3em;
}
.fs-5 {
font-size: 1.1em;
}
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
.jumbotron {
+16
View File
@@ -27,6 +27,22 @@ body {
font-size: 1.5em;
}
.fs-1 {
font-size: 2.0em;
}
.fs-2 {
font-size: 1.7em;
}
.fs-3 {
font-size: 1.5em;
}
.fs-4 {
font-size: 1.3em;
}
.fs-5 {
font-size: 1.1em;
}
/* Responsive: Portrait tablets and up */
@media screen and (min-width: 768px) {
.jumbotron {
+1 -1
View File
@@ -1 +1 @@
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}body{font-family:'Roboto Condensed',sans-serif;font-size:.9rem;}.smallTable{font-size:.7rem;font-family:'Open Sans Condensed',sans-serif;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px!important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#cdcdff),to(#bdbdff));background-image:-webkit-linear-gradient(top,#cdcdff,0%,#bdbdff,100%);background-image:-moz-linear-gradient(top,#cdcdff 0%,#bdbdff 100%);background-image:linear-gradient(to bottom,#cdcdff 0%,#bdbdff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CDCDCDFF',endColorstr='#BDBDBDFF',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#cdcdff),to(#bdbdff));background-image:-webkit-linear-gradient(top,#cdcdff,0%,#bdbdff,100%);background-image:-moz-linear-gradient(top,#cdcdff 0%,#bdbdff 100%);background-image:linear-gradient(to bottom,#cdcdff 0%,#bdbdff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CDCDCDFF',endColorstr='#BDBDBDFF',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}
body{font-family:'Roboto Condensed',sans-serif;padding-top:50px;padding-bottom:20px;}.body-content{padding-left:15px;padding-right:15px;}.textCondens{font-family:'Open Sans Condensed',sans-serif;}.textNormal{font-family:'Roboto',sans-serif;}.textBig{font-size:1.5em;}.fs-1{font-size:2em;}.fs-2{font-size:1.7em;}.fs-3{font-size:1.5em;}.fs-4{font-size:1.3em;}.fs-5{font-size:1.1em;}@media screen and (min-width:768px){.jumbotron{margin-top:20px;}.body-content{padding:0;}body{font-family:'Roboto',sans-serif;}}@media(max-width:992px){.container{width:100%;}body{font-family:'Roboto Condensed',sans-serif;font-size:.9rem;}.smallTable{font-size:.7rem;font-family:'Open Sans Condensed',sans-serif;}}.GridPager a,.GridPager span{display:block;height:1.5em;min-width:1.1em;text-align:center;text-decoration:none;}.GridPager a{background-color:#f5f5f5;color:#969696;}.GridPager span{background-color:#a1dcf2;color:#000;font-weight:bold;}.border-thick{border-width:3px!important;}.flashColor{border:3px solid #00f;-webkit-animation-name:blueFlash;-webkit-animation-duration:.5s;-webkit-animation-timing-function:linear;-webkit-animation-delay:0s;-webkit-animation-iteration-count:infinite;-webkit-animation-direction:alternate;animation-name:blueFlash;animation-duration:.5s;animation-timing-function:linear;animation-delay:0s;animation-iteration-count:infinite;animation-direction:alternate;}@-webkit-keyframes blueFlash{0%{border-color:#c4dbff;}25%{border-color:#9dc4ff;}50%{border-color:#5ca5ff;}75%{border-color:#1b82ff;}100%{border-color:#005ccc;}}.bigText{font-size:1.3em;}.smallText{font-size:.8em;}.dl-horizontal dt{white-space:normal;}.deleted{text-decoration:line-through;}.padZL{padding-left:.2em;}.padZR{padding-right:.2em;}.padZRL{padding-left:.2em;padding-right:.2em;}.colAlt{color:#c93;}.fontBig{font-size:2em;}.tNote{color:#8a8a8a;font-style:italic;}.tNoWrap{white-space:nowrap;}.navbar{min-height:0;color:#696969;}.pagination{margin:5px 0;}.pageSelDD{width:6em;}.zeroWidth{width:0;}.shortcuts{text-align:center;}.shortcuts .shortcut{min-width:9rem;min-height:5rem;display:inline-block;padding:.66666667rem 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut-sm{min-width:4.5rem;min-height:3rem;display:inline-block;padding:1rem/4 0;margin:0 2px 1em;vertical-align:top;text-decoration:none;background:#f3f3f3;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#fff),to(#eee));background-image:-webkit-linear-gradient(top,#fff,0%,#eee,100%);background-image:-moz-linear-gradient(top,#fff 0%,#eee 100%);background-image:linear-gradient(to bottom,#fff 0%,#eee 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffffff',endColorstr='#ffeeeeee',GradientType=0);border:1px solid #ddd;box-sizing:border-box;border-radius:1rem/2;}.shortcuts .shortcut .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut-sm .shortcut-icon{width:100%;margin-top:0;margin-bottom:0;font-size:2rem;color:#333;}.shortcuts .shortcut:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#cdcdff),to(#bdbdff));background-image:-webkit-linear-gradient(top,#cdcdff,0%,#bdbdff,100%);background-image:-moz-linear-gradient(top,#cdcdff 0%,#bdbdff 100%);background-image:linear-gradient(to bottom,#cdcdff 0%,#bdbdff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CDCDCDFF',endColorstr='#BDBDBDFF',GradientType=0);}.shortcuts .shortcut-sm:hover{color:#fff;background:#696969;background-image:-webkit-gradient(linear,left 0%,left 100%,from(#cdcdff),to(#bdbdff));background-image:-webkit-linear-gradient(top,#cdcdff,0%,#bdbdff,100%);background-image:-moz-linear-gradient(top,#cdcdff 0%,#bdbdff 100%);background-image:linear-gradient(to bottom,#cdcdff 0%,#bdbdff 100%);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#CDCDCDFF',endColorstr='#BDBDBDFF',GradientType=0);}.shortcuts .shortcut:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut-sm:active{box-shadow:inset 0 3px 5px rgba(0,0,0,.125);}.shortcuts .shortcut:hover .shortcut-icon{color:#c93;}.shortcuts .shortcut-sm:hover .shortcut-icon{color:#666;}.shortcuts .shortcut-label{display:block;margin-top:.75em;font-weight:400;color:#666;}@media(max-width:992px){.shortcuts .shortcut{min-width:8rem;min-height:4rem;}}
-2
View File
@@ -119,8 +119,6 @@ namespace NKC_WF.Controllers
{
foreach (var item in currBunk.SheetList)
{
// calcolo stsatus dalle date valide...
DLMan.taSHL.updateDate(item.SheetId, item.Printing.DtStart, item.Printing.DtEnd, item.Machining.DtStart, item.Machining.DtEnd, item.Unloading.DtStart, item.Unloading.DtEnd, (int)item.Status);
// SE machining completato --> status a LAVORATO!
if (item.Machining.DtEnd != null)
+173 -38
View File
@@ -1,6 +1,7 @@
using AppData;
using Newtonsoft.Json;
using NKC_SDK;
using SteamWare;
using System;
using System.IO;
using System.Web.Http;
@@ -9,19 +10,17 @@ namespace NKC_WF.Controllers
{
public class SheetController : ApiController
{
#region Protected Fields
#region Public Constructors
/// <summary>
/// oggetto static/singleton per fare chiamate sul datalayer
/// </summary>
protected DataLayer DLMan = new DataLayer();
public SheetController()
{
dfWrkStart = memLayer.ML.CRB("dateFix_WrkStart");
dfWrkEnd = memLayer.ML.CRB("dateFix_WrkEnd");
dfUnlStart = memLayer.ML.CRB("dateFix_UnlStart");
dfUnlEnd = memLayer.ML.CRB("dateFix_UnlEnd");
}
/// <summary>
/// COdice macchina (HARD CODED)
/// </summary>
protected string machine = "WRK001";
#endregion Protected Fields
#endregion Public Constructors
#region Public Methods
@@ -65,25 +64,10 @@ namespace NKC_WF.Controllers
{
Log.Instance.Error($"EXCEPTION api/Sheet | get({id}){Environment.NewLine}{exc}");
}
Log.Instance.Trace($"api/Sheet | get({id}) | answ: {answ}");
return answ;
}
/************************************
* METODI PUT
*
* per abilitare è necessario agire sulla conf di IIS:
*
* - modificare il file applicationHost.config che si trova in C:\Windows\System32\inetsrv\config
* - disinstallare webDav oppure commentare le righe
* <!-- <add name="WebDAVModule" /> -->
* <!-- <add name="WebDAVModule" image="%windir%\System32\inetsrv\webdav.dll" /> -->
* <!-- <add name="WebDAV" path="*" verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule" resourceType="Unspecified" requireAccess="None" /> -->
* - aggiungere PUT/DELETE a handler:
* <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE" modules="IsapiModule" scriptProcessor="%windir%\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll" preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" />
* <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
*
**************************************/
/// <summary>
/// Processa una chiamata POST per l'invio in blocco status BUNK
/// POST: api/Bunk
@@ -116,21 +100,25 @@ namespace NKC_WF.Controllers
if (sheetUpdated.SheetList != null)
{
// salvo macchina
machine = sheetUpdated.Machine;
foreach (var currSheet in sheetUpdated.SheetList)
{
// se non nullo...
if (currSheet != null)
{
DLMan.taSHL.updateDate(currSheet.SheetId, currSheet.Printing.DtStart, currSheet.Printing.DtEnd, currSheet.Machining.DtStart, currSheet.Machining.DtEnd, currSheet.Unloading.DtStart, currSheet.Unloading.DtEnd, (int)currSheet.Status);
// verifico il fixSheet
ProdSheetExt fixSheet = checkFixSheet(currSheet);
DLMan.taSHL.updateDate(fixSheet.SheetId, fixSheet.Printing.DtStart, fixSheet.Printing.DtEnd, fixSheet.Machining.DtStart, fixSheet.Machining.DtEnd, fixSheet.Unloading.DtStart, fixSheet.Unloading.DtEnd, (int)fixSheet.Status);
// SE machining completato --> status a LAVORATO x item!
if (currSheet.Machining.DtEnd != null)
if (fixSheet.Machining.DtEnd != null)
{
// hard coded su multiax
DLMan.taIL.updateSheetStatus(currSheet.SheetId, 1, sheetUpdated.Machine);
DLMan.taIL.updateSheetStatus(fixSheet.SheetId, 1, sheetUpdated.Machine);
}
// segnalo avanzamento su redis x pagina unload
ComLib.advaceSheetRevByBunk(currSheet.BunkId);
BunkId = currSheet.BunkId;
ComLib.advaceSheetRevByBunk(fixSheet.BunkId);
BunkId = fixSheet.BunkId;
answ = "OK";
}
}
@@ -150,20 +138,40 @@ namespace NKC_WF.Controllers
{
answ = "NO";
}
Log.Instance.Trace($"api/Sheet | post() | machine: {machine} | BatchId: {BatchId} | answ: {answ}");
return answ;
}
/// <summary>
/// Effettua la chiamata di update x SINGOLO foglio
/// </summary>
/// <param name="sheetUpdated">Oggetto con Elenco fogli da aggiornare</param>
/// <summary> Effettua la chiamata di update x SINGOLO foglio
///
///
/// *********************************** METODI PUT
///
/// per abilitare è necessario agire sulla conf di IIS:
///
/// - modificare il file applicationHost.config che si trova in C:\Windows\System32\inetsrv\config
/// - disinstallare webDav oppure commentare le righe <!-- <add name="WebDAVModule" /> -->
/// <!-- <add name="WebDAVModule" image="%windir%\System32\inetsrv\webdav.dll" /> --> <!--
/// <add name="WebDAV" path="*"
/// verb="PROPFIND,PROPPATCH,MKCOL,PUT,COPY,DELETE,MOVE,LOCK,UNLOCK" modules="WebDAVModule"
/// /r esourceType="Unspecified"// requireAccess="None" /> -->
/// - aggiungere PUT/DELETE a handler: <add name="ExtensionlessUrlHandler-ISAPI-4.0_64bit"
/// path="*." verb="GET,HEAD,POST,DEBUG,PUT,DELETE" modules="IsapiModule"
/// scriptProcessor="%w indir/%//\Microsoft.NET\Framework64\v4.0.30319\aspnet_isapi.dll"
/// preCondition="classicMode,runtimeVersionv4.0,bitness64" responseBufferLimit="0" /> <add
/// name="ExtensionlessUrlHandler-Integrated-4.0" path="*."
/// verb="GET,HEAD,POST,DEBUG,PUT,DELETE" ///t
/// ype="System.Web.Handlers.TransferRequestHandler"
/// preCondition="integratedMode,runtimeVersionv4.0" responseBufferLimit="0" />
///
/// *************************************/ </summary> <param name="sheetUpdated">Oggetto con
/// Elenco fogli da aggiornare</param>
/// PUT: api/Sheet/machine_ID
[HttpPut]
public void Put(SheetWorkList sheetUpdated)
{
// NB. decodifico direttamente come oggetto, vedere qui:
// https://weblog.west-wind.com/posts/2013/dec/13/accepting-raw-request-body-content-with-aspnet-web-api
// https://weblog.west-wind.com/posts/2017/sep/14/accepting-raw-request-body-content-in-aspnet-core-api-controllers
// https://weblog.west-wind.com/posts/2013/dec/13/accepting-raw-request-body-content-with-aspnet-web-api https://weblog.west-wind.com/posts/2017/sep/14/accepting-raw-request-body-content-in-aspnet-core-api-controllers
int BunkId = 0;
int BatchId = 0;
if (sheetUpdated != null)
@@ -205,5 +213,132 @@ namespace NKC_WF.Controllers
}
#endregion Public Methods
#region Protected Fields
/// <summary>
/// oggetto static/singleton per fare chiamate sul datalayer
/// </summary>
protected DataLayer DLMan = new DataLayer();
/// <summary>
/// COdice macchina (HARD CODED)
/// </summary>
protected string machine = "WRK001";
#endregion Protected Fields
#region Private Fields
/// <summary>
/// Forza fix date al momento ricezione UnlEnd valido
/// </summary>
private bool dfUnlEnd = false;
/// <summary>
/// Forza fix date al momento ricezione UnlStart valido
/// </summary>
private bool dfUnlStart = false;
/// <summary>
/// Forza fix date al momento ricezione WrkEnd valido
/// </summary>
private bool dfWrkEnd = false;
/// <summary>
/// Forza fix date al momento ricezione WrkStart valido
/// </summary>
private bool dfWrkStart = false;
#endregion Private Fields
#region Private Methods
/// <summary>
/// Verifica sheet loggando le eventuali anomalie sulle date e sistemando quelle mancanti in
/// base a setup
/// </summary>
/// <param name="CurrSheet">Sheet da verificare ed eventualmente sistemare</param>
/// <returns></returns>
private ProdSheetExt checkFixSheet(ProdSheetExt CurrSheet)
{
var fixSheet = CurrSheet;
// controllo SOLO SE se non sia ne in attesa ne completato...
if (!fixSheet.Waiting || !fixSheet.Done)
{
// calcolo SE sia in errore secondo i 4 punti di controllo work/unload
if (fixSheet.Unloading.OkE)
{
// loggo
LogSheetError(fixSheet);
if (dfUnlEnd)
{
// sistemo...
fixSheet.Unloading.DtStart = fixSheet.Unloading.OkS ? fixSheet.Unloading.DtStart : fixSheet.Unloading.DtEnd;
fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd;
}
}
else if (fixSheet.Unloading.OkS && (!fixSheet.Printing.Done || !fixSheet.Machining.Done))
{
// loggo
LogSheetError(fixSheet);
if (dfUnlStart)
{
// sistemo...
fixSheet.Machining.DtEnd = fixSheet.Machining.OkE ? fixSheet.Machining.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd;
}
}
else if (fixSheet.Machining.OkE && (!fixSheet.Printing.Done || !fixSheet.Machining.Done))
{
// loggo
LogSheetError(fixSheet);
if (dfWrkEnd)
{
// sistemo...
fixSheet.Machining.DtStart = fixSheet.Machining.OkS ? fixSheet.Machining.DtStart : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd;
}
}
else if (fixSheet.Machining.OkS && !fixSheet.Printing.Done)
{
// loggo
LogSheetError(fixSheet);
if (dfWrkStart)
{
// sistemo...
fixSheet.Printing.DtEnd = fixSheet.Printing.OkE ? fixSheet.Printing.DtEnd : fixSheet.Unloading.DtEnd;
fixSheet.Printing.DtStart = fixSheet.Printing.OkS ? fixSheet.Printing.DtStart : fixSheet.Unloading.DtEnd;
}
}
}
return fixSheet;
}
private void LogSheetError(ProdSheetExt cSheet)
{
// loggo
Log.Instance.Error($"Sheet Date error | SheetId: {cSheet.SheetId} | Print: {prtDate(cSheet.Printing)} | Work: {prtDate(cSheet.Machining)} | Unload: {prtDate(cSheet.Unloading)}");
}
private string prtDate(WorkData wrkRec)
{
string dtSta = wrkRec.DtStart == null ? "NULL" : $"{wrkRec.DtStart:yyyy.MM.dd HH:mm:ss}";
string dtEnd = wrkRec.DtEnd == null ? "NULL" : $"{wrkRec.DtEnd:yyyy.MM.dd HH:mm:ss}";
return $"{dtSta} ... {dtEnd}";
}
#endregion Private Methods
}
}
Binary file not shown.
Binary file not shown.
+118 -68
View File
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props" Condition="Exists('$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\TypeScript\Microsoft.TypeScript.Default.props')" />
<Import Project="packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props" Condition="Exists('packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.2.0.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -59,8 +58,14 @@
<Reference Include="AspNet.ScriptManager.jQuery, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\AspNet.ScriptManager.jQuery.3.6.0\lib\net45\AspNet.ScriptManager.jQuery.dll</HintPath>
</Reference>
<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 Include="AWSSDK.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.Core.3.7.304.8\lib\net45\AWSSDK.Core.dll</HintPath>
</Reference>
<Reference Include="AWSSDK.SecurityToken, Version=3.3.0.0, Culture=neutral, PublicKeyToken=885c28607f98e604, processorArchitecture=MSIL">
<HintPath>..\packages\AWSSDK.SecurityToken.3.7.300.99\lib\net45\AWSSDK.SecurityToken.dll</HintPath>
</Reference>
<Reference Include="Crc32.NET, Version=1.0.0.0, Culture=neutral, PublicKeyToken=dc0b95cf99bf4e99, processorArchitecture=MSIL">
<HintPath>..\packages\Crc32.NET.1.2.0\lib\net20\Crc32.NET.dll</HintPath>
</Reference>
<Reference Include="DnsClient, Version=1.7.0.0, Culture=neutral, PublicKeyToken=4574bb5573c51424, processorArchitecture=MSIL">
<HintPath>..\packages\DnsClient.1.7.0\lib\net45\DnsClient.dll</HintPath>
@@ -68,46 +73,57 @@
<Reference Include="Elmah, Version=1.2.14706.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\elmah.corelibrary.1.2.2\lib\Elmah.dll</HintPath>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.0.12, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.0\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>True</Private>
<Reference Include="ICSharpCode.SharpZipLib, Version=1.4.2.13, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
<HintPath>..\packages\SharpZipLib.1.4.2\lib\netstandard2.0\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=1.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.1.1.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
<Reference Include="IronSnappy, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b1d4b1dc83bdcf31, processorArchitecture=MSIL">
<HintPath>..\packages\IronSnappy.1.3.1\lib\netstandard2.0\IronSnappy.dll</HintPath>
</Reference>
<Reference Include="Microsoft.AspNet.SessionState.SessionStateModule, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.SessionState.SessionStateModule.2.0.0\lib\Net462\Microsoft.AspNet.SessionState.SessionStateModule.dll</HintPath>
</Reference>
<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=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.6.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=3.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\lib\net45\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=8.0.0.1, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.8.0.1\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Web.Infrastructure, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.Infrastructure.2.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath>
</Reference>
<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 Include="Microsoft.Web.RedisSessionStateProvider, Version=5.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.Web.RedisSessionStateProvider.5.0.4\lib\net462\Microsoft.Web.RedisSessionStateProvider.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Bson, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.15.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
<Reference Include="MongoDB.Bson, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Bson.2.25.0\lib\netstandard2.0\MongoDB.Bson.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.15.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
<Reference Include="MongoDB.Driver, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.2.25.0\lib\netstandard2.0\MongoDB.Driver.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Driver.Core, Version=2.15.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.15.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
<Reference Include="MongoDB.Driver.Core, Version=2.25.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Driver.Core.2.25.0\lib\netstandard2.0\MongoDB.Driver.Core.dll</HintPath>
</Reference>
<Reference Include="MongoDB.Libmongocrypt, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.3.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
<Reference Include="MongoDB.Libmongocrypt, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MongoDB.Libmongocrypt.1.9.0\lib\netstandard2.0\MongoDB.Libmongocrypt.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.5.2.4\lib\net46\NLog.dll</HintPath>
<HintPath>..\packages\NLog.5.3.2\lib\net46\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>
@@ -116,17 +132,16 @@
<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.2.2\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
<HintPath>..\packages\Pipelines.Sockets.Unofficial.2.2.8\lib\net461\Pipelines.Sockets.Unofficial.dll</HintPath>
</Reference>
<Reference Include="SharpCompress, Version=0.32.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.32.2\lib\net461\SharpCompress.dll</HintPath>
<Private>True</Private>
<Reference Include="SharpCompress, Version=0.37.2.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
<HintPath>..\packages\SharpCompress.0.37.2\lib\net462\SharpCompress.dll</HintPath>
</Reference>
<Reference Include="Snappy.NET, Version=1.1.1.8, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Snappy.NET.1.1.1.8\lib\net45\Snappy.NET.dll</HintPath>
<Reference Include="Snappier, Version=1.1.6.0, Culture=neutral, PublicKeyToken=a1b25124e6e13a3a, processorArchitecture=MSIL">
<HintPath>..\packages\Snappier.1.1.6\lib\netstandard2.0\Snappier.dll</HintPath>
</Reference>
<Reference Include="StackExchange.Redis, Version=2.0.0.0, Culture=neutral, PublicKeyToken=c219ff1ca8c2ce46, processorArchitecture=MSIL">
<HintPath>..\packages\StackExchange.Redis.2.6.70\lib\net461\StackExchange.Redis.dll</HintPath>
<HintPath>..\packages\StackExchange.Redis.2.7.33\lib\net461\StackExchange.Redis.dll</HintPath>
</Reference>
<Reference Include="SteamWare, Version=5.3.2311.2908, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\SteamWare.5.3.2311.2908\lib\net462\SteamWare.dll</HintPath>
@@ -142,30 +157,36 @@
</Reference>
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
</Reference>
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.6.0.1\lib\net461\System.Diagnostics.PerformanceCounter.dll</HintPath>
<Reference Include="System.Data.OracleClient" />
<Reference Include="System.Diagnostics.PerformanceCounter, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Diagnostics.PerformanceCounter.8.0.0\lib\net462\System.Diagnostics.PerformanceCounter.dll</HintPath>
</Reference>
<Reference Include="System.DirectoryServices" />
<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=6.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.6.0.3\lib\net461\System.IO.Pipelines.dll</HintPath>
<Reference Include="System.IO.Pipelines, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.IO.Pipelines.8.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
</Reference>
<Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
</Reference>
<Reference Include="System.Net" />
<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.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 Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
</Reference>
<Reference Include="System.Numerics" />
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -181,6 +202,9 @@
</Reference>
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Security" />
<Reference Include="System.Security.AccessControl, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.AccessControl.6.0.1\lib\net461\System.Security.AccessControl.dll</HintPath>
</Reference>
<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.1\lib\net461\System.Security.Cryptography.Algorithms.dll</HintPath>
</Reference>
@@ -189,8 +213,8 @@
<Private>True</Private>
<Private>True</Private>
</Reference>
<Reference Include="System.Security.Cryptography.Pkcs, Version=6.0.0.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.6.0.1\lib\net461\System.Security.Cryptography.Pkcs.dll</HintPath>
<Reference Include="System.Security.Cryptography.Pkcs, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.Pkcs.8.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
</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>
@@ -200,12 +224,19 @@
<Reference Include="System.Security.Cryptography.X509Certificates, Version=4.1.1.2, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Cryptography.X509Certificates.4.3.2\lib\net461\System.Security.Cryptography.X509Certificates.dll</HintPath>
</Reference>
<Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encoding.CodePages, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.6.0.0\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
<Reference Include="System.Security.Permissions, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Security.Permissions.8.0.0\lib\net462\System.Security.Permissions.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.6.0.0\lib\net461\System.Threading.Channels.dll</HintPath>
<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.ServiceModel" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Text.Encoding.CodePages, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encoding.CodePages.8.0.0\lib\net462\System.Text.Encoding.CodePages.dll</HintPath>
</Reference>
<Reference Include="System.Threading.Channels, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Threading.Channels.8.0.0\lib\net462\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>
@@ -216,28 +247,28 @@
</Reference>
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Helpers, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.Helpers.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.Helpers.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.2.9\lib\net45\System.Web.Http.dll</HintPath>
<Reference Include="System.Web.Http, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.Core.5.3.0\lib\net45\System.Web.Http.dll</HintPath>
</Reference>
<Reference Include="System.Web.Http.WebHost, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.2.9\lib\net45\System.Web.Http.WebHost.dll</HintPath>
<Reference Include="System.Web.Http.WebHost, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebApi.WebHost.5.3.0\lib\net45\System.Web.Http.WebHost.dll</HintPath>
</Reference>
<Reference Include="System.Web.Mvc, Version=5.2.9.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.2.9\lib\net45\System.Web.Mvc.dll</HintPath>
<Reference Include="System.Web.Mvc, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Mvc.5.3.0\lib\net45\System.Web.Mvc.dll</HintPath>
</Reference>
<Reference Include="System.Web.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.Razor.3.2.9\lib\net45\System.Web.Razor.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.Razor.3.3.0\lib\net45\System.Web.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Deployment, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Deployment.dll</HintPath>
</Reference>
<Reference Include="System.Web.WebPages.Razor, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.2.9\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
<HintPath>..\packages\Microsoft.AspNet.WebPages.3.3.0\lib\net45\System.Web.WebPages.Razor.dll</HintPath>
</Reference>
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
@@ -269,9 +300,14 @@
<Reference Include="Microsoft.AspNet.FriendlyUrls">
<HintPath>..\packages\Microsoft.AspNet.FriendlyUrls.Core.1.0.2\lib\net45\Microsoft.AspNet.FriendlyUrls.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="ZstdSharp, Version=0.8.1.0, Culture=neutral, PublicKeyToken=8d151af33a4ad5cf, processorArchitecture=MSIL">
<HintPath>..\packages\ZstdSharp.Port.0.8.1\lib\net462\ZstdSharp.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="App_Readme\README_SteamWare.txt" />
<None Include="App_Readme\Redis-Readme.md" />
<Content Include="App_Readme\SteamWare_demo\example-config-table.txt" />
<Content Include="App_Readme\SteamWare_demo\example-favicon.ico" />
<Content Include="Content\bootstrap-grid.css" />
@@ -288,9 +324,6 @@
<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\400.aspx" />
<Content Include="ErrorPages\401.aspx" />
@@ -345,10 +378,6 @@
<Content Include="Reports\SpecialParts.rdlc">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="Core\Compression\Zstandard\lib\osx\libzstd.dylib" />
<Content Include="Core\Compression\Zstandard\lib\linux\libzstd.so" />
<Content Include="Core\Compression\Snappy\lib\osx\libsnappy64.dylib" />
<Content Include="Core\Compression\Snappy\lib\linux\libsnappy64.so" />
<Content Include="App_Readme\SteamWare_demo\example-NLog.config" />
<Content Include="App_Readme\SteamWare_demo\example-app.config" />
<None Include="Properties\PublishProfiles\IIS04.pubxml" />
@@ -478,6 +507,8 @@
<Content Include="site\PartMIA.aspx" />
<Content Include="site\PartValidation.aspx" />
<Content Include="site\PlannerReports.aspx" />
<Content Include="site\PlannerReportsBatchStats.aspx" />
<Content Include="site\PlannerReportsDailyStats.aspx" />
<Content Include="site\PlantMgmt.aspx" />
<Content Include="site\RemanExtLink.aspx" />
<Content Include="site\SecondScreen.aspx" />
@@ -485,6 +516,7 @@
<Content Include="site\SvgFull.aspx" />
<Content Include="site\TestAuth.aspx" />
<Content Include="site\StackManager.aspx" />
<Content Include="site\TestChart.aspx" />
<Content Include="site\Unauth.aspx" />
<Content Include="site\UpdMan.aspx" />
<Content Include="WebUserControls\cmp_barcode.ascx" />
@@ -1052,6 +1084,20 @@
<Compile Include="site\PlannerReports.aspx.designer.cs">
<DependentUpon>PlannerReports.aspx</DependentUpon>
</Compile>
<Compile Include="site\PlannerReportsBatchStats.aspx.cs">
<DependentUpon>PlannerReportsBatchStats.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\PlannerReportsBatchStats.aspx.designer.cs">
<DependentUpon>PlannerReportsBatchStats.aspx</DependentUpon>
</Compile>
<Compile Include="site\PlannerReportsDailyStats.aspx.cs">
<DependentUpon>PlannerReportsDailyStats.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\PlannerReportsDailyStats.aspx.designer.cs">
<DependentUpon>PlannerReportsDailyStats.aspx</DependentUpon>
</Compile>
<Compile Include="site\PlantMgmt.aspx.cs">
<DependentUpon>PlantMgmt.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1115,6 +1161,13 @@
<Compile Include="site\StackManager.aspx.designer.cs">
<DependentUpon>StackManager.aspx</DependentUpon>
</Compile>
<Compile Include="site\TestChart.aspx.cs">
<DependentUpon>TestChart.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="site\TestChart.aspx.designer.cs">
<DependentUpon>TestChart.aspx</DependentUpon>
</Compile>
<Compile Include="site\Unauth.aspx.cs">
<DependentUpon>Unauth.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -1958,8 +2011,10 @@
</Content>
</ItemGroup>
<ItemGroup>
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
<Analyzer Include="..\packages\AWSSDK.SecurityToken.3.7.300.99\analyzers\dotnet\cs\AWSSDK.SecurityToken.CodeAnalysis.dll" />
<Analyzer Include="..\packages\AWSSDK.SecurityToken.3.7.300.99\analyzers\dotnet\cs\SharedAnalysisCode.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.CSharp.NetAnalyzers.dll" />
<Analyzer Include="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.8.0.0\analyzers\dotnet\cs\Microsoft.CodeAnalysis.NetAnalyzers.dll" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
@@ -2032,11 +2087,8 @@
<ErrorText>Questo progetto fa riferimento a uno o più pacchetti NuGet che non sono presenti in questo computer. Usare lo strumento di ripristino dei pacchetti NuGet per scaricarli. Per altre informazioni, vedere http://go.microsoft.com/fwlink/?LinkID=322105. Il file mancante è {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets'))" />
<Error Condition="!Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MongoDB.Driver.Core.2.15.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.
@@ -2058,8 +2110,6 @@
<CallTarget Targets="ApplyWebConfigTransform" />
</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.9.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.9.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets" Condition="Exists('..\packages\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.3.6.0\build\net46\Microsoft.CodeDom.Providers.DotNetCompilerPlatform.targets')" />
<Import Project="..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets" Condition="Exists('..\packages\MongoDB.Libmongocrypt.1.3.0\build\MongoDB.Libmongocrypt.targets')" />
<Import Project="..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets" Condition="Exists('..\packages\Microsoft.CodeAnalysis.NetAnalyzers.6.0.0\build\Microsoft.CodeAnalysis.NetAnalyzers.targets')" />
<Import Project="..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets" Condition="Exists('..\packages\MongoDB.Driver.Core.2.15.0\build\MongoDB.Driver.Core.targets')" />
</Project>
+2 -2
View File
@@ -5,8 +5,8 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conf redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConn" value="redis01.ufficio:26379,serviceName=devel,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="redis01.ufficio:26379,serviceName=devel,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conn string-->
<add key="NKC_WFConnectionString" value="Data Source=PC-LELE\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="DbConfConnectionString" value="Data Source=PC-LELE\SQLEXPRESS;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+2 -2
View File
@@ -5,8 +5,8 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conf redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConn" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conn string-->
<add key="NKC_WFConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC2_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="DbConfConnectionString" value="Data Source=SQL2016PROD;Initial Catalog=Sauder_NKC2_Prod;Persist Security Info=True;User ID=sa;Password=keyhammer16;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+2 -2
View File
@@ -5,8 +5,8 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conf redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConn" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conn string-->
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=sa;Password=keyhammer16;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+2 -2
View File
@@ -5,8 +5,8 @@
<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<appSettings>
<!--conf redis-->
<add key="RedisConn" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="nkcredis.steamware.net,abortConnect=false,ssl=false,password=BtN9Py1wtLfLRvmzWnOPJ7RytDM+CLiVsJ/16zduNTlV8IOPGNrtzJSXPUnImA5PqmUMhKaUqo9NdHIG,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConn" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="RedisConnAdmin" value="localhost:26379,serviceName=devel,abortConnect=false,ssl=false,allowAdmin=true" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<!--conn string-->
<add key="NKC_WFConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
<add key="DbConfConnectionString" value="Data Source=SQL2016DEV;Initial Catalog=Sauder_NKC;Persist Security Info=True;User ID=conn_NKC;Password=pwd_NKC;" xdt:Transform="SetAttributes" xdt:Locator="Match(key)"/>
+524 -493
View File
File diff suppressed because it is too large Load Diff
@@ -9,10 +9,10 @@
</div>
</div>
<div class="row">
<div class="col-4">
<div class="col-12 col-md-3">
<b class="text-uppercase"><%: traduci("BatchPreviewStats") %></b>
</div>
<div class="col-8 text-right small">
<div class="col-12 col-md-9 text-right small">
<div class="form-row mb-2">
<div class="col-5">
<asp:LinkButton runat="server" ID="lbtExportCsv" CssClass="btn btn-sm btn-outline-success" OnClick="lbtExportCsv_Click">Create CSV <i class="fa fa-file-excel-o" aria-hidden="true"></i></asp:LinkButton>
@@ -39,7 +39,7 @@
<div class="input-group-prepend">
<span class="input-group-text small"><%: traduci("PlotGraph") %></span>
</div>
<asp:CheckBox runat="server" ID="chkPlotGraph" AutoPostBack="true" OnCheckedChanged="chkPlotGraph_CheckedChanged" CssClass="form-control form-control-sm" />
<asp:CheckBox runat="server" ID="chkPlotGraph" AutoPostBack="true" OnCheckedChanged="chkPlotGraph_CheckedChanged" CssClass="form-control form-control-sm" Checked="true" />
</div>
</div>
<div class="col-2">
@@ -142,7 +142,7 @@ namespace NKC_WF.WebUserControls
{
if (!Page.IsPostBack)
{
cmp_numRow.numRow = 25;
cmp_numRow.numRow = 15;
grView.PageSize = cmp_numRow.numRow;
divGraph.Visible = false;
divType.Visible = false;
@@ -152,6 +152,7 @@ namespace NKC_WF.WebUserControls
hlDownload.Visible = fileExist;
}
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
doUpdate();
}
protected void txtNumShow_TextChanged(object sender, EventArgs e)
+27 -16
View File
@@ -24,7 +24,7 @@
var labelsTS = dataTS.map(function (item) {
return item['x'];
});
//console.log('labels data', labels);
//console.log('labels data', labelsTS);
var myOptions = {
responsive: true,
@@ -42,15 +42,17 @@
};
// recupero obj chart
//console.log('ctx ID: ', document.getElementById('myChartTS'));
var ctx = document.getElementById('myChartTS').getContext('2d');
var sLeg = document.getElementById('<%=hfLegend.ClientID %>').value;
var chart = new Chart(ctx, {
type: 'line',
data: {
labels: labelsTS,
datasets: [{
label: '<%=hfLegend.Value %>',
label: sLeg,
borderColor: 'rgb(7, 173, 236)',
lineTension: 0,
//steppedLine: false,
@@ -66,22 +68,31 @@
}
// effettuo plotting grafico TimeSerie!
function plotTS() {
//console.log("api/BatchStats/<%=hfShowLast.Value %>?PlotType=<%=hfPlotType.Value%>");
// caricamento pagina
$.ajax({
type: "GET",
url: "../api/BatchStats/<%=hfShowLast.Value %>?PlotType=<%=hfPlotType.Value%>",
contentType: "application/json; charset=utf-8",
dataType: "json",
success: OnSuccess_,
error: OnErrorCall_
});
var hfSL = document.getElementById('<%=hfShowLast.ClientID %>');
if (hfSL != null) {
var lastNum = document.getElementById('<%=hfShowLast.ClientID %>').value ?? "";
var plotType = document.getElementById('<%=hfPlotType.ClientID %>').value ?? "";
//console.log("../api/BatchStats/"+lastNum+"?PlotType="+plotType);
// caricamento pagina
$.ajax({
type: "GET",
url: "../api/BatchStats/" + lastNum + "?PlotType=" + plotType,
contentType: "application/json; charset=utf-8",
dataType: "json",
success: OnSuccess_,
error: OnErrorCall_
});
}
}
// funzione di drawing ad OGNI pageload!
function pageLoad() {
// chiamo recupero dati + plot della TS
plotTS();
//console.log('pageLoad!');
try {
console.log('pageLoad BatchStats! | ID: <%= this.ID %> ');
plotTS();
}
catch (error) {
console.log(error);
}
}
</script>
</script>
@@ -53,10 +53,7 @@ namespace NKC_WF.WebUserControls
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
}
@@ -9,10 +9,10 @@
</div>
</div>
<div class="row">
<div class="col-3">
<div class="col-12 col-md-3">
<b class="text-uppercase"><%: traduci("DayProdStats") %></b>
</div>
<div class="col-9 text-right small">
<div class="col-12 col-md-9 text-right small">
<div class="form-row mb-2">
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtExportCsv" CssClass="btn btn-sm btn-outline-success" OnClick="lbtExportCsv_Click">Create CSV <i class="fa fa-file-excel-o" aria-hidden="true"></i></asp:LinkButton>
@@ -38,7 +38,7 @@
<div class="input-group-prepend">
<span class="input-group-text small"><%: traduci("PlotGraph") %></span>
</div>
<asp:CheckBox runat="server" ID="chkPlotGraph" AutoPostBack="true" OnCheckedChanged="chkPlotGraph_CheckedChanged" CssClass="form-control form-control-sm" />
<asp:CheckBox runat="server" ID="chkPlotGraph" AutoPostBack="true" OnCheckedChanged="chkPlotGraph_CheckedChanged" CssClass="form-control form-control-sm" Checked="true" />
</div>
</div>
<div class="col-2">
@@ -174,7 +174,7 @@ namespace NKC_WF.WebUserControls
{
if (!Page.IsPostBack)
{
cmp_numRow.numRow = 25;
cmp_numRow.numRow = 15;
grView.PageSize = cmp_numRow.numRow;
divGraph.Visible = false;
divType.Visible = false;
@@ -186,6 +186,7 @@ namespace NKC_WF.WebUserControls
hlDownload.Visible = fileExist;
}
cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh;
doUpdate();
}
protected void txtDateEnd_TextChanged(object sender, EventArgs e)
+46 -17
View File
@@ -4,11 +4,10 @@
<div class="row">
<div class="col-12 px-2">
<h4>Batch Stats Plot</h4>
<h4>Daily Stats Plot</h4>
</div>
<div class="col-12 px-2">
<div id="divLoading" class="alert alert-primary text-center">
<%--<i class="fa fa-5x fa-circle-o-notch fa-spin" aria-hidden="true"></i>--%>
<div class="progress">
<div class="progress-bar progress-bar-striped progress-bar-animated" style="width: 40%"></div>
</div>
@@ -23,6 +22,7 @@
<canvas id="myChartTS" height="200"></canvas>
</div>
</div>
<script type="text/javascript">
// funzione eseguita se successo al caricamento
function OnSuccess_(reponse) {
@@ -65,7 +65,11 @@
};
// recupero obj chart
//console.log('ctx ID: ', document.getElementById('myChartTS'));
var ctx = document.getElementById('myChartTS').getContext('2d');
//var ctx = document.getElementById('myChartTS').getContext('2d');
var sLeg = document.getElementById('<%=hfLegend.ClientID %>').value;
var chart = new Chart(ctx, {
type: 'line',
@@ -74,21 +78,21 @@
datasets: [
{
label: 'NE01: <%=hfLegend.Value %>',
label: 'NE01: ' + sLeg,
borderColor: 'rgb(7, 173, 236)',
lineTension: 0,
//steppedLine: false,
data: dataNE01
},
{
label: 'NE02: <%=hfLegend.Value %>',
label: 'NE02: ' + sLeg,
borderColor: 'rgb(7, 173, 26)',
lineTension: 0,
//steppedLine: false,
data: dataNE02
},
{
label: 'NE03: <%=hfLegend.Value %>',
label: 'NE03: ' + sLeg,
borderColor: 'rgb(7, 203, 126)',
lineTension: 0,
//steppedLine: false,
@@ -99,10 +103,15 @@
options: myOptions
});
// nascondo panel loading
var currDiv = document.getElementById("divLoading");
currDiv.style.display = "none";
console.log("style: " + currDiv.style.display);
try {
// nascondo panel loading
var currDiv = document.getElementById('divLoading');
currDiv.style.display = "none";
console.log("style: " + currDiv.style.display);
}
catch (error) {
console.log(error);
}
}
// errore in reload!
function OnErrorCall_(repo) {
@@ -110,11 +119,20 @@
}
// effettuo plotting grafico TimeSerie!
function plotTS() {
console.log("api/DayStats/<%=hfPlaceCod.Value %>?StartDate=<%=hfDateStart.Value %>&EndDate=<%=hfDateEnd.Value %>&PlotType=<%=hfPlotType.Value%>");
//console.log("Start plotTS");
var placeCod = document.getElementById('<%=hfPlaceCod.ClientID %>').value;
//console.log("placeCod: " + placeCod);
var dtStart = document.getElementById('<%=hfDateStart.ClientID %>').value;
//console.log("dtStart: " + dtStart);
var dtEnd = document.getElementById('<%=hfDateEnd.ClientID %>').value;
//console.log("dtEnd: " + dtEnd);
var plotType = document.getElementById('<%=hfPlotType.ClientID %>').value;
//console.log("plotType: " + plotType);
//console.log("../api/DayStats/" + placeCod + "?StartDate=" + dtStart + "&EndDate=" + dtEnd + "&PlotType=" + plotType);
// caricamento pagina
$.ajax({
type: "GET",
url: "../api/DayStats/<%=hfPlaceCod.Value %>?StartDate=<%=hfDateStart.Value %>&EndDate=<%=hfDateEnd.Value %>&PlotType=<%=hfPlotType.Value%>",
url: "../api/DayStats/" + placeCod + "?StartDate=" + dtStart + "&EndDate=" + dtEnd + "&PlotType=" + plotType,
contentType: "application/json; charset=utf-8",
dataType: "json",
success: OnSuccess_,
@@ -124,11 +142,22 @@
// funzione di drawing ad OGNI pageload!
function pageLoad() {
// mostro panel loading
var currDiv = document.getElementById("divLoading");
currDiv.style.display = "block";
// chiamo recupero dati + plot della TS
plotTS();
//console.log('pageLoad!');
//console.log('pageLoad DailyStats! | ID: <%= this.ID %> ');
try {
try {
// mostro panel loading
var currDiv = document.getElementById('divLoading');
currDiv.style.display = "block";
}
catch (error) {
console.log(error);
}
// chiamo recupero dati + plot della TS
plotTS();
}
catch (error) {
console.log(error);
}
}
</script>
@@ -1,21 +1,11 @@
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_DailyStatsPlot : System.Web.UI.UserControl
{
#region Protected Fields
protected string dateFormat = "yyyy-MM-dd";
#endregion Protected Fields
#region Public Properties
public DateTime DateEnd
@@ -84,11 +74,14 @@ namespace NKC_WF.WebUserControls
#endregion Public Properties
#region Protected Fields
protected string dateFormat = "yyyy-MM-dd";
#endregion Protected Fields
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
+2 -1
View File
@@ -8,10 +8,11 @@
<asp:HiddenField ID="hfFilename" runat="server" Value="" />
<asp:HiddenField ID="hfCurrRev" runat="server" Value="0" />
<asp:HiddenField ID="hfCurrBunkRev" runat="server" Value="0" />
<asp:HiddenField ID="hfTimerCss" runat="server" Value="1000" />
<script type="text/javascript">
lastVal = 0;
my_function();
setInterval("my_function();", 1000);
setInterval("my_function();", <%=hfTimerCss.Value%>);
function my_function() {
BunkId = document.getElementById('<%=hfBatchId.ClientID%>').value;
SheetId = document.getElementById('<%=hfSheetId.ClientID%>').value;
@@ -48,6 +48,27 @@ namespace NKC_WF.WebUserControls
return answ;
}
}
/// <summary>
/// Timer rilettura css in ms...
/// </summary>
public int TimerCss
{
set
{
if (hfTimerCss.Value != value.ToString())
{
hfTimerCss.Value = value.ToString();
}
}
get
{
int answ = 0;
int.TryParse(hfTimerCss.Value, out answ);
return answ;
}
}
/// <summary>
/// Percorso file calcolato
/// </summary>
@@ -100,7 +121,14 @@ namespace NKC_WF.WebUserControls
{
// scrivo valore revisione batch!
hfCurrBunkRev.Value = ComLib.getSheetRevByBunk(BatchId).ToString();
fixTimer();
}
}
private void fixTimer()
{
int timerCss = memLayer.ML.CRI("timerCss");
TimerCss = timerCss > 0 ? timerCss : 500;
}
}
}
+65 -56
View File
@@ -1,71 +1,80 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
{
public partial class cmp_MU_svgViewer
{
public partial class cmp_MU_svgViewer
{
/// <summary>
/// Controllo hfBatchId.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchId;
/// <summary>
/// hfBatchId control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfBatchId;
/// <summary>
/// Controllo hfSheetId.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetId;
/// <summary>
/// hfSheetId control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfSheetId;
/// <summary>
/// Controllo hfFilename.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfFilename;
/// <summary>
/// hfFilename control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfFilename;
/// <summary>
/// Controllo hfCurrRev.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCurrRev;
/// <summary>
/// hfCurrRev control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCurrRev;
/// <summary>
/// Controllo hfCurrBunkRev.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCurrBunkRev;
/// <summary>
/// hfCurrBunkRev control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfCurrBunkRev;
/// <summary>
/// Controllo svgTable.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable;
}
/// <summary>
/// hfTimerCss control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfTimerCss;
/// <summary>
/// svgTable control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl svgTable;
}
}
@@ -12,18 +12,6 @@ namespace NKC_WF.WebUserControls
{
#region Public Properties
public string currPage
{
get
{
string url = HttpContext.Current.Request.Url.PathAndQuery;
if (url.Contains("?mach="))
{
url = url.Substring(0, url.IndexOf("?mach="));
}
return url;
}
}
public string MachineSel
{
+13 -8
View File
@@ -14,20 +14,25 @@
<asp:HiddenField runat="server" ID="hfCss03" Value="secondary" />
<div class="row" runat="server" id="divSelect">
<asp:DropDownList runat="server" ID="ddlMachine" CssClass="form-control" AutoPostBack="True" OnSelectedIndexChanged="ddlMachine_SelectedIndexChanged">
<asp:ListItem Text="-- PLEASE SELECT ---" Value="" />
<asp:ListItem Text="NE01" Value="NE01" />
<asp:ListItem Text="NE02" Value="NE02" />
<asp:ListItem Text="NE03" Value="NE03" />
</asp:DropDownList>
<div class="col-12">
<asp:DropDownList runat="server" ID="ddlMachine" CssClass="form-control" AutoPostBack="True" OnSelectedIndexChanged="ddlMachine_SelectedIndexChanged">
<asp:ListItem Text="-- PLEASE SELECT ---" Value="" />
<asp:ListItem Text="NE01" Value="NE01" />
<asp:ListItem Text="NE02" Value="NE02" />
<asp:ListItem Text="NE03" Value="NE03" />
</asp:DropDownList>
</div>
</div>
<asp:UpdatePanel runat="server" ID="upnlTitle" UpdateMode="Conditional">
<ContentTemplate>
<asp:Timer ID="timerLoad" runat="server" Interval="2000" OnTick="timerLoad_Tick"></asp:Timer>
<asp:Timer ID="timerLoad" runat="server" OnTick="timerLoad_Tick"></asp:Timer>
<div class="row small py-0" runat="server" id="divRuntime">
<div class="col-2 pr-0">
<asp:LinkButton runat="server" ID="lbtReset" class="btn btn-info btn-block text-center" OnClick="lbtReset_Click"><i class="fa fa-refresh" aria-hidden="true"></i>&nbsp;<%: hfMachine.Value %>&nbsp;<i class="fa fa-link text-success" aria-hidden="true" runat="server" id="icnLiveOk"></i> <i class="fa fa-chain-broken text-danger" aria-hidden="true" runat="server" id="icnLiveKo"></i></asp:LinkButton>
<div class="small">
<asp:Label runat="server" ID="lblUpdated" Text="---"></asp:Label>
</div>
</div>
<div class="col-10">
<div class="d-flex text-center">
@@ -50,4 +55,4 @@
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:UpdatePanel>
+113 -104
View File
@@ -9,7 +9,7 @@ using System.Web.UI.WebControls;
namespace NKC_WF.WebUserControls
{
public partial class cmp_MachSem : BaseUserControl
public partial class cmp_MachSem : BaseUserControl, IDisposable
{
#region Public Properties
@@ -31,19 +31,6 @@ namespace NKC_WF.WebUserControls
}
}
public string currPage
{
get
{
string url = HttpContext.Current.Request.Url.PathAndQuery;
if (url.Contains("?mach="))
{
url = url.Substring(0, url.IndexOf("?mach="));
}
return url;
}
}
public bool machSelected
{
get
@@ -67,9 +54,110 @@ namespace NKC_WF.WebUserControls
}
}
#endregion Public Properties
#region Public Methods
public override void Dispose()
{
timerLoad.Tick -= timerLoad_Tick;
timerLoad.Dispose();
base.Dispose();
}
public void doUpdate()
{
lblUpdated.Text = $"upd: {DateTime.Now:HH:mm:ss}";
// verifico status delle 3 parti e mostro relativo semaforo...
hfCode01.Value = "00";
hfCss01.Value = "secondary";
hfStat01.Value = "UNKNOWN";
hfCode02.Value = "00";
hfCss02.Value = "secondary";
hfStat02.Value = "UNKNOWN";
hfCode03.Value = "00";
hfCss03.Value = "secondary";
hfStat03.Value = "UNKNOWN";
if (!string.IsNullOrEmpty(currMachine))
{
// leggo da redis lo status
var currState = ComLib.prodMachStateDataGet(currMachine);
// traduco!
DS_App.StatusDecodeRow state01 = getState(currState, "PRINTER");
if (state01 != null)
{
hfCode01.Value = state01.Code;
hfCss01.Value = state01.Css;
hfStat01.Value = state01.Descript;
}
DS_App.StatusDecodeRow state02 = getState(currState, "NC_MACHINE");
if (state02 != null)
{
hfCode02.Value = state02.Code;
hfCss02.Value = state02.Css;
hfStat02.Value = state02.Descript;
}
DS_App.StatusDecodeRow state03 = getState(currState, "UNLOADER");
if (state03 != null)
{
hfCode03.Value = state03.Code;
hfCss03.Value = state03.Css;
hfStat03.Value = state03.Descript;
}
icnLiveOk.Visible = false;
icnLiveKo.Visible = false;
if (ComLib.getMachLiveStatus(currMachine))
{
icnLiveOk.Visible = true;
}
else
{
icnLiveKo.Visible = true;
}
}
//upnlTitle.Update();
}
#endregion Public Methods
#region Protected Methods
protected void ddlMachine_SelectedIndexChanged(object sender, EventArgs e)
{
currMachine = ddlMachine.SelectedValue;
}
protected void lbtReset_Click(object sender, EventArgs e)
{
Response.Redirect(currPage);
}
protected void Page_Load(object sender, EventArgs e)
{
hfMachine.Value = currMachine;
checkVisibility();
lbtReset.DataBind();
if (!Page.IsPostBack)
{
setTimer();
doUpdate();
}
}
protected void timerLoad_Tick(object sender, EventArgs e)
{
doUpdate();
}
#endregion Protected Methods
#region Private Methods
private void checkVisibility()
@@ -107,95 +195,16 @@ namespace NKC_WF.WebUserControls
return thisState;
}
/// <summary>
/// imposta il tempo di scadenza del timer x il refresh del componente
/// </summary>
private void setTimer()
{
int timer = memLayer.ML.CRI("timerStatus");
timer = timer > 0 ? timer : 5000;
timerLoad.Interval = timer;
}
#endregion Private Methods
#region Protected Methods
protected void ddlMachine_SelectedIndexChanged(object sender, EventArgs e)
{
currMachine = ddlMachine.SelectedValue;
}
protected void lbtReset_Click(object sender, EventArgs e)
{
Response.Redirect(currPage);
}
protected void Page_Load(object sender, EventArgs e)
{
hfMachine.Value = currMachine;
checkVisibility();
lbtReset.DataBind();
if (!Page.IsPostBack)
{
//// timer base x 1.5
//timerLoad.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms") * 15 / 10;
doUpdate();
}
}
protected void timerLoad_Tick(object sender, EventArgs e)
{
doUpdate();
}
#endregion Protected Methods
#region Public Methods
public void doUpdate()
{
// verifico status delle 3 parti e mostro relativo semaforo...
hfCode01.Value = "00";
hfCss01.Value = "secondary";
hfStat01.Value = "UNKNOWN";
hfCode02.Value = "00";
hfCss02.Value = "secondary";
hfStat02.Value = "UNKNOWN";
hfCode03.Value = "00";
hfCss03.Value = "secondary";
hfStat03.Value = "UNKNOWN";
// leggo da redis lo status
var currState = ComLib.prodMachStateDataGet(currMachine);
// traduco!
DS_App.StatusDecodeRow state01 = getState(currState, "PRINTER");
if (state01 != null)
{
hfCode01.Value = state01.Code;
hfCss01.Value = state01.Css;
hfStat01.Value = state01.Descript;
}
DS_App.StatusDecodeRow state02 = getState(currState, "NC_MACHINE");
if (state02 != null)
{
hfCode02.Value = state02.Code;
hfCss02.Value = state02.Css;
hfStat02.Value = state02.Descript;
}
DS_App.StatusDecodeRow state03 = getState(currState, "UNLOADER");
if (state03 != null)
{
hfCode03.Value = state03.Code;
hfCss03.Value = state03.Css;
hfStat03.Value = state03.Descript;
}
icnLiveOk.Visible = false;
icnLiveKo.Visible = false;
if (ComLib.getMachLiveStatus(currMachine))
{
icnLiveOk.Visible = true;
}
else
{
icnLiveKo.Visible = true;
}
}
#endregion Public Methods
}
}
+9
View File
@@ -193,5 +193,14 @@ namespace NKC_WF.WebUserControls
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl icnLiveKo;
/// <summary>
/// lblUpdated control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblUpdated;
}
}
@@ -14,15 +14,6 @@
</div>
<script type="text/javascript">
//var prm = Sys.WebForms.PageRequestManager.getInstance();
//prm.add_pageLoaded(pageLoaded);
//function pageLoaded(sender, args) {
// console.log('pageLoaded!');
// // chiamo recupero dati + plot della TS e dell'Histogram
// plotTS();
//}
// funzione eseguita se successo al caricamento
function OnSuccess_(reponse) {
+26 -9
View File
@@ -127,6 +127,8 @@ namespace NKC_WF.WebUserControls
{
resetInput();
resetMessage();
setTimer();
test4reload();
}
else if (string.IsNullOrEmpty(inputAcquired))
{
@@ -147,14 +149,7 @@ namespace NKC_WF.WebUserControls
protected void UiTimer_Tick(object sender, EventArgs e)
{
// controllo, se ultima operazione > smartForceReloadPagina_ms --> reload!
var tsLastUpdate = DateTime.Now.Subtract(lastDtInput);
if (tsLastUpdate.TotalMilliseconds > memLayer.ML.confReadInt("smartForceReloadPagina_ms"))
{
lgInfo($"cmp_barcode | Reload page for timeout: {tsLastUpdate.TotalSeconds} sec from last update");
inputAcquired = "##";
Response.Redirect(Request.RawUrl);
}
test4reload();
}
#endregion Protected Methods
@@ -182,10 +177,32 @@ namespace NKC_WF.WebUserControls
{
resetInput();
}
}
}
resetInput();
}
/// <summary>
/// imposta il tempo di scadenza del timer x il refresh del componente
/// </summary>
private void setTimer()
{
int timer = memLayer.ML.CRI("timerBarcode");
timer = timer > 0 ? timer : 10000;
UiTimer.Interval = timer;
}
private void test4reload()
{
// controllo, se ultima operazione > smartForceReloadPagina_ms --> reload!
var tsLastUpdate = DateTime.Now.Subtract(lastDtInput);
if (tsLastUpdate.TotalMilliseconds > memLayer.ML.CRI("smartForceReloadPagina_ms"))
{
lgInfo($"cmp_barcode | Reload page for timeout: {tsLastUpdate.TotalSeconds} sec from last update");
inputAcquired = "##";
Response.Redirect(Request.RawUrl);
}
}
#endregion Private Methods
}
}
@@ -18,6 +18,15 @@
</asp:LinkButton>
</div>
<div class="col-4"></div>
<div id="divError" runat="server" class="col-12 alert alert-warning" visible="false">
<div class="fs-2 text-danger">
<asp:Label ID="lblError" runat="server" CssClass="font-weight-bold" />
</div>
<div class="small text-danger">
<asp:Label ID="lblErrorDetail" runat="server" CssClass="font-weight-bold" />
</div>
</div>
</div>
</div>
<div class="card-body p-1">
@@ -331,6 +331,7 @@ namespace NKC_WF.WebUserControls
protected void lbtBalance_Click(object sender, EventArgs e)
{
divError.Visible = false;
// imposto la % secondo numero di abilitati...
Ratio01 = enable01 ? (double)(100 / numEnabled) / 100 : 0;
Ratio02 = enable02 ? (double)(100 / numEnabled) / 100 : 0;
@@ -421,6 +422,7 @@ namespace NKC_WF.WebUserControls
fixRatio();
checkDisplayMode();
fixEnabled();
divError.Visible = false;
}
cmp_orderExtListNE01.eh_doRefresh += Cmp_orderExtListNE01_eh_doRefresh;
cmp_orderExtListNE02.eh_doRefresh += Cmp_orderExtListNE02_eh_doRefresh;
@@ -830,7 +832,8 @@ namespace NKC_WF.WebUserControls
{
RawList.Add(item.OrdID, item.EstProcTime);
}
Log.Instance.Trace($"Rebalance | S02 | listOrders.count: {listOrders.Count}");
int numOrdOrig = listOrders.Count;
Log.Instance.Trace($"Rebalance | S02 | listOrders.count: {numOrdOrig}");
// ordino la lista x processing successivo
OrderedList = RawList.OrderBy(x => x.Value).ToDictionary(t => t.Key, t => t.Value);
// inizio immaginando di usare TUTTI gli ordini
@@ -956,65 +959,78 @@ namespace NKC_WF.WebUserControls
{
Log.Instance.Error($"Exception durante rebalance 01:{Environment.NewLine}{exc}");
}
// check sul num di spostamenti1
int numMove = 0;
int numOk = 0;
Log.Instance.Trace("Rebalance | Starting final stage (DB modifications)");
try
// 2024.09.20: controllo che il numero ordini torni o LO SEGNALO come errore...
int numAssigned = SetNe01.OrderSet.Count + SetNe02.OrderSet.Count + SetNe03.OrderSet.Count;
if (numAssigned != numOrdOrig)
{
// riorganizzo tabOrders...
foreach (var orderItem in TabOrders)
divError.Visible = true;
Log.Instance.Error($"Error during rebalance | numOrdOrig: {numOrdOrig} | numAssigned: {numAssigned}");
lblError.Text = traduci("ERR_Rebalance01");
lblErrorDetail.Text = $"{traduci("ERR_Rebalance02")} | # Orig: {numOrdOrig} | # Assigned: {numAssigned}";
}
else
{
divError.Visible = false;
// check sul num di spostamenti1
int numMove = 0;
int numOk = 0;
Log.Instance.Trace("Rebalance | Starting final stage (DB modifications)");
try
{
if (SetNe01.OrderSet.ContainsKey(orderItem.OrdID))
// riorganizzo tabOrders...
foreach (var orderItem in TabOrders)
{
if (orderItem.BatchID != cmp_orderExtListNE01.BatchId)
if (SetNe01.OrderSet.ContainsKey(orderItem.OrdID))
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE01.BatchId);
numMove++;
if (orderItem.BatchID != cmp_orderExtListNE01.BatchId)
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE01.BatchId);
numMove++;
}
else
{
numOk++;
}
}
else
if (SetNe02.OrderSet.ContainsKey(orderItem.OrdID))
{
numOk++;
if (orderItem.BatchID != cmp_orderExtListNE02.BatchId)
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE02.BatchId);
numMove++;
}
else
{
numOk++;
}
}
}
if (SetNe02.OrderSet.ContainsKey(orderItem.OrdID))
{
if (orderItem.BatchID != cmp_orderExtListNE02.BatchId)
if (SetNe03.OrderSet.ContainsKey(orderItem.OrdID))
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE02.BatchId);
numMove++;
}
else
{
numOk++;
}
}
if (SetNe03.OrderSet.ContainsKey(orderItem.OrdID))
{
if (orderItem.BatchID != cmp_orderExtListNE03.BatchId)
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE03.BatchId);
numMove++;
}
else
{
numOk++;
if (orderItem.BatchID != cmp_orderExtListNE03.BatchId)
{
DLMan.taOLT.updateBatch(orderItem.BatchID, orderItem.OrdID, cmp_orderExtListNE03.BatchId);
numMove++;
}
else
{
numOk++;
}
}
}
}
catch (Exception exc)
{
Log.Instance.Error($"Exception durante rebalance 02:{Environment.NewLine}{exc}");
}
answ = listOrders.Count > 0;
Log.Instance.Trace($"Final check | S14 | answ: {answ} | listOrders.Count: {listOrders.Count} | numMove: {numMove} | numOk: {numOk}");
// salvo tempo calcolo
stopWatch.Stop();
var elapsTime = stopWatch.Elapsed;
Log.Instance.Info($"Rebalance executed | R01: {Ratio01:P1}/{SetNe01.ActualValue / FullSet.ActualValue:P1} | R02: {Ratio02:P1}/{SetNe02.ActualValue / FullSet.ActualValue:P1} | R03: {Ratio03:P1}/{SetNe03.ActualValue / FullSet.ActualValue:P1} | maxDepth: {maxDepth} | elapsed ms: {elapsTime.TotalMilliseconds:N1}");
// resetto batch ordini...
ComLib.OrdersExtResetCache();
}
catch (Exception exc)
{
Log.Instance.Error($"Exception durante rebalance 02:{Environment.NewLine}{exc}");
}
answ = listOrders.Count > 0;
Log.Instance.Trace($"Final check | S14 | answ: {answ} | listOrders.Count: {listOrders.Count} | numMove: {numMove} | numOk: {numOk}");
// salvo tempo calcolo
stopWatch.Stop();
var elapsTime = stopWatch.Elapsed;
Log.Instance.Info($"Rebalance executed | R01: {Ratio01:P1}/{SetNe01.ActualValue / FullSet.ActualValue:P1} | R02: {Ratio02:P1}/{SetNe02.ActualValue / FullSet.ActualValue:P1} | R03: {Ratio03:P1}/{SetNe03.ActualValue / FullSet.ActualValue:P1} | maxDepth: {maxDepth} | elapsed ms: {elapsTime.TotalMilliseconds:N1}");
// resetto batch ordini...
ComLib.OrdersExtResetCache();
cmp_orderExtListNE01.doUpdate();
cmp_orderExtListNE02.doUpdate();
cmp_orderExtListNE03.doUpdate();
@@ -77,6 +77,33 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtBalance;
/// <summary>
/// divError control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divError;
/// <summary>
/// lblError control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblError;
/// <summary>
/// lblErrorDetail control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblErrorDetail;
/// <summary>
/// divHeadNe01 control.
/// </summary>
+1 -1
View File
@@ -125,7 +125,7 @@
</Columns>
</asp:GridView>
<asp:HiddenField ID="hfDeleteEnabled" runat="server" />
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatus" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
<asp:ObjectDataSource ID="ods" runat="server" OldValuesParameterFormatString="original_{0}" SelectMethod="getByStatusLight" TypeName="AppData.DS_AppTableAdapters.BatchListTableAdapter" DeleteMethod="deleteTree" FilterExpression="Status <> 5">
<SelectParameters>
<asp:ControlParameter ControlID="ddlStatus" DefaultValue="-1" Name="Status" PropertyName="SelectedValue" Type="Int32" />
<asp:SessionParameter Name="SearchVal" SessionField="valoreSearch" Type="String" DefaultValue="" />
@@ -466,6 +466,17 @@ namespace NKC_WF.WebUserControls
private void checkFixOds()
{
// sistemo tipo di ODS dato config...
if (memLayer.ML.CRB("batchListUseStoredLight"))
{
ods.SelectMethod = "getByStatusLight";
}
else
{
ods.SelectMethod = "getByStatus";
}
//ods.SelectMethod=
string isPartVal = "";
switch (listMode)
{
+3 -3
View File
@@ -1,7 +1,7 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_footer.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_footer" %>
<footer class="fixed-bottom bg-dark text-light small textCondens p-1">
<div class="container-flow px-1">
<asp:UpdatePanel runat="server" ID="upnlFooter" UpdateMode="Conditional">
<asp:UpdatePanel runat="server" ID="upnlFooter" UpdateMode="Conditional" ChildrenAsTriggers="true">
<ContentTemplate>
<div class="d-flex justify-content-between">
<div class="px-1">
@@ -16,7 +16,7 @@
<asp:Label runat="server" ID="lblApp" Text="." />
</div>
<div class="px-1">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="10">
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="5">
<ProgressTemplate>
<i class="fa fa-circle-o-notch fa-spin fa-fw text-primary" aria-hidden="true"></i>
<i class="fa fa-circle-o-notch fa-spin fa-fw text-info" aria-hidden="true"></i>
@@ -27,7 +27,7 @@
</div>
</div>
</div>
<asp:Timer ID="Timer1" runat="server" Interval="60000">
<asp:Timer ID="Timer1" runat="server" Interval="1000" OnTick="Timer1_Tick">
</asp:Timer>
</ContentTemplate>
</asp:UpdatePanel>
+2 -2
View File
@@ -26,8 +26,8 @@ namespace NKC_WF.WebUserControls
/// </summary>
private void setTimer()
{
Timer1.Tick += Timer1_Tick;
Timer1.Interval = memLayer.ML.confReadInt("intUpdatePagina_ms");
int intUpdatePagina_ms = memLayer.ML.CRI("intUpdatePagina_ms");
Timer1.Interval = intUpdatePagina_ms;
}
#endregion Private Methods
@@ -32,7 +32,7 @@
<ItemTemplate>
<div class="text-left">
<asp:Label ID="lblPackListID" runat="server" Text='<%# Bind("PackListID") %>' />
<asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
<asp:HyperLink ID="hlShowMissing" runat="server" Target="_blank" NavigateUrl='<%# $"~/site/PartMIA?PLID={Eval("PackListID")}" %>' CssClass="btn btn-sm btn-warning" ToolTip='<%# traduci("PartMIA") %>' Visible='<%# showFull && showPartMIA(Eval("PackListID")) %>'><i class="fa fa-bug" aria-hidden="true"></i></asp:HyperLink>
</div>
</ItemTemplate>
@@ -5,25 +5,36 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_kitReqRunning : BaseUserControl
{
protected void Page_Load(object sender, EventArgs e)
#region Public Properties
public bool enableSuspend
{
if (!Page.IsPostBack)
get
{
fixVisibility();
bool answ = false;
bool.TryParse(hfEnableSuspend.Value, out answ);
return answ;
}
set
{
hfEnableSuspend.Value = value.ToString();
grView.DataBind();
}
}
private void fixVisibility()
public bool showFull
{
cmp_KR_cart.Visible = (grView.SelectedIndex >= 0);
divHeader.Visible = showTitle;
}
internal void doUpdate()
{
grView.DataBind();
fixVisibility();
cmp_KR_cart.doUpdate();
get
{
bool answ = false;
bool.TryParse(hfShowFull.Value, out answ);
return answ;
}
set
{
hfShowFull.Value = value.ToString();
grView.DataBind();
}
}
public bool showTitle
@@ -40,34 +51,45 @@ namespace NKC_WF.WebUserControls
fixVisibility();
}
}
public bool showFull
#endregion Public Properties
#region Public Methods
/// <summary>
/// Verifica se sia da mostrare pagina MissingInAction
/// </summary>
public bool showPartMIA(object plIdRaw)
{
get
bool answ = false;
int plID = 0;
if (int.TryParse($"{plIdRaw}", out plID))
{
bool answ = false;
bool.TryParse(hfShowFull.Value, out answ);
return answ;
}
set
{
hfShowFull.Value = value.ToString();
grView.DataBind();
try
{
answ = DLMan.taISD.getMissingByPLID(plID).Count > 0;
}
catch
{ }
}
return answ;
}
public bool enableSuspend
#endregion Public Methods
#region Internal Methods
internal void doUpdate()
{
get
{
bool answ = false;
bool.TryParse(hfEnableSuspend.Value, out answ);
return answ;
}
set
{
hfEnableSuspend.Value = value.ToString();
grView.DataBind();
}
grView.DataBind();
fixVisibility();
cmp_KR_cart.doUpdate();
}
#endregion Internal Methods
#region Protected Methods
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
int PackListId = 0;
@@ -76,6 +98,7 @@ namespace NKC_WF.WebUserControls
cmp_KR_cart.PackListID = PackListId;
cmp_KR_cart.Visible = true;
}
/// <summary>
/// comando reset
/// </summary>
@@ -108,5 +131,25 @@ namespace NKC_WF.WebUserControls
raiseEvent();
}
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
fixVisibility();
}
}
#endregion Protected Methods
#region Private Methods
private void fixVisibility()
{
cmp_KR_cart.Visible = (grView.SelectedIndex >= 0);
divHeader.Visible = showTitle;
}
#endregion Private Methods
}
}
+26 -26
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
@@ -15,65 +15,65 @@ namespace NKC_WF.WebUserControls
{
/// <summary>
/// Controllo divHeader.
/// divHeader control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divHeader;
/// <summary>
/// Controllo hfShowTitle.
/// hfShowTitle control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowTitle;
/// <summary>
/// Controllo grView.
/// grView control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.GridView grView;
/// <summary>
/// Controllo odsKit.
/// odsKit control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource odsKit;
/// <summary>
/// Controllo hfShowFull.
/// hfShowFull control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfShowFull;
/// <summary>
/// Controllo hfEnableSuspend.
/// hfEnableSuspend control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfEnableSuspend;
/// <summary>
/// Controllo cmp_KR_cart.
/// cmp_KR_cart control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_KR_cart cmp_KR_cart;
}
@@ -4,10 +4,11 @@ using SteamWare;
using System;
using System.Data;
using System.Linq;
using System.Web.WebPages;
namespace NKC_WF.WebUserControls
{
public partial class cmp_kittingSmart : BaseUserControl
public partial class cmp_kittingSmart : BaseUserControl, IDisposable
{
#region Public Properties
@@ -47,6 +48,19 @@ namespace NKC_WF.WebUserControls
#endregion Public Properties
#region Public Methods
public override void Dispose()
{
cmp_barcode.eh_doRefresh -= Cmp_barcode_eh_doRefresh;
cmp_barcode.eh_doReset -= Cmp_barcode_eh_doReset;
cmp_KS_BinCart.eh_doRefresh -= cmp_KS_BinCart_eh_doRefresh;
cmp_KS_OtherItemsCart.eh_doRefresh -= cmp_KS_OtherItemsCart_eh_doRefresh;
cmp_KS_Items.eh_doRefresh -= cmp_KS_Items_eh_doRefresh;
}
#endregion Public Methods
#region Protected Properties
protected DS_App.BinsDataTable currBinTab
@@ -330,6 +344,7 @@ namespace NKC_WF.WebUserControls
DS_App.ItemListDataTable tabItem = null;
DataLayer DLMan = new DataLayer();
divInfo.Visible = false;
divError.Visible = false;
// processo suggerimenti x ITEM / cart / bin dato suo RawData (Dtmx) e Cod univoco (intero)
switch (tipoCod)
{
@@ -392,7 +407,7 @@ namespace NKC_WF.WebUserControls
if (lastObject == rawData)
{
// --> metto cart in scarico e registro LOG come se avesse
// appena letto 1:1 ogni Dtmx
// appena letto 1:1 ogni Dtmx
DLMan.taPLog.closeCart(codeInt);
lgInfo($"cmp_kittingSmart | taPLog.closeCart | codeInt: {codeInt} | rawData: {rawData}");
// mostro che ho fatto
@@ -430,7 +445,7 @@ namespace NKC_WF.WebUserControls
if (lastObject == rawData)
{
// --> metto cart in scarico e registro LOG come se
// avesse appena letto 1:1 ogni Dtmx
// avesse appena letto 1:1 ogni Dtmx
DLMan.taPLog.acquireCart(rawData, currIpAddress, user_std.UtSn.userNameAD);
lgInfo($"cmp_kittingSmart | taPLog.acquireCart | KittingStart = GETDATE() | rawData: {rawData} | UserName: {user_std.UtSn.userNameAD} | currIpAddress: {currIpAddress}");
displInfo($"OK: CART acquired {rawData} - item confirmed");
@@ -1,4 +1,5 @@
using SteamWare;
using NKC_SDK;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -75,7 +76,16 @@ namespace NKC_WF.WebUserControls
set
{
hfShowFull.Value = value.ToString();
grView.DataBind();
try
{
grView.DataBind();
}
catch (Exception exc)
{
lgError($"Eccezione durante cpm_partMIA_byPLID.showFull{Environment.NewLine}{exc}");
// rimando a pagina
Response.Redirect(currPage);
}
}
}
@@ -1,13 +1,11 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_reportSelector.ascx.cs" Inherits="NKC_WF.WebUserControls.cmp_reportSelector" %>
<ul class="nav nav-pills nav-justified">
<li class="nav-item">
<li class="nav-item px-2">
<asp:LinkButton runat="server" ID="lbtBatchPreview" CssClass="btn btn-block btn-outline-primary" OnClick="lbtBatchPreview_Click"><%: traduci("RepBatchPreview") %></asp:LinkButton>
</li>
<li class="nav-item mx-2">
<asp:LinkButton runat="server" ID="lbtUnloadPart" CssClass="btn btn-block btn-outline-primary" OnClick="lbtUnloadPart_Click"><%: traduci("RepUnloadPart") %></asp:LinkButton>
</li>
<li class="nav-item">
<li class="nav-item px-2">
<asp:LinkButton runat="server" ID="lbtDayStats" CssClass="btn btn-block btn-outline-primary" OnClick="lbtDailyStats_Click"><%: traduci("RepDayStats") %></asp:LinkButton>
</li>
</ul>
@@ -10,12 +10,6 @@ namespace NKC_WF.WebUserControls
{
public partial class cmp_reportSelector : BaseUserControl
{
#region Protected Properties
protected ReportType _selReport { get; set; } = ReportType.ND;
#endregion Protected Properties
#region Public Properties
public ReportType SelReport
@@ -34,57 +28,47 @@ namespace NKC_WF.WebUserControls
#endregion Public Properties
#region Protected Properties
protected ReportType _selReport { get; set; } = ReportType.ND;
#endregion Protected Properties
#region Protected Methods
protected void lbtBatchPreview_Click(object sender, EventArgs e)
{
Response.Redirect("PlannerReportsBatchStats");
}
protected void lbtDailyStats_Click(object sender, EventArgs e)
{
Response.Redirect("PlannerReportsDailyStats");
}
protected void Page_Load(object sender, EventArgs e)
{
if (currPage.Contains("PlannerReportsBatchStats"))
{
lbtBatchPreview.CssClass = "btn btn-block btn-primary";
}
else if (currPage.Contains("PlannerReportsDailyStats"))
{
lbtDayStats.CssClass = "btn btn-block btn-primary";
}
}
#endregion Protected Methods
#region Private Methods
private void updateDisplay()
{
string baseCss = "btn btn-block btn-outline-primary";
lbtBatchPreview.CssClass = baseCss;
lbtUnloadPart.CssClass = baseCss;
lbtDayStats.CssClass = baseCss;
switch (_selReport)
{
case ReportType.BatchStats:
lbtBatchPreview.CssClass = "btn btn-block btn-primary";
break;
case ReportType.BatchUnloadPreview:
lbtUnloadPart.CssClass = "btn btn-block btn-primary";
break;
case ReportType.DailyReport:
lbtDayStats.CssClass = "btn btn-block btn-primary";
break;
case ReportType.ND:
default:
break;
}
}
#endregion Private Methods
#region Protected Methods
protected void lbtBatchPreview_Click(object sender, EventArgs e)
{
SelReport = ReportType.BatchStats;
}
protected void lbtDailyStats_Click(object sender, EventArgs e)
{
SelReport = ReportType.DailyReport;
}
protected void lbtUnloadPart_Click(object sender, EventArgs e)
{
SelReport = ReportType.BatchUnloadPreview;
}
protected void Page_Load(object sender, EventArgs e)
{
}
#endregion Protected Methods
}
}
@@ -23,15 +23,6 @@ namespace NKC_WF.WebUserControls
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtBatchPreview;
/// <summary>
/// lbtUnloadPart control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtUnloadPart;
/// <summary>
/// lbtDayStats control.
/// </summary>
+19 -7
View File
@@ -5,17 +5,16 @@
<asp:FormView ID="frmView" runat="server" DataSourceID="ods" DataKeyNames="ItemID" Width="100%">
<ItemTemplate>
<div class="row text-center" style="font-size: 1.5em;">
<div class="col-md-2">
<asp:Label ID="ItemExtCodeLabel" runat="server" CssClass="font-weight-bold" Text='<%# Eval("ItemExtCode") %>' />
<asp:Label ID="ItemQtyLabel" runat="server" Text='<%# Eval("ItemQty"," x {0}") %>' CssClass="font-weight-bold" />
<div class="row text-center">
<div class="col-md-2 fs-2">
<asp:Label ID="ItemExtCodeLabel" runat="server" CssClass="font-weight-bold" Text='<%# Eval("ItemExtCode") %>' /><small>&nbsp;&times;&nbsp;</small><asp:Label ID="ItemQtyLabel" runat="server" Text='<%# Eval("ItemQty") %>' CssClass="font-weight-bold" />
</div>
<div class="col-md-8 textCondens">
<div class="col-md-8 textCondens fs-4">
<asp:Label ID="ItemDescLabel" runat="server" Text='<%# Eval("ItemDesc") %>' />
|
<asp:Label ID="MatDescLabel" runat="server" Text='<%# $"{Eval("MatExtCode")}: {Eval("MatDesc")}" %>' />
</div>
<div class="col-md-2">
<div class="col-md-2 fs-2">
<asp:Label ID="MatExtCodeLabel" runat="server" CssClass="font-weight-bold" Text='<%# Eval("DueDate","{0:MMM dd yyyy}") %>' />
</div>
</div>
@@ -37,6 +36,19 @@
<asp:Label ID="BinDtmxLabel" runat="server" Text='<%# Eval("BinDtmx") %>' />
</div>
</div>
<div class="row">
<div class="col-md-4">
<asp:Label CssClass="fs-3" ID="lblPlaceCod" runat="server"><i class="fa fa-industry" aria-hidden="true"></i> <%# Eval("PlaceCod") %></asp:Label>
</div>
<div class="col-md-8">
<div>
<asp:Label CssClass="fs-5" ID="lblWrkEnd" runat="server"><i class="fa fa-scissors" aria-hidden="true"></i> <%# Eval("WrkEnd","{0:yyyy-MM-dd}") %> <small><%# Eval("WrkEnd","{0:ddd hh:mm:ss tt}") %></small></asp:Label>
</div>
<div>
<asp:Label CssClass="fs-5" ID="lblUnlEnd" runat="server"><i class="fa fa-download" aria-hidden="true"></i> <%# Eval("UnlEnd","{0:yyyy-MM-dd}") %> <small><%# Eval("UnlEnd","{0:ddd hh:mm:ss tt}") %></small></asp:Label>
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<asp:Image runat="server" ID="imgPart" CssClass="img-fluid" ImageUrl='<%# $"~/PartsImg/{Eval("ItemExtCode")}.png" %>' />
@@ -44,7 +56,7 @@
</div>
<div class="row my-2">
<div class="col-12">
<asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' OnClick="lbtSetScrap_Click"><%# traduci("SetScrap") %> <i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
<asp:LinkButton ID="lbtSetScrap" runat="server" CausesValidation="False" CommandArgument='<%# Eval("ItemID") %>' CommandName="Select" CssClass="btn btn-lg btn-block btn-danger textCondens px-0" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmSendScrap") %>' OnClick="lbtSetScrap_Click"><%# traduci("SetScrap") %> <i class="fa fa-recycle" aria-hidden="true"></i></asp:LinkButton>
</div>
</div>
</ItemTemplate>
+17 -17
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.WebUserControls
@@ -15,38 +15,38 @@ namespace NKC_WF.WebUserControls
{
/// <summary>
/// Controllo frmView.
/// frmView control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.FormView frmView;
/// <summary>
/// Controllo hfImgBasePath.
/// hfImgBasePath control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfImgBasePath;
/// <summary>
/// Controllo ods.
/// ods control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.ObjectDataSource ods;
/// <summary>
/// Controllo hfItemDtmx.
/// hfItemDtmx control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfItemDtmx;
}
+44 -32
View File
@@ -5,76 +5,88 @@
<package id="Antlr" version="3.5.0.2" targetFramework="net462" />
<package id="AspNet.ScriptManager.bootstrap" version="4.6.0" targetFramework="net462" />
<package id="AspNet.ScriptManager.jQuery" version="3.6.0" targetFramework="net462" />
<package id="AWSSDK.Core" version="3.7.304.8" targetFramework="net462" />
<package id="AWSSDK.SecurityToken" version="3.7.300.99" targetFramework="net462" />
<package id="bootstrap" version="4.6.0" targetFramework="net462" />
<package id="Chart.js" version="2.9.3" targetFramework="net462" />
<package id="Crc32C.NET" version="1.0.5.0" targetFramework="net462" />
<package id="Crc32.NET" version="1.2.0" targetFramework="net462" />
<package id="DnsClient" version="1.7.0" 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" />
<package id="IronSnappy" version="1.3.1" targetFramework="net462" />
<package id="jQuery" version="3.6.0" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls.Core" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.FriendlyUrls.Core.it" version="1.0.2" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc.it" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor" version="3.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Mvc.it" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Razor" version="3.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.ScriptManager.MSAjax" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.ScriptManager.WebForms" version="5.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.SessionState.SessionStateModule" version="1.1.0" targetFramework="net462" />
<package id="Microsoft.AspNet.SessionState.SessionStateModule" version="2.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.it" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.Web.Optimization.WebForms" version="1.1.3" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client.it" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core.it" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost.it" version="5.2.9" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.2.9" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.NetAnalyzers" version="6.0.0" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.AspNet.WebApi" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Client.it" version="6.0.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.Core.it" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebApi.WebHost.it" version="5.3.0" targetFramework="net462" />
<package id="Microsoft.AspNet.WebPages" version="3.3.0" targetFramework="net462" />
<package id="Microsoft.Bcl.AsyncInterfaces" version="8.0.0" targetFramework="net462" />
<package id="Microsoft.CodeAnalysis.NetAnalyzers" version="8.0.0" targetFramework="net462" developmentDependency="true" />
<package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="3.6.0" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="6.0.6" targetFramework="net462" />
<package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
<package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.1" targetFramework="net462" />
<package id="Microsoft.Extensions.Logging.Abstractions" version="8.0.1" targetFramework="net462" />
<package id="Microsoft.NETCore.Platforms" version="7.0.4" targetFramework="net462" />
<package id="Microsoft.Web.Infrastructure" version="2.0.0" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="4.0.1" targetFramework="net462" />
<package id="Microsoft.Web.RedisSessionStateProvider" version="5.0.4" targetFramework="net462" />
<package id="Modernizr" version="2.8.3" targetFramework="net462" />
<package id="Moment.js" version="2.29.1" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.15.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.3.0" targetFramework="net462" />
<package id="MongoDB.Bson" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Driver" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Driver.Core" version="2.25.0" targetFramework="net462" />
<package id="MongoDB.Libmongocrypt" version="1.9.0" targetFramework="net462" />
<package id="NETStandard.Library" version="2.0.3" targetFramework="net462" />
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
<package id="NLog" version="5.2.4" targetFramework="net462" />
<package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
<package id="NLog" version="5.3.2" targetFramework="net462" />
<package id="PDFsharp" version="1.50.5147" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.2" targetFramework="net462" />
<package id="Pipelines.Sockets.Unofficial" version="2.2.8" targetFramework="net462" />
<package id="popper.js" version="1.16.1" targetFramework="net462" />
<package id="SharpCompress" version="0.32.2" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.0" targetFramework="net462" />
<package id="Snappy.NET" version="1.1.1.8" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.6.70" targetFramework="net462" />
<package id="SharpCompress" version="0.37.2" targetFramework="net462" />
<package id="SharpZipLib" version="1.4.2" targetFramework="net462" />
<package id="Snappier" version="1.1.6" targetFramework="net462" />
<package id="StackExchange.Redis" version="2.7.33" targetFramework="net462" />
<package id="SteamWare" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Logger" version="5.3.2311.2908" targetFramework="net462" />
<package id="SteamWare.Reports" version="5.3.2311.2908" targetFramework="net462" />
<package id="System.Buffers" version="4.5.1" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="6.0.1" targetFramework="net462" />
<package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net462" />
<package id="System.Diagnostics.PerformanceCounter" version="8.0.0" targetFramework="net462" />
<package id="System.IO.Compression" version="4.3.0" targetFramework="net462" />
<package id="System.IO.Pipelines" version="6.0.3" targetFramework="net462" />
<package id="System.IO.Pipelines" version="8.0.0" targetFramework="net462" />
<package id="System.Memory" version="4.5.5" 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="6.0.0" targetFramework="net462" />
<package id="System.Runtime.InteropServices.RuntimeInformation" version="4.3.0" targetFramework="net462" />
<package id="System.Security.AccessControl" version="6.0.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="6.0.1" targetFramework="net462" />
<package id="System.Security.Cryptography.Pkcs" version="8.0.0" targetFramework="net462" />
<package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net462" />
<package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="6.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="6.0.0" targetFramework="net462" />
<package id="System.Security.Permissions" version="8.0.0" targetFramework="net462" />
<package id="System.Security.Principal.Windows" version="5.0.0" targetFramework="net462" />
<package id="System.Text.Encoding.CodePages" version="8.0.0" targetFramework="net462" />
<package id="System.Threading.Channels" version="8.0.0" targetFramework="net462" />
<package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
<package id="WebGrease" version="1.6.0" targetFramework="net462" />
<package id="ZstdSharp.Port" version="0.8.1" targetFramework="net462" />
</packages>
+25 -16
View File
@@ -4,7 +4,7 @@ using System.Web.UI;
namespace NKC_WF.site
{
public partial class KittingSmart : BasePage
public partial class KittingSmart : BasePage, IDisposable
{
#region Public Properties
@@ -27,6 +27,30 @@ namespace NKC_WF.site
#endregion Public Properties
#region Public Methods
public override void Dispose()
{
cmp_kittingSmart.eh_doRefresh -= cmp_kittingSmart_eh_doRefresh;
}
#endregion Public Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
cmp_kittingSmart.eh_doRefresh += cmp_kittingSmart_eh_doRefresh;
cmp_kittingSmart.PlaceCod = "KIT001";
}
#endregion Protected Methods
#region Private Methods
private void cmp_kittingSmart_eh_doRefresh(object sender, EventArgs e)
@@ -57,20 +81,5 @@ namespace NKC_WF.site
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
cmp_kittingSmart.eh_doRefresh += cmp_kittingSmart_eh_doRefresh;
cmp_kittingSmart.PlaceCod = "KIT001";
}
#endregion Protected Methods
}
}
+11 -11
View File
@@ -1,10 +1,10 @@
//------------------------------------------------------------------------------
// <generato automaticamente>
// Codice generato da uno strumento.
// <auto-generated>
// This code was generated by a tool.
//
// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se
// il codice viene rigenerato.
// </generato automaticamente>
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.site
@@ -15,20 +15,20 @@ namespace NKC_WF.site
{
/// <summary>
/// Controllo hfPackListID.
/// hfPackListID control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.HiddenField hfPackListID;
/// <summary>
/// Controllo cmp_kittingSmart.
/// cmp_kittingSmart control.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_kittingSmart cmp_kittingSmart;
}
+1 -1
View File
@@ -43,6 +43,7 @@
<div class="col-8 py-0 my-0 px-0">
<asp:UpdatePanel runat="server" ID="upnlDrawings" UpdateMode="Conditional">
<ContentTemplate>
<asp:Timer ID="timerSvg" runat="server" OnTick="timerSvg_Tick"></asp:Timer>
<uc1:cmp_MU_svgViewer runat="server" ID="cmp_MU_svgViewer" />
</ContentTemplate>
</asp:UpdatePanel>
@@ -50,7 +51,6 @@
<div class="col-2 pl-0">
<asp:UpdatePanel runat="server" ID="upnlCarts" UpdateMode="Conditional">
<ContentTemplate>
<asp:Timer ID="timerSvg" runat="server" Interval="500" OnTick="timerSvg_Tick"></asp:Timer>
<uc1:cmp_MU_carts runat="server" ID="cmp_MU_carts" />
</ContentTemplate>
</asp:UpdatePanel>
+129 -110
View File
@@ -4,8 +4,81 @@ using System;
namespace NKC_WF
{
public partial class MachineUnload : BasePage
public partial class MachineUnload : BasePage, IDisposable
{
#region Public Properties
/// <summary>
/// BatchId corrente...
/// </summary>
public int BatchId
{
set
{
hfBatchID.Value = value.ToString();
ComLib.setCurrBatchId(MachineSel, value);
}
get
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
}
}
/// <summary>
/// SheetId corrente...
/// </summary>
public int SheetId
{
set
{
hfSheetID.Value = value.ToString();
ComLib.setCurrSheetId(MachineSel, value);
}
get
{
int answ = 0;
int.TryParse(hfSheetID.Value, out answ);
return answ;
}
}
/// <summary>
/// Verifica se sia da mostrare pagina MissingInAction
/// </summary>
public bool showPartMIA
{
get
{
bool answ = false;
if (BatchId > 0)
{
try
{
bool hasMIA = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
answ = hasMIA && MachineSel != "#";
}
catch
{ }
}
return answ;
}
}
#endregion Public Properties
#region Public Methods
public override void Dispose()
{
timerSvg.Tick -= timerSvg_Tick;
timerSvg.Dispose();
base.Dispose();
}
#endregion Public Methods
#region Protected Properties
protected string MachineSel
@@ -73,67 +146,68 @@ namespace NKC_WF
#endregion Protected Properties
#region Public Properties
#region Protected Methods
/// <summary>
/// BatchId corrente...
/// Incrementa counter redis
/// </summary>
public int BatchId
protected void incrNumWait()
{
set
if (numWaitSvg > 30)
{
hfBatchID.Value = value.ToString();
ComLib.setCurrBatchId(MachineSel, value);
memLayer.ML.resetRCnt(redProdReq);
Response.Redirect(Request.RawUrl);
}
get
memLayer.ML.setRCntI(redProdReq);
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
int answ = 0;
int.TryParse(hfBatchID.Value, out answ);
return answ;
((SiteMaster)this.Master).showSearch = false;
setTimer();
doUpdate();
}
}
/// <summary>
/// SheetId corrente...
/// Main SVG timer
/// </summary>
public int SheetId
/// <param name="sender"></param>
/// <param name="e"></param>
protected void timerSvg_Tick(object sender, EventArgs e)
{
set
// in base al num di sec dell'ora decido cosa aggiornare...
int counter = numWaitSvg;
// ogni x cicli resetto batch/Foglio
if (counter % 15 == 0)
{
hfSheetID.Value = value.ToString();
ComLib.setCurrSheetId(MachineSel, value);
SheetId = -3;
}
get
// ora faccio verifiche
doUpdate();
// ogni x cicli
if (counter % 5 == 0)
{
int answ = 0;
int.TryParse(hfSheetID.Value, out answ);
return answ;
cmp_MU_stats.doUpdate();
upnlStats.Update();
}
// faccio update bin/cart ogni pari/dispari...
if (counter % 2 == 0)
{
cmp_MU_carts.doUpdate();
upnlCarts.Update();
}
else
{
cmp_MU_bins.doUpdate();
upnlBins.Update();
}
incrNumWait();
}
/// <summary>
/// Verifica se sia da mostrare pagina MissingInAction
/// </summary>
public bool showPartMIA
{
get
{
bool answ = false;
if (BatchId > 0)
{
try
{
bool hasMIA = DLMan.taIL.getMissingByBatch(BatchId).Count > 0;
answ = hasMIA && MachineSel!="#";
}
catch
{ }
}
return answ;
}
}
#endregion Public Properties
#endregion Protected Methods
#region Private Methods
@@ -168,8 +242,8 @@ namespace NKC_WF
upnlTitle.Update();
}
}
// definisco se mostrare PartMIA
hlPartMIA.Visible = showPartMIA;
// definisco se mostrare PartMIA
hlPartMIA.Visible = showPartMIA;
}
/// <summary>
@@ -218,71 +292,16 @@ namespace NKC_WF
return needUpdate;
}
/// <summary>
/// imposta il tempo di scadenza del timer x il refresh del componente
/// </summary>
private void setTimer()
{
int timerSvgInt = memLayer.ML.CRI("timerUnload");
timerSvgInt = timerSvgInt > 0 ? timerSvgInt : 500;
timerSvg.Interval = timerSvgInt;
}
#endregion Private Methods
#region Protected Methods
/// <summary>
/// Incrementa counter redis
/// </summary>
protected void incrNumWait()
{
if (numWaitSvg > 30)
{
memLayer.ML.resetRCnt(redProdReq);
Response.Redirect(Request.RawUrl);
}
memLayer.ML.setRCntI(redProdReq);
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
int timerSvgInt = memLayer.ML.CRI("timerSvgInt");
timerSvgInt = timerSvgInt > 0 ? timerSvgInt : 500;
timerSvg.Interval = timerSvgInt;
}
}
/// <summary>
/// Main SVG timer
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void timerSvg_Tick(object sender, EventArgs e)
{
// in base al num di sec dell'ora decido cosa aggiornare...
int counter = numWaitSvg;
// ogni x cicli resetto batch/Foglio
if (counter % 15 == 0)
{
SheetId = -3;
}
// ora faccio verifiche
doUpdate();
// ogni x cicli
if (counter % 5 == 0)
{
cmp_MU_stats.doUpdate();
upnlStats.Update();
}
// faccio update bin/cart ogni pari/dispari...
if (counter % 2 == 0)
{
cmp_MU_carts.doUpdate();
upnlCarts.Update();
}
else
{
cmp_MU_bins.doUpdate();
upnlBins.Update();
}
incrNumWait();
}
#endregion Protected Methods
}
}
+9 -9
View File
@@ -113,6 +113,15 @@ namespace NKC_WF
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlDrawings;
/// <summary>
/// timerSvg control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.Timer timerSvg;
/// <summary>
/// cmp_MU_svgViewer control.
/// </summary>
@@ -131,15 +140,6 @@ namespace NKC_WF
/// </remarks>
protected global::System.Web.UI.UpdatePanel upnlCarts;
/// <summary>
/// timerSvg control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.Timer timerSvg;
/// <summary>
/// cmp_MU_carts control.
/// </summary>
+5 -11
View File
@@ -2,8 +2,6 @@
<%@ Register Src="~/WebUserControls/cmp_SheetsStats.ascx" TagPrefix="uc1" TagName="cmp_SheetsStats" %>
<%@ Register Src="~/WebUserControls/cmp_reportSelector.ascx" TagPrefix="uc1" TagName="cmp_reportSelector" %>
<%@ Register Src="~/WebUserControls/cmp_BatchStatsList.ascx" TagPrefix="uc1" TagName="cmp_BatchStatsList" %>
<%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="uplBody">
@@ -17,7 +15,7 @@
<div class="col-2">
<h3>Reports</h3>
</div>
<div class="col-9">
<div class="col-8">
<uc1:cmp_reportSelector runat="server" ID="cmp_reportSelector" />
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="100">
<ProgressTemplate>
@@ -27,23 +25,19 @@
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div class="col-1">
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
<div class="col-2">
</div>
</div>
</div>
<div class="card-body">
<div class="row">
<div class="col-3"></div>
<div class="col-9">
<div class="row" id="divInstruction" runat="server">
<div class="col-12">
<div class="text-info text-center">
<asp:Label runat="server" ID="lblInstruction" CssClass="alert alert-primary"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
<asp:Label runat="server" ID="lblInstruction" CssClass="alert alert-primary p-4 display-4"><i class="fa fa-arrow-up" aria-hidden="true"></i> <%# traduci("PleaseSelectReportType") %><i class="fa fa-arrow-up" aria-hidden="true"></i></asp:Label>
</div>
</div>
</div>
<uc1:cmp_SheetsStats runat="server" ID="cmp_SheetsStats" />
<uc1:cmp_BatchStatsList runat="server" ID="cmp_BatchStatsList" />
<uc1:cmp_DailyStatsList runat="server" ID="cmp_DailyStatsList" />
</div>
</div>
</div>
+43 -110
View File
@@ -13,18 +13,6 @@ namespace NKC_WF.site
{
public partial class PlannerReports : BasePage
{
#region Protected Properties
protected int savedBatchId
{
get
{
return ComLib.getCurrBatchId(PlaceCod);
}
}
#endregion Protected Properties
#region Public Properties
/// <summary>
@@ -65,102 +53,6 @@ namespace NKC_WF.site
#endregion Public Properties
#region Private Methods
private void Cmp_reportSelector_eh_doRefresh(object sender, EventArgs e)
{
// display in base al report selezionato
updateDisplay();
}
private void TryUpdateModel()
{
Thread.Sleep(50);
DateTime oggi = DateTime.Today;
// verifica se ci sia VETO x update da redis
string rawVal = memLayer.ML.getRSV(ComLib.redVetoDayStats);
if (string.IsNullOrEmpty(rawVal))
{ // effettuo calcolo statistiche
Stopwatch stopWatchLap = new Stopwatch();
stopWatchLap.Start();
// se non c'è effettua ricalcolo x i giorni necessari (da ultimo ricalcolo oppure da valore web.config)
int numDays = memLayer.ML.CRI("repNumDayPre");
// verifico ultimo record...
var tabLast = DLMan.taDayStats.getLast();
try
{
// se vuoto: 90gg
if (tabLast == null || tabLast.Count == 0)
{
numDays = 90;
}
else
{
var lastRec = tabLast[0];
// calcolo x eccesso la differenza in giorni
var dayDiff = Math.Ceiling(oggi.Subtract(lastRec.DataRif).TotalDays + 1);
int numDayLast = (int)dayDiff;
numDays = numDays > numDayLast ? numDays : numDayLast;
}
}
catch
{ }
// verifico ultimo giorno disponibile...
DateTime DateEnd = oggi.AddDays(1);
DateTime DateStart = DateEnd.AddDays(-numDays);
DLMan.taDayStats.ProductionUpdate(DateStart, DateEnd, "*", true);
int vetoRecalcMin = memLayer.ML.CRI("repVetoRecalcMin");
memLayer.ML.setRSV(ComLib.redVetoDayStats, $"Recalc Done | {DateStart} --> {DateEnd}", 60 * vetoRecalcMin);
stopWatchLap.Stop();
lgInfo($"DayStats DB ProductionUpdate: effettuato ricalcolo statistiche | periodo {DateStart} --> {DateEnd} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms | veto ricalcolo per {vetoRecalcMin} minuti");
}
}
private void updateDisplay()
{
lblInstruction.DataBind();
lblInstruction.Visible = false;
cmp_SheetsStats.Visible = false;
cmp_BatchStatsList.Visible = false;
cmp_DailyStatsList.Visible = false;
switch (cmp_reportSelector.SelReport)
{
case ReportType.BatchStats:
cmp_BatchStatsList.Visible = true;
break;
case ReportType.BatchUnloadPreview:
cmp_SheetsStats.Visible = true;
break;
case ReportType.DailyReport:
cmp_DailyStatsList.Visible = true;
break;
case ReportType.ND:
default:
lblInstruction.Visible = true;
break;
}
}
#endregion Private Methods
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
//TryUpdateModel();
cmp_reportSelector.eh_doRefresh += Cmp_reportSelector_eh_doRefresh;
}
#endregion Protected Methods
#region Public Methods
/// <summary>
@@ -180,9 +72,50 @@ namespace NKC_WF.site
#endregion Public Methods
protected void lbtRefreshData_Click(object sender, EventArgs e)
#region Protected Properties
protected int savedBatchId
{
TryUpdateModel();
get
{
return ComLib.getCurrBatchId(PlaceCod);
}
}
#endregion Protected Properties
#region Protected Methods
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
doUpdate();
}
}
#endregion Protected Methods
#region Private Methods
private void updateDisplay()
{
divInstruction.Visible = false;
cmp_SheetsStats.Visible = false;
cmp_reportSelector.Visible = false;
if (BatchId == 0)
{
lblInstruction.DataBind();
divInstruction.Visible = true;
cmp_reportSelector.Visible = true;
}
else
{
cmp_SheetsStats.Visible = true;
}
}
#endregion Private Methods
}
}
+2 -20
View File
@@ -42,13 +42,13 @@ namespace NKC_WF.site
protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
/// <summary>
/// lbtRefreshData control.
/// divInstruction control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefreshData;
protected global::System.Web.UI.HtmlControls.HtmlGenericControl divInstruction;
/// <summary>
/// lblInstruction control.
@@ -67,23 +67,5 @@ namespace NKC_WF.site
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_SheetsStats cmp_SheetsStats;
/// <summary>
/// cmp_BatchStatsList control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_BatchStatsList cmp_BatchStatsList;
/// <summary>
/// cmp_DailyStatsList control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_DailyStatsList cmp_DailyStatsList;
}
}
+43
View File
@@ -0,0 +1,43 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PlannerReportsBatchStats.aspx.cs" Inherits="NKC_WF.site.PlannerReportsBatchStats" %>
<%@ Register Src="~/WebUserControls/cmp_reportSelector.ascx" TagPrefix="uc1" TagName="cmp_reportSelector" %>
<%@ Register Src="~/WebUserControls/cmp_BatchStatsList.ascx" TagPrefix="uc1" TagName="cmp_BatchStatsList" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="uplBody">
<ContentTemplate>
<div class="my-2 mx-3">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-2">
<h3>Reports</h3>
</div>
<div class="col-9">
<uc1:cmp_reportSelector runat="server" ID="cmp_reportSelector" />
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="100">
<ProgressTemplate>
<div class="progress">
<div class="progress-bar bg-success progress-bar-striped progress-bar-animated" style="width: 70%"></div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div class="col-1">
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<uc1:cmp_BatchStatsList runat="server" ID="cmp_BatchStatsList" />
</div>
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
@@ -0,0 +1,95 @@
using AppData;
using NKC_WF.WebUserControls;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class PlannerReportsBatchStats : BasePage
{
#region Protected Properties
protected int savedBatchId
{
get
{
return ComLib.getCurrBatchId(PlaceCod);
}
}
#endregion Protected Properties
#region Protected Methods
protected void lbtRefreshData_Click(object sender, EventArgs e)
{
TryUpdateModel();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
}
}
#endregion Protected Methods
#region Private Methods
private void TryUpdateModel()
{
Thread.Sleep(50);
DateTime oggi = DateTime.Today;
// verifica se ci sia VETO x update da redis
string rawVal = memLayer.ML.getRSV(ComLib.redVetoDayStats);
if (string.IsNullOrEmpty(rawVal))
{
// effettuo calcolo statistiche
Stopwatch stopWatchLap = new Stopwatch();
stopWatchLap.Start();
// se non c'è effettua ricalcolo x i giorni necessari (da ultimo ricalcolo oppure da
// valore web.config)
int numDays = memLayer.ML.CRI("repNumDayPre");
// verifico ultimo record...
var tabLast = DLMan.taDayStats.getLast();
try
{
// se vuoto: 90gg
if (tabLast == null || tabLast.Count == 0)
{
numDays = 90;
}
else
{
var lastRec = tabLast[0];
// calcolo x eccesso la differenza in giorni
var dayDiff = Math.Ceiling(oggi.Subtract(lastRec.DataRif).TotalDays + 1);
int numDayLast = (int)dayDiff;
numDays = numDays > numDayLast ? numDays : numDayLast;
}
}
catch
{ }
// verifico ultimo giorno disponibile...
DateTime DateEnd = oggi.AddDays(1);
DateTime DateStart = DateEnd.AddDays(-numDays);
DLMan.taDayStats.ProductionUpdate(DateStart, DateEnd, "*", true);
int vetoRecalcMin = memLayer.ML.CRI("repVetoRecalcMin");
memLayer.ML.setRSV(ComLib.redVetoDayStats, $"Recalc Done | {DateStart} --> {DateEnd}", 60 * vetoRecalcMin);
stopWatchLap.Stop();
lgInfo($"DayStats DB ProductionUpdate: effettuato ricalcolo statistiche | periodo {DateStart} --> {DateEnd} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms | veto ricalcolo per {vetoRecalcMin} minuti");
}
}
#endregion Private Methods
}
}
+62
View File
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class PlannerReportsBatchStats
{
/// <summary>
/// uplBody control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel uplBody;
/// <summary>
/// cmp_reportSelector control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_reportSelector cmp_reportSelector;
/// <summary>
/// UpdateProgressDisplay control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
/// <summary>
/// lbtRefreshData control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefreshData;
/// <summary>
/// cmp_BatchStatsList control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_BatchStatsList cmp_BatchStatsList;
}
}
+42
View File
@@ -0,0 +1,42 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/Site.Master" AutoEventWireup="true" CodeBehind="PlannerReportsDailyStats.aspx.cs" Inherits="NKC_WF.site.PlannerReportsDailyStats" %>
<%@ Register Src="~/WebUserControls/cmp_reportSelector.ascx" TagPrefix="uc1" TagName="cmp_reportSelector" %>
<%@ Register Src="~/WebUserControls/cmp_DailyStatsList.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsList" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<asp:UpdatePanel runat="server" ID="uplBody">
<ContentTemplate>
<div class="my-2 mx-3">
<div class="row">
<div class="col-12">
<div class="card">
<div class="card-header">
<div class="row">
<div class="col-2">
<h3>Reports</h3>
</div>
<div class="col-9">
<uc1:cmp_reportSelector runat="server" ID="cmp_reportSelector" />
<asp:UpdateProgress ID="UpdateProgressDisplay" runat="server" DisplayAfter="100">
<ProgressTemplate>
<div class="progress">
<div class="progress-bar bg-success progress-bar-striped progress-bar-animated" style="width: 70%"></div>
</div>
</ProgressTemplate>
</asp:UpdateProgress>
</div>
<div class="col-1">
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
</div>
</div>
</div>
<div class="card-body">
<uc1:cmp_DailyStatsList runat="server" ID="cmp_DailyStatsList" />
</div>
</div>
</div>
</div>
</div>
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
@@ -0,0 +1,95 @@
using AppData;
using NKC_WF.WebUserControls;
using SteamWare;
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Threading;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class PlannerReportsDailyStats : BasePage
{
#region Protected Properties
protected int savedBatchId
{
get
{
return ComLib.getCurrBatchId(PlaceCod);
}
}
#endregion Protected Properties
#region Protected Methods
protected void lbtRefreshData_Click(object sender, EventArgs e)
{
TryUpdateModel();
}
protected void Page_Load(object sender, EventArgs e)
{
if (!Page.IsPostBack)
{
((SiteMaster)this.Master).showSearch = false;
}
}
#endregion Protected Methods
#region Private Methods
private void TryUpdateModel()
{
Thread.Sleep(50);
DateTime oggi = DateTime.Today;
// verifica se ci sia VETO x update da redis
string rawVal = memLayer.ML.getRSV(ComLib.redVetoDayStats);
if (string.IsNullOrEmpty(rawVal))
{
// effettuo calcolo statistiche
Stopwatch stopWatchLap = new Stopwatch();
stopWatchLap.Start();
// se non c'è effettua ricalcolo x i giorni necessari (da ultimo ricalcolo oppure da
// valore web.config)
int numDays = memLayer.ML.CRI("repNumDayPre");
// verifico ultimo record...
var tabLast = DLMan.taDayStats.getLast();
try
{
// se vuoto: 90gg
if (tabLast == null || tabLast.Count == 0)
{
numDays = 90;
}
else
{
var lastRec = tabLast[0];
// calcolo x eccesso la differenza in giorni
var dayDiff = Math.Ceiling(oggi.Subtract(lastRec.DataRif).TotalDays + 1);
int numDayLast = (int)dayDiff;
numDays = numDays > numDayLast ? numDays : numDayLast;
}
}
catch
{ }
// verifico ultimo giorno disponibile...
DateTime DateEnd = oggi.AddDays(1);
DateTime DateStart = DateEnd.AddDays(-numDays);
DLMan.taDayStats.ProductionUpdate(DateStart, DateEnd, "*", true);
int vetoRecalcMin = memLayer.ML.CRI("repVetoRecalcMin");
memLayer.ML.setRSV(ComLib.redVetoDayStats, $"Recalc Done | {DateStart} --> {DateEnd}", 60 * vetoRecalcMin);
stopWatchLap.Stop();
lgInfo($"DayStats DB ProductionUpdate: effettuato ricalcolo statistiche | periodo {DateStart} --> {DateEnd} | elapsed: {stopWatchLap.Elapsed.TotalMilliseconds} ms | veto ricalcolo per {vetoRecalcMin} minuti");
}
}
#endregion Private Methods
}
}
+62
View File
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class PlannerReportsDailyStats
{
/// <summary>
/// uplBody control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel uplBody;
/// <summary>
/// cmp_reportSelector control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_reportSelector cmp_reportSelector;
/// <summary>
/// UpdateProgressDisplay control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdateProgress UpdateProgressDisplay;
/// <summary>
/// lbtRefreshData control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefreshData;
/// <summary>
/// cmp_DailyStatsList control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_DailyStatsList cmp_DailyStatsList;
}
}
+22
View File
@@ -0,0 +1,22 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/SiteContent.master" AutoEventWireup="true" CodeBehind="TestChart.aspx.cs" Inherits="NKC_WF.site.TestChart" %>
<%@ Register Src="~/WebUserControls/cmp_BatchStatsPlot.ascx" TagPrefix="uc1" TagName="cmp_BatchStatsPlot" %>
<%@ Register Src="~/WebUserControls/cmp_DailyStatsPlot.ascx" TagPrefix="uc1" TagName="cmp_DailyStatsPlot" %>
<asp:Content ID="Content1" ContentPlaceHolderID="MainContent" runat="server">
<h1>Chart Js test</h1>
<asp:UpdatePanel runat="server" ID="uplBody" UpdateMode="Conditional">
<ContentTemplate>
<asp:LinkButton runat="server" ID="lbtRefreshData" CssClass="btn btn-success" OnClick="lbtRefreshData_Click"><i class="fa fa-refresh" aria-hidden="true"></i> Reload</asp:LinkButton>
<asp:DropDownList runat="server" ID="ddlChart">
<asp:ListItem Text="Graph_01" Value="1"></asp:ListItem>
<asp:ListItem Text="Graph_02" Value="2"></asp:ListItem>
<asp:ListItem Text="Graph_03" Value="3"></asp:ListItem>
</asp:DropDownList>
<uc1:cmp_BatchStatsPlot runat="server" ID="cmp_BatchStatsPlot" />
<uc1:cmp_DailyStatsPlot runat="server" ID="cmp_DailyStatsPlot" />
</ContentTemplate>
</asp:UpdatePanel>
</asp:Content>
+52
View File
@@ -0,0 +1,52 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace NKC_WF.site
{
public partial class TestChart : System.Web.UI.Page
{
protected void Page_Load(object sender, EventArgs e)
{
setGraph();
}
private void setGraph()
{
cmp_BatchStatsPlot.Visible = false;
cmp_DailyStatsPlot.Visible = false;
Random rnd = new Random();
switch (ddlChart.SelectedValue)
{
case "1":
int numRec = rnd.Next(50, 250);
cmp_BatchStatsPlot.PlotType = "Yeld";
cmp_BatchStatsPlot.ShowLast = numRec;
cmp_BatchStatsPlot.Legend = $"PROVA | {numRec} | {DateTime.Now:HH:mm:ss}";
cmp_BatchStatsPlot.Visible = true;
break;
case "2":
cmp_DailyStatsPlot.PlaceCod = "[ALL]";
cmp_DailyStatsPlot.PlotType = "OEE";
cmp_DailyStatsPlot.DateStart = DateTime.Today.AddMonths(-1);
cmp_DailyStatsPlot.DateEnd = DateTime.Today;
cmp_DailyStatsPlot.Visible = true;
break;
case "3":
break;
default:
break;
}
uplBody.Update();
}
protected void lbtRefreshData_Click(object sender, EventArgs e)
{
setGraph();
}
}
}
+62
View File
@@ -0,0 +1,62 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace NKC_WF.site
{
public partial class TestChart
{
/// <summary>
/// uplBody control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.UpdatePanel uplBody;
/// <summary>
/// lbtRefreshData control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.LinkButton lbtRefreshData;
/// <summary>
/// ddlChart control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.DropDownList ddlChart;
/// <summary>
/// cmp_BatchStatsPlot control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_BatchStatsPlot cmp_BatchStatsPlot;
/// <summary>
/// cmp_DailyStatsPlot control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::NKC_WF.WebUserControls.cmp_DailyStatsPlot cmp_DailyStatsPlot;
}
}
+1 -1
View File
@@ -4,7 +4,7 @@
<TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Version>1.1.2202.0117</Version>
<Version>1.1.2401.2516</Version>
</PropertyGroup>
<ItemGroup>
+2 -2
View File
@@ -1,6 +1,6 @@
<body>
<i>REMAN module for NKC</i>
<h4>Versione: 1.1.2202.0117</h4>
<h4>Versione: 1.1.2401.2516</h4>
<br />
Release Note:
<ul>
@@ -19,7 +19,7 @@
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/IOT" target="_blank">&copy; Egalware 2006-2022</a>
<a href="https://www.steamware.net/IOT" target="_blank">&copy; Egalware 2006-2024</a>
</div>
</div>
</body>
+1 -1
View File
@@ -1 +1 @@
1.1.2202.0117
1.1.2401.2516
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.1.2202.0117</version>
<version>1.1.2401.2516</version>
<url>https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/REMAN.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/REMAN/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>