Joseph Doherty
a25593a9c6
Group all 69 projects into category subfolders under src/ and tests/ so the Rider Solution Explorer mirrors the module structure. Folders: Core, Server, Drivers (with a nested Driver CLIs subfolder), Client, Tooling. - Move every project folder on disk with git mv (history preserved as renames). - Recompute relative paths in 57 .csproj files: cross-category ProjectReferences, the lib/ HintPath+None refs in Driver.Historian.Wonderware, and the external mxaccessgw refs in Driver.Galaxy and its test project. - Rebuild ZB.MOM.WW.OtOpcUa.slnx with nested solution folders. - Re-prefix project paths in functional scripts (e2e, compliance, smoke SQL, integration, install). Build green (0 errors); unit tests pass. Docs left for a separate pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
69 lines
2.9 KiB
C#
69 lines
2.9 KiB
C#
namespace ZB.MOM.WW.OtOpcUa.Configuration.Entities;
|
|
|
|
/// <summary>
|
|
/// Staged equipment-import batch per Phase 6.4 Stream B.2. Rows land in the child
|
|
/// <see cref="EquipmentImportRow"/> table under a batch header; operator reviews + either
|
|
/// drops (via <c>DropImportBatch</c>) or finalises (via <c>FinaliseImportBatch</c>) in one
|
|
/// bounded transaction. The live <c>Equipment</c> table never sees partial state.
|
|
/// </summary>
|
|
/// <remarks>
|
|
/// <para>User-scoped visibility: the preview modal only shows batches where
|
|
/// <see cref="CreatedBy"/> equals the current operator. Prevents accidental
|
|
/// cross-operator finalise during concurrent imports. An admin finalise / drop surface
|
|
/// can override this — tracked alongside the UI follow-up.</para>
|
|
///
|
|
/// <para><see cref="FinalisedAtUtc"/> stamps the moment the batch promoted from staging
|
|
/// into <c>Equipment</c>. Null = still in staging; non-null = archived / finalised.</para>
|
|
/// </remarks>
|
|
public sealed class EquipmentImportBatch
|
|
{
|
|
public Guid Id { get; set; }
|
|
public required string ClusterId { get; set; }
|
|
public required string CreatedBy { get; set; }
|
|
public DateTime CreatedAtUtc { get; set; }
|
|
public int RowsStaged { get; set; }
|
|
public int RowsAccepted { get; set; }
|
|
public int RowsRejected { get; set; }
|
|
public DateTime? FinalisedAtUtc { get; set; }
|
|
|
|
public ICollection<EquipmentImportRow> Rows { get; set; } = [];
|
|
}
|
|
|
|
/// <summary>
|
|
/// One staged row under an <see cref="EquipmentImportBatch"/>. Mirrors the decision #117
|
|
/// + decision #139 columns from the CSV importer's output + an
|
|
/// <see cref="IsAccepted"/> flag + a <see cref="RejectReason"/> string the preview modal
|
|
/// renders.
|
|
/// </summary>
|
|
public sealed class EquipmentImportRow
|
|
{
|
|
public Guid Id { get; set; }
|
|
public Guid BatchId { get; set; }
|
|
public int LineNumberInFile { get; set; }
|
|
public bool IsAccepted { get; set; }
|
|
public string? RejectReason { get; set; }
|
|
|
|
// Required (decision #117)
|
|
public required string ZTag { get; set; }
|
|
public required string MachineCode { get; set; }
|
|
public required string SAPID { get; set; }
|
|
public required string EquipmentId { get; set; }
|
|
public required string EquipmentUuid { get; set; }
|
|
public required string Name { get; set; }
|
|
public required string UnsAreaName { get; set; }
|
|
public required string UnsLineName { get; set; }
|
|
|
|
// Optional (decision #139 — OPC 40010 Identification)
|
|
public string? Manufacturer { get; set; }
|
|
public string? Model { get; set; }
|
|
public string? SerialNumber { get; set; }
|
|
public string? HardwareRevision { get; set; }
|
|
public string? SoftwareRevision { get; set; }
|
|
public string? YearOfConstruction { get; set; }
|
|
public string? AssetLocation { get; set; }
|
|
public string? ManufacturerUri { get; set; }
|
|
public string? DeviceManualUri { get; set; }
|
|
|
|
public EquipmentImportBatch? Batch { get; set; }
|
|
}
|