diff --git a/Common/.shared/SharedAssemblyInfo.cs b/Common/.shared/SharedAssemblyInfo.cs
index 6c4ebd47..f97c684a 100644
--- a/Common/.shared/SharedAssemblyInfo.cs
+++ b/Common/.shared/SharedAssemblyInfo.cs
@@ -14,4 +14,4 @@ using System.Reflection;
//[assembly: AssemblyVersion("1.2.*.0")]
-[assembly: AssemblyVersion("2.7.0.*")]
+[assembly: AssemblyVersion("2.7.1.*")]
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
index 8865d283..4163759b 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-89102b0142e574de38a9f47d370f3334e5e6c268
+8cb55c312de586b683d72cf58c13e2801d10e14b767777d98338d3e1473a1213
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckProductionState.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckProductionState.cs
index 8918b640..f923459e 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckProductionState.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/EolProcesses/CheckProductionState.cs
@@ -887,7 +887,8 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.EolPr
///
private StatusReturn CheckKitronRadioSignalLevels(out String feedbackMsg)
{
- return GenericChecks.CheckKitronRadioSignalLevels(Meter, RegisterRestorer, out feedbackMsg);
+ return GenericChecks.CheckKitronRadioSignalLevels(Meter, RegisterRestorer, ProductionRequirements.SkipRadioCheck,
+ out feedbackMsg);
}
///
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericModules/GenericChecks.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericModules/GenericChecks.cs
index 7bb35539..45f4a449 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericModules/GenericChecks.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/GenericModules/GenericChecks.cs
@@ -18,6 +18,7 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Gener
/// Check the measurements from Kitron for this specific Cordonel if it is an EMEA region.
///
///
+ ///
///
///
///
@@ -28,7 +29,7 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Gener
/// - Import from CheckProductionState for common use.
///
public static StatusReturn CheckKitronRadioSignalLevels(IGenesisMeter meter, RegisterRestorer registerRestorer,
- out String feedbackMsg)
+ Boolean skipRadioCheck, out String feedbackMsg)
{
feedbackMsg = "";
if (meter == null ||
@@ -37,8 +38,8 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Gener
{
return StatusReturn.Failed;
}
- // The NA region has no radio
- if (meter.Region.Equals("NA"))
+ // The NA region has no radio or radio check should be ignored
+ if (meter.Region.Equals("NA") || skipRadioCheck)
{
return StatusReturn.Skipped;
}
diff --git a/Common/Production/ProductionUiCordonel/ProductionProcesses/PickingProcesses/CheckProductionState.cs b/Common/Production/ProductionUiCordonel/ProductionProcesses/PickingProcesses/CheckProductionState.cs
index 75f02dde..1373ced7 100644
--- a/Common/Production/ProductionUiCordonel/ProductionProcesses/PickingProcesses/CheckProductionState.cs
+++ b/Common/Production/ProductionUiCordonel/ProductionProcesses/PickingProcesses/CheckProductionState.cs
@@ -559,7 +559,8 @@ namespace Xylem.Common.Production.ProductionUiCordonel.ProductionProcesses.Picki
///
private StatusReturn CheckKitronRadioSignalLevels(out String feedbackMsg)
{
- return GenericChecks.CheckKitronRadioSignalLevels(Meter, RegisterRestorer, out feedbackMsg);
+ return GenericChecks.CheckKitronRadioSignalLevels(Meter, RegisterRestorer, ProductionRequirements.SkipRadioCheck,
+ out feedbackMsg);
}