diff --git a/Common/CordonelAssemblyLine/Leak.xaml.cs b/Common/CordonelAssemblyLine/Leak.xaml.cs
index a177fb65..ac793528 100644
--- a/Common/CordonelAssemblyLine/Leak.xaml.cs
+++ b/Common/CordonelAssemblyLine/Leak.xaml.cs
@@ -34,13 +34,10 @@ namespace CordonelAssemblyLine
{
var ret = ViewModel.StoreData(true);
- if (int.TryParse($"{ViewModel?.CurrentPcbID}", out var pcbId))
+ if (ret && int.TryParse($"{ViewModel?.CurrentPcbID}", out var pcbId))
{
ShouldBePressureTestedModal.Check(pcbId);
- }
- else
- {
- MessageBox.Show($"Kann nicht die PcbId: {ViewModel?.CurrentPcbID} in nummer konvertieren!");
+ MessageBox.Show("Ergebnis gespeichert der Zähler weiterbearbeitet werden.");
}
}
diff --git a/Common/CordonelAssemblyLine/Model/LeakViewModel.cs b/Common/CordonelAssemblyLine/Model/LeakViewModel.cs
index 74d8b9bc..d5703b8c 100644
--- a/Common/CordonelAssemblyLine/Model/LeakViewModel.cs
+++ b/Common/CordonelAssemblyLine/Model/LeakViewModel.cs
@@ -388,23 +388,18 @@ namespace CordonelAssemblyLine.Model
}
// Wird von die Stichproben prüfung übernohmen
- //if (status == DisplayCodes.PressureTested)
- //{
-
-
- // if (isStored.Contains("0"))
- // {
- // OnStoreDone?.Invoke(null, new StringPressureArgs("Ergebnis gespeichert der Zähler weiterbearbeitet werden. Dieser Zähler muss NICHT zur Druckprüfung",false));
- // return false;
- // }
- // else
- // {
- // OnStoreDone?.Invoke(null, new StringPressureArgs("Ergebnis gespeichert der Zähler weiterbearbeitet werden. Dieser Zähler muss zur Druckprüfung",true));
- // return true;
- // }
-
-
- //}
+ if (status == DisplayCodes.PressureTested)
+ {
+ if (isStored.Contains("0"))
+ {
+ OnStoreDone?.Invoke(null, new StringPressureArgs("Ergebnis gespeichert der Zähler weiterbearbeitet werden. Dieser Zähler muss NICHT zur Druckprüfung", false));
+ return false;
+ }
+ else
+ {
+ return true;
+ }
+ }
OnStoreDone?.Invoke(null, new StringPressureArgs("Bitte erneut testen oder Linienleitung und QS informieren.", true));
return false;
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 d110f5fc..8865d283 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 @@
-c43c40a030005a8f189e6179faf40a6d42bfef5c
+89102b0142e574de38a9f47d370f3334e5e6c268
diff --git a/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Repositories/RequirementsRepository.cs b/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Repositories/RequirementsRepository.cs
index c3d2d2a7..b7f58efc 100644
--- a/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Repositories/RequirementsRepository.cs
+++ b/LaaProductionWeb/Data/LaaProduction.Data.Cordonel/Repositories/RequirementsRepository.cs
@@ -20,16 +20,17 @@
public CordonelRequirements FindByPcbId(string pcbid)
=> this.sqlConnection
.CreateCommand($@"
- SELECT cr.SpecialId
+ SELECT DISTINCT
+ cr.SpecialId
, cr.SpecialVersion
, cr.StandardId
, cr.StandardVersion
, cr.Region
, cr.Size
, cr.PoNr
- , aap.FertigungsauftragNr
+ , aap.FertigungsauftragNr
, cr.PcbId
- , map.MapPcbIdToSerialNumber_PcbId
+ , map.MapPcbIdToSerialNumber_PcbId
, cr.SkipCalibration
, cr.SkipRadioCheck
, cr.FwVersion
@@ -38,10 +39,10 @@
, cr.RLTYS
, cr.MDBLPA
, cr.MDBLPS
- , CASE WHEN aap.Menge < 6
- THEN MSM
- ELSE MSMBO
- END AS MaxStorageMonths
+ , CASE WHEN aap.Menge < 6
+ THEN MSM
+ ELSE MSMBO
+ END AS MaxStorageMonths
, cr.QuiescentCurrent_uA
, cr.EPBLP
, cr.Timestamp
@@ -53,40 +54,33 @@
, cr.IsStdApproved
, cr.RegionSizeKey
FROM Cordonel_Requirements AS cr
- JOIN AlleIdentNrVakoMerkmale AS idn
- ON cr.IdentNr = idn.IdentNr
- AND idn.Stelle = 4
- AND idn.Laenge = 2
JOIN AlleAuftragPositionen AS aap
- ON idn.IdentNr = aap.IdentNr
+ ON cr.IdentNr = aap.IdentNr
AND (cr.PoNr = aap.FertigungsauftragNr OR cr.PoNr IS NULL)
JOIN AuftragPositionSerienNr AS aps
- ON aap.AuftragNr = aps.AuftragNr
+ ON aap.AuftragNr = aps.AuftragNr
AND aap.PositionNr = aps.PositionNr
JOIN MapPcbIdToSerialNumber AS map
ON aps.SerienNr = map.MapPcbIdToSerialNumber_SerialNumber
AND (cr.PcbId = map.MapPcbIdToSerialNumber_PcbId OR cr.PcbId IS NULL)
- WHERE map.MapPcbIdToSerialNumber_PcbId = @{nameof(pcbid)}
- ORDER BY SpecialId DESC
- , SpecialVersion DESC
- , StandardId DESC
- , StandardVersion DESC")
+ WHERE map.MapPcbIdToSerialNumber_PcbId = '212120036'")
.SetParameter(nameof(pcbid), pcbid)
.FirstOrDefault(this.ParseCordonelRequirements);
public CordonelRequirements FindByPoNo(string pono)
=> this.sqlConnection
.CreateCommand($@"
- SELECT cr.SpecialId
+ SELECT DISTINCT
+ cr.SpecialId
, cr.SpecialVersion
, cr.StandardId
, cr.StandardVersion
, cr.Region
, cr.Size
, cr.PoNr
- , aap.FertigungsauftragNr
- , NULL
- , NULL
+ , aap.FertigungsauftragNr
+ , cr.PcbId
+ , map.MapPcbIdToSerialNumber_PcbId
, cr.SkipCalibration
, cr.SkipRadioCheck
, cr.FwVersion
@@ -95,10 +89,10 @@
, cr.RLTYS
, cr.MDBLPA
, cr.MDBLPS
- , CASE WHEN aap.Menge < 6
- THEN MSM
- ELSE MSMBO
- END AS MaxStorageMonths
+ , CASE WHEN aap.Menge < 6
+ THEN MSM
+ ELSE MSMBO
+ END AS MaxStorageMonths
, cr.QuiescentCurrent_uA
, cr.EPBLP
, cr.Timestamp
@@ -110,24 +104,16 @@
, cr.IsStdApproved
, cr.RegionSizeKey
FROM Cordonel_Requirements AS cr
- JOIN AlleIdentNrVakoMerkmale AS idn
- ON cr.IdentNr = idn.IdentNr
- AND idn.Stelle = 4
- AND idn.Laenge = 2
JOIN AlleAuftragPositionen AS aap
- ON idn.IdentNr = aap.IdentNr
+ ON cr.IdentNr = aap.IdentNr
AND (cr.PoNr = aap.FertigungsauftragNr OR cr.PoNr IS NULL)
JOIN AuftragPositionSerienNr AS aps
- ON aap.AuftragNr = aps.AuftragNr
+ ON aap.AuftragNr = aps.AuftragNr
AND aap.PositionNr = aps.PositionNr
JOIN MapPcbIdToSerialNumber AS map
ON aps.SerienNr = map.MapPcbIdToSerialNumber_SerialNumber
AND (cr.PcbId = map.MapPcbIdToSerialNumber_PcbId OR cr.PcbId IS NULL)
- WHERE aap.FertigungsauftragNr = @{nameof(pono)}
- ORDER BY SpecialId DESC
- , SpecialVersion DESC
- , StandardId DESC
- , StandardVersion DESC")
+ WHERE aap.FertigungsauftragNr = @{nameof(pono)}")
.SetParameter(nameof(pono), pono)
.FirstOrDefault(this.ParseCordonelRequirements);
diff --git a/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs b/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs
deleted file mode 100644
index 7142a7db..00000000
--- a/LaaProductionWeb/LaaProductionWeb/Hubs/RemoteControl.cs
+++ /dev/null
@@ -1,77 +0,0 @@
-namespace LaaProductionWeb.Hubs
-{
- //using InspectionUI.RemoteControl.Interfaces;
- //using InspectionUI.RemoteControl.Messages;
-
- using Microsoft.AspNet.SignalR;
-
- //using System;
- //using System.Threading.Tasks;
-
- public class RemoteControl : Hub//, IRemoteConnectionEvents
- {
- //protected string ConnectionId
- // => this.Context.ConnectionId;
-
- //protected string GroupName
- // => this.Context
- // .QueryString
- // .Get(nameof(GroupName));
-
- //public void Disposed()
- //{
- // var groupName = this.GroupName;
-
- // this.Clients
- // .OthersInGroup(groupName)
- // .Disposed();
-
- // this.Groups
- // .Remove(this.ConnectionId, groupName);
- //}
-
- //public override async Task OnConnected()
- // => await this.Groups.Add(this.ConnectionId, this.GroupName);
-
- //public override async Task OnDisconnected(bool stopCalled)
- // => await this.Groups.Remove(this.ConnectionId, this.GroupName);
-
- //public override async Task OnReconnected()
- // => await this.Groups.Add(this.ConnectionId, this.GroupName);
-
- //public void StartFlow(FlowMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .StartFlow(message);
-
- //public void GetFlow(FlowMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .GetFlow(message);
-
- //public void StopFlow(FlowMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .StopFlow(message);
-
- //public void StartRM(ReferenceMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .StartRM(message);
-
- //public void GetRM(ReferenceMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .GetRM(message);
-
- //public void StopRM(ReferenceMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .StopRM(message);
-
- //public void GetInfo(InfoMessage message)
- // => this.Clients
- // .OthersInGroup(this.GroupName)
- // .GetInfo(message);
- }
-}
\ No newline at end of file
diff --git a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
index cf72c3db..4d9df789 100644
--- a/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
+++ b/LaaProductionWeb/LaaProductionWeb/LaaProductionWeb.csproj
@@ -242,7 +242,6 @@
Global.asax
-