Egalware/MoonPro.net
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix messaggio x lotti non richiesti TAB - 1351

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-12-16 18:20:58 +01:00
parent 37f5443d46
commit e11f95679b
7 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -12,7 +12,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1350']) {
withEnv(['NEXT_BUILD_NUMBER=1351']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.12.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-IO/MP-IO.csproj.user
+1 -1
View File
@@ -10,7 +10,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
<WebStackScaffolding_ControllerDialogWidth>600</WebStackScaffolding_ControllerDialogWidth>
MP-MON/MP-MON.csproj.user
+1 -1
View File
@@ -19,7 +19,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<Controller_SelectedScaffolderID>ApiControllerWithActionsScaffolder</Controller_SelectedScaffolderID>
<Controller_SelectedScaffolderCategoryPath>root/Controller</Controller_SelectedScaffolderCategoryPath>
</PropertyGroup>
MP-Site/MP-Site.csproj.user
+1 -1
View File
@@ -8,7 +8,7 @@
<IISExpressWindowsAuthentication />
<IISExpressUseClassicPipelineMode />
<UseGlobalApplicationHostFile />
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<ProjectView>ShowAllFiles</ProjectView>
<NameOfLastUsedPublishProfile>IIS02</NameOfLastUsedPublishProfile>
</PropertyGroup>
MP-TAB/WebUserControls/cmp_ST_objCheck.ascx
+3 -3
View File
@@ -1,13 +1,13 @@
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objCheck.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objCheck" %>
<div class="form-row" runat="server" id="divCheckData">
<div class="form-group col-8 col-md-9 col-lg-10">
<div class="form-group col-8 col-md-9 col-lg-10 mb-0">
<asp:TextBox runat="server" ID="txtInput" CssClass="form-control form-control-lg" OnTextChanged="txtInput_TextChanged" TabIndex="1" AutoPostBack="true" />
</div>
<div class="col-4 col-md-3 col-lg-2">
<div class="form-group col-4 col-md-3 col-lg-2 mb-0">
<asp:LinkButton ID="lbtCerca" runat="server" CssClass="btn text-truncate btn-warning btn-lg btn-block text-uppercase"><i class="fa fa-barcode"></i> read</asp:LinkButton>
</div>
<div class="col-12 small text-center">
<div class="col-12 text-center">
<asp:Label runat="server" ID="lblMessage" Text="prego confermare parametri" />
</div>
</div>
MP-TAB/WebUserControls/cmp_ST_objCheck.ascx.cs
+37 -8
View File
@@ -90,8 +90,12 @@ namespace MoonProTablet.WebUserControls
private void processInput()
{
bool found = false;
MapoDb.DS_Arca.GiacenzeDataTable tabGiacenzeLotto = new MapoDb.DS_Arca.GiacenzeDataTable();
MapoDb.DS_SheetTech.ST_ActualRowDataTable tabRichieste = new MapoDb.DS_SheetTech.ST_ActualRowDataTable();
MapoDb.DS_SheetTech.ST_ActualRowRow datiBatchCheck;
MapoDb.DS_Arca.GiacenzeRow datiLotto;
// per prima cosa recupero i valori "Pending" da leggere come candidati...
var tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
tabRichieste = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
if (tabRichieste != null && tabRichieste.Count > 0)
{
// cerco per EQ come primo step...
@@ -111,30 +115,55 @@ namespace MoonProTablet.WebUserControls
// se non trovato
if (!found)
{
// recupero record.. cercando in giacenza il LOTTO...
tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false);
// controllo condizione tipo BATCH (speciale) - prima solo che CI SIA una richiesta di questo tipo
var trovatoBatch = tabRichieste.Where(x => x.CheckType == "BATCH");
if (trovatoBatch != null && trovatoBatch.Count() > 0)
{
// recupero record.. cercando in giacenza il LOTTO...
var tabGiacenzeLotto = DataLayerObj.taArcaGiac.getBySearch(null, "", BCodeVal, "", false);
if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0)
{
var datiBatchCheck = trovatoBatch.FirstOrDefault();
var datiLotto = tabGiacenzeLotto.FirstOrDefault();
datiBatchCheck = trovatoBatch.FirstOrDefault();
datiLotto = tabGiacenzeLotto.FirstOrDefault();
// registro trovato
found = true;
lblMessage.Text = $"Parametro acquisito: {BCodeVal} --> {datiLotto.Cd_AR}";
lblMessage.CssClass = "text-success";
// upsert controllo
DataLayerObj.taSTChk.upsertQuery(idxOdl, datiBatchCheck.IdxST, datiBatchCheck.Oggetto, datiBatchCheck.Num, BCodeVal, datiLotto.Cd_AR, true, user_std.UtSn.utente);
// conto quanti check ci sono dopo, se calati --> ok altrimenti errore
var tabRichiestePost = DataLayerObj.taSTAR.getPendingByOdl(idxOdl);
if (tabRichiestePost.Count < tabRichieste.Count)
{
lblMessage.Text = $"Lotto riconosciuto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo acquisito";
lblMessage.CssClass = "text-success";
}
else
{
lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto";
lblMessage.CssClass = "text-danger";
}
}
}
}
// se non trovato
if (!found)
{
if (tabGiacenzeLotto != null && tabGiacenzeLotto.Count > 0)
{
datiLotto = tabGiacenzeLotto.FirstOrDefault();
lblMessage.Text = $"Lotto: {BCodeVal} --> {datiLotto.Cd_AR} | Articolo NON richiesto";
lblMessage.CssClass = "text-danger";
}
else
{
lblMessage.Text = $"Parametro non riconosciuto: {BCodeVal}";
lblMessage.CssClass = "text-secondary";
}
}
}
else
{
lblMessage.Text = "Parametro non valido";
lblMessage.Text = $"Parametro non valido: {BCodeVal}";
lblMessage.CssClass = "text-secondary";
}
WebConfigSetter/WebConfigSetter.csproj
+3
View File
@@ -45,5 +45,8 @@
<None Update="CONF\Steamware.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="CONF\Valvital.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
</Project>