diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 338d3496..e6392b30 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -54,13 +54,13 @@ - + - + - + @@ -100,25 +100,25 @@ - - - - - - + + + + + + - - - + + + - + @@ -128,13 +128,13 @@ - - - - - - - + + + + + + + @@ -142,56 +142,56 @@ - + - + - + - + - + - + - - + + - + - + - + - + - + - + - + - + - + - + - - + + - + - + @@ -206,25 +206,25 @@ - + - + - + - + - + diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx index 07c756cc..8d6f71a7 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx @@ -21,6 +21,9 @@
+
+ +
@@ -34,24 +37,26 @@
- +
+ Text="+" OnClick="btnAdd_Click" TabIndex="7" />
- +
+ Text="-" OnClick="btnSvuota_Click" TabIndex="8" />
@@ -59,7 +64,8 @@

- +
@@ -67,20 +73,20 @@
+ Style="text-align: center" TabIndex="4" />

+ OnClick="btnStampa_Click" TabIndex="5" />

+ Style="text-align: center" TabIndex="1" /> @@ -89,7 +95,11 @@
+ TextMode="MultiLine" TabIndex="2" /> +
+
+
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs index 593080b1..17aaa492 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.cs @@ -28,10 +28,20 @@ namespace GMW.WebUserControls if (currParticolare != "") { lblGitterBoxAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); + // aggiungo descrizione del particolare + string descr = ""; + try + { + descr = utils.obj.taSelPart.getByConditioPref("", currParticolare)[0].label; + } + catch + { } + lblDescrAttivo.Text = descr; } else { lblGitterBoxAttivo.Text = "..."; + lblDescrAttivo.Text = ""; } } /// @@ -62,6 +72,7 @@ namespace GMW.WebUserControls btnStampa.Text = traduci("btnStampa"); btnAdd.ToolTip = traduci("btnAdd"); btnSvuota.ToolTip = traduci("btnSvuota"); + btnEmptyNote.Text = traduci("btnEmptyNote"); } /// /// restituisce il nome della pagina corrente @@ -459,5 +470,14 @@ namespace GMW.WebUserControls MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartLiquidiF10); } } + /// + /// svuoto le note + /// + /// + /// + protected void btnEmptyNote_Click(object sender, EventArgs e) + { + txtNote.Text = ""; + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs index c0a8c872..1eb29a78 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_controlloLiquidi.ascx.designer.cs @@ -67,6 +67,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblGitterBoxAttivo; + /// + /// lblDescrAttivo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + /// /// lblMessaggi control. /// @@ -219,5 +228,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtNote; + + /// + /// btnEmptyNote control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnEmptyNote; } } diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx index a99eb779..38410122 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx @@ -21,33 +21,69 @@
+
+ +
-
-   +
+
+ +
+
+
+
+
+ + +
+   +
+
+ +
+
+
+
+
+
+ +
+
+ +
+
+
+

+ Style="text-align: center" TabIndex="4" />

+ OnClick="btnStampa_Click" TabIndex="5" />

