diff --git a/GMW/GMW/Web.config b/GMW/GMW/Web.config index 3903a592..78d09930 100644 --- a/GMW/GMW/Web.config +++ b/GMW/GMW/Web.config @@ -99,10 +99,10 @@ - - - - + + + + diff --git a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs index c43bf5f2..a582256c 100644 --- a/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_UdcCella.ascx.cs @@ -215,7 +215,7 @@ namespace GMW.WebUserControls // controllo che sia valido x fare l'operazione if (IdxCellaTo > 0) { - MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaTo); + MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaTo, true); } azzeraPostUpdate(); if (eh_nuovoValore != null) diff --git a/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs b/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs index 49ee4392..34837979 100644 --- a/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs +++ b/GMW/GMW/WebUserControls/mod_execUDC.ascx.cs @@ -109,7 +109,7 @@ namespace GMW.WebUserControls // controllo che sia valido x fare l'operazione if (IdxCellaTo > 0) { - MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaTo); + MagClass.magazzino.spostaUDC(memLayer.ML.StringSessionObj("CodCS"), UDC, IdxCellaTo, true); } azzeraPostUpdate(); if (eh_nuovoValore != null) diff --git a/GMW/GMW/WebUserControls/mod_main_help.ascx b/GMW/GMW/WebUserControls/mod_main_help.ascx index c08cf0b0..7ec55b3c 100644 --- a/GMW/GMW/WebUserControls/mod_main_help.ascx +++ b/GMW/GMW/WebUserControls/mod_main_help.ascx @@ -18,8 +18,8 @@
- + Mag 56, MP Tara @@ -39,10 +39,10 @@ title="" /> Mag 54, Celle - Delibera spedizione terzista + Prelievo Prelievo - Contapezzi Delibera fusi diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll index f7d99d56..e82ff88c 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 1c80fcf1..a92aceef 100644 Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ diff --git a/GMW/GMW/flusso.jpg b/GMW/GMW/flusso.jpg deleted file mode 100644 index a533e00a..00000000 Binary files a/GMW/GMW/flusso.jpg and /dev/null differ diff --git a/GMW/GMW/images/flusso.png b/GMW/GMW/images/flusso.png index a6bc9eda..b51e3e5c 100644 Binary files a/GMW/GMW/images/flusso.png and b/GMW/GMW/images/flusso.png differ diff --git a/GMW/GMW/mazzAppSettings.config b/GMW/GMW/mazzAppSettings.config index 3bf72599..b7f0dfd5 100644 --- a/GMW/GMW/mazzAppSettings.config +++ b/GMW/GMW/mazzAppSettings.config @@ -44,10 +44,10 @@ - - - - + + + + diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll index f7d99d56..e82ff88c 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 87328353..6d573289 100644 Binary files a/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_Term/Web.config b/GMW/GMW_Term/Web.config index 7639a3f1..6410e67f 100644 --- a/GMW/GMW_Term/Web.config +++ b/GMW/GMW_Term/Web.config @@ -58,7 +58,7 @@ - + diff --git a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs index b1ecdc57..92238bcd 100644 --- a/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs +++ b/GMW/GMW_Term/WebUserControls/mod_execUdc.ascx.cs @@ -259,7 +259,7 @@ namespace GMW_Term.WebUserControls // cerco id della cella... int idxCella = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); // salva le info facendo caricamento - MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCella); + MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCella, true); if (setCellaPiena) { MagClass.magazzino.taCelle.stp_celle_updPiena(idxCella, true); @@ -279,7 +279,7 @@ namespace GMW_Term.WebUserControls int idxCellaFrom = MagClass.magazzino.taDettUDC.getByFullUdc(_UDC, _CodCS)[0].IdxCella; int idxCellaTo = MagClass.magazzino.IdxCellaByCodCella(_CodCS, valoreScanUdc); // salva le info facendo caricamento - MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCellaTo); + MagClass.magazzino.spostaUDC(_CodCS, _UDC, idxCellaTo, true); // dopo aver spostato UDC sistemo eventuali Righe di Prelievo x lo stesso UDC pending... MagClass.magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate("ND", _UDC); // metto "ND" perché voglio sbloccare tutti gli impieghi di quell'UDC // la cella di partenza la indico come disponibile (comunque ho tolto un UDC...) diff --git a/GMW/GMW_Term/bin/GMW_Term.dll b/GMW/GMW_Term/bin/GMW_Term.dll index decd6297..8ccd9b7e 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 e4d73998..a5fe8d27 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/mazzAppSettings.config b/GMW/GMW_Term/mazzAppSettings.config index d4d1e1fa..d64930e7 100644 --- a/GMW/GMW_Term/mazzAppSettings.config +++ b/GMW/GMW_Term/mazzAppSettings.config @@ -7,7 +7,7 @@ - + diff --git a/GMW/GMW_Term/obj/Debug/GMW_Term.dll b/GMW/GMW_Term/obj/Debug/GMW_Term.dll index 4a89c3b2..8ccd9b7e 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 18877c77..be0dbd34 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_Term_installer/GMW_Term_installer.vdproj b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj index c1f11b2b..71daa394 100644 --- a/GMW/GMW_Term_installer/GMW_Term_installer.vdproj +++ b/GMW/GMW_Term_installer/GMW_Term_installer.vdproj @@ -331,7 +331,7 @@ "Name" = "8:Microsoft Visual Studio" "ProductName" = "8:GMW_Term" "ProductCode" = "8:{7CB4D0AA-04F4-4DA1-941D-30C26B52991B}" - "PackageCode" = "8:{9A7250B6-67C7-4C48-9370-65636E65C7C9}" + "PackageCode" = "8:{7AF4125C-4DA7-49FD-A2DD-FC8934CFCFC3}" "UpgradeCode" = "8:{B348C50D-8DAD-4430-AEF0-60800C94CB78}" "RestartWWWService" = "11:TRUE" "RemovePreviousVersions" = "11:TRUE" @@ -810,7 +810,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_9C1BA08A590A44EC9515C0F91AD50A1D" { - "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Release\\SetDirectoryPermission.exe" + "SourcePath" = "8:..\\..\\SetDirectoryPermission\\obj\\Debug\\SetDirectoryPermission.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" @@ -838,7 +838,7 @@ } "{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_B0271B832DBE45F0B50639E61DAE3CF4" { - "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Release\\IISConsoleVB.exe" + "SourcePath" = "8:..\\..\\IISCustomActionVB\\IISConsoleVB\\obj\\Debug\\IISConsoleVB.exe" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_A89965CB827F476CB8D496FFFC9653DF" diff --git a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi index fa6e09fd..0f5a9a3e 100644 Binary files a/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi and b/GMW/GMW_Term_installer/Release/GMW_Term_installer.msi differ diff --git a/GMW/GMW_WS/bilance.asmx.cs b/GMW/GMW_WS/bilance.asmx.cs index 62edf64c..ce34f226 100644 --- a/GMW/GMW_WS/bilance.asmx.cs +++ b/GMW/GMW_WS/bilance.asmx.cs @@ -14,7 +14,7 @@ namespace GMW_WS /// /// WebService per gestione sw bilance /// - [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.330")] + [WebService(Namespace = "http://www.steamware.net/", Description = "Web Services che funziona da collettore di tutte le richieste delle applicazioni per le bilance integrate a GMW v.1.0.335")] [WebServiceBinding(ConformsTo = WsiProfiles.BasicProfile1_1)] [System.ComponentModel.ToolboxItem(false)] public class bilance : System.Web.Services.WebService @@ -1060,7 +1060,7 @@ namespace GMW_WS } try { - answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); + answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo, true); } catch { } @@ -1109,7 +1109,7 @@ namespace GMW_WS } try { - answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); + answ = MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo, true); } catch { } @@ -1153,7 +1153,7 @@ namespace GMW_WS try { - MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo); + MagClass.magazzino.spostaUDC(CodCs, UDC_reqTrim, idxCellaTo, true); answ = true; } catch diff --git a/GMW/GMW_WS/bin/GMW.dll b/GMW/GMW_WS/bin/GMW.dll index 4d9975a4..e82ff88c 100644 Binary files a/GMW/GMW_WS/bin/GMW.dll and b/GMW/GMW_WS/bin/GMW.dll differ diff --git a/GMW/GMW_WS/bin/GMW_WS.dll b/GMW/GMW_WS/bin/GMW_WS.dll index 08fcfbfe..41c85391 100644 Binary files a/GMW/GMW_WS/bin/GMW_WS.dll and b/GMW/GMW_WS/bin/GMW_WS.dll differ diff --git a/GMW/GMW_WS/bin/GMW_data.dll b/GMW/GMW_WS/bin/GMW_data.dll index e4d73998..a92aceef 100644 Binary files a/GMW/GMW_WS/bin/GMW_data.dll and b/GMW/GMW_WS/bin/GMW_data.dll differ diff --git a/GMW/GMW_WS/obj/Debug/GMW_WS.dll b/GMW/GMW_WS/obj/Debug/GMW_WS.dll index 20169c18..41c85391 100644 Binary files a/GMW/GMW_WS/obj/Debug/GMW_WS.dll and b/GMW/GMW_WS/obj/Debug/GMW_WS.dll differ diff --git a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache index bcff6bb0..04844bc5 100644 Binary files a/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache and b/GMW/GMW_WS/obj/Debug/ResolveAssemblyReference.cache differ diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs index 70d66d2a..8077e849 100644 --- a/GMW/GMW_data/DS_magazzino.Designer.cs +++ b/GMW/GMW_data/DS_magazzino.Designer.cs @@ -16958,6 +16958,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = 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("@UDC", 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("@IdxCellaTo", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + this._commandCollection[7].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@resetRLP", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -17287,7 +17288,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] - public virtual int stp_spostaUdc(string CodCS, string UDC, global::System.Nullable IdxCellaTo) { + public virtual int stp_spostaUdc(string CodCS, string UDC, global::System.Nullable IdxCellaTo, global::System.Nullable resetRLP) { global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[7]; if ((CodCS == null)) { command.Parameters[1].Value = global::System.DBNull.Value; @@ -17307,6 +17308,12 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = else { command.Parameters[3].Value = global::System.DBNull.Value; } + if ((resetRLP.HasValue == true)) { + command.Parameters[4].Value = ((bool)(resetRLP.Value)); + } + else { + command.Parameters[4].Value = global::System.DBNull.Value; + } global::System.Data.ConnectionState previousConnectionState = command.Connection.State; if (((command.Connection.State & global::System.Data.ConnectionState.Open) != global::System.Data.ConnectionState.Open)) { diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd index 023f6196..a3c06a0a 100644 --- a/GMW/GMW_data/DS_magazzino.xsd +++ b/GMW/GMW_data/DS_magazzino.xsd @@ -561,6 +561,7 @@ SELECT UDC, IdxCella, CodCS, DataRif FROM PosizioneUdcCorrente WHERE (IdxCella = + @@ -2538,274 +2539,127 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - + - - - - + + + + - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -2820,18 +2674,18 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - + + + + + + + + - + @@ -2841,7 +2695,154 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2855,99 +2856,99 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - + - + - + - + - - - + + + - - + + - - + + - + - + - - - - - + + + + + - + - + - + @@ -2958,6 +2959,343 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2974,358 +3312,21 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3338,131 +3339,131 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + - + - - + + - - - + + + - + - - + + - - + + - + - - - + + + - - - + + + - + - + - + - - + + - - + + - + - + @@ -3482,8 +3483,8 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - + + @@ -3496,74 +3497,74 @@ SELECT Particolare, CodCS, CodCliente, DisegnoGrezzo, CodFamiglia, DescParticola - - - + + + - + - - + + - - + + - + - + - + - + - + - + diff --git a/GMW/GMW_data/DS_magazzino.xss b/GMW/GMW_data/DS_magazzino.xss index 7ff48fca..d4a012c5 100644 --- a/GMW/GMW_data/DS_magazzino.xss +++ b/GMW/GMW_data/DS_magazzino.xss @@ -4,11 +4,11 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - + - + @@ -20,7 +20,7 @@ - + @@ -28,8 +28,8 @@ - - + + @@ -75,7 +75,7 @@ 687 - 709 + 654 687 diff --git a/GMW/GMW_data/MagClass.cs b/GMW/GMW_data/MagClass.cs index 62499729..3be4d76d 100644 --- a/GMW/GMW_data/MagClass.cs +++ b/GMW/GMW_data/MagClass.cs @@ -186,13 +186,14 @@ namespace GMW_data /// Codice company/sito /// Codice UDC /// Cella di destinazione + /// indica se sia richiesto resettare le Righe Liste Prelievo con lo spostsamento /// esito comando - public bool spostaUDC(string CodCS, string UDC, int IdxCellaTo) + public bool spostaUDC(string CodCS, string UDC, int IdxCellaTo, bool resetRLP) { bool answ = false; try { - taPosUdcCorr.stp_spostaUdc(CodCS, UDC, IdxCellaTo); + taPosUdcCorr.stp_spostaUdc(CodCS, UDC, IdxCellaTo, resetRLP); // cerco nuova posizione... if (taPosUdcCorr.getByCellaUdc(UDC, IdxCellaTo).Rows.Count > 0) { @@ -879,7 +880,7 @@ namespace GMW_data // ricavo il codice UDC... string _UDC = row.UDC; // sposto UDC - spostaUDC(CodCS, _UDC, idxCellaTo); + spostaUDC(CodCS, _UDC, idxCellaTo, false); // dopo aver spostato UDC sistemo eventuali Righe di Prelievo x lo stesso UDC pending... magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate(CodLista, _UDC); } @@ -1005,10 +1006,13 @@ namespace GMW_data // sposto nella PRIMA cella di destinazione associata l'UDC if (idxCellaTo > 0) { - spostaUDC(CodCS, UDC, idxCellaTo); + spostaUDC(CodCS, UDC, idxCellaTo, false); + } + if (fatto) + { + // dopo aver scaricato UDC sistemo eventuali Righe di Prelievo x lo stesso pending... + magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate(CodLista, UDC); } - // dopo aver scaricato UDC sistemo eventuali Righe di Prelievo x lo stesso pending... - magazzino.taRigheListePrelievo.stp_RLP_sbloccaNonPrelevate(CodLista, UDC); } // segna come scaricata la lista prelievo taElencoListePrelievo.updateStato(CodSoggetto, CodLista, (int)statoLista.scaricata); diff --git a/GMW/GMW_data/SqlScripts/GMW_00335.sql b/GMW/GMW_data/SqlScripts/GMW_00335.sql index 260fa419..5011951c 100644 --- a/GMW/GMW_data/SqlScripts/GMW_00335.sql +++ b/GMW/GMW_data/SqlScripts/GMW_00335.sql @@ -130,6 +130,351 @@ commit go +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_ParticolariOverview +* +* elenco di overview sull'impiego dei particolari (dettaglio a "maglie larghe") +* +* Steamware, S.E.L. +* mod: 2010.05.31 +* +****************************************/ +alter PROCEDURE stp_ParticolariOverview +( + @searchVal VARCHAR(50), + @CodCS VARCHAR(2) +) +AS + + SELECT RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare, ISNULL(COUNT(dbo.ElencoCartellini.UDC), 0) AS NumUDC, + ISNULL(SUM(dbo.ElencoCartellini.Qta), 0) AS TotQta, ISNULL(COUNT(dbo.PosizioneUdcCorrente.IdxCella), 0) AS NumInMag + FROM RilPro.AnagParticolari LEFT OUTER JOIN + dbo.ElencoCartellini ON RilPro.AnagParticolari.Particolare = dbo.ElencoCartellini.Particolare LEFT OUTER JOIN + dbo.PosizioneUdcCorrente ON dbo.ElencoCartellini.UDC = dbo.PosizioneUdcCorrente.UDC + WHERE RilPro.AnagParticolari.CodCS = @CodCS AND RilPro.AnagParticolari.Particolare = @searchVal + AND ElencoCartellini.IdxPosizione >= 0 -- vincolo posizioni mag attive + GROUP BY RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare + +RETURN +go + +/*************************************** +* STORED stp_ParticolariOverviewLike +* +* elenco di overview sull'impiego dei particolari (dettaglio a "maglie larghe") - modalità LIKE +* +* Steamware, S.E.L. +* mod: 2010.05.31 +* +****************************************/ +alter PROCEDURE stp_ParticolariOverviewLike +( + @searchVal VARCHAR(50), + @CodCS VARCHAR(2) +) +AS + + SELECT RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare, ISNULL(COUNT(ElencoCartellini.UDC), 0) AS NumUDC, + SUM(ISNULL(ElencoCartellini.Qta, 0)) AS TotQta, ISNULL(COUNT(PosizioneUdcCorrente.IdxCella), 0) AS NumInMag + FROM RilPro.AnagParticolari LEFT OUTER JOIN + ElencoCartellini ON RilPro.AnagParticolari.Particolare = ElencoCartellini.Particolare LEFT OUTER JOIN + PosizioneUdcCorrente ON ElencoCartellini.UDC = PosizioneUdcCorrente.UDC + WHERE (RilPro.AnagParticolari.CodCS = @CodCS) + AND ((RilPro.AnagParticolari.Particolare LIKE '%' + @searchVal + '%') OR (RilPro.AnagParticolari.DescParticolare LIKE '%' + @searchVal + '%')) + AND ElencoCartellini.IdxPosizione >= 0 -- vincolo posizioni mag attive + GROUP BY RilPro.AnagParticolari.Particolare, RilPro.AnagParticolari.DescParticolare + +RETURN +go + +commit +go + + +set xact_abort on +go + +begin transaction +go + +set ANSI_NULLS on +go + +/*************************************** +* STORED stp_paretoDettMagByParticolare +* +* restituisce elenco giacenze a magazzino in logica pareto (quantità) per un dato particolare +* +* Steamware, S.E.L. +* mod: 2010.06.04 +* +****************************************/ +alter PROCEDURE stp_paretoDettMagByParticolare +( + @CodCS VARCHAR(2), + @Particolare VARCHAR(20) +) +AS + + SELECT TOP (100) PERCENT am.CodCS, am.CodMag, am.DescMag, b.IdxBlocco, b.CodBlocco, ec.Particolare, + ec.Esponente, COUNT(puc.UDC) AS NumUDC, ISNULL(MIN(puc.DataRif), + GETDATE()) AS Oldest, ISNULL(MAX(puc.DataRif), GETDATE()) AS Newest, SUM(ec.Qta) AS QtaTotPz, + asp.DescStato, ec.IdxPosizione AS CodMagLog + FROM AnagMag am INNER JOIN + Blocchi b ON am.CodMag = b.CodMag AND am.CodCS = b.CodCS INNER JOIN + Celle c INNER JOIN + ElencoCartellini ec LEFT OUTER JOIN + PosizioneUdcCorrente puc ON ec.UDC = puc.UDC ON c.IdxCella = puc.IdxCella ON + b.IdxBlocco = c.IdxBlocco INNER JOIN + AnagStatiProdotto asp ON ec.CodStato = asp.CodStato + WHERE (c.Attiva = 1) AND (am.CodCS = @CodCS) AND (ec.Particolare = @Particolare) + GROUP BY am.CodCS, am.CodMag, am.DescMag, b.IdxBlocco, b.CodBlocco, b.NumX, b.NumY, b.NumZ, + ec.Particolare, ec.Esponente, ec.IdxPosizione, asp.DescStato + ORDER BY QtaTotPz DESC + + +RETURN +go + +commit +go + + +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 +) +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 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 + + -- cancello eventuali righe liste di prelievo FUSI per l'UDC + DELETE FROM RigheListePrelievo + WHERE UDC = @UDC AND CodLista IN ( + SELECT CodLista FROM ElencoListePrelievo + WHERE CodTipoLista='01-PreFus' + ) + + + + -- 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 + +COMMIT TRAN + +RETURN +go + +commit +go + +set xact_abort on +go + +begin transaction +go + +DELETE FROM dbo.TabTranPosizEventi WHERE CodEvento=N'UDC_RIEN' and IdxPosizione=88 +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_RIEN54', N'Rientro UDC da 88 a 54') +INSERT INTO dbo.AnagTipoEvento + VALUES (N'UDC_RIEN84', N'Rientro UDC da 88 a 84') +DELETE FROM dbo.AnagTipoEvento WHERE CodEvento=N'UDC_RIEN' +go + +commit transaction +go + + +set xact_abort on +go + +begin transaction +go + +INSERT INTO dbo.TabTranPosizEventi + VALUES (N'UDC_RIEN54', 88, 54, 1) +INSERT INTO dbo.TabTranPosizEventi + VALUES (N'UDC_RIEN84', 88, 84, 1) +go + +commit transaction +go + + +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 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' + ) + 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 + +COMMIT TRAN + +RETURN +go + +commit +go + + + diff --git a/GMW/GMW_data/bin/Debug/GMW_data.dll b/GMW/GMW_data/bin/Debug/GMW_data.dll index 1c80fcf1..a5fe8d27 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 8621e1c8..5243d20b 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 1c80fcf1..a5fe8d27 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/TempPE/DS_magazzino.Designer.cs.dll b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll index 90fe1c1d..ae40ef5a 100644 Binary files a/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll and b/GMW/GMW_data/obj/Debug/TempPE/DS_magazzino.Designer.cs.dll differ diff --git a/GMW/GMW_data/obj/Release/GMW_data.dll b/GMW/GMW_data/obj/Release/GMW_data.dll index 8621e1c8..5243d20b 100644 Binary files a/GMW/GMW_data/obj/Release/GMW_data.dll and b/GMW/GMW_data/obj/Release/GMW_data.dll differ