phares3757/oi-metrology
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nuget bump and userSecrets tasks and query update for event

Browse Source 
Allow multiple ids are present
This commit is contained in:
Mike Phares
2023-04-05 13:15:24 -07:00
parent 994556d453
commit 66f38fcf33
21 changed files with 296 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Shared/DataModels/InfinityQSEvent.cs
View File

@ -1,27 +1,13 @@
namespace OI.Metrology.Shared.DataModels;
public record InfinityQSEvent(int F_EVNT,
int F_CRTM,
int F_EDTM,
int F_TYPE,
string F_NAME,
int F_EMPL,
int F_EVTM,
int F_PRCS,
int F_PART,
int F_TEST,
int F_SGTM,
int F_ACC,
int F_ACEM,
int F_ACTM,
int F_CAC,
int F_CAEM,
int F_CATM,
int F_FLAG,
int F_USER,
int F_DSBL,
int F_RFC,
int F_TRTM)
public record InfinityQSEvent(int EV_EVNT,
int EV_SGTM,
string EV_UTC7,
string PR_NAME,
string PD_NAME,
int TD_TEST,
string TD_NAME,
string EV_NAME)
{
public static InfinityQSEventV2[] Convert(InfinityQSEvent[] collection)
@ -34,53 +20,25 @@ public record InfinityQSEvent(int F_EVNT,
public static InfinityQSEventV2 Map(InfinityQSEvent item)
{
InfinityQSEventV2 result = new(item.F_EVNT,
item.F_CRTM,
item.F_EDTM,
item.F_TYPE,
item.F_NAME,
item.F_EMPL,
item.F_EVTM,
item.F_PRCS,
item.F_PART,
item.F_TEST,
item.F_SGTM,
item.F_ACC,
item.F_ACEM,
item.F_ACTM,
item.F_CAC,
item.F_CAEM,
item.F_CATM,
item.F_FLAG,
item.F_USER,
item.F_DSBL,
item.F_RFC,
item.F_TRTM);
InfinityQSEventV2 result = new(item.EV_EVNT,
item.EV_SGTM,
item.EV_UTC7,
item.PR_NAME,
item.PD_NAME,
item.TD_TEST,
item.TD_NAME,
item.EV_NAME);
return result;
}
}
public record InfinityQSEventV2(int Evnt,
int Crtm,
int Edtm,
int Type,
string Name,
int Empl,
int Evtm,
int Prcs,
int Part,
int Test,
int Sgtm,
int Acc,
int Acem,
int Actm,
int Cac,
int Caem,
int Catm,
int Flag,
int User,
int Dsbl,
int Rfc,
int Trtm)
public record InfinityQSEventV2(int EventId,
int SubGroupDateTimeId,
string SubGroupDateTime,
string Process,
string Part,
int VariableNumber,
string Variable,
string Name)
{ }

2
Shared/DataModels/Pinned.cs
View File

@ -24,7 +24,7 @@ public class Pinned : HeaderCommon
ToolTypeName = headerCommon.ToolTypeName;
MesEntity = headerCommon.MesEntity;
Employee = headerCommon.Employee;
Layer = headerCommon.Layer;
PSN = headerCommon.PSN;

1
Shared/Models/Stateless/IInfinityQSRepository.cs
View File

@ -6,6 +6,7 @@ public interface IInfinityQSRepository
{
string GetCommandText(string subGroupId);
string GetCommandText(InfinityQSBase infinityQSBase);
string GetCommandText(string? subGroupId, string? process, string? job, string? part, string? lot, string? dateTime);
Result<InfinityQSBase[]> GetData(string subGroupId);
Result<InfinityQSDescriptor[]> GetDescriptors(string subGroupId);

1
Shared/Models/Stateless/IInfinityQSV2Repository.cs
View File

@ -6,6 +6,7 @@ public interface IInfinityQSV2Repository
{
string GetCommandText(string subGroupId);
string GetCommandText(InfinityQSBaseV2 infinityQSBase);
string GetCommandText(string? subGroupId, string? process, string? job, string? part, string? lot, string? dateTime);
Result<InfinityQSBaseV2[]> GetData(string subGroupId);
Result<InfinityQSDescriptorV2[]> GetDescriptors(string subGroupId);

2
Shared/OI.Metrology.Shared.csproj
View File

@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Text.Json" Version="7.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
</ItemGroup>
</Project>