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

MeterProcessState - deleted entries filterd out

Browse Source
This commit is contained in:
Stoyan Zlatev 2025-03-06 13:54:07 +01:00
parent 1acf7ad560
commit be0eed69e6
3 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Common/Logic/ProductionOrderCore/OrderData/OrderProgrammingParameters.cs
View File

@ -24,23 +24,37 @@ namespace Xylem.Common.Logic.ProductionOrderCore.OrderData
using (var dataAccess = new SqlDataAccess(connectionString))
{
//var sb = new StringBuilder();
//sb.AppendLine(" SELECT distinct[MapPcbIdToSerialNumber_SerialNumber], mapOrder.CordonelPressureTest_FertigungsAuftragsNr ");
//sb.AppendLine($" FROM Auftrag.dbo.Cordonel_PressureTest mapOrder ");
//sb.AppendLine($" left outer join [Auftrag].[dbo].[MapPcbIdToSerialNumber] map on mapOrder.CordonelPressureTest_PcbId = map.MapPcbIdToSerialNumber_PcbId ");
//sb.AppendLine($" left outer join Auftrag.dbo.AuftragPositionSerienNr mapSrn on map.[MapPcbIdToSerialNumber_SerialNumber] = mapSrn.SerienNr and mapSrn.Pruefgangnr = 0 ");
//sb.AppendLine($" left outer join Auftrag.dbo.AlleAuftragPositionen auftraginfo on auftraginfo.AuftragNr = mapSrn.AuftragNr and auftraginfo.PositionNr = mapSrn.PositionNr ");
var sb = new StringBuilder();
//sb.AppendLine($" where mapOrder.CordonelPressureTest_PcbId = '{pcbID}'");
sb.AppendLine($" SELECT distinct[MapPcbIdToSerialNumber_SerialNumber], mapOrder.CordonelPressureTest_FertigungsAuftragsNr ");
sb.AppendLine($" FROM Auftrag.dbo.Cordonel_PressureTest mapOrder ");
sb.AppendLine($" left outer join [Auftrag].[dbo].[MapPcbIdToSerialNumber] map on mapOrder.CordonelPressureTest_PcbId = map.MapPcbIdToSerialNumber_PcbId ");
sb.AppendLine($" left outer join Auftrag.dbo.AuftragPositionSerienNr mapSrn on map.[MapPcbIdToSerialNumber_SerialNumber] = mapSrn.SerienNr and mapSrn.Pruefgangnr = 0 ");
sb.AppendLine($" left outer join Auftrag.dbo.AlleAuftragPositionen auftraginfo on auftraginfo.AuftragNr = mapSrn.AuftragNr and auftraginfo.PositionNr = mapSrn.PositionNr ");
var mapData = dataAccess.ExecuteQuery(@"
SELECT DISTINCT
map.MapPcbIdToSerialNumber_SerialNumber
, mapOrder.CordonelPressureTest_FertigungsAuftragsNr
FROM Cordonel_PressureTest AS mapOrder
LEFT OUTER JOIN MapPcbIdToSerialNumber AS map
ON mapOrder.CordonelPressureTest_PcbId = map.MapPcbIdToSerialNumber_PcbId
LEFT OUTER JOIN AuftragPositionSerienNr AS mapSrn
ON map.MapPcbIdToSerialNumber_SerialNumber = mapSrn.SerienNr
AND mapSrn.Pruefgangnr = 0
LEFT OUTER JOIN AlleAuftragPositionen AS auftraginfo
ON auftraginfo.AuftragNr = mapSrn.AuftragNr
AND auftraginfo.PositionNr = mapSrn.PositionNr
WHERE mapOrder.CordonelPressureTest_PcbId = '{pcbID}'
AND mapOrder.CordonelPressureTest_IsDeleted = 0
AND map.MapPcbIdToSerialNumber_Deleted = 0");
sb.AppendLine($" where mapOrder.CordonelPressureTest_PcbId = '{pcbID}'");
var mapData = dataAccess.ExecuteQuery(sb.ToString());
if (mapData.Rows.Count != 1)
{
throw new ApplicationException("No base data found");
}
orderNr = (Int32)mapData.Rows[0]["CordonelPressureTest_FertigungsAuftragsNr"];
}

2
Common/Service/MeterProcessState/Controllers/FinalCheckController.cs
View File

@ -83,7 +83,7 @@ namespace Xylem.Common.Service.MeterProcessState.Controllers
/// </summary>
/// <param name="pcbID">PcbID from Meter</param>
/// <returns></returns>
[Route("GetProgrammingParameters"), HttpGet]
[Route("GetProgrammingParameters"), HttpGet] // 244839518
public async Task<HttpResponseMessage> GetProgrammingParameters(String pcbID)
{
try

2
Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
65d75c3322f8a137c69963cfdc0cb6f1ffacf62a
338bdd8d71c148c9df0972f903098eb23eacf0c9