marekf/laatzen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://slm.sms-esaap.com/la_operations/laa_production

Browse Source
This commit is contained in:
Thomas Wiedebusch
2022-11-14 08:58:27 +01:00
parent a04844786b 2325046e07
commit dc726b04ca
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CordonelAssemblyLine/Leak.xaml
+1 -1
View File
@@ -59,7 +59,7 @@
<Label Content="Prüfer" HorizontalAlignment="Left" Margin="0,0,0,0" VerticalAlignment="Top" Grid.Row="3" Grid.Column="0" Height="26" Width="85" Grid.RowSpan="2" />
<ListView x:Name="listViewTestPotins" ItemsSource="{Binding Result.Testpoints, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="2" Grid.RowSpan="4" HorizontalAlignment="left" Width="380" Margin="12,10,0,0" Grid.ColumnSpan="3" >
<ListView x:Name="listViewTestPotins" ItemsSource="{Binding Result.TestPoints, UpdateSourceTrigger=PropertyChanged}" Grid.Row="2" Grid.Column="2" Grid.RowSpan="4" HorizontalAlignment="left" Width="380" Margin="12,10,0,0" Grid.ColumnSpan="3" >
<ListView.View>
<GridView >
<GridViewColumn Header="Nr" >
Common/CordonelAssemblyLine/Model/PickingModel.cs
+2 -2
View File
@@ -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;
}
Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
+3
View File
@@ -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<List<CsdParameterResult>>(retStr);
if (retListRealCsd.Any())
Common/ProductionUiCordonel/FinalTest.xaml.cs
+1
View File
@@ -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]