Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://gitlab.steamware.net/steamware/mapo-core into develop

Browse Source
This commit is contained in:
Samuele Locatelli
2022-12-12 20:09:10 +01:00
parent 076495494d 19b6cc5be6
commit fafa8c9f68
10 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Data/DatabaseModels/AnagLottiArca.cs
+2 -2
View File
@@ -19,8 +19,8 @@ namespace MP.Data.DatabaseModels
public string Cd_MGUbicazione { get; set; }
public string Cd_ARLotto { get; set; }
public string Cd_DoSottoCommessa { get; set; }
public decimal Quantita { get; set; }
public decimal Valore { get; set; }
public string Quantita { get; set; }
public string Valore { get; set; }
public string IniQ { get; set; }
public string IniV { get; set; }
public string RetQ { get; set; }
MP.INVE/Components/InveSessionList.razor
+1 -1
View File
@@ -94,7 +94,7 @@
{
<td>
<!-- Button trigger modal -->
<button type="button" class="btn btn-dark" data-bs-toggle="modal" data-bs-target="#exampleModal" @onclick="()=> getCurrSess(item.InveSessID, item.AnagMagNav.MagID)" title="Apri qr per connettersi alla sessione">
<button type="button" class="btn btn-dark" data-bs-toggle="modal" data-bs-target="#exampleModal" @onclick="()=> getCurrSess(item.InveSessID, item.AnagMagNav.CodMag)" title="Apri qr per connettersi alla sessione">
<i class="fa-solid fa-qrcode"></i>
</button>
</td>
MP.INVE/Components/InveSessionList.razor.cs
+2 -2
View File
@@ -111,7 +111,7 @@ namespace MP.INVE.Components
}
}
protected async Task getCurrSess(int idSess, int idMag)
protected async Task getCurrSess(int idSess, string idMag)
{
currIdSess = idSess;
currIdMag = idMag;
@@ -190,7 +190,7 @@ namespace MP.INVE.Components
[Parameter]
public int currIdSess { get; set; }
[Parameter]
public int currIdMag { get; set; }
public string currIdMag { get; set; }
[Inject]
private MiDataService MIDataservice { get; set; } = null!;
MP.INVE/Components/ProcSuggestion.razor.cs
+11 -8
View File
@@ -35,7 +35,7 @@ namespace MP.INVE.Components
[Parameter]
public int sessID { get; set; } = 0;
[Parameter]
public int magID { get; set; } = 0;
public string magID { get; set; } = "";
[Inject]
public IJSRuntime JSRuntime { get; set; } = null!;
[Inject]
@@ -120,8 +120,16 @@ namespace MP.INVE.Components
}
else
{
searchRecordsLottoInterni = MIService.ElencoLotti();
lottoInterno = searchRecordsLottoInterni.Where(x => x.Lotto == lastScan).FirstOrDefault();
if (lastScan.StartsWith("M") && lastScan.Length == 10)
{
searchRecordsLottoInterni = MIService.ElencoLotti();
lottoInterno = searchRecordsLottoInterni.Where(x => (x.Lotto == lastScan) && x.Origine == "INT").FirstOrDefault();
}
else
{
searchRecordsLottoEsterni = MIService.ListLottiEsterni(articoloScan, lastScan, magID);
lottoEsterno = searchRecordsLottoEsterni.FirstOrDefault();
}
if (lottoInterno != null)
{
tipo = "LOTTO";
@@ -132,14 +140,9 @@ namespace MP.INVE.Components
}
else
{
searchRecordsLottoEsterni = MIService.ListLottiEsterni(articoloScan, lastScan, magID.ToString());
lottoEsterno = searchRecordsLottoEsterni.FirstOrDefault();
if (lottoEsterno != null)
{
tipo = "LOTTO EXT";
//currLotto = lottoEsterno;
//lottoScan = lottoEsterno.Lotto;
//articoloScan = lottoInterno.CodArt;
quantitaScan = 0;
}
else
MP.INVE/Data/MiDataService.cs
+2 -2
View File
@@ -634,8 +634,8 @@ namespace MP.INVE.Data
private const string redisOperatoriBaseAddr = ":Operatore";
private const string redisLottiBaseAddr = ":Lotti";
private const string redisUdcBaseAddr = ":UDC";
private const string redisLottiInterni = redisLottiBaseAddr + ":LottiInterni";
private const string redisLottiEsterni = redisLottiBaseAddr + ":LottiEsterni";
private const string redisLottiInterni = redisBaseAddr + redisLottiBaseAddr + ":LottiInterni";
private const string redisLottiEsterni = redisBaseAddr + redisLottiBaseAddr + ":LottiEsterni";
private const string redisConfigBaseAddr = ":Config";
private const string redisScanBaseAddr = redisBaseAddr + ":Scan";
private const string redisElencoOperatori = redisBaseAddr + redisOperatoriBaseAddr + ":ListOperatori";
MP.INVE/MP.INVE.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.INVE</RootNamespace>
<Version>6.16.2212.1216</Version>
<Version>6.16.2212.1218</Version>
</PropertyGroup>
<ItemGroup>
MP.INVE/Pages/Acquisizione.razor.cs
+2 -2
View File
@@ -37,7 +37,7 @@ namespace MP.INVE.Pages
protected string rawScan { get; set; } = null!;
protected string idOpr { get; set; } = null!;
protected int sessionId { get; set; } = 0;
protected int magazzinoId { get; set; } = 0;
protected string magazzinoId { get; set; } = "";
protected int nScansioniTot { get; set; } = 0;
protected string descr { get; set; } = "";
@@ -53,7 +53,7 @@ namespace MP.INVE.Pages
{
idOpr = _matrOpr;
sessionId = int.Parse(_inveSessionId);
magazzinoId = int.Parse(_idMag);
magazzinoId = _idMag;
eleScansioni = MIService.ScanBySession(sessionId);
nScansioniTot = eleScansioni.Count();
MP.INVE/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOINVE </i>
<h4>Versione: 6.16.2212.1216</h4>
<h4>Versione: 6.16.2212.1218</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.INVE/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2212.1216
6.16.2212.1218
MP.INVE/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2212.1216</version>
<version>6.16.2212.1218</version>
<url>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/MP.INVE.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-INVE/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>