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

Fix gestione update ODL x SheetTech in fase di setup

Browse Source
This commit is contained in:
Samuele E. Locatelli
2020-12-14 19:00:23 +01:00
parent 5e5faecc1b
commit 1b9517df64
7 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
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/MP-TAB.csproj
-3
View File
@@ -507,7 +507,6 @@
<Content Include="images\ST_img\Steamware.png" />
<Content Include="IOB-info.aspx" />
<Content Include="jumper.aspx" />
<Content Include="libzstd.dll" />
<Content Include="Logout.aspx" />
<Content Include="MappaStato.aspx" />
<Content Include="mongocrypt.dll" />
@@ -684,8 +683,6 @@
<Content Include="Scripts\WebForms\WebParts.js" />
<Content Include="Scripts\WebForms\WebUIValidation.js" />
<Content Include="SendParameters.aspx" />
<Content Include="snappy32.dll" />
<Content Include="snappy64.dll" />
<Content Include="StoricoTC.aspx" />
<Content Include="SheetTech.aspx" />
<Content Include="Test.aspx" />
MP-TAB/SheetTech.aspx.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace MoonProTablet
private void checkModuleEnabled()
{
cmp_sheetTech.Visible = enableSchedaTecnica;
cmp_sheetTech.Visible = enableSchedaTecnica && (idxODL > 0);
cmp_disabled.Visible = !enableSchedaTecnica;
}
MP-TAB/WebUserControls/cmp_sheetTech.ascx.cs
+25 -15
View File
@@ -20,8 +20,14 @@ namespace MoonProTablet.WebUserControls
}
set
{
hfCodArticolo.Value = value.Trim();
cmp_ST_objCheck.CodArticolo = value.Trim();
string newVal = value.Trim();
hfCodArticolo.Value = newVal;
cmp_ST_objCheck.CodArticolo = newVal;
// se ho articolo FIX DISPLAY!
if (!string.IsNullOrEmpty(newVal))
{
repGroup.DataBind();
}
}
}
@@ -36,23 +42,27 @@ namespace MoonProTablet.WebUserControls
{
// condizioni booleane
bool inAttr = false;
// controllo se la macchina è in attrezzaggio...
DS_applicazione.StatoMacchineRow rigaStato = null;
try
// SOLO SE ho articolo sennò niente reset...
if (!string.IsNullOrEmpty(CodArticolo))
{
// se è multi controllo parent...
if (isMulti)
// controllo se la macchina è in attrezzaggio...
DS_applicazione.StatoMacchineRow rigaStato = null;
try
{
rigaStato = selData.mng.rigaStato(idxMaccParent);
// se è multi controllo parent...
if (isMulti)
{
rigaStato = selData.mng.rigaStato(idxMaccParent);
}
else
{
rigaStato = selData.mng.rigaStato(idxMacchinaFix);
}
inAttr = (rigaStato.IdxStato == 2);
}
else
{
rigaStato = selData.mng.rigaStato(idxMacchinaFix);
}
inAttr = (rigaStato.IdxStato == 2);
catch
{ }
}
catch
{ }
lbtClearOdl.Visible = inAttr;
}
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+6 -6
View File
@@ -857,8 +857,8 @@ namespace MoonProTablet.WebUserControls
}
// resetto ODL su redis...
DataLayerObj.emptyCurrODL(idxMacchinaFix);
// imposto odl a zero...
idxOdl = 0;
// reset ODL!...
idxOdl = -1;
// aggiorno visualizzazione
checkAll();
// sollevo evento!
@@ -1038,14 +1038,14 @@ namespace MoonProTablet.WebUserControls
{
TCRichAttr = TCAssegnato(idxODLSel);
}
int idxODL = 0;
int idxODLTemp = 0;
if (enableSplitODL)
{
// splitto VECCHIO ODL (se è rimasto qualcosa da produrre e se ce ne è rimasto uno.......)
try
{
idxODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
DataLayerObj.taODL.splitODL(idxODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODL), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODL, TCAssegnato(idxODL)), false, 0);
idxODLTemp = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
DataLayerObj.taODL.splitODL(idxODLTemp, DataLayerObj.MatrOpr, idxMacchinaFix, TCAssegnato(idxODLTemp), PzPallet, string.Format("inizio attrezzaggio, Sospensione ODL {0}, generato residuo con pari TCiclo: {1}", idxODLTemp, TCAssegnato(idxODLTemp)), false, 0);
// se è multi processo ANCHE x altra tavola...
if (isMulti)
{
@@ -1152,7 +1152,7 @@ namespace MoonProTablet.WebUserControls
// imposto ODL su redis...
DataLayerObj.saveCurrODL(idxMacchinaFix, idxODL_curr.ToString());
// salvo odl selezionato
idxODL = idxODL_curr;
idxOdl = idxODL_curr;
}
else
{