diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index 0ef6a152..22ae6712 100644 Binary files a/GMW-RT/bin/GMW-RT.dll and b/GMW-RT/bin/GMW-RT.dll differ diff --git a/GMW-RT/bin/GMW_data.dll b/GMW-RT/bin/GMW_data.dll index 8f8a04fe..1e3357c7 100644 Binary files a/GMW-RT/bin/GMW_data.dll and b/GMW-RT/bin/GMW_data.dll differ diff --git a/GMW-RT/bin/SteamWare.dll b/GMW-RT/bin/SteamWare.dll index dbedd044..3b3b3915 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW/Web.config b/GMW/Web.config index 514dc4de..aa5a75b0 100644 --- a/GMW/Web.config +++ b/GMW/Web.config @@ -274,19 +274,19 @@ - + - + - + - + - + diff --git a/GMW/WebUserControls/mod_LiqDtAnom.ascx b/GMW/WebUserControls/mod_LiqDtAnom.ascx index 0c5b53e7..5d6c2a66 100644 --- a/GMW/WebUserControls/mod_LiqDtAnom.ascx +++ b/GMW/WebUserControls/mod_LiqDtAnom.ascx @@ -121,6 +121,20 @@ <%: traduci("updateQty") %> +
+
+ <%: traduci("CodImballo") %> +
+
+ + + + + + + +
+
diff --git a/GMW/WebUserControls/mod_LiqDtAnom.ascx.cs b/GMW/WebUserControls/mod_LiqDtAnom.ascx.cs index d6f2e010..9771db77 100644 --- a/GMW/WebUserControls/mod_LiqDtAnom.ascx.cs +++ b/GMW/WebUserControls/mod_LiqDtAnom.ascx.cs @@ -158,6 +158,23 @@ namespace GMW.WebUserControls } } /// + /// cod imballo dell'ultimo UDC del particolare generato + /// + public string lastCodImb + { + get + { + string answ = ""; + try + { + answ = MagClass.magazzino.taCartellini.getLastByParticolareStato(memLayer.ML.StringSessionObj("CodCS"), currParticolare, statoUdcOut)[0].CodImballo; + } + catch + { } + return answ; + } + } + /// /// qta pezzi x UDC /// public int qta @@ -248,6 +265,11 @@ namespace GMW.WebUserControls showBtn = true; } divQta.Visible = showBtn; + divImballi.Visible = showBtn; + if (showBtn) + { + selezionaImballo(); + } // definisce se mostrare controlli x forzare trattamento / UDC di riferimento 0000 oppure uno vero... divForceUdcTratt.Visible = showForceUdcTratt; } @@ -863,7 +885,7 @@ namespace GMW.WebUserControls try { // update UDC! - fatto = MagClass.magazzino.liquidiFullUpdate("", flussoAnc, currUDC, noteTrim, MagClass.magazzino.CodSoggCurrUser); + fatto = MagClass.magazzino.liquidiFullUpdate("", flussoAnc, currUDC, ddlImballi.SelectedValue, noteTrim, MagClass.magazzino.CodSoggCurrUser); } catch { } @@ -905,6 +927,38 @@ namespace GMW.WebUserControls return memLayer.ML.StringSessionObj("udcSelSAO"); } } + /// + /// preseleziono (se possibile) imballo... + /// + /// + /// + protected void ddlImballi_DataBound(object sender, EventArgs e) + { + selezionaImballo(); + } + /// + /// seleziona imballo corretto + /// + private void selezionaImballo() + { + string codImb = ""; + // cerco se c'è un imballo x particolare corrente... + if (currParticolare != "") + { + codImb = lastCodImb; + } + else + { + codImb = memLayer.ML.confReadString("CodImballoFiniti"); + } + try + { + // preseleziono + ddlImballi.SelectedValue = codImb; + } + catch + { } + } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_LiqDtAnom.ascx.designer.cs b/GMW/WebUserControls/mod_LiqDtAnom.ascx.designer.cs index d48d5e4d..37e7392b 100644 --- a/GMW/WebUserControls/mod_LiqDtAnom.ascx.designer.cs +++ b/GMW/WebUserControls/mod_LiqDtAnom.ascx.designer.cs @@ -200,5 +200,41 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtUpdQty; + + /// + /// divImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divImballi; + + /// + /// lblPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPart; + + /// + /// ddlImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlImballi; + + /// + /// odsImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImballi; } } diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx b/GMW/WebUserControls/mod_PostLiq_DT.ascx index d3b6c45f..6b7889d3 100644 --- a/GMW/WebUserControls/mod_PostLiq_DT.ascx +++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx @@ -167,6 +167,20 @@ <%: traduci("updateQty") %> +
+
+ <%: traduci("CodImballo") %> +
+
+ + + + + + + +
+
diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs index f60b1b3e..2b416346 100644 --- a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs +++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs @@ -192,6 +192,25 @@ namespace GMW.WebUserControls } } /// + /// cod imballo dell'ultimo UDC del particolare generato + /// + public string lastCodImb + { + get + { + string answ = ""; + try + { + answ = MagClass.magazzino.taCartellini.getLastByParticolareStato(memLayer.ML.StringSessionObj("CodCS"), currParticolare, statoUdcOut)[0].CodImballo; + } + catch + { + answ = memLayer.ML.confReadString("CodImballoFiniti"); + } + return answ; + } + } + /// /// qta pezzi x UDC /// public int qta @@ -314,6 +333,11 @@ namespace GMW.WebUserControls showBtn = true; } divQta.Visible = showBtn; + divImballi.Visible = showBtn; + if (showBtn) + { + selezionaImballo(); + } } /// /// reset maschera... @@ -898,6 +922,9 @@ namespace GMW.WebUserControls currParticolare = DataProxy.obj.taCartellini.stp_getByUdc(currUDC)[0].Particolare; qta = Convert.ToInt32(DataProxy.obj.taCartellini.stp_getByUdc(currUDC)[0].Qta); qtaDtx = Convert.ToInt32(MagClass.magazzino.taA2U2D.getByUDC(currUDC)[0].QtaDtx); + // imposto particolare... + lblPart.Text = currParticolare; + ddlImballi.DataBind(); } Postazione.messaggiText = traduci("partSelected"); Postazione.warningText = ""; @@ -1134,7 +1161,7 @@ namespace GMW.WebUserControls try { // update UDC! - fatto = MagClass.magazzino.liquidiFullUpdate(sourceAL, flussoAnc, currUDC, noteTrim, MagClass.magazzino.CodSoggCurrUser); + fatto = MagClass.magazzino.liquidiFullUpdate(sourceAL, flussoAnc, currUDC, ddlImballi.SelectedValue, noteTrim, MagClass.magazzino.CodSoggCurrUser); } catch { } @@ -1205,6 +1232,38 @@ namespace GMW.WebUserControls } } } + /// + /// preseleziono (se possibile) imballo... + /// + /// + /// + protected void ddlImballi_DataBound(object sender, EventArgs e) + { + selezionaImballo(); + } + /// + /// seleziona imballo corretto + /// + private void selezionaImballo() + { + string codImb = ""; + // cerco se c'è un imballo x particolare corrente... + if (currParticolare != "") + { + codImb = lastCodImb; + } + else + { + codImb = memLayer.ML.confReadString("CodImballoFiniti"); + } + try + { + // preseleziono + ddlImballi.SelectedValue = codImb; + } + catch + { } + } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx.designer.cs b/GMW/WebUserControls/mod_PostLiq_DT.ascx.designer.cs index b1fe2c7c..42a5ef10 100644 --- a/GMW/WebUserControls/mod_PostLiq_DT.ascx.designer.cs +++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx.designer.cs @@ -236,5 +236,41 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.LinkButton lbtUpdQty; + + /// + /// divImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divImballi; + + /// + /// lblPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPart; + + /// + /// ddlImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlImballi; + + /// + /// odsImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImballi; } } diff --git a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx index 37e2ae3a..f8f05dda 100644 --- a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx +++ b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx @@ -93,6 +93,20 @@ +
+
+ <%: traduci("CodImballo") %> +
+
+ + + + + + + +
+
diff --git a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index c55ad699..89acd41d 100644 --- a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -207,6 +207,25 @@ namespace GMW.WebUserControls } } /// + /// cod imballo dell'ultimo UDC del particolare generato + /// + public string lastCodImb + { + get + { + string answ = ""; + try + { + answ = MagClass.magazzino.taCartellini.getLastByParticolareStato(memLayer.ML.StringSessionObj("CodCS"), currParticolare, statoUDC)[0].CodImballo; + } + catch + { + answ = memLayer.ML.confReadString("CodImballoFiniti"); + } + return answ; + } + } + /// /// decodifica il tipo barcode acquisito /// public tipoCodiceBarcode tipoBCode @@ -292,6 +311,8 @@ namespace GMW.WebUserControls case tipoCodiceBarcode.Particolare: // imposto il particolare corrente currParticolare = barcodeIn; + // imposto particolare... + lblPart.Text = currParticolare; // controllo esista il particolare scansionato if (DataProxy.obj.taAnagParticolari.getByParticolare(currParticolare).Rows.Count == 0) { @@ -321,6 +342,8 @@ namespace GMW.WebUserControls { txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidi"); } + // fix imballo + ddlImballi.DataBind(); break; case tipoCodiceBarcode.UDC: // procedo solo se UDC esistente @@ -587,6 +610,38 @@ namespace GMW.WebUserControls { txtNote.Text = ""; } + /// + /// preseleziono (se possibile) imballo... + /// + /// + /// + protected void ddlImballi_DataBound(object sender, EventArgs e) + { + selezionaImballo(); + } + /// + /// seleziona imballo corretto + /// + private void selezionaImballo() + { + string codImb = ""; + // cerco se c'è un imballo x particolare corrente... + if (currParticolare != "") + { + codImb = lastCodImb; + } + else + { + codImb = memLayer.ML.confReadString("CodImballoFiniti"); + } + try + { + // preseleziono + ddlImballi.SelectedValue = codImb; + } + catch + { } + } } } \ No newline at end of file diff --git a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs index b663fd1d..61a7c953 100644 --- a/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs +++ b/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs @@ -192,6 +192,42 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.TextBox txtQta; + /// + /// divImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.HtmlControls.HtmlGenericControl divImballi; + + /// + /// lblPart control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblPart; + + /// + /// ddlImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.DropDownList ddlImballi; + + /// + /// odsImballi control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource odsImballi; + /// /// btnStampa control. /// diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index e04f6b7f..bcfdb090 100644 Binary files a/GMW/bin/GMW.dll and b/GMW/bin/GMW.dll differ diff --git a/GMW/bin/GMW_data.dll b/GMW/bin/GMW_data.dll index 8f8a04fe..1e3357c7 100644 Binary files a/GMW/bin/GMW_data.dll and b/GMW/bin/GMW_data.dll differ diff --git a/GMW/bin/SteamWare.dll b/GMW/bin/SteamWare.dll index dbedd044..3b3b3915 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index 80a7ac74..2dd144df 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW_data/DS_magazzino.Designer.cs b/GMW_data/DS_magazzino.Designer.cs index ed3232ab..6da136dc 100644 --- a/GMW_data/DS_magazzino.Designer.cs +++ b/GMW_data/DS_magazzino.Designer.cs @@ -23292,6 +23292,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@SourceAL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@TipoAlAnc", global::System.Data.SqlDbType.Char, 1, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@UDC", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodImballo", global::System.Data.SqlDbType.VarChar, 15, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Note", global::System.Data.SqlDbType.VarChar, 500, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataOra", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[14].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodSoggetto", global::System.Data.SqlDbType.NVarChar, 17, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -23632,7 +23633,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] - public virtual DS_magazzino.ElencoCartelliniDataTable UdcLiqFullUpdate(string SourceAL, string TipoAlAnc, string UDC, string Note, global::System.Nullable DataOra, string CodSoggetto) { + public virtual DS_magazzino.ElencoCartelliniDataTable UdcLiqFullUpdate(string SourceAL, string TipoAlAnc, string UDC, string CodImballo, string Note, global::System.Nullable DataOra, string CodSoggetto) { this.Adapter.SelectCommand = this.CommandCollection[14]; if ((SourceAL == null)) { this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; @@ -23652,23 +23653,29 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno else { this.Adapter.SelectCommand.Parameters[3].Value = ((string)(UDC)); } - if ((Note == null)) { + if ((CodImballo == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Note)); + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodImballo)); } - if ((DataOra.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[5].Value = ((System.DateTime)(DataOra.Value)); - } - else { + if ((Note == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } - if ((CodSoggetto == null)) { - this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + else { + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Note)); + } + if ((DataOra.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[6].Value = ((System.DateTime)(DataOra.Value)); } else { - this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodSoggetto)); + this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; + } + if ((CodSoggetto == null)) { + this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(CodSoggetto)); } DS_magazzino.ElencoCartelliniDataTable dataTable = new DS_magazzino.ElencoCartelliniDataTable(); this.Adapter.Fill(dataTable); diff --git a/GMW_data/DS_magazzino.xsd b/GMW_data/DS_magazzino.xsd index 1decb8dc..29a415e1 100644 --- a/GMW_data/DS_magazzino.xsd +++ b/GMW_data/DS_magazzino.xsd @@ -396,6 +396,7 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno + diff --git a/GMW_data/DS_magazzino.xss b/GMW_data/DS_magazzino.xss index 72db90ac..0e598281 100644 --- a/GMW_data/DS_magazzino.xss +++ b/GMW_data/DS_magazzino.xss @@ -4,44 +4,44 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + - - + + - + - + - + - + - + - - - - - - - - - - - + + + + + + + + + + + @@ -143,12 +143,12 @@ - 735 - 977 + 736 + 962 656 - 977 + 962 @@ -184,7 +184,7 @@ - + 174 @@ -196,7 +196,7 @@ - + -39 @@ -208,7 +208,7 @@ - + 87 @@ -220,7 +220,7 @@ - + -47 diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index 4005722f..a4f10609 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -619,15 +619,16 @@ namespace GMW_data /// AL sorgente in postazione (ATL) /// Tipo cart da legare (TT) /// Cod UDC da processare + /// Cod Imballo /// Note x cartellino /// Cod soggetto /// - public bool liquidiFullUpdate(string SourceAL, string TipoAlAnc, string UDC, string Note, string CodSoggetto) + public bool liquidiFullUpdate(string SourceAL, string TipoAlAnc, string UDC, string CodImb, string Note, string CodSoggetto) { bool answ = false; try { - DS_magazzino.ElencoCartelliniRow riga = taCartellini.UdcLiqFullUpdate(SourceAL, TipoAlAnc, UDC, Note, DateTime.Now, CodSoggetto)[0]; + DS_magazzino.ElencoCartelliniRow riga = taCartellini.UdcLiqFullUpdate(SourceAL, TipoAlAnc, UDC, CodImb, Note, DateTime.Now, CodSoggetto)[0]; answ = true; } catch diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 03d2df86..6956762d 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.715.1650")] -[assembly: AssemblyFileVersion("2.5.715.1650")] +[assembly: AssemblyVersion("2.5.716.1650")] +[assembly: AssemblyFileVersion("2.5.716.1650")] [assembly: AssemblyCopyright("Steamware © 2007-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index c1c3f533..6c742b0b 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.715.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.715.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.716.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.716.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+