+ AutoPostBack="True" Style="text-align: center" TabIndex="1" /> @@ -56,7 +92,11 @@
+ TextMode="MultiLine" TabIndex="2" /> +
+
+
diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs index 642f6c98..c433c72f 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.cs @@ -27,10 +27,20 @@ namespace GMW.WebUserControls if (currParticolare != "") { lblGitterBoxAttivo.Text = string.Format("Particolare selezionato {0}", currParticolare); + // aggiungo descrizione del particolare + string descr = ""; + try + { + descr = utils.obj.taSelPart.getByConditioPref("", currParticolare)[0].label; + } + catch + { } + lblDescrAttivo.Text = descr; } else { lblGitterBoxAttivo.Text = "..."; + lblDescrAttivo.Text = ""; } } /// @@ -49,6 +59,7 @@ namespace GMW.WebUserControls // labels lblPostazione.Text = string.Format("{2}: {0} ({1})", postazione_name, postazione_IP, traduci("postazione")); lblPrinter.Text = string.Format("{1}: {0}", postazione_printer, traduci("stampante")); + lblUDC.Text = traduci("lblUDC"); lblQta.Text = traduci("lblQuantita"); lblNote.Text = traduci("lblNote"); lblCurrentPage.Text = traduci(PagCorrente); @@ -56,6 +67,7 @@ namespace GMW.WebUserControls txtQta.Text = memLayer.ML.confReadString("QtaImballoLiquidiDaSpedire"); // buttons btnStampa.Text = traduci("btnStampa"); + btnEmptyNote.Text = traduci("btnEmptyNote"); } /// /// restituisce il nome della pagina corrente @@ -296,6 +308,8 @@ namespace GMW.WebUserControls // procedo solo se UDC esistente if (MagClass.magazzino.checkUDC(barcodeIn)) { + // VECCHIA VERSIONE: caricava particolare da UDC +#if false // recupero il particolare dai dati del cartellino preesistente currParticolare = DataProxy.obj.taCartellini.stp_getByUdc(barcodeIn)[0].Particolare; // controllo esista il particolare @@ -309,7 +323,9 @@ namespace GMW.WebUserControls { lblMessaggi.Text += " - impostato particolare!"; pnlAll.CssClass = "stileComandoOk"; - } + } +#endif + checkUdc4elenco(barcodeIn); } break; @@ -344,6 +360,114 @@ namespace GMW.WebUserControls btnStampa.Enabled = stampaOk; } /// + /// elenco dictionary dei trattamenti da associare ad UDC + /// + public Dictionary elencoUDC + { + get + { + try + { + return (Dictionary)memLayer.ML.objSessionObj("elencoUDC"); + } + catch + { + return new Dictionary(); + } + } + set + { + memLayer.ML.setSessionVal("elencoUDC", value, false); + } + } + /// + /// aggiungo un oggetto trattamento alla lista.. + /// + /// + /// + protected void btnAdd_Click(object sender, EventArgs e) + { + if (txtUDC.Text.Trim() != "") + { + string valore = txtUDC.Text.Trim().ToUpper(); + // controllo esista UDC.. + checkUdc4elenco(valore); + } + doChecks(); + } + /// + /// controlla validità UDC x inserire in elenco... + /// + /// + private void checkUdc4elenco(string valore) + { + if (MagClass.magazzino.checkUDC(valore)) + { + // controllo sia un cartellino F10... + DS_Applicazione.ElencoCartelliniRow rigaCart; + string tipoImballo = ""; + try + { + rigaCart = DataProxy.obj.taCartellini.stp_getByUdc(valore)[0]; + tipoImballo = rigaCart.CodImballo; + } + catch + { } + // controllo il tipo imballo dell'UDC per decidere se sia F10... + if (tipoImballo == memLayer.ML.confReadString("CodImballoLiquidi")) + { + Dictionary elenco = elencoUDC; + // controllo il valore non ci sia già... + if (!elenco.ContainsKey(valore)) + { + elenco.Add(valore, valore); + elencoUDC = elenco; + } + txtUDC.Text = ""; + lblWarnUdc.Visible = false; + updateListBoxUDC(); + } + else + { + // elimino UDC con imballo non valido! + txtUDC.Text = ""; + lblWarnUdc.Text = traduci("UdcImballoErrato"); + lblWarnUdc.Visible = true; + } + } + else + { + // elimino UDC non valido! + txtUDC.Text = ""; + lblWarnUdc.Text = traduci("UdcNonTrovato"); + lblWarnUdc.Visible = true; + } + } + /// + /// aggiorna la listbox + /// + private void updateListBoxUDC() + { + lbUdc.DataSource = elencoUDC; + lbUdc.DataTextField = "Value"; + lbUdc.DataValueField = "Key"; + lbUdc.DataBind(); + } + /// + /// svuota elenco trattamenti + /// + /// + /// + protected void btnSvuota_Click(object sender, EventArgs e) + { + Dictionary elenco = new Dictionary(); + elencoUDC = elenco; + txtUDC.Text = ""; + lblWarnUdc.Visible = false; + updateListBoxUDC(); + doChecks(); + } + /// /// genera i barcode di /// - trattamenti /// - nuovo x pezzi liquidi @@ -370,12 +494,27 @@ namespace GMW.WebUserControls } catch { } - // se ho cart liquidi genero (se non ci sono) cart trattamenti + // stampo! if (newUdcChild != "") { // ora stampo il nuovo cartellino!!! MagClass.magazzino.stampaUdc(newUdcChild, postazione_printer, tipoCartellino.cartLiquidiF18); + // controllo se ci sono UDC F10 da associare... e x ognuno associo! + foreach (KeyValuePair kvp in elencoUDC) + { + // associo i 2 cartellini + MagClass.magazzino.associaUdcParent(newUdcChild, kvp.Key); + } } } + /// + /// svuoto le note + /// + /// + /// + protected void btnEmptyNote_Click(object sender, EventArgs e) + { + txtNote.Text = ""; + } } } \ No newline at end of file diff --git a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs index 507e2373..b04dd86d 100644 --- a/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs +++ b/GMW/GMW/WebUserControls/mod_sanpos_creazioneF18.ascx.designer.cs @@ -67,6 +67,15 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblGitterBoxAttivo; + /// + /// lblDescrAttivo control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblDescrAttivo; + /// /// lblMessaggi control. /// @@ -76,6 +85,69 @@ namespace GMW.WebUserControls { /// protected global::System.Web.UI.WebControls.Label lblMessaggi; + /// + /// lblUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblUDC; + + /// + /// txtUDC control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.TextBox txtUDC; + + /// + /// revNumTratt control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.RegularExpressionValidator revNumTratt; + + /// + /// lblWarnUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label lblWarnUdc; + + /// + /// btnAdd control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnAdd; + + /// + /// lbUdc control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.ListBox lbUdc; + + /// + /// btnSvuota control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnSvuota; + /// /// lblQta control. /// @@ -147,5 +219,14 @@ namespace GMW.WebUserControls { /// To modify move field declaration from designer file to code-behind file. /// protected global::System.Web.UI.WebControls.TextBox txtNote; + + /// + /// btnEmptyNote control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Button btnEmptyNote; } } diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index afd29f8f..6509ad18 100644 Binary files a/GMW/GMW/bin/GMW.dll and b/GMW/GMW/bin/GMW.dll differ diff --git a/GMW/GMW/bin/GMW_data.dll b/GMW/GMW/bin/GMW_data.dll index 28eb0666..d8a22344 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 44fb787f..f406bd77 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP.config b/GMW/GMW/mazzAppSettingsSP.config index d465da74..a7d5871f 100644 --- a/GMW/GMW/mazzAppSettingsSP.config +++ b/GMW/GMW/mazzAppSettingsSP.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsSP_test.config b/GMW/GMW/mazzAppSettingsSP_test.config index 30cb9242..dd422b6d 100644 --- a/GMW/GMW/mazzAppSettingsSP_test.config +++ b/GMW/GMW/mazzAppSettingsSP_test.config @@ -7,8 +7,8 @@ - - + + diff --git a/GMW/GMW/mazzAppSettingsTK.config b/GMW/GMW/mazzAppSettingsTK.config index d5d106ea..bd3f1daf 100644 --- a/GMW/GMW/mazzAppSettingsTK.config +++ b/GMW/GMW/mazzAppSettingsTK.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzAppSettingsTK_test.config b/GMW/GMW/mazzAppSettingsTK_test.config index b60e28ab..36727758 100644 --- a/GMW/GMW/mazzAppSettingsTK_test.config +++ b/GMW/GMW/mazzAppSettingsTK_test.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW/mazzConnectionStrings.config b/GMW/GMW/mazzConnectionStrings.config index 2d681ba2..090a45c1 100644 --- a/GMW/GMW/mazzConnectionStrings.config +++ b/GMW/GMW/mazzConnectionStrings.config @@ -1,3 +1,3 @@  - + \ No newline at end of file diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index 2aac98a6..0c5a3853 100644 Binary files a/GMW/GMW/obj/Debug/GMW.dll and b/GMW/GMW/obj/Debug/GMW.dll differ diff --git a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache index a0a19659..ed1791d7 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW/obj/Release/GMW.dll b/GMW/GMW/obj/Release/GMW.dll index afd29f8f..6509ad18 100644 Binary files a/GMW/GMW/obj/Release/GMW.dll and b/GMW/GMW/obj/Release/GMW.dll differ diff --git a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache index ccad8f59..5e1d2353 100644 Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index 8d4ed843..e543891d 100644 Binary files a/GMW/GMW_Term/bin/GMW_Term.dll and b/GMW/GMW_Term/bin/GMW_Term.dll differ diff --git a/GMW/GMW_Term/bin/GMW_data.dll b/GMW/GMW_Term/bin/GMW_data.dll index 28eb0666..1cf64a87 100644 Binary files a/GMW/GMW_Term/bin/GMW_data.dll and b/GMW/GMW_Term/bin/GMW_data.dll differ diff --git a/GMW/GMW_Term/bin/SteamWare.dll b/GMW/GMW_Term/bin/SteamWare.dll index adbe7a46..04ad31bd 100644 Binary files a/GMW/GMW_Term/bin/SteamWare.dll and b/GMW/GMW_Term/bin/SteamWare.dll differ diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 4aae7c67..e543891d 100644 Binary files a/GMW/GMW_Term/obj/Debug/GMW_Term.dll and b/GMW/GMW_Term/obj/Debug/GMW_Term.dll differ diff --git a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache index e6d5c370..078aace1 100644 Binary files a/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_Term/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/GMW_data.csproj b/GMW/GMW_data/GMW_data.csproj index 9f844b03..7588a6ca 100644 --- a/GMW/GMW_data/GMW_data.csproj +++ b/GMW/GMW_data/GMW_data.csproj @@ -271,6 +271,7 @@ + @@ -288,6 +289,7 @@ + diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 294c3485..30be6a31 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -191,39 +191,47 @@ namespace GMW_data public bool spostaUDC(string CodCS, string UDC, int IdxCellaTo, bool resetRLP) { bool answ = false; - try - { - taPosUdcCorr.stp_spostaUdc(CodCS, UDC, IdxCellaTo, resetRLP); - // cerco nuova posizione... - if (taPosUdcCorr.getByCellaUdc(UDC, IdxCellaTo).Rows.Count > 0) - { - answ = true; - } - } - catch (Exception e) - { - logger.lg.scriviLog(string.Format("Errore durante spostamento cella: {0}", e), tipoLog.EXCEPTION); - } - // solo se ha fatto spostamento posizione corrente verifico se fare spostamento in posizione LOGICA magazzino - if (answ) + // procedo SOLO se la cella di dest è VUOTA... + if (!MagClass.magazzino.cellaPiena(CodCS, IdxCellaTo)) { try { - // verifico tipo cella e se ci sia da fare spostamento in mag logico/contabile - int idxTipoCella = taCelle.getByIdxCella(IdxCellaTo)[0].IdxTipoCella; - bool needSetMag = taTipoCella.getByIdx(idxTipoCella)[0].SetMag; - if (needSetMag) + taPosUdcCorr.stp_spostaUdc(CodCS, UDC, IdxCellaTo, resetRLP); + // cerco nuova posizione... + if (taPosUdcCorr.getByCellaUdc(UDC, IdxCellaTo).Rows.Count > 0) { - // cambio (eventualmente) la posizione "logica" dato lo spostamento (il codice magazzino...) - int idxBlocco = taCelle.getByIdxCella(IdxCellaTo)[0].IdxBlocco; - int idxPosizione = Convert.ToInt32(taBlocchi.getByIdx(idxBlocco)[0].CodMag); - taCartellini.updateIdxPosizione(UDC, idxPosizione); + answ = true; } } catch (Exception e) { - logger.lg.scriviLog(string.Format("Errore durante indicazione posizione UDC: {0}", e), tipoLog.EXCEPTION); + logger.lg.scriviLog(string.Format("Errore durante spostamento cella: {0}", e), tipoLog.EXCEPTION); } + // solo se ha fatto spostamento posizione corrente verifico se fare spostamento in posizione LOGICA magazzino + if (answ) + { + try + { + // verifico tipo cella e se ci sia da fare spostamento in mag logico/contabile + int idxTipoCella = taCelle.getByIdxCella(IdxCellaTo)[0].IdxTipoCella; + bool needSetMag = taTipoCella.getByIdx(idxTipoCella)[0].SetMag; + if (needSetMag) + { + // cambio (eventualmente) la posizione "logica" dato lo spostamento (il codice magazzino...) + int idxBlocco = taCelle.getByIdxCella(IdxCellaTo)[0].IdxBlocco; + int idxPosizione = Convert.ToInt32(taBlocchi.getByIdx(idxBlocco)[0].CodMag); + taCartellini.updateIdxPosizione(UDC, idxPosizione); + } + } + catch (Exception e) + { + logger.lg.scriviLog(string.Format("Errore durante indicazione posizione UDC: {0}", e), tipoLog.EXCEPTION); + } + } + } + else + { + logger.lg.scriviLog(string.Format("Errore, cella {0} di destinazione piena!!!", IdxCellaTo), tipoLog.ERROR); } return answ; } diff --git a/GMW/GMW_data/SqlScripts/V1.2/GMW_00432.sql b/GMW/GMW_data/SqlScripts/V1.2/GMW_00432.sql new file mode 100644 index 00000000..0375c02d --- /dev/null +++ b/GMW/GMW_data/SqlScripts/V1.2/GMW_00432.sql @@ -0,0 +1,152 @@ +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/*************************************** +* STORED stp_spostaUdc +* +* sposta un UDC, salvandone la posizione precedente (se esiste) nella tab storica +* +* Steamware, S.E.L. +* mod: 2010.06.11 +* +****************************************/ +alter PROCEDURE stp_spostaUdc +( + @CodCS VARCHAR(2), + @UDC VARCHAR(50), + @IdxCellaTo INT, + @resetRLP BIT +) +AS + +BEGIN TRAN + + -- DICHIARAZIONI iniziali variabili + DECLARE @IdxCellaFrom INT + DECLARE @capienza INT + DECLARE @numUdc INT + + -- controllo cella di partenza + SET @IdxCellaFrom = (SELECT IdxCella FROM PosizioneUdcCorrente WHERE UDC = @UDC) + + -- controllo se cella di destinazione e di aprtenza coincidono NON FACCIO NULLA... altrimenti procedo + IF (@IdxCellaTo <> @IdxCellaFrom) + BEGIN + + -- controllo se la cella di dest vada indicata come piena + SET @capienza = ( + SELECT tc.Capienza + FROM TipoCella TC INNER JOIN Celle c ON TC.IdxTipoCella=c.IdxTipoCella + WHERE c.IdxCella = @IdxCellaFrom + ) + SET @numUdc = (SELECT COUNT(*) FROM PosizioneUdcCorrente WHERE IdxCella = @IdxCellaFrom) + -- se capienza raggiunta aggiorno... + IF(@numUdc -1 < @capienza) + BEGIN + EXEC stp_celle_updPiena @IdxCellaFrom, 0 + END + + -- cancello posizione occupata + DELETE + FROM PosizioneUdcCorrente + WHERE UDC = @UDC + + -- SE RICHIESTO cancello eventuali righe liste di prelievo FUSI per l'UDC + IF(@resetRLP = 1) + BEGIN + DELETE FROM RigheListePrelievo + WHERE UDC = @UDC AND CodLista IN ( + SELECT CodLista FROM ElencoListePrelievo + --WHERE CodTipoLista='01-PreFus' + WHERE CodStatoLista < 4 + ) + END + + + + -- creo una nuova posizione per l'UDC + INSERT INTO PosizioneUdcCorrente(UDC, IdxCella, CodCS, DataRif) + VALUES(@UDC, @IdxCellaTo, @CodCS, GETDATE()) + + -- controllo se la cella di dest vada indicata come piena + SET @capienza = ( + SELECT tc.Capienza + FROM TipoCella TC INNER JOIN Celle c ON TC.IdxTipoCella=c.IdxTipoCella + WHERE c.IdxCella = @IdxCellaTo + ) + SET @numUdc = (SELECT COUNT(*) FROM PosizioneUdcCorrente WHERE IdxCella = @IdxCellaTo) + -- se capienza raggiunta aggiorno... + IF(@numUdc >= @capienza) + BEGIN + EXEC stp_celle_updPiena @IdxCellaTo, 1 + END + + END -- cellaFrom e cellaTo non coincidono... + +COMMIT TRAN + +RETURN +go + +commit; +go + + +set xact_abort on; +go + +begin transaction; +go + +set ANSI_NULLS on; +go + +/*************************************** +* function componiUdc +* +* compone il cod UDC a partire da +* - "U" fisso +* - CodCS (codice company sito, 2 char) +* - Flusso (codice flusso-bilancia 2 char) +* - @Anno (anno, 2 char) +* - @numUdc (progr annuale, 2 char) +* +* Steamware, S.E.L. +* mod: 2010.09.23 +* +****************************************/ +alter FUNCTION componiUdc +( + @CodCS NVARCHAR(2), + @Flusso NVARCHAR(2), + @Anno NVARCHAR(2), + @numUdc INT +) +RETURNS NVARCHAR(13) +AS + BEGIN + + DECLARE @answ AS NVARCHAR(50) + + SET @answ = 'U' + @CodCS + @Flusso + @Anno + dbo.f_padLeft(CAST(@numUdc AS VARCHAR(6)), 6, '0') + + RETURN @answ + END +go + +commit; +go + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(432, GETDATE()) +GO diff --git a/GMW/GMW_data/SqlScripts/Vocabolario/vocab_432.sql b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_432.sql new file mode 100644 index 00000000..aedb1a44 --- /dev/null +++ b/GMW/GMW_data/SqlScripts/Vocabolario/vocab_432.sql @@ -0,0 +1,31 @@ +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'btnEmptyNote', N'svuota note') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'UdcImballoErrato', N'Errore UDC: imballo errato!') +INSERT INTO dbo.Vocabolario + VALUES (N'EN', N'UdcNonTrovato', N'UDC non trovato!') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'btnEmptyNote', N'svuota note') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'UdcImballoErrato', N'Errore UDC: imballo errato!') +INSERT INTO dbo.Vocabolario + VALUES (N'IT', N'UdcNonTrovato', N'UDC non trovato!') +go + +commit transaction +go + + + + + + +-- registro versione... +INSERT INTO [dbo].[LogUpdateDb] ([Versione],[Data]) VALUES(432, GETDATE()) +GO diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index f604cd04..1cf64a87 100644 Binary files a/GMW/GMW_data/bin/Debug/GMW_data.dll and b/GMW/GMW_data/bin/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/bin/Release/GMW_data.dll b/GMW/GMW_data/bin/Release/GMW_data.dll index 28eb0666..d8a22344 100644 Binary files a/GMW/GMW_data/bin/Release/GMW_data.dll and b/GMW/GMW_data/bin/Release/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/GMW_data.dll b/GMW/GMW_data/obj/Debug/GMW_data.dll index f604cd04..1cf64a87 100644 Binary files a/GMW/GMW_data/obj/Debug/GMW_data.dll and b/GMW/GMW_data/obj/Debug/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll index 6ad55d47..41752234 100644 Binary files a/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll and b/GMW/GMW_data/obj/Debug/Refactor/GMW_data.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 28eb0666..d8a22344 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ diff --git a/GMW/GMW_deploy/Release/mazzConnectionStrings.config b/GMW/GMW_deploy/Release/mazzConnectionStrings.config index 2d681ba2..090a45c1 100644 --- a/GMW/GMW_deploy/Release/mazzConnectionStrings.config +++ b/GMW/GMW_deploy/Release/mazzConnectionStrings.config @@ -1,3 +1,3 @@  - + \ No newline at end of file diff --git a/GMW/GMW_deploy/Source/mazzConnectionStrings.config b/GMW/GMW_deploy/Source/mazzConnectionStrings.config index 2d681ba2..090a45c1 100644 --- a/GMW/GMW_deploy/Source/mazzConnectionStrings.config +++ b/GMW/GMW_deploy/Source/mazzConnectionStrings.config @@ -1,3 +1,3 @@  - + \ No newline at end of file diff --git a/GMW/GMW_test_installer/GMW_test_installer.vdproj b/GMW/GMW_test_installer/GMW_test_installer.vdproj index e2ab5a25..43c8bedf 100644 --- a/GMW/GMW_test_installer/GMW_test_installer.vdproj +++ b/GMW/GMW_test_installer/GMW_test_installer.vdproj @@ -301,14 +301,14 @@ { "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_test" - "ProductCode" = "8:{EE9A2B35-42ED-4E33-8817-6186449E8709}" - "PackageCode" = "8:{698D5F38-916A-41DC-BA59-9254A66A07BF}" + "ProductCode" = "8:{51BB4C27-7274-409D-B809-FEBE74F162BA}" + "PackageCode" = "8:{EFDCEFB3-2C6E-4AC1-A456-E42E8D0B39B2}" "UpgradeCode" = "8:{6FD64E39-D93B-4ADA-ADF3-303A1BCA49C2}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" "DetectNewerInstalledVersion" = "11:TRUE" "InstallAllUsers" = "11:FALSE" - "ProductVersion" = "8:1.1.431" + "ProductVersion" = "8:1.1.432" "Manufacturer" = "8:SteamWare s.r.l." "ARPHELPTELEPHONE" = "8:+39-035460560" "ARPHELPLINK" = "8:http://www.steamware.net" diff --git a/GMW/GMW_test_installer/Release/GMW_test_installer.msi b/GMW/GMW_test_installer/Release/GMW_test_installer.msi index 5a249e75..d84ac6f0 100644 Binary files a/GMW/GMW_test_installer/Release/GMW_test_installer.msi and b/GMW/GMW_test_installer/Release/GMW_test_installer.msi differ