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

Solution builds successfully

Browse Source
This commit is contained in:
Stoyan Zlatev
2024-06-04 14:21:33 +02:00
parent 1e3b4a0a1d
commit cc2cf2cc3f
9 changed files with 149 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Common/CommonConsole/Program.cs
+21 -15
View File
@@ -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
Common/OmniPlus/InspectionUI.Plugins.Omni/InspectionUI.Plugins.Omni.csproj
+1 -1
View File
@@ -53,7 +53,7 @@
<Name>HttpExtensions</Name>
</ProjectReference>
<ProjectReference Include="..\InspectionUI.Abstraction\InspectionUI.Abstraction.csproj">
<Project>{C6BFAC88-5647-4131-90B1-4D6265E08348}</Project>
<Project>{c6bfac88-5647-4131-90b1-4d6265e08348}</Project>
<Name>InspectionUI.Abstraction</Name>
</ProjectReference>
<ProjectReference Include="..\InspectionUI.RemoteControl\InspectionUI.RemoteControl.csproj">
Common/OmniPlus/OmniPlus/Inspection/TestRun.cs
+6 -2
View File
@@ -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
Common/OmniPlus/OmniPlus/OmniPlus.csproj
-8
View File
@@ -49,10 +49,6 @@
<Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\..\packages\NLog.5.2.8\lib\net35\NLog.dll</HintPath>
</Reference>
<Reference Include="SqlExtensions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\SqlExtensions\SqlExtensions.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Configuration" />
<Reference Include="System.Core" />
@@ -136,10 +132,6 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ExchangeHub\ExchangeHub.csproj">
<Project>{6033FF0C-CF32-4BC5-8EFE-4774CCDC663D}</Project>
<Name>ExchangeHub</Name>
</ProjectReference>
<ProjectReference Include="..\HttpExtensions\HttpExtensions.csproj">
<Project>{DC78FF93-86FE-4099-8ACC-41B6B0533B69}</Project>
<Name>HttpExtensions</Name>
LaaProductionWeb/Data/LaaProduction.Data.Inspection/InspectionDbContext.cs
+44
View File
@@ -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]
*/
LaaProductionWeb/Data/LaaProduction.Data.Inspection/LaaProduction.Data.Inspection.csproj
+1
View File
@@ -40,6 +40,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="InspectionDbContext.cs" />
<Compile Include="Pruefer.cs" />
<Compile Include="Prueffehler.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
LaaProductionWeb/Data/LaaProduction.Data.Inspection/PruefgangPP.cs
+12 -10
View File
@@ -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; }
}
}
LaaProductionWeb/LaaProductionVFM/Omni.aspx
+12
View File
@@ -23,6 +23,12 @@
<input id="regsn" runat="server" class="form-control form-control-sm rounded-0 border-0 bg-light" readonly />
</td>
</tr>
<tr>
<th class="bg-light">Barcode Nr.</th>
<td class="text-end p-0" colspan="2">
<input id="tagno" runat="server" onserverchange="LoadOrderData" class="form-control form-control-sm rounded-0 border-0" />
</td>
</tr>
<tr>
<th class="bg-light">Deckel Nr.</th>
<td class="text-end p-0" colspan="2">
@@ -35,6 +41,12 @@
<input id="partno" runat="server" class="form-control form-control-sm rounded-0 border-0 bg-light" readonly />
</td>
</tr>
<tr>
<th class="bg-light">Box-Titel</th>
<td class="text-end p-0" colspan="2">
<input id="title" runat="server" class="form-control form-control-sm rounded-0 border-0 bg-light" readonly />
</td>
</tr>
<tr>
<th class="bg-light">Bezeichnung L1</th>
<td class="text-end p-0" colspan="2">
LaaProductionWeb/LaaProductionVFM/Omni.aspx.cs
+52 -1
View File
@@ -46,7 +46,32 @@
protected string SERIALNO { get; set; }
protected string TITLE { get; set; }
/// <summary>
/// boxlabel
/// </summary>
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;
}
}
/// <summary>
/// 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;