Set-MachineNumber: handle duplicate-PC reassignment (real -> real)
Tech catches a PC imaged with a wrong machine number. Previously the share restore (NTLARS .reg + UDC settings + UDC live data) only fired on the placeholder->real transition, so a real->real change rewrote only UDC JSON, eDNC reg, and MTConnect Devices.xml - leaving the wrong NTLARS config in place. Update-MachineNumber.ps1: replace the placeholder-only guard with an any-change guard so the share restore block fires on reassign too. The existing one-shot migrated/ consumption keeps live-data restore idempotent. Also writes C:\Enrollment\machine-number.txt to keep imaging-time scripts in sync. Set-MachineNumber.ps1 (both collections + nocollections): show a confirmation dialog when reassigning between two real numbers, naming old/new and listing what gets pulled. Audit each call to C:\Logs\Shopfloor\reassign.log. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -60,16 +60,19 @@ function Update-MachineNumber {
|
||||
[string]$Site = 'West Jefferson'
|
||||
)
|
||||
|
||||
$out = @{ UdcUpdated = $false; EdncUpdated = $false; Errors = @(); RegImported = $null }
|
||||
$out = @{ UdcUpdated = $false; EdncUpdated = $false; Errors = @(); RegImported = $null; OldUdc = $null; OldEdnc = $null }
|
||||
|
||||
# --- If UDC or eDNC is still at placeholder 9999, try to pull the
|
||||
# per-machine .reg backup from the SFLD share and restore all
|
||||
# the eFocas/PPDCS/Hssb config. The tech-typed $NewNumber is still
|
||||
# written last (below), so the restore never clobbers it. ---
|
||||
# If the machine number is changing (placeholder->real OR real->real
|
||||
# reassignment after a duplicate-image), pull per-machine state for the
|
||||
# new number from the SFLD share: NTLARS .reg, UDC settings, UDC live
|
||||
# data. The live-data restore is idempotent via one-shot migrated/
|
||||
# consumption, so it stays safe on reassign too.
|
||||
$current = Get-CurrentMachineNumber
|
||||
$isPlaceholder = (($current.Udc -in @('9999', $null, '')) -or ($current.Ednc -in @('9999', $null, '')))
|
||||
$out.OldUdc = $current.Udc
|
||||
$out.OldEdnc = $current.Ednc
|
||||
$isChanging = ($current.Udc -ne $NewNumber) -or ($current.Ednc -ne $NewNumber)
|
||||
|
||||
if ($isPlaceholder -and $NewNumber -ne '9999') {
|
||||
if ($isChanging -and $NewNumber -ne '9999') {
|
||||
$sharePath = $null
|
||||
$siteCfgPath = 'C:\Enrollment\site-config.json'
|
||||
if (Test-Path $siteCfgPath) {
|
||||
@@ -329,5 +332,19 @@ function Update-MachineNumber {
|
||||
}
|
||||
}
|
||||
|
||||
# Keep C:\Enrollment\machine-number.txt in sync. Post-imaging GE-Enforce
|
||||
# prefers eDNC reg, but imaging-time scripts (Install-FromManifest
|
||||
# TargetMachineNumbers filter, 01-eDNC.ps1, 03-RestoreEDncConfig.ps1)
|
||||
# still read this file. Avoid drift on reassign.
|
||||
try {
|
||||
$mnFile = 'C:\Enrollment\machine-number.txt'
|
||||
$mnDir = Split-Path -Parent $mnFile
|
||||
if (-not (Test-Path $mnDir)) { New-Item -ItemType Directory -Path $mnDir -Force | Out-Null }
|
||||
Set-Content -Path $mnFile -Value $NewNumber -Encoding UTF8 -NoNewline
|
||||
$out.MachineNumberTxtUpdated = $true
|
||||
} catch {
|
||||
$out.Errors += "machine-number.txt update failed: $_"
|
||||
}
|
||||
|
||||
return $out
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user