Egalware/magman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/NewQtyCalc01'

Browse Source
This commit is contained in:
Samuele Locatelli
2024-07-04 15:19:20 +02:00
parent 68d131bc84 627a9297f7
commit c9cd3889da
18 changed files with 62 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MagMan.Core/DTO/MaterialDTO.cs
+7 -2
View File
@@ -48,9 +48,14 @@ namespace MagMan.Core.DTO
public int SizeNum { get; set; } = 0;
/// <summary>
/// Quantità totale in giacenza
/// Quantità totale in giacenza, come lunghezza (m) se barre o area (m2) se pareti
/// </summary>
public int QtyTot { get; set; } = 0;
public double QtyTot { get; set; } = 0;
public string UM
{
get => IsBeam ? "m" : "m2";
}
/// <summary>
/// Codice materiale x QR/Datamatrix
MagMan.Data.Tenant/Controllers/TenantController.cs
+19 -4
View File
@@ -725,7 +725,8 @@ namespace MagMan.Data.Tenant.Controllers
LMm = x.LMm,
WMm = x.WMm,
SizeNum = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Count(),
QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Sum(r => r.QtyAvail),
//QtyTot = x.RawItemList == null ? 0 : x.RawItemList.Where(x => x.IsActive).Sum(r => r.QtyAvail),
QtyTot = x.RawItemList == null ? 0 : calcQty(x.IsBeam, x.RawItemList.Where(x => x.IsActive).ToList()),
MatDtmx = x.MatDtmx,
IsBeam = x.IsBeam,
IsWall = x.IsWall,
@@ -741,6 +742,20 @@ namespace MagMan.Data.Tenant.Controllers
return dbResult;
}
protected double calcQty(bool isBeam, List<RawItemModel> items)
{
double answ = 0;
if (isBeam)
{
answ = items.Sum(x => x.QtyAvail * (double)x.LMm / 1000);
}
else
{
answ = items.Sum(x => x.QtyAvail * (double)x.LMm / 1000 * (double)x.WMm / 1000);
}
return answ;
}
/// <summary>
/// Elenco Materiali gestiti a magazzino formato DTO
/// </summary>
@@ -1122,8 +1137,8 @@ namespace MagMan.Data.Tenant.Controllers
.DbSetProjects
.Where(x => (rec2upd.ProjDbId > 0 && x.ProjDbId == rec2upd.ProjDbId))
.FirstOrDefault();
//.Where(x => (rec2upd.projDbId > 0 && x.projDbId == rec2upd.projDbId) ||
// ((x.ProjExtDbId == rec2upd.ProjExtDbId && x.KeyNum == rec2upd.KeyNum) && (x.ProjExtId == rec2upd.ProjExtId && x.KeyNum == rec2upd.KeyNum)))
//.Where(x => (rec2upd.projDbId > 0 && x.projDbId == rec2upd.projDbId) ||
// ((x.ProjExtDbId == rec2upd.ProjExtDbId && x.KeyNum == rec2upd.KeyNum) && (x.ProjExtId == rec2upd.ProjExtId && x.KeyNum == rec2upd.KeyNum)))
if (currData != null)
{
currData.MachineID = rec2upd.MachineID;
@@ -1217,7 +1232,7 @@ namespace MagMan.Data.Tenant.Controllers
.DbSetProjects
.Where(x => x.ProjDbId == rec2upd.ProjDbId)
.FirstOrDefault();
if(recProj != null)
if (recProj != null)
{
recProj.DtLastAction = adesso;
dbCtx.Entry(recProj).State = EntityState.Modified;
MagMan.UI/Components/AuthKeyMan.razor.cs
+4 -2
View File
@@ -75,14 +75,16 @@ namespace MagMan.UI.Components
await ReloadData();
}
protected void SetNumRec(int newNum)
protected async Task SetNumRec(int newNum)
{
numRecord = newNum;
await Task.Delay(1);
currPage = 1;
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
await Task.Delay(1);
currPage = newNum;
}
MagMan.UI/Components/CustomerMan.razor.cs
+4 -2
View File
@@ -135,14 +135,16 @@ namespace MagMan.UI.Components
await Task.Delay(1);
}
protected void SetNumRec(int newNum)
protected async Task SetNumRec(int newNum)
{
numRecord = newNum;
await Task.Delay(1);
currPage = 1;
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
await Task.Delay(1);
currPage = newNum;
}
MagMan.UI/Components/ItemMan.razor.cs
+2 -2
View File
@@ -213,10 +213,10 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/MacStatusMan.razor.cs
+2 -2
View File
@@ -117,11 +117,11 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/MachineMan.razor.cs
+4 -2
View File
@@ -81,14 +81,16 @@ namespace MagMan.UI.Components
await ReloadData();
}
protected void SetNumRec(int newNum)
protected async Task SetNumRec(int newNum)
{
numRecord = newNum;
await Task.Delay(1);
currPage = 1;
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
await Task.Delay(1);
currPage = newNum;
}
MagMan.UI/Components/MaterialMan.razor
+1 -1
View File
@@ -142,7 +142,7 @@
@item.SizeNum
</td>
<td class="text-end">
@item.QtyTot
@($"{item.QtyTot:N1} {item.UM}")
</td>
}
<AuthorizeView Roles="SuperAdmin, Admin">
MagMan.UI/Components/MaterialMan.razor.cs
+2 -2
View File
@@ -148,11 +148,11 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/MovMag.razor.cs
+2 -2
View File
@@ -141,10 +141,10 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/ProjectMan.razor.cs
+3 -3
View File
@@ -124,11 +124,11 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
@@ -245,7 +245,7 @@ namespace MagMan.UI.Components
SearchRecords = await TService.ProjectGetByMachine(KeyNum, MachineIdSel);
// verifico SE filtrare attivi
if(OnlyActive)
if (OnlyActive)
{
SearchRecords = SearchRecords.Where(x => x.IsActive).ToList();
}
MagMan.UI/Components/ResourcesAct.razor.cs
+2 -2
View File
@@ -106,11 +106,11 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/ResourcesEstim.razor.cs
+2 -2
View File
@@ -105,11 +105,11 @@ namespace MagMan.UI.Components
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected async Task SortRequested(Sorter.SortCallBack e)
MagMan.UI/Components/UserMan.razor.cs
+4 -4
View File
@@ -193,18 +193,18 @@ namespace MagMan.UI.Components
await GetUsers();
}
protected void SetNumRec(int newNum)
protected async Task SetNumRec(int newNum)
{
numRecord = newNum;
currPage = 1;
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
protected void SetPage(int newNum)
protected async Task SetPage(int newNum)
{
currPage = newNum;
DoSelect(null);
InvokeAsync(ReloadData);
await InvokeAsync(ReloadData);
}
#endregion Protected Methods
MagMan.UI/MagMan.UI.csproj
+1 -1
View File
@@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<Version>1.0.2407.0314</Version>
<Version>1.0.2407.0415</Version>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<EnableNETAnalyzers>true</EnableNETAnalyzers>
Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MagMan - Wood Warehouse Management System</i>
<h4>Versione: 1.0.2407.0314</h4>
<h4>Versione: 1.0.2407.0415</h4>
<br /> Note di rilascio:
<ul>
<li>
Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.0.2407.0314
1.0.2407.0415
Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.2407.0314</version>
<version>1.0.2407.0415</version>
<url>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/MagMan.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MagMan/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>