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

Update ADM x selezione reparti e fix spostamento podl IN TEST sim-dp

Browse Source
This commit is contained in:
Samuele E. Locatelli
2019-01-11 11:53:17 +01:00
parent da795cd270
commit bf99baf6da
4 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+3 -3
View File
@@ -18,9 +18,9 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=1138']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.4.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
withEnv(['NEXT_BUILD_NUMBER=1139']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.5.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
}
}
MP-ADM/BCode.aspx.cs
+8 -5
View File
@@ -7,11 +7,14 @@ namespace MP_ADM
{
protected void Page_Load(object sender, EventArgs e)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
if (!Page.IsPostBack)
{
checkEnabled();
string codPre = memLayer.ML.CRS("OptAdmBCode_CodPre");
mod_barcode.codOrdPre = codPre != "" ? codPre : "OPR";
mod_gestPromODL.enableSelFase = memLayer.ML.CRB("OptBCode_enbSelFase");
mod_gestPromODL.CodGruppo = memLayer.ML.CRS("OptBCode_CodGruppo");
}
}
private void checkEnabled()
{
MP-ADM/WebUserControls/mod_gestPromODL.ascx.cs
+1 -3
View File
@@ -302,13 +302,11 @@ namespace MP_ADM.WebUserControls
{
mod_newPromessaODL.Visible = false;
grView.PageSize = pageSize;
#if false
// se ho in sessione selezione la recupero...
if (memLayer.ML.isInSessionObject("selFaseBCode") && enableSelFase)
{
ddlCodGruppo.SelectedValue = memLayer.ML.StringSessionObj("selFaseBCode");
}
#endif
}
}
mod_newPromessaODL.eh_nuovoValore += new EventHandler(mod_newOdl1_eh_nuovoValore);
}
MP-ADM/WebUserControls/mod_newPromessaODL.ascx.cs
+32 -28
View File
@@ -33,40 +33,44 @@ namespace MP_ADM.WebUserControls
{
// se ho una promessa da clonare copio dati da quella...
int idxProm = 0;
if (memLayer.ML.isInSessionObject("idxProm2Clone"))
try
{
idxProm = memLayer.ML.IntSessionObj("idxProm2Clone");
}
else if (memLayer.ML.isInSessionObject("idxProm2Edit"))
{
idxProm = memLayer.ML.IntSessionObj("idxProm2Edit");
}
// provo a selezionare
var tPODL = DataLayer.obj.taPODL.getByKey(idxProm);
if (tPODL.Rows.Count > 0)
{
var rPODL = tPODL[0];
txtSearch.Text = rPODL.CodArticolo;
ddlArticolo.DataBind();
ddlGruppi.DataBind();
ddlGruppi.SelectedValue = rPODL.CodGruppo;
txtNumPz.Text = rPODL.NumPezzi.ToString();
txtPzPallet.Text = rPODL.PzPallet.ToString();
txtPrio.Text = rPODL.Priorita.ToString();
if (memLayer.ML.cdvb("ADM_TC_MinSec"))
if (memLayer.ML.isInSessionObject("idxProm2Clone"))
{
txtTCms.Text = TempiCiclo.minSec(rPODL.TCAssegnato);
idxProm = memLayer.ML.IntSessionObj("idxProm2Clone");
}
else
else if (memLayer.ML.isInSessionObject("idxProm2Edit"))
{
txtTCmc.Text = rPODL.TCAssegnato.ToString("N3");
idxProm = memLayer.ML.IntSessionObj("idxProm2Edit");
}
// provo a selezionare
var tPODL = DataLayer.obj.taPODL.getByKey(idxProm);
if (tPODL.Rows.Count > 0)
{
var rPODL = tPODL[0];
txtSearch.Text = rPODL.CodArticolo;
ddlArticolo.DataBind();
ddlGruppi.DataBind();
ddlGruppi.SelectedValue = rPODL.CodGruppo;
txtNumPz.Text = rPODL.NumPezzi.ToString();
txtPzPallet.Text = rPODL.PzPallet.ToString();
txtPrio.Text = rPODL.Priorita.ToString();
if (memLayer.ML.cdvb("ADM_TC_MinSec"))
{
txtTCms.Text = TempiCiclo.minSec(rPODL.TCAssegnato);
}
else
{
txtTCmc.Text = rPODL.TCAssegnato.ToString("N3");
}
ddlMacchine.SelectedValue = rPODL.IdxMacchina;
txtKeyExt.Text = rPODL.KeyRichiesta;
// svuoto se ci fosse cloning......
memLayer.ML.emptySessionVal("idxProm2Clone");
}
ddlMacchine.SelectedValue = rPODL.IdxMacchina;
txtKeyExt.Text = rPODL.KeyRichiesta;
// svuoto se ci fosse cloning......
memLayer.ML.emptySessionVal("idxProm2Clone");
}
catch
{ }
}
private void setDefaults()