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

Merge branch 'TAB' into ES3

Browse Source
This commit is contained in:
Samuele E. Locatelli
2021-01-05 19:14:53 +01:00
parent a4bbd6ecbd b3f2b95013
commit ee8519fd64
7 changed files with 41 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -13,7 +13,7 @@ pipeline {
steps {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1359']) {
withEnv(['NEXT_BUILD_NUMBER=1360']) {
// 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-ADM/WebUserControls/cmp_ST_preview.ascx
+1 -1
View File
@@ -8,7 +8,7 @@
<h4>Scheda Tecnica Articolo</h4>
</div>
<div class="col-2">
<asp:LinkButton runat="server" ID="lbtPaste" CssClass="btn btn-block btn-outline-light" OnClick="lbtPaste_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("ConfirmPasteFullST") %>'>
<asp:LinkButton runat="server" ID="lbtPaste" CssClass="btn btn-block btn-outline-light" OnClick="lbtPaste_Click">
<i class="fa fa-clone" aria-hidden="true"></i> PASTE
</asp:LinkButton>
</div>
MP-ADM/WebUserControls/cmp_ST_preview.ascx.cs
+3 -2
View File
@@ -82,9 +82,8 @@ namespace MP_ADM.WebUserControls
}
}
// verifica x stile copy
lbtCopy.CssClass = checkSource ? "btn btn-block btn-light" : "btn btn-block btn-outline-light";
lbtCopy.CssClass = checkSource ? "btn btn-block btn-light border border-dark" : "btn btn-block btn-outline-light";
lbtPaste.Visible = showPaste;
lbtPaste.DataBind();
}
#endregion Private Methods
@@ -129,6 +128,8 @@ namespace MP_ADM.WebUserControls
if (!Page.IsPostBack)
{
clipboard = "";
string testo = traduci("ConfirmPasteFullST");
lbtPaste.OnClientClick = SteamWare.jsUtils.getCBE(testo, false);
}
checkClipboard();
}
MP-IO/Controllers/IOBController.cs
+6 -2
View File
@@ -336,12 +336,16 @@ namespace MP_IO.Controllers
/// <param name="qtyFromLast"></param>
/// <param name="roundStep"></param>
/// <returns>Esito chiamata (OK/vuoto)</returns>
public string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int roundStep)
public string forceSplitOdlFull(string id, bool doConfirm, bool qtyFromLast, int? roundStep)
{
// attenzione! poiché nell'URL il carattere "#" fiene filtrato ci aspettiamo il carattere "|" che poi trasformiamo ora in "#"
id = id.Replace("|", "#");
DataLayer DataLayerObj = new DataLayer();
return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, roundStep);
if (roundStep == null)
{
roundStep = 100;
}
return DataLayerObj.forceSplitOdl(id, doConfirm, qtyFromLast, (int)roundStep);
}
/// <summary>
MP-TAB/WebUserControls/mod_ODL.ascx
+1 -1
View File
@@ -92,7 +92,7 @@
</div>
<div class="row pb-3 mt-3">
<div class="col-sm-6">
<asp:Label runat="server" ID="lblNeedSTAR" Visible="false" CssClass="btn btn-block btn-outline-danger">Scheda Tecnica incompleta!!!</asp:Label>
<asp:HyperLink runat="server" ID="hlNeedStar" NavigateUrl="~/SheetTech" Visible="false" CssClass="btn btn-block btn-outline-danger">Scheda Tecnica incompleta!!!</asp:HyperLink>
<asp:LinkButton runat="server" ID="lbtStartProd" OnClick="lbtStartProd_Click" OnClientClick='<%# SteamWare.jsUtils.getCBE("confermaInizioProd") %>' CssClass="btn btn-block btn-warning"><i class="fa fa-check"></i> FINE Attr / INIZIO Prod.</asp:LinkButton>
</div>
<div class="col-sm-6">
MP-TAB/WebUserControls/mod_ODL.ascx.cs
+27 -10
View File
@@ -46,6 +46,17 @@ namespace MoonProTablet.WebUserControls
}
}
/// <summary>
/// Verifica chiave showOdlProvv in tab Config
/// </summary>
protected bool enableRiattrezzaggio
{
get
{
return memLayer.ML.cdvb("enableRiattrezzaggio");
}
}
/// <summary>
/// Restituisce il codice IdxMacchina dell'altra tavola (se multi) altrimenti la stessa macchina...
/// </summary>
@@ -437,7 +448,7 @@ namespace MoonProTablet.WebUserControls
private void checkBtnStatus()
{
// di default rendo abilitato / disabilitato tutto in base al valore "isEnabled"
lbtShowSplitODL.Enabled = isEnabled;
lbtShowSplitODL.Enabled = isEnabled && enableRiattrezzaggio;
lbtSplitODL.Enabled = isEnabled;
chkCloseOdl.Enabled = isEnabled;
fixWCtrStatus(lbtShowSplitODL);
@@ -487,12 +498,12 @@ namespace MoonProTablet.WebUserControls
bool okCheckST = tabRichieste.Count == 0;
if (okCheckST)
{
lblNeedSTAR.Visible = false;
hlNeedStar.Visible = false;
lbtStartProd.Enabled = (isEnabled && inAttr);
}
else
{
lblNeedSTAR.Visible = (isEnabled && inAttr);
hlNeedStar.Visible = (isEnabled && inAttr);
lbtStartProd.Enabled = false;
}
}
@@ -608,7 +619,7 @@ namespace MoonProTablet.WebUserControls
/// <param name="splitOdl"></param>
private void fixSplitBtn(bool splitOdl)
{
lbtShowSplitODL.Visible = !splitOdl;
lbtShowSplitODL.Visible = !splitOdl && enableRiattrezzaggio;
chkCloseOdl.Visible = !splitOdl;
lbtSplitODL.Visible = splitOdl;
showNoteTC(splitOdl);
@@ -846,8 +857,7 @@ namespace MoonProTablet.WebUserControls
DataLayerObj.taODL.fixMachineSlave(idxMacchina, 30, 1);
}
// sistemo buttons!
bool splitOdl = false;
fixSplitBtn(splitOdl);
fixSplitBtn(false);
}
catch (Exception exc)
{
@@ -926,8 +936,7 @@ namespace MoonProTablet.WebUserControls
/// <param name="e"></param>
protected void lbtShowSplitODL_Click(object sender, EventArgs e)
{
bool splitOdl = true;
fixSplitBtn(splitOdl);
fixSplitBtn(true);
// recupero current idx
int currODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
updateTempoTc(currODL, true);
@@ -955,6 +964,12 @@ namespace MoonProTablet.WebUserControls
// effettuo split su nuovo ODL
DataLayerObj.taODL.splitODL(currODL, DataLayerObj.MatrOpr, idxMacchinaFix, TCRichAttr, PzPallet, txtNote.Text, true, 0);
// se c'è gestione SchedaTecnica --> chiamo procedura update x lotti
if (enableSchedaTecnica)
{
int newODL = DataLayerObj.taODL.getByMacchina(idxMacchinaFix)[0].IdxODL;
DataLayerObj.taMagELotti.UpsertByOdl(newODL, true);
}
// resetto ODL su redis...
DataLayerObj.emptyCurrODL(idxMacchinaFix);
@@ -964,8 +979,7 @@ namespace MoonProTablet.WebUserControls
// processo chiusura setup
processaEvento(idxMacchinaFix, idxEvento, String.Format("Registrato Riattrezzaggio ODL (old: {0})", currODL), currODL);
// sistemo buttons!
bool splitOdl = false;
fixSplitBtn(splitOdl);
fixSplitBtn(false);
// sollevo evento!
if (eh_reqUpdate != null)
@@ -1165,6 +1179,8 @@ namespace MoonProTablet.WebUserControls
{
lblOut.Text = "Selezionare un ORDINE valido!";
}
checkBtnStatus();
fixSplitBtn(false);
// sollevo evento!
if (eh_reqUpdate != null)
{
@@ -1258,6 +1274,7 @@ namespace MoonProTablet.WebUserControls
{
mod_tempoMSMC.modoTempo = timeMode.MC;
}
fixSplitBtn(false);
}
cmp_newODL.eh_newVal += Cmp_newODL_eh_newVal;
}
MP-TAB/WebUserControls/mod_ODL.ascx.designer.cs
Generated
+2 -2
View File
@@ -222,13 +222,13 @@ namespace MoonProTablet.WebUserControls
protected global::System.Web.UI.WebControls.LinkButton lbtReopOdlSuTav;
/// <summary>
/// Controllo lblNeedSTAR.
/// Controllo hlNeedStar.
/// </summary>
/// <remarks>
/// Campo generato automaticamente.
/// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind.
/// </remarks>
protected global::System.Web.UI.WebControls.Label lblNeedSTAR;
protected global::System.Web.UI.WebControls.HyperLink hlNeedStar;
/// <summary>
/// Controllo lbtStartProd.