diff --git a/REMAN/NKC.Data/DbModels/RemnantsModel.cs b/REMAN/NKC.Data/DbModels/RemnantsModel.cs index 6e567b0..db09305 100644 --- a/REMAN/NKC.Data/DbModels/RemnantsModel.cs +++ b/REMAN/NKC.Data/DbModels/RemnantsModel.cs @@ -63,6 +63,13 @@ namespace NKC.Data.DbModels get => LMm * WMm; } + + [NotMapped] + public string RemDtmx + { + get => $"MT{MaterialNav.MatExtCode:00000000}-{LMm*1000:00000000}-{WMm*1000:00000000}"; + } + /// /// Navigation property to Material /// diff --git a/REMAN/REMAN/Pages/Remnants.razor b/REMAN/REMAN/Pages/Remnants.razor index 9d5e356..3cf2104 100644 --- a/REMAN/REMAN/Pages/Remnants.razor +++ b/REMAN/REMAN/Pages/Remnants.razor @@ -10,10 +10,10 @@

Remnants

-
+width
@if (processing) { - ...working... + ...working... }
@@ -68,11 +68,11 @@ - Cod - Descr - Location + Qr + Material + Size L x W x T (mm) Qty - L x W x T (mm) + Location Note @@ -80,28 +80,44 @@ @foreach (var record in ListRecords) { - - - - - + +
+
+ +
+
+ +
+
+
+
+ +
+
+ +
+
+ + + +
@record.RemDtmx
+
@record.MaterialNav.MatExtCode - - @record.MaterialNav.MatDesc +
- @record.Location + @record.LMm x @record.WMm x @record.TMm
@@ -117,9 +133,9 @@
- @record.LMm x @record.WMm x @record.TMm + @record.Location - + @record.Note diff --git a/REMAN/REMAN/Pages/Remnants.razor.cs b/REMAN/REMAN/Pages/Remnants.razor.cs index 5b737ba..ffb4cff 100644 --- a/REMAN/REMAN/Pages/Remnants.razor.cs +++ b/REMAN/REMAN/Pages/Remnants.razor.cs @@ -87,6 +87,10 @@ namespace REMAN.Pages [Inject] protected MessageService AppMService { get; set; } + + [Inject] + protected IConfiguration Configuration { get; set; } + protected int SelMatID { get @@ -103,6 +107,19 @@ namespace REMAN.Pages } } + /// + /// Restituisce URL immagine QRCode + /// + /// Parametro da renderizzare con QRCode + /// + protected string getImgUrl(object QrValue) + { + string baseUrl = $"{Configuration["ZCodeUrl"]}/HOME/QR_site/JSON?val="; + string payload = "{'baseUrl':'{0}','parameters':['" + $"{QrValue}" + "']}"; + string answ = $"{baseUrl}{payload}"; + return answ; + } + protected int totalCount { get diff --git a/REMAN/REMAN/appsettings.json b/REMAN/REMAN/appsettings.json index 9d8a6c0..70be43d 100644 --- a/REMAN/REMAN/appsettings.json +++ b/REMAN/REMAN/appsettings.json @@ -9,5 +9,6 @@ "ConnectionStrings": { "NKC.DB": "Server=SQL2016DEV;Database=Sauder_NKC; User ID=sa;Password=keyhammer16; integrated security=False; MultipleActiveResultSets=True; App=REMAN;", "Redis": "localhost:6379" - } + }, + "ZCodeUrl": "https://qrcode.steamware.net/" }