diff --git a/MP-MAG/MP-MAG.csproj b/MP-MAG/MP-MAG.csproj index c32836b2..26cf82fd 100644 --- a/MP-MAG/MP-MAG.csproj +++ b/MP-MAG/MP-MAG.csproj @@ -352,6 +352,13 @@ printCartOdl.aspx + + Reset.aspx + ASPXCodeBehind + + + Reset.aspx + SmartStarter.aspx ASPXCodeBehind @@ -802,6 +809,7 @@ + diff --git a/MP-MAG/SMART/Reset.aspx b/MP-MAG/SMART/Reset.aspx new file mode 100644 index 00000000..af5226b4 --- /dev/null +++ b/MP-MAG/SMART/Reset.aspx @@ -0,0 +1,16 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="Reset.aspx.cs" Inherits="MP_MAG.SMART.Reset" %> + + + + + + + + + +
+
+
+
+ + diff --git a/MP-MAG/SMART/Reset.aspx.cs b/MP-MAG/SMART/Reset.aspx.cs new file mode 100644 index 00000000..62572934 --- /dev/null +++ b/MP-MAG/SMART/Reset.aspx.cs @@ -0,0 +1,22 @@ +using SteamWare; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace MP_MAG.SMART +{ + public partial class Reset : System.Web.UI.Page + { + #region Protected Methods + + protected void Page_Load(object sender, EventArgs e) + { + DataWrap.DW.resetVocabolario(); + } + + #endregion Protected Methods + } +} \ No newline at end of file diff --git a/MP-MAG/SMART/Reset.aspx.designer.cs b/MP-MAG/SMART/Reset.aspx.designer.cs new file mode 100644 index 00000000..3941db84 --- /dev/null +++ b/MP-MAG/SMART/Reset.aspx.designer.cs @@ -0,0 +1,25 @@ +//------------------------------------------------------------------------------ +// +// Codice generato da uno strumento. +// +// Le modifiche a questo file possono causare un comportamento non corretto e verranno perse se +// il codice viene rigenerato. +// +//------------------------------------------------------------------------------ + + +namespace MP_MAG.SMART +{ + public partial class Reset + { + + /// + /// Controllo form1. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + } +} diff --git a/MP-MAG/SMART/gestPedane.aspx b/MP-MAG/SMART/gestPedane.aspx index 5cef5589..caa10b17 100644 --- a/MP-MAG/SMART/gestPedane.aspx +++ b/MP-MAG/SMART/gestPedane.aspx @@ -22,6 +22,7 @@
+ Aggiorna
@@ -38,6 +39,6 @@ + - \ No newline at end of file diff --git a/MP-MAG/SMART/gestPedane.aspx.cs b/MP-MAG/SMART/gestPedane.aspx.cs index 7d7291ef..ca4539e7 100644 --- a/MP-MAG/SMART/gestPedane.aspx.cs +++ b/MP-MAG/SMART/gestPedane.aspx.cs @@ -56,6 +56,13 @@ namespace MP_MAG.SMART refreshQrCode(); } + private void refreshStatus() + { + cmp_OrderList.doUpdate(); + cmp_elencoPedane.doUpdate(); + cmp_elencoUDC.doUpdate(); + } + private void resetSelezione() { cmp_elencoPedane.resetSelezione(); @@ -88,10 +95,16 @@ namespace MP_MAG.SMART return answ; } + protected void lbtRefresh_Click(object sender, EventArgs e) + { + refreshStatus(); + } + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { + ((Site)this.Master).showSearch = false; resetSelezione(); } cmp_elencoPedane.eh_doRefresh += Cmp_elencoPedane_eh_doRefresh; @@ -108,8 +121,7 @@ namespace MP_MAG.SMART protected void timerGestPed_Tick(object sender, EventArgs e) { - cmp_elencoPedane.doUpdate(); - cmp_elencoUDC.doUpdate(); + refreshStatus(); } #endregion Protected Methods diff --git a/MP-MAG/SMART/gestPedane.aspx.designer.cs b/MP-MAG/SMART/gestPedane.aspx.designer.cs index 0c90b1f3..611166e1 100644 --- a/MP-MAG/SMART/gestPedane.aspx.designer.cs +++ b/MP-MAG/SMART/gestPedane.aspx.designer.cs @@ -41,6 +41,15 @@ namespace MP_MAG.SMART /// protected global::MP_MAG.WebUserControls.cmp_OrderList cmp_OrderList; + /// + /// Controllo lbtRefresh. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtRefresh; + /// /// Controllo imgQrMain. /// diff --git a/MP-MAG/SMART/packList.aspx.cs b/MP-MAG/SMART/packList.aspx.cs index c5b2dda5..28c1e9e4 100644 --- a/MP-MAG/SMART/packList.aspx.cs +++ b/MP-MAG/SMART/packList.aspx.cs @@ -15,6 +15,7 @@ namespace MP_MAG.SMART { if (!Page.IsPostBack) { + ((Site)this.Master).showSearch = false; cmp_packListMgmt.showAdd = true; } } diff --git a/MP-MAG/SMART/printCartOdl.aspx b/MP-MAG/SMART/printCartOdl.aspx index b0109be7..660562bc 100644 --- a/MP-MAG/SMART/printCartOdl.aspx +++ b/MP-MAG/SMART/printCartOdl.aspx @@ -5,16 +5,22 @@ <%@ Register Src="~/WebUserControls/cmp_printODL.ascx" TagPrefix="uc1" TagName="cmp_printODL" %> <%@ Register Src="~/WebUserControls/cmp_listODL.ascx" TagPrefix="uc1" TagName="cmp_listODL" %> -
-

Stampa ODL

+
+
+

Stampa ODL

+
+
+ Reset ODL +
+
- +
@@ -30,4 +36,4 @@
- + \ No newline at end of file diff --git a/MP-MAG/SMART/printCartOdl.aspx.cs b/MP-MAG/SMART/printCartOdl.aspx.cs index 97d6b94a..40835fb7 100644 --- a/MP-MAG/SMART/printCartOdl.aspx.cs +++ b/MP-MAG/SMART/printCartOdl.aspx.cs @@ -11,6 +11,15 @@ namespace MP_MAG.SMART { #region Private Methods + private void checkVisibility() + { + // verifico ci sia ODL + bool missingOdl = MagData.MagDataLayer.man.currProdPrintData.IdxOdl <= 0; + // di conseguenza mostro stampa oppure selezione ODL... + divOdl.Visible = missingOdl; + divPrint.Visible = !missingOdl; + } + private void Cmp_printODL_eh_addNew(object sender, EventArgs e) { cmp_UdcODL.doUpdate(); @@ -20,16 +29,20 @@ namespace MP_MAG.SMART #region Protected Methods + protected void lbtResetOdl_Click(object sender, EventArgs e) + { + var printData = MagData.MagDataLayer.man.currProdPrintData; + printData.IdxOdl = -2; + MagData.MagDataLayer.man.currProdPrintData = printData; + checkVisibility(); + } + protected void Page_Load(object sender, EventArgs e) { if (!Page.IsPostBack) { ((Site)this.Master).showSearch = false; - // verifico ci sia ODL - bool missingOdl = MagData.MagDataLayer.man.currProdPrintData.IdxOdl <= 0; - // di conseguenza mostro stampa oppure selezione ODL... - divOdl.Visible = missingOdl; - divPrint.Visible = !missingOdl; + checkVisibility(); } cmp_printODL.eh_addNew += Cmp_printODL_eh_addNew; } diff --git a/MP-MAG/SMART/printCartOdl.aspx.designer.cs b/MP-MAG/SMART/printCartOdl.aspx.designer.cs index eb4f8b13..bcc14e7b 100644 --- a/MP-MAG/SMART/printCartOdl.aspx.designer.cs +++ b/MP-MAG/SMART/printCartOdl.aspx.designer.cs @@ -14,6 +14,15 @@ namespace MP_MAG.SMART public partial class printCartOdl { + /// + /// Controllo lbtResetOdl. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtResetOdl; + /// /// Controllo divOdl. /// diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx b/MP-MAG/WebUserControls/cmp_OrderList.ascx index 0cfeb387..7126f443 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx @@ -3,8 +3,17 @@
-
Dettaglio Richiesta
- +
+
+
Dettaglio Richiesta
+
+
+ REPORT Dettaglio +
+
+ +
+
@@ -122,4 +131,18 @@
+
+
+
+ Report + + + + + + + +
+
+
\ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs index b8bb270f..d7ecfafc 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx.cs @@ -74,6 +74,17 @@ namespace MP_MAG.WebUserControls cmp_OrderListAdd.Visible = !cmp_OrderListAdd.Visible; } + /// + /// Avvia stampa report pedana + /// + /// + /// + protected void lbtPrintReport_Click(object sender, EventArgs e) + { + // lancio il report x l'elenco pedane + contenuto + MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue); + } + /// /// comando reset /// @@ -89,6 +100,7 @@ namespace MP_MAG.WebUserControls if (!Page.IsPostBack) { cmp_OrderListAdd.Visible = false; + lbtPrintReport.DataBind(); } cmp_OrderListAdd.eh_addNew += Cmp_OrderListAdd_eh_addNew; } diff --git a/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs index 2edba8d7..7976b528 100644 --- a/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_OrderList.ascx.designer.cs @@ -14,6 +14,15 @@ namespace MP_MAG.WebUserControls public partial class cmp_OrderList { + /// + /// Controllo lbtPrintReport. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.LinkButton lbtPrintReport; + /// /// Controllo cmp_OrderListAdd. /// @@ -67,5 +76,23 @@ namespace MP_MAG.WebUserControls /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. /// protected global::System.Web.UI.WebControls.HiddenField hfEnableEdit; + + /// + /// Controllo ddlPost. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlPost; + + /// + /// Controllo odsPedaneList. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneList; } } diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx index b7e3b8d5..393efd30 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx @@ -17,7 +17,7 @@ COMPLETA
- REPORT Dettaglio + <%--REPORT Dettaglio --%>
@@ -115,14 +115,14 @@
- Report + <%--Report - + --%>
diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs index f4ef48fe..a48c6749 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.cs @@ -160,6 +160,7 @@ namespace MP_MAG.WebUserControls grView.DataBind(); } +#if false /// /// Avvia stampa report pedana /// @@ -170,6 +171,7 @@ namespace MP_MAG.WebUserControls // lancio il report x l'elenco pedane + contenuto MagDataLayerObj.taPJQ.insertQuery($"{tipoDocumento.docPackList}", $"{PackListID}", ddlPost.SelectedValue); } +#endif /// /// comando reset @@ -213,6 +215,8 @@ namespace MP_MAG.WebUserControls grView.PageSize = cmp_numRow.numRow; divAddNew.Visible = false; lastCmd = ""; + lbtSetStarted.DataBind(); + lbtSetCompleted.DataBind(); } cmp_numRow.eh_doRefresh += Cmp_numRow_eh_doRefresh; checkBtn(); diff --git a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs index 6932d038..2881a1bd 100644 --- a/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_elencoPedane.ascx.designer.cs @@ -41,15 +41,6 @@ namespace MP_MAG.WebUserControls /// protected global::System.Web.UI.WebControls.LinkButton lbtSetCompleted; - /// - /// Controllo lbtPrintReport. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.LinkButton lbtPrintReport; - /// /// Controllo divAddNew. /// @@ -131,24 +122,6 @@ namespace MP_MAG.WebUserControls /// protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneSingle; - /// - /// Controllo ddlPost. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.DropDownList ddlPost; - - /// - /// Controllo odsPedaneList. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.WebControls.ObjectDataSource odsPedaneList; - /// /// Controllo cmp_numRow. /// diff --git a/MP-MAG/WebUserControls/cmp_listODL.ascx.cs b/MP-MAG/WebUserControls/cmp_listODL.ascx.cs index e0aa619d..e61ea12e 100644 --- a/MP-MAG/WebUserControls/cmp_listODL.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_listODL.ascx.cs @@ -10,14 +10,19 @@ namespace MP_MAG.WebUserControls { public partial class cmp_listODL : BaseUserControl { - protected void Page_Load(object sender, EventArgs e) + #region Private Methods + + private void resetSelezione() { - if (!Page.IsPostBack) - { - grView.PageSize = 5; - } + grView.SelectedIndex = -1; + grView.DataBind(); + raiseReset(); } + #endregion Private Methods + + #region Protected Methods + protected void grView_SelectedIndexChanged(object sender, EventArgs e) { // recupero ODL @@ -28,7 +33,11 @@ namespace MP_MAG.WebUserControls // salvo in cookie i dati idxODL, idxMacchina e QtaUdc x successivo impiego string IdxMacchina = ddlMacchina.SelectedValue; - int QtaUdc = 1; // default... + int QtaUdc = QtaUdcByOdl(IdxODL); + if (QtaUdc <= 0) + { + QtaUdc = 100; + } bool isFinito = false; string ArtCod = ""; string ArtDesc = ""; @@ -76,8 +85,8 @@ namespace MP_MAG.WebUserControls string tgtPage = "printCartOdl"; Response.Redirect($"~/SMART/{tgtPage}"); } - } + /// /// comando reset /// @@ -87,11 +96,34 @@ namespace MP_MAG.WebUserControls { resetSelezione(); } - private void resetSelezione() + + protected void Page_Load(object sender, EventArgs e) { - grView.SelectedIndex = -1; - grView.DataBind(); - raiseReset(); + if (!Page.IsPostBack) + { + grView.PageSize = 5; + } } + + protected int QtaUdcByOdl(int idxOdl) + { + int answ = 1; + string codGrp = "IMB"; + string codVal = "NUM_PZ_CONT"; + // recupero dato da scheda tecnica della quantità per UDC + var tabSTAR = DataLayerObj.taSTAR.getByGrpOdlLbl(codGrp, codVal, idxOdl); + if (tabSTAR.Rows.Count > 0) + { + try + { + int.TryParse(tabSTAR[0].Value, out answ); + } + catch + { } + } + return answ; + } + + #endregion Protected Methods } } \ No newline at end of file diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx b/MP-MAG/WebUserControls/cmp_packList.ascx index 1f3feb18..49f929a8 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx +++ b/MP-MAG/WebUserControls/cmp_packList.ascx @@ -3,7 +3,7 @@ <%@ Register Src="~/WebUserControls/cmp_OrderList.ascx" TagPrefix="uc1" TagName="cmp_OrderList" %>
-
+
BOZZA diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx.cs b/MP-MAG/WebUserControls/cmp_packList.ascx.cs index 70130d03..a89f830a 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_packList.ascx.cs @@ -43,32 +43,34 @@ namespace MP_MAG.WebUserControls private void showAction(bool showAction) { - divAction.Visible = showAction; // calcolo cosa mostro da status corrente var tabPackList = MagData.MagDataLayer.man.taPList.getByKey(PackListID); - lbtSetDraft.Visible = false; - lbtSetRequest.Visible = false; - lbtSendPack.Visible = false; - if (tabPackList != null && tabPackList.Count > 0) + lbtSendPack.CssClass = "btn btn-block btn-outline-secondary disabled"; + lbtSetDraft.CssClass = "btn btn-block btn-outline-secondary disabled"; + lbtSetRequest.CssClass = "btn btn-block btn-outline-secondary disabled"; + if (showAction) { - int currStatus = tabPackList[0].PackStatus; - switch (currStatus) + if (tabPackList != null && tabPackList.Count > 0) { - case 0: - lbtSetRequest.Visible = true; - break; + int currStatus = tabPackList[0].PackStatus; + switch (currStatus) + { + case 0: + lbtSetRequest.CssClass = "btn btn-block btn-success"; + break; - case 1: - lbtSetDraft.Visible = true; - break; + case 1: + lbtSetDraft.CssClass = "btn btn-block btn-info"; + break; - case 3: - lbtSetRequest.Visible = true; - lbtSendPack.Visible = true; - break; + case 3: + lbtSetDraft.CssClass = "btn btn-block btn-info"; + lbtSendPack.CssClass = "btn btn-block btn-warning"; + break; - default: - break; + default: + break; + } } } } diff --git a/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs b/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs index 09cc342e..d7513b02 100644 --- a/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs +++ b/MP-MAG/WebUserControls/cmp_packList.ascx.designer.cs @@ -14,15 +14,6 @@ namespace MP_MAG.WebUserControls public partial class cmp_packList { - /// - /// Controllo divAction. - /// - /// - /// Campo generato automaticamente. - /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. - /// - protected global::System.Web.UI.HtmlControls.HtmlGenericControl divAction; - /// /// Controllo lbtSetDraft. /// diff --git a/MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs b/MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs index 697755eb..878d1ac2 100644 --- a/MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_packListMgmt.ascx.cs @@ -63,6 +63,8 @@ namespace MP_MAG.WebUserControls { cmp_packListNew.CodCliente = ddlElencoCli.SelectedValue; cmp_packList.CodCliente = ddlElencoCli.SelectedValue; + cmp_packList.resetSelezione(); + cmp_OrderList.Visible = false; } protected void lbtAddNew_Click(object sender, EventArgs e) diff --git a/MP-MAG/WebUserControls/cmp_packListNew.ascx b/MP-MAG/WebUserControls/cmp_packListNew.ascx index 21998c84..23939d3e 100644 --- a/MP-MAG/WebUserControls/cmp_packListNew.ascx +++ b/MP-MAG/WebUserControls/cmp_packListNew.ascx @@ -5,10 +5,10 @@ Creazione Packing List
-
+
-
+
Note
@@ -16,7 +16,7 @@
-
+
Crea PackList diff --git a/MP-MAG/WebUserControls/cmp_printODL.ascx.cs b/MP-MAG/WebUserControls/cmp_printODL.ascx.cs index 03d55532..ac269542 100644 --- a/MP-MAG/WebUserControls/cmp_printODL.ascx.cs +++ b/MP-MAG/WebUserControls/cmp_printODL.ascx.cs @@ -78,6 +78,15 @@ namespace MP_MAG.WebUserControls lbtPrint.Visible = numPz2print > 0; } + private void checkQtaRemUdc() + { + int numPz2print = calcPzRem; + if (numPz2print > 0) + { + numPzUdc = numPz2print > currData.QtaUdc ? currData.QtaUdc : numPz2print; + } + } + #endregion Private Methods #region Protected Methods @@ -86,6 +95,11 @@ namespace MP_MAG.WebUserControls { string flusso = currData.isProdFinito ? "MFI" : "MSL"; tipoDocumento tipoDoc = currData.isProdFinito ? tipoDocumento.docFinito : tipoDocumento.docSemilavorato; + // sistemo pezzi + if (calcPzRem < numPzUdc) + { + numPzUdc = calcPzRem; + } // creo UDC var tabUdc = MagDataLayerObj.taEUdc.insertQuery(currData.Lotto, flusso, currData.CliCod, currData.CodPost, numPzUdc, 1, "", 0, 0, 0, "", 0, ""); // se ho nuovo udc --> seleziono stampa! @@ -104,11 +118,7 @@ namespace MP_MAG.WebUserControls if (!Page.IsPostBack) { // sistemo pezzi - int numPz2print = calcPzRem; - if (numPz2print > 0) - { - numPzUdc = numPz2print > currData.QtaUdc ? currData.QtaUdc : numPz2print; - } + checkQtaRemUdc(); } checkPrint(); }