Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Samuele Locatelli
|
9fc3a81560 | ||
|
Samuele Locatelli
|
668a405901 | ||
|
Samuele Locatelli
|
67ace71b4e | ||
|
Samuele Locatelli
|
17aa2a0f13 | ||
|
Samuele Locatelli
|
d9505e1749 |
Vendored
+2
-5
@@ -13,11 +13,8 @@ pipeline {
|
||||
steps {
|
||||
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
|
||||
script {
|
||||
withEnv(['NEXT_BUILD_NUMBER=1428']) {
|
||||
// env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
|
||||
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'MAPO'
|
||||
}
|
||||
env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILD_DATE_FORMATTED, "ddHH"}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
|
||||
env.APP_NAME = 'MAPO'
|
||||
}
|
||||
script {
|
||||
currentBuild.displayName = "${env.versionNumber}"
|
||||
|
||||
@@ -6,12 +6,12 @@
|
||||
<asp:Repeater ID="repDetail" runat="server" DataSourceID="ods">
|
||||
<ItemTemplate>
|
||||
<div class="border border-bottom-secondary">
|
||||
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
|
||||
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataOggetto='<%# Eval("Oggetto") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
|
||||
</div>
|
||||
</ItemTemplate>
|
||||
<AlternatingItemTemplate>
|
||||
<div class="">
|
||||
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
|
||||
<uc1:cmp_ST_objView runat="server" ID="cmp_ST_objView" dataType='<%# Eval("CodTipo") %>' dataGroup='<%# Eval("CodGruppo") %>' idxST='<%# Eval("IdxST") %>' dataNum='<%# Eval("Num") %>' dataOggetto='<%# Eval("Oggetto") %>' dataLabel='<%# traduci(Eval("Label")) %>' dataValue='<%# Eval("Value") %>' dataValueRead='<%# Eval("ValueRead") %>' extCode='<%# Eval("ExtCode") %>' required='<%# Eval("Required") %>' />
|
||||
</div>
|
||||
</AlternatingItemTemplate>
|
||||
</asp:Repeater>
|
||||
|
||||
@@ -72,7 +72,7 @@ namespace MoonProTablet.WebUserControls
|
||||
|
||||
#region Private Methods
|
||||
|
||||
private void checkInputData()
|
||||
public void checkInputData()
|
||||
{
|
||||
bool showInput = false;
|
||||
try
|
||||
@@ -152,7 +152,7 @@ namespace MoonProTablet.WebUserControls
|
||||
// verifico EVENTUALI deroghe
|
||||
var currDeroga = DataLayerObj.getDerogaSt(tabRichieste[0].IdxST);
|
||||
// se è deroga x gruppo/tipo/num corretto...
|
||||
if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num)
|
||||
if (currDeroga.CanForce && tabRichieste[0].CodGruppo == currDeroga.CodGruppo && tabRichieste[0].CodTipo == currDeroga.CodTipo && tabRichieste[0].Num == currDeroga.Num && tabRichieste[0].Oggetto == currDeroga.Oggetto)
|
||||
{
|
||||
// ... forzo accettazione deroga
|
||||
DataLayerObj.taSTChk.upsertQuery(idxOdl, tabRichieste[0].IdxST, tabRichieste[0].Oggetto, tabRichieste[0].Num, BCodeVal, tabRichieste[0].Value, true, user_std.UtSn.utente);
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
<%@ Control Language="C#" AutoEventWireup="true" CodeBehind="cmp_ST_objView.ascx.cs" Inherits="MoonProTablet.WebUserControls.cmp_ST_objView" %>
|
||||
|
||||
<asp:HiddenField runat="server" ID="hfNum" />
|
||||
<asp:HiddenField runat="server" ID="hfIdxST" />
|
||||
<asp:HiddenField runat="server" ID="hfType" />
|
||||
<asp:HiddenField runat="server" ID="hfGruppo" />
|
||||
<asp:HiddenField runat="server" ID="hfNum" />
|
||||
<asp:HiddenField runat="server" ID="hfOggetto" />
|
||||
<asp:HiddenField runat="server" ID="hfLabel" />
|
||||
<asp:HiddenField runat="server" ID="hfValue" />
|
||||
<asp:HiddenField runat="server" ID="hfValueRead" />
|
||||
|
||||
@@ -71,7 +71,6 @@ namespace MoonProTablet.WebUserControls
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
public int dataNum
|
||||
{
|
||||
get
|
||||
@@ -85,6 +84,21 @@ namespace MoonProTablet.WebUserControls
|
||||
hfNum.Value = $"{value}";
|
||||
}
|
||||
}
|
||||
|
||||
public int dataOggetto
|
||||
{
|
||||
get
|
||||
{
|
||||
int answ = 0;
|
||||
int.TryParse(hfOggetto.Value, out answ);
|
||||
return answ;
|
||||
}
|
||||
set
|
||||
{
|
||||
hfOggetto.Value = $"{value}";
|
||||
}
|
||||
}
|
||||
|
||||
public int idxST
|
||||
{
|
||||
get
|
||||
@@ -237,7 +251,7 @@ namespace MoonProTablet.WebUserControls
|
||||
answ = (currDeroga != null);
|
||||
if (answ)
|
||||
{
|
||||
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType);
|
||||
answ = (currDeroga.CanForce && currDeroga.Num == dataNum && currDeroga.CodGruppo == dataGroup && currDeroga.CodTipo == dataType && currDeroga.Oggetto == dataOggetto);
|
||||
}
|
||||
}
|
||||
catch
|
||||
@@ -289,6 +303,7 @@ namespace MoonProTablet.WebUserControls
|
||||
{
|
||||
CanForce = enableForceParamSchedaTecnica,
|
||||
Num = dataNum,
|
||||
Oggetto = dataOggetto,
|
||||
CodTipo = dataType,
|
||||
CodGruppo = dataGroup,
|
||||
IdxST = idxST
|
||||
|
||||
+18
-9
@@ -14,15 +14,6 @@ namespace MoonProTablet.WebUserControls
|
||||
public partial class cmp_ST_objView
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
/// hfNum control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfNum;
|
||||
|
||||
/// <summary>
|
||||
/// hfIdxST control.
|
||||
/// </summary>
|
||||
@@ -50,6 +41,24 @@ namespace MoonProTablet.WebUserControls
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfGruppo;
|
||||
|
||||
/// <summary>
|
||||
/// hfNum control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfNum;
|
||||
|
||||
/// <summary>
|
||||
/// hfOggetto control.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Auto-generated field.
|
||||
/// To modify move field declaration from designer file to code-behind file.
|
||||
/// </remarks>
|
||||
protected global::System.Web.UI.WebControls.HiddenField hfOggetto;
|
||||
|
||||
/// <summary>
|
||||
/// hfLabel control.
|
||||
/// </summary>
|
||||
|
||||
@@ -49,14 +49,20 @@ namespace MoonProTablet.WebUserControls
|
||||
DS_applicazione.StatoMacchineRow rigaStato = null;
|
||||
try
|
||||
{
|
||||
string idxMacc = "";
|
||||
// se è multi controllo parent...
|
||||
if (isMulti)
|
||||
{
|
||||
rigaStato = selData.mng.rigaStato(idxMaccParent);
|
||||
idxMacc = idxMaccParent;
|
||||
}
|
||||
else
|
||||
{
|
||||
rigaStato = selData.mng.rigaStato(idxMacchinaFix);
|
||||
idxMacc = !string.IsNullOrEmpty(idxMacchinaFix) ? idxMacchinaFix : idxMacchina;
|
||||
}
|
||||
|
||||
if (!string.IsNullOrEmpty(idxMacc))
|
||||
{
|
||||
rigaStato = selData.mng.rigaStato(idxMacc);
|
||||
}
|
||||
if (rigaStato != null)
|
||||
{
|
||||
@@ -67,6 +73,7 @@ namespace MoonProTablet.WebUserControls
|
||||
{ }
|
||||
}
|
||||
lbtClearOdl.Visible = inAttr;
|
||||
cmp_ST_objCheck.checkInputData();
|
||||
}
|
||||
|
||||
private void cmp_ST_objCheck_eh_doUpdate(object sender, EventArgs e)
|
||||
|
||||
@@ -990,5 +990,6 @@ namespace MapoSDK
|
||||
public string CodTipo { get; set; } = "";
|
||||
public int IdxST { get; set; } = 0;
|
||||
public int Num { get; set; } = 0;
|
||||
public int Oggetto { get; set; } = 0;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user