Continuo modifiche

This commit is contained in:
Samuele Locatelli
2026-05-23 12:47:52 +02:00
parent 62847732dd
commit f21754cf5a
4 changed files with 10 additions and 7 deletions
+3 -3
View File
@@ -4,11 +4,11 @@
A collection of .NET (C#/VB) projects for industrial communication with NC controls (Fanuc, Siemens, Mitsubishi, etc.) via the Mapo Protocol.
## Build & Release
- **Toolchain**: MSBuild (`x86` target).
- **Config**: Always use `Release` configuration and `x86` platform.
- **Toolchain**: MSBuild.
- **Config**: Always use `Release` configuration.
- **Command Example**:
```powershell
& "$env:MSBUILD_PATH" "ProjectName\ProjectName.csproj" -target:Build /p:Configuration=Release /p:Platform="x86" /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m
& "$env:MSBUILD_PATH" "ProjectName\ProjectName.csproj" -target:Build /p:Configuration=Release /p:OutputPath=bin/ /nodeReuse:false /verbosity:minimal /m
```
- **NuGet**: Requires Steamware Nexus Proxy sources. Use `dotnet nuget restore` on the specific `.sln` before building.
- **Versioning**: Automated via `VersGen\VersGen.cs` and `.nuspec` updates during CI. Manual updates to `VersGen.cs` might be needed if mimicking CI.
BIN
View File
Binary file not shown.
+1
View File
@@ -1,5 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Objects;
using IOB_UT_NEXT.Services.Data;
using NLog;
using System;
+6 -4
View File
@@ -991,7 +991,6 @@ namespace IOB_WIN_FORM.Iob
{
// deserializzo...
JobTaskData jobTaskReq = JsonDeserialize<JobTaskData>(rawJob);
// processo!
var reqDict = JobTaskData.TaskDict(jobTaskReq.RawData);
if (reqDict.Count > 0)
@@ -3820,7 +3819,7 @@ namespace IOB_WIN_FORM.Iob
#region Protected Fields
protected CommunicationService commService;
protected MachineCommunicationService machineCommService;
protected MachineCommunicationService machineCommService;
#endregion Protected Fields
@@ -5068,7 +5067,8 @@ namespace IOB_WIN_FORM.Iob
}
var rawData = HttpService.CallUrlGet(url2call);
// deserializzo e recupero KVP...
var dictArtSrv = JsonConvert.DeserializeObject<Dictionary<string, string>>(rawData);
var dictArtSrv = JsonDeserialize<Dictionary<string, string>>(rawData);
// se fosse una chiamata con valore vuoto --> salvo intera tabella...
if (string.IsNullOrEmpty(value))
{
@@ -6110,6 +6110,7 @@ namespace IOB_WIN_FORM.Iob
string rawData = File.ReadAllText(recipeFile);
// deserializza file XML x recuperare righe consumo
var currRecipe = XmlDeserialize<ARecipe>(rawData);
if (currRecipe != null)
{
// recupero data-ora ricetta da campo string
@@ -8024,7 +8025,7 @@ namespace IOB_WIN_FORM.Iob
#region Private Fields
/// <summary>
/// Oggetto logger della classe
@@ -8996,6 +8997,7 @@ namespace IOB_WIN_FORM.Iob
{
// deserializzo...
JobTaskData jobTask = JsonDeserialize<JobTaskData>(rawJob);
// ora chiamo la cancellazione dei task eseguiti...
var taskDict = JobTaskData.TaskDict(jobTask.RawData);
foreach (var item in taskDict)