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

Fix clona/delete PODL (manca edit QTA/pzPallet)

Browse Source
This commit is contained in:
Samuele E. Locatelli
2018-09-26 10:14:49 +02:00
parent 059c5cc7bc
commit d3d9c0bf06
6 changed files with 97 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ pipeline {
/* calcolo numero versione... diverso x branch MASTER/DEVELOP */
script {
withEnv(['NEXT_BUILD_NUMBER=820']) {
withEnv(['NEXT_BUILD_NUMBER=822']) {
// env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true)
env.versionNumber = VersionNumber(versionNumberString : '6.0.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}')
env.APP_NAME = 'MAPO'
MP-Admin/WebUserControls/mod_gestPromODL.ascx
+5 -7
View File
@@ -47,11 +47,9 @@
<HeaderTemplate>
<asp:Button ID="btnReset" runat="server" Text='<%# traduci("Reset") %>' OnClick="btnReset_Click" CausesValidation="false" Visible="true" />
</HeaderTemplate>
<ItemTemplate>
<span style="padding-right: 2px;">
<asp:ImageButton ID="ImageButton1" runat="server" CausesValidation="False" CommandName="Select"
ToolTip="Modifica num pz" ImageUrl="~/images/edit_s.png" Visible='<%# Eval("IdxOdl").ToString()=="" || Eval("IdxOdl").ToString()=="0" %>' />
</span>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbtSel" CausesValidation="false" CommandName="Select" ToolTip="Modifica promessa" Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-info"><i class="fa fa-edit"></i></asp:LinkButton>
<asp:LinkButton runat="server" ID="lbtClona" CausesValidation="false" CommandName="Select" OnCommand="lbt_Command" CommandArgument="Clona" ToolTip="Copia promessa" CssClass="btn btn-sm btn-warning"><i class="fa fa-clipboard"></i></asp:LinkButton>
</ItemTemplate>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
</asp:TemplateField>
@@ -118,8 +116,8 @@
</ItemTemplate>
</asp:TemplateField>
<asp:TemplateField HeaderStyle-HorizontalAlign="Center" ItemStyle-HorizontalAlign="Center">
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("IdxPromessa") %>' OnClientClick="return confirm('Sicuro di voler procedere con eliminazione?');" OnClick="lbtDel_Click" ToolTip='<%# traduci("Delete") %>' Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-block btn-danger py-0"><i class="fa fa-trash"></i></asp:LinkButton>
<ItemTemplate>
<asp:LinkButton runat="server" ID="lbtDel" CommandArgument='<%# Eval("IdxPromessa") %>' OnClientClick="return confirm('Sicuro di voler procedere con eliminazione?');" OnClick="lbtDel_Click" ToolTip='<%# traduci("Delete") %>' Visible='<%# Eval("IdxODL").ToString()=="" || Eval("IdxODL").ToString()=="0" %>' CssClass="btn btn-sm btn-danger"><i class="fa fa-trash"></i></asp:LinkButton>
</ItemTemplate>
<HeaderStyle HorizontalAlign="Center"></HeaderStyle>
<ItemStyle HorizontalAlign="Center"></ItemStyle>
MP-Admin/WebUserControls/mod_gestPromODL.ascx.cs
+49 -8
View File
@@ -46,6 +46,16 @@ namespace MoonProAdmin.WebUserControls
{
resetSelezione();
}
/// <summary>
/// salvo comando
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void lbt_Command(object sender, CommandEventArgs e)
{
SteamWare.memLayer.ML.setSessionVal("nextObjCommand", ((LinkButton)sender).CommandArgument);
}
/// <summary>
/// gestione cambio selezione valore
/// </summary>
@@ -54,14 +64,39 @@ namespace MoonProAdmin.WebUserControls
protected void grView_SelectedIndexChanged(object sender, EventArgs e)
{
// salvo in session il valore selezionato...
SteamWare.memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false);
// mostro edit quantità...
divEditQta.Visible = true;
btnNewPromOdl.Visible = true;
mod_newPromessaODL.Visible = false;
var riga = DataLayer.obj.taODL.getByIdx(idxOdlSel, false)[0];
numPz = riga.NumPezzi;
pzPallet = riga.PzPallet;
memLayer.ML.setSessionVal(string.Format("{0}_sel", _idxGridView), grView.SelectedValue, false);
bool doClone = false;
// gestione buttons richieste
string _comando = "";
if (memLayer.ML.isInSessionObject("nextObjCommand"))
{
_comando = memLayer.ML.StringSessionObj("nextObjCommand");
memLayer.ML.emptySessionVal("nextObjCommand");
}
switch (_comando)
{
case "Clona":
doClone = true;
break;
default:
break;
}
if (doClone)
{
memLayer.ML.setSessionVal("idxProm2Clone", grView.SelectedValue, false);
showAddNewPODL();
mod_newPromessaODL.doSelPODL();
}
else
{
// mostro edit quantità...
divEditQta.Visible = true;
btnNewPromOdl.Visible = true;
mod_newPromessaODL.Visible = false;
var riga = DataLayer.obj.taODL.getByIdx(idxOdlSel, false)[0];
numPz = riga.NumPezzi;
pzPallet = riga.PzPallet;
}
}
/// <summary>
/// traduce gli header delle colonne
@@ -275,6 +310,11 @@ namespace MoonProAdmin.WebUserControls
/// <param name="sender"></param>
/// <param name="e"></param>
protected void btnNewPromOdl_Click(object sender, EventArgs e)
{
showAddNewPODL();
}
private void showAddNewPODL()
{
// mostro controllo creazione ODL
mod_newPromessaODL.Visible = true;
@@ -283,6 +323,7 @@ namespace MoonProAdmin.WebUserControls
grView.SelectedIndex = -1;
grView.DataBind();
}
/// <summary>
/// formatot url x stampa ODL
/// </summary>
MP-Admin/WebUserControls/mod_newPromessaODL.ascx
+1 -8
View File
@@ -73,7 +73,7 @@
Commessa / Ordine Ext
</div>
<div class="my-0">
<asp:TextBox runat="server" ID="txKeyExt" CssClass="form form-control text-right" />
<asp:TextBox runat="server" ID="txtKeyExt" CssClass="form form-control text-right" />
</div>
</div>
<div class="col-2 pr-0 pl-1">
@@ -117,7 +117,6 @@
</div>
</div>
</div>
<div style="font-size: 0.8em; background-color: #EFEFEF;">
<div runat="server" id="divTempi" style="clear: both;">
<asp:GridView ID="grViewTempi" runat="server" AllowPaging="True" AllowSorting="True" AutoGenerateColumns="False" BackColor="LightGoldenrodYellow" BorderColor="Tan" BorderWidth="1px" CellPadding="2" DataKeyNames="IdxODL" DataSourceID="odsTempi" ForeColor="Black" GridLines="None" OnSelectedIndexChanged="grViewTempi_SelectedIndexChanged" Width="100%">
@@ -144,11 +143,6 @@
<asp:LinkButton ID="lnkSelect" runat="server" CausesValidation="False" CommandName="Select" ToolTip="Selezione"><i class="fa fa-arrow-circle-right fa-2x"></i></asp:LinkButton>
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="Nome" HeaderText="Nome" SortExpression="Nome" />
<asp:BoundField DataField="CodArticolo" HeaderText="CodArticolo" SortExpression="CodArticolo" />
<asp:BoundField DataField="CodMacchina" HeaderText="CodMacchina" SortExpression="CodMacchina" />
<asp:BoundField DataField="IdxMacchina" HeaderText="IdxMacchina" SortExpression="IdxMacchina" />
<asp:BoundField DataField="DescArticolo" HeaderText="DescArticolo" SortExpression="DescArticolo" />--%>
<asp:BoundField DataField="CommessaAs400" HeaderText="CommessaAs400" SortExpression="CommessaAs400" />
<asp:BoundField DataField="IdxODL" HeaderText="IdxODL" InsertVisible="False" ReadOnly="True" SortExpression="IdxODL" />
<asp:BoundField DataField="NumPezzi" HeaderText="NumPezzi" SortExpression="NumPezzi" />
@@ -169,7 +163,6 @@
</div>
</ItemTemplate>
</asp:TemplateField>
<%--<asp:BoundField DataField="Note" HeaderText="Note" SortExpression="Note" />--%>
<asp:TemplateField HeaderText="DataInizio" SortExpression="DataInizio" ItemStyle-HorizontalAlign="Right">
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# Bind("DataInizio","{0:dd/MM/yyyy}</br>{0:HH:mm}") %>' />
MP-Admin/WebUserControls/mod_newPromessaODL.ascx.cs
+39 -2
View File
@@ -1,4 +1,5 @@
using SteamWare;
using MapoDb;
using SteamWare;
using System;
using System.Web.UI;
@@ -13,6 +14,42 @@ namespace MoonProAdmin.WebUserControls
setDefaults();
}
}
public void doSelPODL()
{
// se ho una promessa da clonare copio dati da quella...
if (memLayer.ML.isInSessionObject("idxProm2Clone"))
{
int idxProm = memLayer.ML.IntSessionObj("idxProm2Clone");
var tPODL = DataLayer.obj.taPODL.getByKey(idxProm);
if (tPODL.Rows.Count > 0)
{
var rPODL = tPODL[0];
txtSearch.Text = rPODL.CodArticolo;
ddlArticolo.DataBind();
txtNumPz.Text = rPODL.NumPezzi.ToString();
txtPzPallet.Text = rPODL.PzPallet.ToString();
txtPrio.Text = rPODL.Priorita.ToString();
int min = 0;
int sec = 0;
string TC_MinSec = "";
try
{
// cerco di convertire in min/sec
min = Convert.ToInt32(Math.Floor(Convert.ToDouble(rPODL.TCAssegnato)));
sec = Convert.ToInt32((Convert.ToDouble(rPODL.TCAssegnato) - min) * 60);
TC_MinSec = string.Format("{0}:{1:00}", min, sec);
}
catch
{ }
txtTC.Text = TC_MinSec;
ddlGruppi.SelectedValue = rPODL.CodGruppo;
ddlMacchine.SelectedValue = rPODL.IdxMacchina;
txtKeyExt.Text = rPODL.KeyRichiesta;
// svuoto...
memLayer.ML.emptySessionVal("idxProm2Clone");
}
}
}
private void setDefaults()
{
@@ -60,7 +97,7 @@ namespace MoonProAdmin.WebUserControls
CodArticolo = ddlArticolo.SelectedValue;
Gruppo = ddlGruppi.SelectedValue;
IdxMacchina = ddlMacchine.SelectedValue;
KeyReq = txKeyExt.Text.Trim();
KeyReq = txtKeyExt.Text.Trim();
//IdxMacchina = txtMacchina.Text.Trim();
// se IdxMacchina è vuoto metto null...
if (IdxMacchina == "")
MP-Admin/WebUserControls/mod_newPromessaODL.ascx.designer.cs
Generated
+2 -2
View File
@@ -94,13 +94,13 @@ namespace MoonProAdmin.WebUserControls {
protected global::System.Web.UI.WebControls.TextBox txtTC;
/// <summary>
/// Controllo txKeyExt.
/// Controllo txtKeyExt.
/// </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.TextBox txKeyExt;
protected global::System.Web.UI.WebControls.TextBox txtKeyExt;
/// <summary>
/// Controllo txtPrio.