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

fix fai issuses, no encr key and radio test is skipable

Browse Source
This commit is contained in:
Roland Drabesch
2022-08-30 11:54:10 +02:00
parent f2bff1d39c
commit 5875bcd5d0
5 changed files with 74 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/.vs/config/applicationhost.config
+1 -1
View File
@@ -155,7 +155,7 @@
</site>
<site name="MeterProcessState" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="D:\Projekte\SENSUS_GitLab\laa_production\Common\Service\MeterProcessState" />
<virtualDirectory path="/" physicalPath="C:\Users\drabesch_ro\Repo\lab\la_operations\laa_production\Common\Service\MeterProcessState" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:56011:localhost" />
Common/CordonelAssemblyLine/App.config
+2 -2
View File
@@ -6,13 +6,13 @@
<appSettings>
<add key="PickingSlot" value="1"/>
<add key="PickingBarcode" value="COM22"/>
<add key="PickingBarcode" value="COM20"/>
<add key="LeakSlot" value="2"/>
<add key="LeakStationId" value="1"/>
<add key="MarriageSlot" value="4"/>
<add key="MarriageBarcode" value="COM19"/>
<add key="MarriageBarcode" value="COM21"/>
</appSettings>
Common/Logic/ProductionOrderCore/KitronTestResults/RadioTest.cs
+41 -269
View File
@@ -3,7 +3,9 @@ namespace Xylem.Common.Logic.ProductionOrderCore.KitronTestResults
{
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Globalization;
public partial class RadioTest
@@ -271,304 +273,74 @@ namespace Xylem.Common.Logic.ProductionOrderCore.KitronTestResults
}
alternateReturnObj.StartDt = newFromat.JsonObject.StartDT;
alternateReturnObj.TestStepLoopCalibrate = new TestStep();
alternateReturnObj.TestStepLoopCalibrate.Values = new Value[12];
alternateReturnObj.TestStepLoopCalibrate.Values = new Value[23];
var add = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop1;
add.LengthCode = newFromat.JsonObject.LengthCodeLoop1;
add.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
var TestStepLoopCalibrateToAdd = new List<Value>();
JObject joResponse = JObject.Parse(json);
add.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop1;
add.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop1;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add, 0);
var Hit = true;
var add2 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add2.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop2;
add2.LengthCode = newFromat.JsonObject.LengthCodeLoop2;
add2.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add2.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop2;
add2.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop2;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add2, 1);
var add3 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add3.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop3;
add3.LengthCode = newFromat.JsonObject.LengthCodeLoop3;
add3.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add3.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop3;
add3.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop3;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add3, 2);
var add4 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add4.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop4;
add4.LengthCode = newFromat.JsonObject.LengthCodeLoop4;
add4.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add4.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop4;
add4.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop4;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add4, 3);
var add5 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add5.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop5;
add5.LengthCode = newFromat.JsonObject.LengthCodeLoop5;
add5.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add5.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop5;
add5.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop5;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add5, 4);
var add6 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add6.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop6;
add6.LengthCode = newFromat.JsonObject.LengthCodeLoop6;
add6.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add6.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop6;
add6.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop6;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add6, 5);
var add7 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add7.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop7;
add7.LengthCode = newFromat.JsonObject.LengthCodeLoop7;
add7.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add7.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop7;
add7.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop7;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add7, 6);
var add8 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add8.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop8;
add8.LengthCode = newFromat.JsonObject.LengthCodeLoop8;
add8.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add8.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop8;
add8.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop8;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add8, 7);
var add9 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add9.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop9;
add9.LengthCode = newFromat.JsonObject.LengthCodeLoop9;
add9.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add9.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop9;
add9.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop9;
if (add9.ResultCalibration == null)
int loopCount = 0;
foreach (var item in joResponse["JsonObject"].Children())
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add9, 8);
var add10 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add10.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop10;
add10.LengthCode = newFromat.JsonObject.LengthCodeLoop10;
add10.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add10.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop10;
add10.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop10;
if (add10.ResultCalibration == null)
if (item is JProperty pitem)
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add10, 9);
var add11 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add11.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop11;
add11.LengthCode = newFromat.JsonObject.LengthCodeLoop11;
add11.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add11.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop11;
add11.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop11;
if (add11.ResultCalibration == null)
if (pitem.Name == $"ResultCalibration Loop_{loopCount +1}")
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add11, 10);
var add12 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add12.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop12;
add12.LengthCode = newFromat.JsonObject.LengthCodeLoop12;
add12.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add12.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop12;
add12.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop12;
if (add12.ResultCalibration == null)
if (pitem.Value.ToString() == "ok")
{
return alternateReturnObj;
TestStepLoopCalibrateToAdd.Add(new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value());
TestStepLoopCalibrateToAdd[loopCount].ResultCalibration = pitem.Value.ToString();
TestStepLoopCalibrateToAdd[loopCount].SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
loopCount = loopCount + 1;
}
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add12, 11);
var add13 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add13.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop13;
add13.LengthCode = newFromat.JsonObject.LengthCodeLoop13;
add13.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add13.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop13;
add13.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop13;
if (add13.ResultCalibration == null)
if (pitem.Name == $"LengthCode Loop_{loopCount}")
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add13, 12);
var add14 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add14.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop14;
add14.LengthCode = newFromat.JsonObject.LengthCodeLoop14;
add14.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add14.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop14;
add14.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop14;
if (add14.ResultCalibration == null)
if (TestStepLoopCalibrateToAdd.Count == loopCount)
{
return alternateReturnObj;
TestStepLoopCalibrateToAdd[loopCount-1].LengthCode = pitem.Value.ToString();
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add14, 13);
var add15 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add15.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop15;
add15.LengthCode = newFromat.JsonObject.LengthCodeLoop15;
add15.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add15.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop15;
add15.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop15;
if (add15.ResultCalibration == null)
}
if (pitem.Name == $"PowerLevelCalculated Loop_{loopCount}")
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add15, 14);
var add16 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add16.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop16;
add16.LengthCode = newFromat.JsonObject.LengthCodeLoop16;
add16.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add16.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop16;
add16.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop16;
if (add16.ResultCalibration == null)
if (TestStepLoopCalibrateToAdd.Count == loopCount)
{
return alternateReturnObj;
TestStepLoopCalibrateToAdd[loopCount-1].IPowerLevelCalculated = pitem.Value.ToString();
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add16, 15);
}
var add17 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add17.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop17;
add17.LengthCode = newFromat.JsonObject.LengthCodeLoop17;
add17.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add17.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop17;
add17.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop17;
if (add17.ResultCalibration == null)
if (pitem.Name == $"AntennaMatching Loop_{loopCount}")
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add17, 16);
var add18 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add18.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop18;
add18.LengthCode = newFromat.JsonObject.LengthCodeLoop18;
add18.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add18.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop18;
add18.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop18;
if (add18.ResultCalibration == null)
if (TestStepLoopCalibrateToAdd.Count == loopCount)
{
return alternateReturnObj;
TestStepLoopCalibrateToAdd[loopCount-1].IAntennaMatching = pitem.Value.ToString();
}
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add18, 17);
var add19 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add19.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop19;
add19.LengthCode = newFromat.JsonObject.LengthCodeLoop19;
add19.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
}
//if (item.Name
//{
add19.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop19;
add19.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop19;
if (add19.ResultCalibration == null)
//}
}
int i = 0;
foreach (var item in TestStepLoopCalibrateToAdd)
{
return alternateReturnObj;
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(item, i);
i = i + 1;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add19, 18);
var add20 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add20.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop20;
add20.LengthCode = newFromat.JsonObject.LengthCodeLoop20;
add20.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add20.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop20;
add20.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop20;
if (add20.ResultCalibration == null)
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add20, 19);
var add21 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add21.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop21;
add21.LengthCode = newFromat.JsonObject.LengthCodeLoop21;
add21.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add21.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop21;
add21.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop21;
if (add21.ResultCalibration == null)
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add21, 20);
var add22 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add22.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop22;
add22.LengthCode = newFromat.JsonObject.LengthCodeLoop22;
add22.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add22.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop22;
add22.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop22;
if (add22.ResultCalibration == null)
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add22, 21);
var add23 = new Xylem.Common.Logic.ProductionOrderCore.KitronTestResults.Value();
add23.ResultCalibration = newFromat.JsonObject.ResultCalibrationLoop23;
add23.LengthCode = newFromat.JsonObject.LengthCodeLoop23;
add23.SLookupTablePower = newFromat.JsonObject.AttachmentFile.ToLower();
add23.IPowerLevelCalculated = newFromat.JsonObject.PowerLevelCalculatedLoop23;
add23.IAntennaMatching = newFromat.JsonObject.AntennaMatchingLoop23;
if (add23.ResultCalibration == null)
{
return alternateReturnObj;
}
alternateReturnObj.TestStepLoopCalibrate.Values.SetValue(add23, 22);
return alternateReturnObj;
Common/Service/MeterProcessState/Controllers/FinalCheckController.cs
+5
View File
@@ -126,12 +126,17 @@ namespace Service.MeterProcessState.Controllers
var radio = OrderRadioParameter.GetRadioPramas(PcbID, GlobalConfig.connectionString.Value, withPressure ? "p" : "");
if (radio != null)
{
if (radio.EncryptionKey != null)
{
var builder = new StringBuilder();
foreach (var t in radio.EncryptionKey)
{
builder.Append(t.ToString("x2"));
}
}
return Request.CreateResponse(HttpStatusCode.OK, radio);
}
else
Common/Service/MeterProcessState/Controllers/ProccesStateController.cs
+1 -1
View File
@@ -735,7 +735,7 @@ namespace Service.MeterProcessState.Controllers
ret.SkipRadioParameters = (bool)item["SkipRadioParameters"];
ret.SkipFWCheck = (bool)item["SkipFWCheck"];
ret.SkipBatteyCheck = (bool)item["SkipBatteyCheck"];
ret.SkipBatteyCheck = (bool)item["SkipLUT"];
ret.SkipLUT = (bool)item["SkipLUT"];
ret.Date = (DateTime)item["Date"];
ret.Name = item["Name"].ToString();
}