diff --git a/GMW-RT/bin/GMW-RT.dll b/GMW-RT/bin/GMW-RT.dll index cd82c29f..3d178efe 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 1275bb83..5fd87fcf 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 ae4e106a..4b182952 100644 Binary files a/GMW-RT/bin/SteamWare.dll and b/GMW-RT/bin/SteamWare.dll differ diff --git a/GMW-RT/bin/SteamWare.xml b/GMW-RT/bin/SteamWare.xml index 790694bc..08587fdc 100644 --- a/GMW-RT/bin/SteamWare.xml +++ b/GMW-RT/bin/SteamWare.xml @@ -3031,6 +3031,43 @@ testo associato al controllo + + + Classe gestione metodi di accesso ai dati embeddati + + + + + classe accesso tabelle selettori + + + + + tabella vocabolario + + + + + + tabella lingue + + + + + + faccio update del lemma indicato... + + + + + + + + cancella il lemma indicato + + + + Summary description for selettori diff --git a/GMW/Bootstrap.Master b/GMW/Bootstrap.Master index 42200bd2..b0a5f875 100644 --- a/GMW/Bootstrap.Master +++ b/GMW/Bootstrap.Master @@ -34,8 +34,6 @@ <%--To learn more about bundling scripts in ScriptManager see http://go.microsoft.com/fwlink/?LinkID=272931&clcid=0x409 --%> <%--Framework Scripts--%> - <%-- - --%> diff --git a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs index d72030ee..8e7e4bc2 100644 --- a/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs +++ b/GMW/WebUserControls/mod_PostLiq_DT.ascx.cs @@ -556,7 +556,7 @@ namespace GMW.WebUserControls if (memLayer.ML.confReadBool("useStoredLiqSP")) { // nuova stored con AL e cella...... - NewUDC = MagClass.magazzino.creaUdcWithAlCella(destAL, Postazione.currCodCella, flusso, "", currParticolare, "", "", "", "", OldUDC, 0, memLayer.ML.confReadString("CodImballoFiniti"), "U", MagClass.magazzino.CodSoggCurrUser, pezziUdc, 0, 0, adesso, 0, statoUdcOut, memLayer.ML.confReadInt("IdxPosizioneFinTemp"), "IdxPosizioneFinTemp", codEventoUdcOut, "", "", adesso.Year, Request.UserHostName); + NewUDC = MagClass.magazzino.creaUdcWithAlCella(destAL, sourceAL, barcodeIn, statoUdcOut, Postazione.currCodCella, flusso, "", currParticolare, "", "", "", "", OldUDC, 0, memLayer.ML.confReadString("CodImballoFiniti"), "U", MagClass.magazzino.CodSoggCurrUser, pezziUdc, 0, 0, adesso, 0, statoUdcOut, memLayer.ML.confReadInt("IdxPosizioneFinTemp"), "IdxPosizioneFinTemp", codEventoUdcOut, "", "", adesso.Year, Request.UserHostName); } else { @@ -564,12 +564,19 @@ namespace GMW.WebUserControls NewUDC = MagClass.magazzino.creaUdc(flusso, "", currParticolare, "", "", "", "", OldUDC, 0, memLayer.ML.confReadString("CodImballoFiniti"), "U", MagClass.magazzino.CodSoggCurrUser, pezziUdc, 0, 0, adesso, 0, statoUdcOut, memLayer.ML.confReadInt("IdxPosizioneFinTemp"), "IdxPosizioneFinTemp", codEventoUdcOut, "", "", adesso.Year, Request.UserHostName); // lo associo all'AL! MagClass.magazzino.taAL2UDC.Insert(destAL, NewUDC, adesso, MagClass.magazzino.CodSoggCurrUser); + // se lo trovo chiamo procedura di spostamento Dtx tra UDC sorgente --> dest (con eventuale creazione dest) + DataMatrix.mgr.taDtx2UDC.UpdateUDC(NewUDC, barcodeIn, statoUdcOut, DateTime.Now, MagClass.magazzino.CodSoggCurrUser); + // disattivo AL (se non era già disattivo...) x evitare si possa togliere senza chiudere... + MagClass.magazzino.taEA.DisattivaAL(sourceAL); } } - // se lo trovo chiamo procedura di spostamento Dtx tra UDC sorgente --> dest (con eventuale creazione dest) - DataMatrix.mgr.taDtx2UDC.UpdateUDC(NewUDC, barcodeIn, statoUdcOut, DateTime.Now, MagClass.magazzino.CodSoggCurrUser); - // disattivo AL (se non era già disattivo...) x evitare si possa togliere senza chiudere... - MagClass.magazzino.taEA.DisattivaAL(sourceAL); + else + { + // se lo trovo chiamo procedura di spostamento Dtx tra UDC sorgente --> dest (con eventuale creazione dest) + DataMatrix.mgr.taDtx2UDC.UpdateUDC(NewUDC, barcodeIn, statoUdcOut, DateTime.Now, MagClass.magazzino.CodSoggCurrUser); + // disattivo AL (se non era già disattivo...) x evitare si possa togliere senza chiudere... + MagClass.magazzino.taEA.DisattivaAL(sourceAL); + } // fix messaggi Postazione.messaggiText = traduci("ConfermatoDtx"); Postazione.warningText = ""; diff --git a/GMW/bin/GMW.dll b/GMW/bin/GMW.dll index 45d24007..ec6f45de 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 1275bb83..5fd87fcf 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 ae4e106a..4b182952 100644 Binary files a/GMW/bin/SteamWare.dll and b/GMW/bin/SteamWare.dll differ diff --git a/GMW/bin/SteamWare.xml b/GMW/bin/SteamWare.xml index 790694bc..08587fdc 100644 --- a/GMW/bin/SteamWare.xml +++ b/GMW/bin/SteamWare.xml @@ -3031,6 +3031,43 @@ testo associato al controllo + + + Classe gestione metodi di accesso ai dati embeddati + + + + + classe accesso tabelle selettori + + + + + tabella vocabolario + + + + + + tabella lingue + + + + + + faccio update del lemma indicato... + + + + + + + + cancella il lemma indicato + + + + Summary description for selettori diff --git a/GMW/bin/VersGen.dll b/GMW/bin/VersGen.dll index b4117bdd..7985d2a2 100644 Binary files a/GMW/bin/VersGen.dll and b/GMW/bin/VersGen.dll differ diff --git a/GMW/vocabolario.aspx b/GMW/vocabolario.aspx index c431b82b..c8a3453e 100644 --- a/GMW/vocabolario.aspx +++ b/GMW/vocabolario.aspx @@ -5,8 +5,7 @@ <%@ Register Src="WebUserControls/mod_lemmiVocab.ascx" TagName="mod_lemmiVocab" TagPrefix="uc2" %> <%@ Register Src="WebUserControls/mod_righePag.ascx" TagName="mod_righePag" TagPrefix="uc3" %> -<%@ Register Src="WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc1" TagName="mod_ricercaGenerica" %> -<%@ Register Src="~/WebUserControls/mod_righePag.ascx" TagPrefix="uc1" TagName="mod_righePag" %> +<%@ Register Src="WebUserControls/mod_ricercaGenerica.ascx" TagPrefix="uc4" TagName="mod_ricercaGenerica" %> @@ -19,7 +18,7 @@
- +
diff --git a/GMW_data/DS_Applicazione.Designer.cs b/GMW_data/DS_Applicazione.Designer.cs index 227d7f21..93af4546 100644 --- a/GMW_data/DS_Applicazione.Designer.cs +++ b/GMW_data/DS_Applicazione.Designer.cs @@ -17423,6 +17423,9 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno this._commandCollection[7].CommandType = global::System.Data.CommandType.StoredProcedure; this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@RETURN_VALUE", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.ReturnValue, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@AL", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].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[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@DataMatrix", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodStatoUdcOut", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCella", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodCS", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Flusso", global::System.Data.SqlDbType.VarChar, 2, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); @@ -18032,6 +18035,9 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)] public virtual DS_Applicazione.ElencoCartelliniDataTable stp_insNewFullWithAL( string AL, + string SourceAL, + string DataMatrix, + string CodStatoUdcOut, string CodCella, string CodCS, string Flusso, @@ -18064,155 +18070,173 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno else { this.Adapter.SelectCommand.Parameters[1].Value = ((string)(AL)); } - if ((CodCella == null)) { + if ((SourceAL == null)) { this.Adapter.SelectCommand.Parameters[2].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[2].Value = ((string)(CodCella)); + this.Adapter.SelectCommand.Parameters[2].Value = ((string)(SourceAL)); } - if ((CodCS == null)) { + if ((DataMatrix == null)) { this.Adapter.SelectCommand.Parameters[3].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[3].Value = ((string)(CodCS)); + this.Adapter.SelectCommand.Parameters[3].Value = ((string)(DataMatrix)); } - if ((Flusso == null)) { + if ((CodStatoUdcOut == null)) { this.Adapter.SelectCommand.Parameters[4].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[4].Value = ((string)(Flusso)); + this.Adapter.SelectCommand.Parameters[4].Value = ((string)(CodStatoUdcOut)); } - if ((Anno == null)) { + if ((CodCella == null)) { this.Adapter.SelectCommand.Parameters[5].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[5].Value = ((string)(Anno)); + this.Adapter.SelectCommand.Parameters[5].Value = ((string)(CodCella)); } - if ((CodCliente == null)) { + if ((CodCS == null)) { this.Adapter.SelectCommand.Parameters[6].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodCliente)); + this.Adapter.SelectCommand.Parameters[6].Value = ((string)(CodCS)); } - if ((Particolare == null)) { + if ((Flusso == null)) { this.Adapter.SelectCommand.Parameters[7].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[7].Value = ((string)(Particolare)); + this.Adapter.SelectCommand.Parameters[7].Value = ((string)(Flusso)); } - if ((CodImpianto == null)) { + if ((Anno == null)) { this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[8].Value = ((string)(CodImpianto)); + this.Adapter.SelectCommand.Parameters[8].Value = ((string)(Anno)); } - if ((CodStampo == null)) { + if ((CodCliente == null)) { this.Adapter.SelectCommand.Parameters[9].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[9].Value = ((string)(CodStampo)); + this.Adapter.SelectCommand.Parameters[9].Value = ((string)(CodCliente)); } - if ((Esponente == null)) { + if ((Particolare == null)) { this.Adapter.SelectCommand.Parameters[10].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[10].Value = ((string)(Esponente)); + this.Adapter.SelectCommand.Parameters[10].Value = ((string)(Particolare)); } - if ((Figura == null)) { + if ((CodImpianto == null)) { this.Adapter.SelectCommand.Parameters[11].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[11].Value = ((string)(Figura)); + this.Adapter.SelectCommand.Parameters[11].Value = ((string)(CodImpianto)); } - if ((DataFus.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[12].Value = ((System.DateTime)(DataFus.Value)); - } - else { + if ((CodStampo == null)) { this.Adapter.SelectCommand.Parameters[12].Value = global::System.DBNull.Value; } - if ((TurnoFus.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[13].Value = ((int)(TurnoFus.Value)); - } else { + this.Adapter.SelectCommand.Parameters[12].Value = ((string)(CodStampo)); + } + if ((Esponente == null)) { this.Adapter.SelectCommand.Parameters[13].Value = global::System.DBNull.Value; } - if ((CodImballo == null)) { + else { + this.Adapter.SelectCommand.Parameters[13].Value = ((string)(Esponente)); + } + if ((Figura == null)) { this.Adapter.SelectCommand.Parameters[14].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[14].Value = ((string)(CodImballo)); + this.Adapter.SelectCommand.Parameters[14].Value = ((string)(Figura)); } - if ((CodSoggetto == null)) { - this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value; + if ((DataFus.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[15].Value = ((System.DateTime)(DataFus.Value)); } else { - this.Adapter.SelectCommand.Parameters[15].Value = ((string)(CodSoggetto)); + this.Adapter.SelectCommand.Parameters[15].Value = global::System.DBNull.Value; } - if ((Tara.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[16].Value = ((double)(Tara.Value)); + if ((TurnoFus.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[16].Value = ((int)(TurnoFus.Value)); } else { this.Adapter.SelectCommand.Parameters[16].Value = global::System.DBNull.Value; } - if ((IdxPosizione.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[17].Value = ((int)(IdxPosizione.Value)); - } - else { + if ((CodImballo == null)) { this.Adapter.SelectCommand.Parameters[17].Value = global::System.DBNull.Value; } - if ((CodTipoDichiaraz == null)) { + else { + this.Adapter.SelectCommand.Parameters[17].Value = ((string)(CodImballo)); + } + if ((CodSoggetto == null)) { this.Adapter.SelectCommand.Parameters[18].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[18].Value = ((string)(CodTipoDichiaraz)); + this.Adapter.SelectCommand.Parameters[18].Value = ((string)(CodSoggetto)); } - if ((CodEvento == null)) { - this.Adapter.SelectCommand.Parameters[19].Value = global::System.DBNull.Value; + if ((Tara.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[19].Value = ((double)(Tara.Value)); } else { - this.Adapter.SelectCommand.Parameters[19].Value = ((string)(CodEvento)); + this.Adapter.SelectCommand.Parameters[19].Value = global::System.DBNull.Value; } - if ((Qta.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[20].Value = ((decimal)(Qta.Value)); + if ((IdxPosizione.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[20].Value = ((int)(IdxPosizione.Value)); } else { this.Adapter.SelectCommand.Parameters[20].Value = global::System.DBNull.Value; } - if ((PesoTot.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[21].Value = ((double)(PesoTot.Value)); - } - else { + if ((CodTipoDichiaraz == null)) { this.Adapter.SelectCommand.Parameters[21].Value = global::System.DBNull.Value; } - if ((PesoCad.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[22].Value = ((double)(PesoCad.Value)); - } else { + this.Adapter.SelectCommand.Parameters[21].Value = ((string)(CodTipoDichiaraz)); + } + if ((CodEvento == null)) { this.Adapter.SelectCommand.Parameters[22].Value = global::System.DBNull.Value; } - if ((CodStato == null)) { + else { + this.Adapter.SelectCommand.Parameters[22].Value = ((string)(CodEvento)); + } + if ((Qta.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[23].Value = ((decimal)(Qta.Value)); + } + else { this.Adapter.SelectCommand.Parameters[23].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[23].Value = ((string)(CodStato)); + if ((PesoTot.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[24].Value = ((double)(PesoTot.Value)); } - if ((UDC_parent == null)) { + else { this.Adapter.SelectCommand.Parameters[24].Value = global::System.DBNull.Value; } - else { - this.Adapter.SelectCommand.Parameters[24].Value = ((string)(UDC_parent)); - } - if ((DoDeleteUdcParent.HasValue == true)) { - this.Adapter.SelectCommand.Parameters[25].Value = ((bool)(DoDeleteUdcParent.Value)); + if ((PesoCad.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[25].Value = ((double)(PesoCad.Value)); } else { this.Adapter.SelectCommand.Parameters[25].Value = global::System.DBNull.Value; } - if ((Note == null)) { + if ((CodStato == null)) { this.Adapter.SelectCommand.Parameters[26].Value = global::System.DBNull.Value; } else { - this.Adapter.SelectCommand.Parameters[26].Value = ((string)(Note)); + this.Adapter.SelectCommand.Parameters[26].Value = ((string)(CodStato)); + } + if ((UDC_parent == null)) { + this.Adapter.SelectCommand.Parameters[27].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[27].Value = ((string)(UDC_parent)); + } + if ((DoDeleteUdcParent.HasValue == true)) { + this.Adapter.SelectCommand.Parameters[28].Value = ((bool)(DoDeleteUdcParent.Value)); + } + else { + this.Adapter.SelectCommand.Parameters[28].Value = global::System.DBNull.Value; + } + if ((Note == null)) { + this.Adapter.SelectCommand.Parameters[29].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[29].Value = ((string)(Note)); } DS_Applicazione.ElencoCartelliniDataTable dataTable = new DS_Applicazione.ElencoCartelliniDataTable(); this.Adapter.Fill(dataTable); diff --git a/GMW_data/DS_Applicazione.xsd b/GMW_data/DS_Applicazione.xsd index 7104d6fe..07458821 100644 --- a/GMW_data/DS_Applicazione.xsd +++ b/GMW_data/DS_Applicazione.xsd @@ -819,6 +819,9 @@ SELECT UDC, CodCS, CodCliente, RagSociale, Particolare, DescParticolare, Disegno + + + @@ -2951,12 +2954,12 @@ SELECT codPostazione, stampante FROM ElencoPostazioni WHERE (codPostazione = @co - - - - - - + + + + + + \ No newline at end of file diff --git a/GMW_data/MagClass.cs b/GMW_data/MagClass.cs index ed008367..862f9642 100644 --- a/GMW_data/MagClass.cs +++ b/GMW_data/MagClass.cs @@ -954,6 +954,9 @@ namespace GMW_data /// Fornisce un nuovo codice UDC tipo completo (con pezzi e cod magazzino) a partire dalla richiesta e associa ad AL e mette nella cella richiesta ///
/// AL da associare + /// AL Sorgente (da disattivare) + /// DataMatrix da spostare + /// /// codice cella destinazione /// codice anagrafico della bilanca che effettua la richiesta (codice della pesa) /// codice anagrafico del cliente @@ -981,7 +984,7 @@ namespace GMW_data /// anno in cui intestare i cartellini, trimma a 2 cifre DX /// Ip del client /// UDC del nuovo cartellino per FINITI - public string creaUdcWithAlCella(string AL, string CodCella, string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag, string defIdxPosiz, string codEvento, string note, string UDC, int anno, string clientIp) + public string creaUdcWithAlCella(string AL, string SourceAL, string DataMatrix, string CodStatoUdcOut, string CodCella, string CodBilancia, string CodCliente, string Particolare, string CodImpianto, string CodStampo, string Esponente, string Figura, string UDC_parent, double Tara, string CodImballo, string CodTipoDichiarazione, string CodSoggetto, int Quantita, float PesoTot, float PesoCad, DateTime DataRif, int TurnoRif, string CodStato, int CodMag, string defIdxPosiz, string codEvento, string note, string UDC, int anno, string clientIp) {// trim fix string CodBilanciaTrim = CodBilancia.Trim(); string CodClienteTrim = CodCliente.Trim(); @@ -1033,7 +1036,7 @@ namespace GMW_data // insert nuovo UDC con codice impostato try { - tabUdc = DataProxy.obj.taCartellini.stp_insNewFullWithAL(AL, CodCella, CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_parentTrim, doDeleteUdcTara, noteTrim); + tabUdc = DataProxy.obj.taCartellini.stp_insNewFullWithAL(AL, SourceAL,DataMatrix,CodStatoUdcOut, CodCella, CodCS, CodBilanciaTrim, annoTrim, CodClienteTrim, ParticolareTrim, CodImpiantoTrim, CodStampoTrim, EsponenteTrim, FiguraTrim, DataRif, TurnoRif, CodImballoTrim, CodSoggettoTrim, Tara, IdxPosizione, CodTipoDichiarazioneTrim, codEventoTrim, Quantita, PesoTot, PesoCad, CodStatoTrim, UDC_parentTrim, doDeleteUdcTara, noteTrim); answ = UDC; } catch diff --git a/GMW_data/bin/Debug/SteamWare.xml b/GMW_data/bin/Debug/SteamWare.xml index 05566b23..12e1fc0b 100644 --- a/GMW_data/bin/Debug/SteamWare.xml +++ b/GMW_data/bin/Debug/SteamWare.xml @@ -3031,6 +3031,43 @@ testo associato al controllo + + + Classe gestione metodi di accesso ai dati embeddati + + + + + classe accesso tabelle selettori + + + + + tabella vocabolario + + + + + + tabella lingue + + + + + + faccio update del lemma indicato... + + + + + + + + cancella il lemma indicato + + + + Summary description for selettori diff --git a/GMW_data/bin/SP_prod/GMW_data.dll b/GMW_data/bin/SP_prod/GMW_data.dll index 94c83374..5fd87fcf 100644 Binary files a/GMW_data/bin/SP_prod/GMW_data.dll and b/GMW_data/bin/SP_prod/GMW_data.dll differ diff --git a/GMW_data/bin/SP_prod/SteamWare.dll b/GMW_data/bin/SP_prod/SteamWare.dll index ae4e106a..4b182952 100644 Binary files a/GMW_data/bin/SP_prod/SteamWare.dll and b/GMW_data/bin/SP_prod/SteamWare.dll differ diff --git a/GMW_data/bin/SP_test/GMW_data.dll b/GMW_data/bin/SP_test/GMW_data.dll index 9f241a15..a707d83e 100644 Binary files a/GMW_data/bin/SP_test/GMW_data.dll and b/GMW_data/bin/SP_test/GMW_data.dll differ diff --git a/GMW_data/bin/SP_test/SteamWare.dll b/GMW_data/bin/SP_test/SteamWare.dll index ae4e106a..4b182952 100644 Binary files a/GMW_data/bin/SP_test/SteamWare.dll and b/GMW_data/bin/SP_test/SteamWare.dll differ diff --git a/ReleaseClienti/SP_prod/GMW.zip b/ReleaseClienti/SP_prod/GMW.zip index 7a376b36..16634ac4 100644 Binary files a/ReleaseClienti/SP_prod/GMW.zip and b/ReleaseClienti/SP_prod/GMW.zip differ diff --git a/ReleaseClienti/SP_test/GMW.zip b/ReleaseClienti/SP_test/GMW.zip index 200f97ce..6508fd82 100644 Binary files a/ReleaseClienti/SP_test/GMW.zip and b/ReleaseClienti/SP_test/GMW.zip differ diff --git a/VersGen/GMW.cs b/VersGen/GMW.cs index 71b2784d..b12f7a79 100644 --- a/VersGen/GMW.cs +++ b/VersGen/GMW.cs @@ -5,7 +5,7 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.667.1564")] -[assembly: AssemblyFileVersion("2.5.667.1564")] +[assembly: AssemblyVersion("2.5.668.1568")] +[assembly: AssemblyFileVersion("2.5.668.1568")] [assembly: AssemblyCopyright("Steamware © 2007-2014")] [assembly: AssemblyCompany("Steamware")] diff --git a/VersGen/GMW.tt b/VersGen/GMW.tt index f37b3f22..238f4300 100644 --- a/VersGen/GMW.tt +++ b/VersGen/GMW.tt @@ -6,8 +6,8 @@ using System.Reflection; -[assembly: AssemblyVersion("2.5.667.<#= this.RevisionNumber #>")] -[assembly: AssemblyFileVersion("2.5.667.<#= this.RevisionNumber #>")] +[assembly: AssemblyVersion("2.5.668.<#= this.RevisionNumber #>")] +[assembly: AssemblyFileVersion("2.5.668.<#= this.RevisionNumber #>")] [assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")] [assembly: AssemblyCompany("Steamware")] <#+