diff --git a/Common/CordonelAssemblyLine/Leak.xaml b/Common/CordonelAssemblyLine/Leak.xaml
index c7fd496d..cb2021ee 100644
--- a/Common/CordonelAssemblyLine/Leak.xaml
+++ b/Common/CordonelAssemblyLine/Leak.xaml
@@ -59,7 +59,7 @@
-
+
diff --git a/Common/CordonelAssemblyLine/Model/PickingModel.cs b/Common/CordonelAssemblyLine/Model/PickingModel.cs
index 1860c453..b62d65d0 100644
--- a/Common/CordonelAssemblyLine/Model/PickingModel.cs
+++ b/Common/CordonelAssemblyLine/Model/PickingModel.cs
@@ -602,9 +602,9 @@ namespace CordonelAssemblyLine.Model
SetState($"Battery Total Charge {nowChargeV}uAs");
SetState($"Battery MFG Charge {mfgChargeV}uAs");
- if (totalUsed >= 5.0)
+ if (totalUsed >= 7.5)
{
- lblS08Text = "Batterieentladung über 5%";
+ lblS08Text = "Batterieentladung über 7.5%";
lblS08Color = _progressError;
ret = false;
}
diff --git a/Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs b/Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
index 988dc8a3..2bedc31d 100644
--- a/Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
+++ b/Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
@@ -44,6 +44,7 @@ namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
}
var radioParams = OrderRadioParameter.GetRadioParams(pcbID, connectionString);
+ //NA Zähler haben keine RadioAdresse
if (radioParams.RadioAddress != 0)
{
@@ -136,6 +137,8 @@ namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
ident = "GNSU";
}
+
+
var retStr = LocalWebRequest.GetRequest($"http://sla12iis01/csdcore/csdservice/getstampings?CsdIdent={csdIdent}&GroupId=1&ProductIdent={ident}&ProductDn={rawVako.Dn}&ShowOnlyValidStampings=0", 8000);
var retListRealCsd = JsonConvert.DeserializeObject>(retStr);
if (retListRealCsd.Any())
diff --git a/Common/ProductionUiCordonel/FinalTest.xaml.cs b/Common/ProductionUiCordonel/FinalTest.xaml.cs
index 690ee284..017359ea 100644
--- a/Common/ProductionUiCordonel/FinalTest.xaml.cs
+++ b/Common/ProductionUiCordonel/FinalTest.xaml.cs
@@ -467,6 +467,7 @@ namespace ProductionUiCordonel
pc.Processes.Add(new ProductionProcessShippingMode(true, RadioAdress != 0)); //[] [] []
pc.Processes.Add(new ProductionProcessFinalParameterizationVakoCsd(connectProcess, RadioAdress != 0)); //[x] [x] []
+
pc.Processes.Add(new ProductionProcessShippingMode(false, RadioAdress != 0)); //[] [] []
pc.Processes.Add(new ProductionProcessFullReadOut()); //[x] [x] [x]