diff --git a/Common/CommonConsole/Program.cs b/Common/CommonConsole/Program.cs index 24b03451..cee36c1a 100644 --- a/Common/CommonConsole/Program.cs +++ b/Common/CommonConsole/Program.cs @@ -12,23 +12,29 @@ { public static void Main() { - var connection = new OmniIrdaConnection("COM36"); - connection.StateChenged += Console.WriteLine; - connection.Open(); - - if (connection.FactorySeal().Sealed) - { - var _sealed = connection.FactorySeal(false); - } - - var response = connection.Set(new BuildInfo - { - Value = "816232411982" - }); - - connection.Close(); + var a = 816242311982; + var b = (int)a; + Console.WriteLine(a); + Console.WriteLine(b); Console.ReadKey(); + //var connection = new OmniIrdaConnection("COM36"); + //connection.StateChenged += Console.WriteLine; + //connection.Open(); + + //if (connection.FactorySeal().Sealed) + //{ + // var _sealed = connection.FactorySeal(false); + //} + + //var response = connection.Set(new BuildInfo + //{ + // Value = "816232411982" + //}); + + //connection.Close(); + + //Console.ReadKey(); //response = connection.ClearDisplay(); //response = connection.Set(new LeakAlarm diff --git a/Common/OmniPlus/InspectionUI.Plugins.Omni/InspectionUI.Plugins.Omni.csproj b/Common/OmniPlus/InspectionUI.Plugins.Omni/InspectionUI.Plugins.Omni.csproj index 89f12196..deaad3e7 100644 --- a/Common/OmniPlus/InspectionUI.Plugins.Omni/InspectionUI.Plugins.Omni.csproj +++ b/Common/OmniPlus/InspectionUI.Plugins.Omni/InspectionUI.Plugins.Omni.csproj @@ -53,7 +53,7 @@ HttpExtensions - {C6BFAC88-5647-4131-90B1-4D6265E08348} + {c6bfac88-5647-4131-90b1-4d6265e08348} InspectionUI.Abstraction diff --git a/Common/OmniPlus/OmniPlus/Inspection/TestRun.cs b/Common/OmniPlus/OmniPlus/Inspection/TestRun.cs index 2bf1a55d..93d44683 100644 --- a/Common/OmniPlus/OmniPlus/Inspection/TestRun.cs +++ b/Common/OmniPlus/OmniPlus/Inspection/TestRun.cs @@ -69,7 +69,10 @@ ?? new double[3]; internal TestedPoint GetTestedPoint() - => new TestedPoint + { + var tpCount = this.TestPoints.Count + 1; + + return new TestedPoint { RunId = this.Id, Pcb = this.Pcb, @@ -79,9 +82,10 @@ Id = this.CurrentTP.Id, M3S = this.CurrentTP.M3S, M3SRef = this.CurrentTP.M3SRef, - Nr = this.CurrentTP.Nr, + Nr = tpCount - this.CurrentTP.Nr, Rotations = this.CurrentTP.Rotations }; + } internal TestedRun GetTestedRun() => new TestedRun diff --git a/Common/OmniPlus/OmniPlus/OmniPlus.csproj b/Common/OmniPlus/OmniPlus/OmniPlus.csproj index 5625328d..9636f391 100644 --- a/Common/OmniPlus/OmniPlus/OmniPlus.csproj +++ b/Common/OmniPlus/OmniPlus/OmniPlus.csproj @@ -49,10 +49,6 @@ ..\..\packages\NLog.5.2.8\lib\net35\NLog.dll - - False - ..\..\packages\SqlExtensions\SqlExtensions.dll - @@ -136,10 +132,6 @@ - - {6033FF0C-CF32-4BC5-8EFE-4774CCDC663D} - ExchangeHub - {DC78FF93-86FE-4099-8ACC-41B6B0533B69} HttpExtensions diff --git a/LaaProductionWeb/Data/LaaProduction.Data.Inspection/InspectionDbContext.cs b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/InspectionDbContext.cs new file mode 100644 index 00000000..a4e31c27 --- /dev/null +++ b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/InspectionDbContext.cs @@ -0,0 +1,44 @@ +namespace LaaProduction.Data.Inspection +{ + public class InspectionDbContext + { + } +} + +/** + * Pruefgang + * |_ PruefgangNr + * |_ PruefstationNr + * |_ Pruefstation + * |_ Nr + * |_ Typ + * |_ Gesperrt + * |_ Bemerkung + * |_ PrueferNr + * |_ Pruefer + * |_ Nr + * |_ Name + * |_ Vorname + * |_ IstPruefer + * |_ Pruefzeit + * |_ PruefgangLang + * |_ Datum + * |_ Typ + * |_ Nennweite + * |_ Nenntemperatur + * |_ Lufttemperatur + * |_ LuftDruck + * |_ RelativeFeuchte + * |_ Vorlauftemperatur + * |_ Einbaulage_alt + * |_ Anzahl + * |_ Bemerkung + * |_ DBasePruefgangNr + * |_ KalibrierID + * |_ Metrolog + * |_ FPP + * |_ Korrigiert + * |_ Typzusatz + * |_ Baulaenge + * |_ Pruefpunkte[1..10] + */ diff --git a/LaaProductionWeb/Data/LaaProduction.Data.Inspection/LaaProduction.Data.Inspection.csproj b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/LaaProduction.Data.Inspection.csproj index fc20a629..ea76d4e4 100644 --- a/LaaProductionWeb/Data/LaaProduction.Data.Inspection/LaaProduction.Data.Inspection.csproj +++ b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/LaaProduction.Data.Inspection.csproj @@ -40,6 +40,7 @@ + diff --git a/LaaProductionWeb/Data/LaaProduction.Data.Inspection/PruefgangPP.cs b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/PruefgangPP.cs index 5606a2cc..7c6b18ab 100644 --- a/LaaProductionWeb/Data/LaaProduction.Data.Inspection/PruefgangPP.cs +++ b/LaaProductionWeb/Data/LaaProduction.Data.Inspection/PruefgangPP.cs @@ -2,28 +2,30 @@ { public class PruefgangPP { + public int Nr { get; set; } + public int PruefgangNr { get; set; } public int PruefpunktNr { get; set; } - public double PP1_Zeit { get; set; } + public double Zeit { get; set; } - public double PP1_Soll { get; set; } + public double Soll { get; set; } - public double PP1_Ist { get; set; } + public double Ist { get; set; } - public int PP1_RefZSerienNr { get; set; } + public int RefZSerienNr { get; set; } - public double PP1_RefFehl { get; set; } + public double RefFehl { get; set; } - public double PP1_Ist_V { get; set; } + public double Ist_V { get; set; } - public byte PP1_Waage { get; set; } + public byte Waage { get; set; } - public char PP1_Info { get; set; } + public char Info { get; set; } - public double PP1_T_Start { get; set; } + public double T_Start { get; set; } - public double PP1_T_Ende { get; set; } + public double T_Ende { get; set; } } } diff --git a/LaaProductionWeb/LaaProductionVFM/Omni.aspx b/LaaProductionWeb/LaaProductionVFM/Omni.aspx index 2fb90acf..8839e10e 100644 --- a/LaaProductionWeb/LaaProductionVFM/Omni.aspx +++ b/LaaProductionWeb/LaaProductionVFM/Omni.aspx @@ -23,6 +23,12 @@ + + Barcode Nr. + + + + Deckel Nr. @@ -35,6 +41,12 @@ + + Box-Titel + + + + Bezeichnung L1 diff --git a/LaaProductionWeb/LaaProductionVFM/Omni.aspx.cs b/LaaProductionWeb/LaaProductionVFM/Omni.aspx.cs index a6f1e401..748953f9 100644 --- a/LaaProductionWeb/LaaProductionVFM/Omni.aspx.cs +++ b/LaaProductionWeb/LaaProductionVFM/Omni.aspx.cs @@ -46,7 +46,32 @@ protected string SERIALNO { get; set; } - protected string TITLE { get; set; } + /// + /// boxlabel + /// + protected string TITLE + { + get + { + return this.title.Value; + } + set + { + this.title.Value = value; + } + } + + protected string TAGNO + { + get + { + return this.tagno.Value; + } + set + { + this.tagno.Value = value; + } + } /// /// testlabel, boxlabel @@ -325,6 +350,23 @@ return; } + else if (custsn != this.TAGNO) + { + this.ViewState[Appsettings.ERROR_MSG] = "Eingegebene Deckel und Messeinsatz passen nicht zueinander."; + + return; + } + + this.ORDERNO = default(string); + this.POSNO = default(string); + this.CUSTSN = default(string); + this.REGSN = default(string); + this.PARTNO = default(string); + this.DESCRIPTIONL1 = default(string); + this.DESCRIPTIONL2 = default(string); + this.TITLE = default(string); + this.QUANTITY = default(string); + this.BOXNO = default(string); using (var connection = new SqlConnection(Appsettings.SQLServer)) { @@ -422,6 +464,15 @@ return; } + this.QMINGPM = default(string); + this.QMINACC = default(string); + this.QMIDGPM = default(string); + this.QMIDACC = default(string); + this.QMAXGPM = default(string); + this.QMAXACC = default(string); + this.TESTDATE = default(string); + this.DESCRIPTION = default(string); + using (var connection = new SqlConnection(Appsettings.SQLServer)) { connection.FireInfoMessageEventOnUserErrors = true;