From 188fd448ae8e8b33e6dd777d28eab9dca312dd3a Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Sat, 1 Aug 2026 22:47:34 +0200 Subject: [PATCH] Weighing: Differentiate between scale and terminal --- Elwig/Documents/DeliveryNote.cs | 4 +-- Elwig/Helpers/Export/ElwigData.cs | 4 +-- Elwig/Helpers/Weighing/AveryEventScale.cs | 7 ++-- .../{GassnerScale.cs => GassnerEnqScale.cs} | 34 +++++++++---------- Elwig/Helpers/Weighing/ICommandScale.cs | 4 +-- Elwig/Helpers/Weighing/IScale.cs | 7 +--- Elwig/Helpers/Weighing/InvalidScale.cs | 3 +- Elwig/Helpers/Weighing/Scale.cs | 4 +-- Elwig/Helpers/Weighing/SysTecITScale.cs | 20 +++++------ Elwig/Helpers/Weighing/WeighingResult.cs | 6 ++++ Elwig/Models/Entities/DeliveryPart.cs | 7 ++-- Elwig/Services/DeliveryService.cs | 4 +-- Elwig/ViewModels/DeliveryAdminViewModel.cs | 2 +- Elwig/Windows/DeliveryAdminWindow.xaml.cs | 18 +++++----- .../WeighingTests/ScaleTestHaugsdorfDMA02.cs | 2 +- .../ScaleTestSitzendorfDMA03Baby.cs | 2 +- 16 files changed, 63 insertions(+), 65 deletions(-) rename Elwig/Helpers/Weighing/{GassnerScale.cs => GassnerEnqScale.cs} (77%) diff --git a/Elwig/Documents/DeliveryNote.cs b/Elwig/Documents/DeliveryNote.cs index a95f45f..1c50ffa 100644 --- a/Elwig/Documents/DeliveryNote.cs +++ b/Elwig/Documents/DeliveryNote.cs @@ -181,8 +181,8 @@ namespace Elwig.Documents { } } else { var info = part.WeighingInfo; - weighing.Add(Italic("Waage:")) - .Add(Normal(" " + (part.ScaleId ?? "?") + ", ")) + weighing.Add(Italic("Waage/Terminal:")) + .Add(Normal(" " + (info.ScaleId ?? "1") + "/" + (part.ScaleTerminalId ?? "?") + ", ")) .Add(Italic("ID:")) .Add(Normal(" " + (info.Id ?? "?"))); if (info.Date != null || info.Time != null) diff --git a/Elwig/Helpers/Export/ElwigData.cs b/Elwig/Helpers/Export/ElwigData.cs index f8ab3d8..32f6c83 100644 --- a/Elwig/Helpers/Export/ElwigData.cs +++ b/Elwig/Helpers/Export/ElwigData.cs @@ -951,7 +951,7 @@ namespace Elwig.Helpers.Export { if (p.Unloading != null) obj["unloading"] = p.Unloading; if (p.Temperature != null) obj["temperature"] = p.Temperature; if (p.Acid != null) obj["acid"] = p.Acid; - if (p.ScaleId != null) obj["scale_id"] = p.ScaleId; + if (p.ScaleTerminalId != null) obj["scale_terminal"] = p.ScaleTerminalId; if (p.WeighingData != null) obj["weighing_data"] = JsonNode.Parse(p.WeighingData); if (p.WeighingReason != null) obj["weighing_reason"] = p.WeighingReason; return obj; @@ -1022,7 +1022,7 @@ namespace Elwig.Helpers.Export { Unloading = p["unloading"]?.AsValue().GetValue() ?? ((p["lesewagen"]?.AsValue().GetValue() ?? false) ? DeliveryPart.Pumped : null), Temperature = p["temperature"]?.AsValue().GetValue(), Acid = p["acid"]?.AsValue().GetValue(), - ScaleId = p["scale_id"]?.AsValue().GetValue(), + ScaleTerminalId = p["scale_terminal"]?.AsValue().GetValue() ?? p["scale_id"]?.AsValue().GetValue(), WeighingData = p["weighing_data"]?.AsObject().ToJsonString(Utils.JsonOpts), WeighingReason = p["weighing_reason"]?.AsValue().GetValue(), }, createdAt == null || modifiedAt == null ? null : diff --git a/Elwig/Helpers/Weighing/AveryEventScale.cs b/Elwig/Helpers/Weighing/AveryEventScale.cs index 3458079..bc1516c 100644 --- a/Elwig/Helpers/Weighing/AveryEventScale.cs +++ b/Elwig/Helpers/Weighing/AveryEventScale.cs @@ -9,9 +9,8 @@ namespace Elwig.Helpers.Weighing { public class AveryEventScale : Scale, IEventScale, IDisposable { public string Manufacturer => "Avery"; - public int InternalScaleNr => 1; public string Model { get; private set; } - public string ScaleId { get; private set; } + public string ScaleTerminalId { get; private set; } public bool IsReady { get; private set; } public bool HasFillingClearance { get; private set; } @@ -19,13 +18,11 @@ namespace Elwig.Helpers.Weighing { private bool IsRunning = true; private readonly Thread BackgroundThread; - private readonly string Connection; public AveryEventScale(string id, string model, string cnx, string? log = null, bool required = true) : base(cnx, null, null, null, log, true, !required) { - ScaleId = id; + ScaleTerminalId = id; Model = model; - Connection = cnx; IsReady = true; HasFillingClearance = false; Stream.WriteTimeout = -1; diff --git a/Elwig/Helpers/Weighing/GassnerScale.cs b/Elwig/Helpers/Weighing/GassnerEnqScale.cs similarity index 77% rename from Elwig/Helpers/Weighing/GassnerScale.cs rename to Elwig/Helpers/Weighing/GassnerEnqScale.cs index 32406bb..33aa3b8 100644 --- a/Elwig/Helpers/Weighing/GassnerScale.cs +++ b/Elwig/Helpers/Weighing/GassnerEnqScale.cs @@ -5,18 +5,17 @@ using System.Text; using System.Threading.Tasks; namespace Elwig.Helpers.Weighing { - public class GassnerScale : Scale, ICommandScale { + public class GassnerEnqScale : Scale, ICommandScale { public string Manufacturer => "Gassner"; - public int InternalScaleNr => 1; public string Model { get; private set; } - public string ScaleId { get; private set; } + public string ScaleTerminalId { get; private set; } public bool IsReady { get; private set; } public bool HasFillingClearance { get; private set; } - public GassnerScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) : + public GassnerEnqScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) : base(cnx, empty, filling, limit, log) { - ScaleId = id; + ScaleTerminalId = id; Model = model; IsReady = true; HasFillingClearance = false; @@ -24,10 +23,9 @@ namespace Elwig.Helpers.Weighing { Stream.ReadTimeout = 11000; } - protected Task SendCommand(char command) => SendCommand(Convert.ToByte(command)); + protected Task SendCommand(string command) => SendCommand(Encoding.ASCII.GetBytes(command)); - protected async Task SendCommand(byte command) { - byte[] cmd = [command]; + protected async Task SendCommand(byte[] cmd) { await Stream.WriteAsync(cmd); if (LogPath != null) await File.AppendAllTextAsync(LogPath, Encoding.ASCII.GetString(cmd)); } @@ -53,15 +51,15 @@ namespace Elwig.Helpers.Weighing { return line[1..^1]; } - protected async Task Weigh(bool incIdentNr, bool retry = true) { + protected async Task Weigh(int? internalScaleNr, bool incIdentNr, bool retry = true) { string record; try { - await SendCommand(incIdentNr ? '\x05' : '?'); + await SendCommand(incIdentNr ? "\x05" : "?"); record = await ReceiveResponse(); } catch (IOException) { if (!retry || Tcp == null) throw; ReconnectTcp(); - return await Weigh(incIdentNr, false); + return await Weigh(internalScaleNr, incIdentNr, false); } if (record.Length != 45) throw new FormatException("Invalid response from scale: Received record has invalid size"); @@ -80,6 +78,7 @@ namespace Elwig.Helpers.Weighing { GrossWeight = int.Parse(brutto), TareWeight = int.Parse(tara), NetWeight = int.Parse(netto), + ScaleId = scaleNr, WeighingId = identNr, FullWeighingId = identNr, Date = DateOnly.TryParseExact(date, "yyyyMMdd", out var d) ? d : null, @@ -87,12 +86,12 @@ namespace Elwig.Helpers.Weighing { }; } - public async Task Weigh() { - return await Weigh(true); + public async Task Weigh(int? scaleNr = null) { + return await Weigh(scaleNr, true); } - public async Task GetCurrentWeight() { - return await Weigh(false); + public async Task GetCurrentWeight(int? scaleNr = null) { + return await Weigh(scaleNr, false); } public async Task Empty() { @@ -126,8 +125,9 @@ namespace Elwig.Helpers.Weighing { await SetFillingClearance(false); } - public Task SetDateAndTime(DateTime dateTime) { - throw new NotImplementedException("Für Waagen vom Typ 'Gassner' ist diese Funktion noch nicht implementiert"); + public async Task SetDateAndTime(DateTime dateTime) { + await SendCommand($"C{dateTime:yyyyMMddHHmmss}\r"); + await ReceiveResponse(); } } } diff --git a/Elwig/Helpers/Weighing/ICommandScale.cs b/Elwig/Helpers/Weighing/ICommandScale.cs index 33f006a..92d1f7e 100644 --- a/Elwig/Helpers/Weighing/ICommandScale.cs +++ b/Elwig/Helpers/Weighing/ICommandScale.cs @@ -10,13 +10,13 @@ namespace Elwig.Helpers.Weighing { /// Get the current weight on the scale without performing a weighing process /// /// Result of the weighing process (probably without a weighing id) - Task GetCurrentWeight(); + Task GetCurrentWeight(int? scaleNr = null); /// /// Perform a weighing process /// /// Result of the weighing process (including a weighing id) - Task Weigh(); + Task Weigh(int? scaleNr = null); /// /// Empty the scale container or grant clearance to do so diff --git a/Elwig/Helpers/Weighing/IScale.cs b/Elwig/Helpers/Weighing/IScale.cs index 070ae89..6fa53ea 100644 --- a/Elwig/Helpers/Weighing/IScale.cs +++ b/Elwig/Helpers/Weighing/IScale.cs @@ -18,12 +18,7 @@ namespace Elwig.Helpers.Weighing { /// /// Unique identificator of the scale /// - string ScaleId { get; } - - /// - /// Internal identifying number of the scale in its system - /// - int InternalScaleNr { get; } + string ScaleTerminalId { get; } /// /// Indicates if the scale is currently processing a request or not diff --git a/Elwig/Helpers/Weighing/InvalidScale.cs b/Elwig/Helpers/Weighing/InvalidScale.cs index 7db66b7..47cad2b 100644 --- a/Elwig/Helpers/Weighing/InvalidScale.cs +++ b/Elwig/Helpers/Weighing/InvalidScale.cs @@ -5,8 +5,7 @@ namespace Elwig.Helpers.Weighing { public string Manufacturer => "NONE"; public string Model => "NONE"; - public string ScaleId => id; - public int InternalScaleNr => 0; + public string ScaleTerminalId => id; public bool IsReady => false; public bool HasFillingClearance => false; public int? WeightLimit => null; diff --git a/Elwig/Helpers/Weighing/Scale.cs b/Elwig/Helpers/Weighing/Scale.cs index 68b8dae..1a0fbcd 100644 --- a/Elwig/Helpers/Weighing/Scale.cs +++ b/Elwig/Helpers/Weighing/Scale.cs @@ -28,10 +28,10 @@ namespace Elwig.Helpers.Weighing { int? limit = config.Limit != null ? int.Parse(config.Limit) : null; if (config.Type == "SysTec-IT") { return new SysTecITScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log); + } else if (config.Type == "Gassner-Enq" || config.Type == "Gassner") { + return new GassnerEnqScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log); } else if (config.Type == "Avery-Async") { return new AveryEventScale(config.Id, config.Model!, config.Connection!, config.Log, config.Required); - } else if (config.Type == "Gassner") { - return new GassnerScale(config.Id, config.Model!, config.Connection!, config.Empty, config.Filling, limit, config.Log); } else { throw new ArgumentException($"Invalid scale type: \"{config.Type}\""); } diff --git a/Elwig/Helpers/Weighing/SysTecITScale.cs b/Elwig/Helpers/Weighing/SysTecITScale.cs index 7dc7bb3..5b1170a 100644 --- a/Elwig/Helpers/Weighing/SysTecITScale.cs +++ b/Elwig/Helpers/Weighing/SysTecITScale.cs @@ -8,15 +8,14 @@ namespace Elwig.Helpers.Weighing { public class SysTecITScale : Scale, ICommandScale { public string Manufacturer => "SysTec"; - public int InternalScaleNr => 1; public string Model { get; private set; } - public string ScaleId { get; private set; } + public string ScaleTerminalId { get; private set; } public bool IsReady { get; private set; } public bool HasFillingClearance { get; private set; } public SysTecITScale(string id, string model, string cnx, string? empty = null, string? filling = null, int? limit = null, string? log = null) : base(cnx, empty, filling, limit, log) { - ScaleId = id; + ScaleTerminalId = id; Model = model; IsReady = true; HasFillingClearance = false; @@ -74,15 +73,15 @@ namespace Elwig.Helpers.Weighing { return line[1..^3]; } - protected async Task Weigh(bool incIdentNr, bool retry = true) { + protected async Task Weigh(int internalScalNr, bool incIdentNr, bool retry = true) { string record; try { - await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}"); + await SendCommand(incIdentNr ? $"RN{internalScalNr}" : $"RM{internalScalNr}"); record = await ReceiveResponse(); } catch (IOException) { if (!retry || Tcp == null) throw; ReconnectTcp(); - return await Weigh(incIdentNr, false); + return await Weigh(internalScalNr, incIdentNr, false); } if (record.Length != 62) throw new FormatException("Invalid response from scale: Received record has invalid size"); @@ -114,6 +113,7 @@ namespace Elwig.Helpers.Weighing { GrossWeight = int.Parse(brutto), TareWeight = int.Parse(tara), NetWeight = int.Parse(netto), + ScaleId = scaleNr, WeighingId = identNr, FullWeighingId = identNr != null ? $"{parsedDate:yyyy-MM-dd}/{identNr}" : null, Date = parsedDate, @@ -121,12 +121,12 @@ namespace Elwig.Helpers.Weighing { }; } - public async Task Weigh() { - return await Weigh(true); + public async Task Weigh(int? scaleNr = 1) { + return await Weigh(scaleNr ?? 1, true); } - public async Task GetCurrentWeight() { - return await Weigh(false); + public async Task GetCurrentWeight(int? scaleNr = 1) { + return await Weigh(scaleNr ?? 1, false); } public async Task Empty() { diff --git a/Elwig/Helpers/Weighing/WeighingResult.cs b/Elwig/Helpers/Weighing/WeighingResult.cs index 5447a49..d69afbc 100644 --- a/Elwig/Helpers/Weighing/WeighingResult.cs +++ b/Elwig/Helpers/Weighing/WeighingResult.cs @@ -21,6 +21,11 @@ namespace Elwig.Helpers.Weighing { /// public int? NetWeight; + /// + /// Reported id of the scale + /// + public string? ScaleId; + /// /// Weighing id (or IdentNr) provided by the scale /// @@ -49,6 +54,7 @@ namespace Elwig.Helpers.Weighing { public readonly JsonObject ToJson() { var obj = new JsonObject(); + if (ScaleId != null) obj["scale"] = ScaleId; if (FullWeighingId != null) obj["id"] = FullWeighingId; if (WeighingId != null) obj["nr"] = int.Parse(WeighingId); if (Date != null) obj["date"] = $"{Date:yyyy-MM-dd}"; diff --git a/Elwig/Models/Entities/DeliveryPart.cs b/Elwig/Models/Entities/DeliveryPart.cs index 0eb5d82..9b94652 100644 --- a/Elwig/Models/Entities/DeliveryPart.cs +++ b/Elwig/Models/Entities/DeliveryPart.cs @@ -119,16 +119,17 @@ namespace Elwig.Models.Entities { public double? Acid { get; set; } [Column("scale_id")] - public string? ScaleId { get; set; } + public string? ScaleTerminalId { get; set; } [Column("weighing_data")] public string? WeighingData { get; set; } [NotMapped] - public (string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo { + public (string? ScaleId, string? Id, int? Gross, int? Tare, int? Net, DateOnly? Date, TimeOnly? Time) WeighingInfo { get { try { var obj = JsonNode.Parse(WeighingData!)!.AsObject(); return ( + obj["scale"]?.AsValue().GetValue(), obj["id"]?.AsValue().GetValue(), obj["gross_weight"]?.AsValue().GetValue(), obj["tare_weight"]?.AsValue().GetValue(), @@ -137,7 +138,7 @@ namespace Elwig.Models.Entities { TimeOnly.TryParseExact(obj["time"]?.AsValue().GetValue(), ["HH:mm:ss", "HH:mm"], out var t) ? t : null ); } catch { - return (null, null, null, null, null, null); + return (null, null, null, null, null, null, null); } } } diff --git a/Elwig/Services/DeliveryService.cs b/Elwig/Services/DeliveryService.cs index 9d20349..b55bb6e 100644 --- a/Elwig/Services/DeliveryService.cs +++ b/Elwig/Services/DeliveryService.cs @@ -67,7 +67,7 @@ namespace Elwig.Services { vm.IsGebunden = p.IsGebunden; vm.Unloading = p.Unloading; - vm.ScaleId = p.ScaleId; + vm.ScaleTerminalId = p.ScaleTerminalId; vm.WeighingData = p.WeighingData; vm.ManualWeighingReason = p.WeighingReason; } @@ -515,7 +515,7 @@ namespace Elwig.Services { Weight = vm.Weight!.Value, IsManualWeighing = vm.IsManualWeighing, - ScaleId = vm.ScaleId, + ScaleTerminalId = vm.ScaleTerminalId, WeighingData = vm.WeighingData, WeighingReason = vm.ManualWeighingReason, }; diff --git a/Elwig/ViewModels/DeliveryAdminViewModel.cs b/Elwig/ViewModels/DeliveryAdminViewModel.cs index fa9c2bd..9d41b87 100644 --- a/Elwig/ViewModels/DeliveryAdminViewModel.cs +++ b/Elwig/ViewModels/DeliveryAdminViewModel.cs @@ -25,7 +25,7 @@ namespace Elwig.ViewModels { [ObservableProperty] private string? _manualWeighingReason; [ObservableProperty] - private string? _scaleId; + private string? _scaleTerminalId; [ObservableProperty] private string? _weighingData; diff --git a/Elwig/Windows/DeliveryAdminWindow.xaml.cs b/Elwig/Windows/DeliveryAdminWindow.xaml.cs index a714b2d..c305659 100644 --- a/Elwig/Windows/DeliveryAdminWindow.xaml.cs +++ b/Elwig/Windows/DeliveryAdminWindow.xaml.cs @@ -85,10 +85,10 @@ namespace Elwig.Windows { if (n < 3) WeighingCButton.Visibility = Visibility.Hidden; if (n < 4) WeighingDButton.Visibility = Visibility.Hidden; if (n == 1) WeighingAButton.Content = "Wiegen"; - if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleId}"; - if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleId}"; - if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleId}"; - if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleId}"; + if (n > 1) WeighingAButton.Content = $"Wiegen {App.CommandScales[0].ScaleTerminalId}"; + if (n >= 2) WeighingBButton.Content = $"Wiegen {App.CommandScales[1].ScaleTerminalId}"; + if (n >= 3) WeighingCButton.Content = $"Wiegen {App.CommandScales[2].ScaleTerminalId}"; + if (n >= 4) WeighingDButton.Content = $"Wiegen {App.CommandScales[3].ScaleTerminalId}"; WeighingManualButton.Margin = new Thickness(10, 10 + n * 32, 10, 10); foreach (var s in App.EventScales) { s.WeighingEvent += Scale_Weighing; @@ -366,7 +366,7 @@ namespace Elwig.Windows { private void InitialInputs() { ViewModel.LastScaleError = null; ViewModel.WeighingData = null; - ViewModel.ScaleId = null; + ViewModel.ScaleTerminalId = null; ViewModel.ManualWeighingReason = null; ClearOriginalValues(); @@ -651,13 +651,13 @@ namespace Elwig.Windows { private void OnWeighingResult(IScale scale, WeighingResult res) { if ((res.NetWeight ?? 0) > 0 && res.FullWeighingId != null) { ViewModel.Weight = res.NetWeight; - ViewModel.ScaleId = scale.ScaleId; + ViewModel.ScaleTerminalId = scale.ScaleTerminalId; ViewModel.WeighingData = res.ToJson().ToJsonString(); ViewModel.ManualWeighingReason = null; ManualWeighingInput.IsChecked = false; } else { ViewModel.Weight = null; - ViewModel.ScaleId = null; + ViewModel.ScaleTerminalId = null; ViewModel.WeighingData = null; } ViewModel.LastScaleError = null; @@ -771,7 +771,7 @@ namespace Elwig.Windows { } private void EmptyScale() { - var scale = App.Scales.Where(s => s.ScaleId == ViewModel.ScaleId).FirstOrDefault(); + var scale = App.Scales.Where(s => s.ScaleTerminalId == ViewModel.ScaleTerminalId).FirstOrDefault(); if (scale is not ICommandScale cs) return; cs.Empty(); } @@ -953,7 +953,7 @@ namespace Elwig.Windows { ViewModel.Weight = res?.Item1; ManualWeighingInput.IsChecked = true; ViewModel.ManualWeighingReason = res?.Item2; - ViewModel.ScaleId = null; + ViewModel.ScaleTerminalId = null; ViewModel.WeighingData = null; } diff --git a/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs b/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs index b315c1a..e1f08e9 100644 --- a/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs +++ b/Tests/UnitTests/WeighingTests/ScaleTestHaugsdorfDMA02.cs @@ -5,7 +5,7 @@ namespace Tests.UnitTests.WeighingTests { public class ScaleTestHaugsdorfDMA02 { private MockScale Mock; - private GassnerScale Scale; + private GassnerEnqScale Scale; [OneTimeSetUp] public void SetupScale() { diff --git a/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs b/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs index 96b24f7..08c0464 100644 --- a/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs +++ b/Tests/UnitTests/WeighingTests/ScaleTestSitzendorfDMA03Baby.cs @@ -5,7 +5,7 @@ namespace Tests.UnitTests.WeighingTests { public class ScaleTestSitzendorfDMA03Baby { private MockScale Mock; - private GassnerScale Scale; + private GassnerEnqScale Scale; [OneTimeSetUp] public void SetupScale() {