diff --git a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs
index 5f12d23d..1f3b5c16 100644
--- a/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_detailParticolari.ascx.cs
@@ -173,9 +173,11 @@ namespace GMW.WebUserControls
string Esponente = grView.SelectedDataKey["Esponente"].ToString();
string CodMag = grView.SelectedDataKey["CodMag"].ToString();
int IdxBlocco = Convert.ToInt32(grView.SelectedDataKey["IdxBlocco"]);
+ string CodMagLog = grView.SelectedDataKey["CodMagLog"].ToString();
// salvo in session
SteamWare.memLayer.ML.setSessionVal("CodMag_sel", CodMag, false);
SteamWare.memLayer.ML.setSessionVal("IdxBlocco_sel", IdxBlocco, false);
+ memLayer.ML.setSessionVal("CodMagLogico_sel", CodMagLog, false);
// sollevo evento nuovo valore...
if (eh_selValore != null)
{
diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
index d27d1108..ad5869c0 100644
--- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
+++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx
@@ -43,7 +43,7 @@
|
-
+
diff --git a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs
index 78d377c9..62aa64f5 100644
--- a/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_dettaglioBlocco.ascx.cs
@@ -74,6 +74,7 @@ namespace GMW.WebUserControls
}
else
{
+ mod_filtroMagLog.valore = "";
mod_filtroMagLog.isChecked = false;
}
pnlDetail.Visible = false;
@@ -175,9 +176,6 @@ namespace GMW.WebUserControls
}
// svuoto selezioni secondarie...
memLayer.ML.emptySessionVal("Particolare_sel");
- //// chiamo procedura che aggiorna ods principale
- //mod_dettCelleBlocco1.doUpdate();
- //updateControlli();
// aggiorno la visualizzazione del magazzino!
Response.Redirect("~/DettaglioBlocco.aspx");
diff --git a/GMW/GMW/WebUserControls/mod_filtro.ascx.cs b/GMW/GMW/WebUserControls/mod_filtro.ascx.cs
index 60b1a2cb..84132a7d 100644
--- a/GMW/GMW/WebUserControls/mod_filtro.ascx.cs
+++ b/GMW/GMW/WebUserControls/mod_filtro.ascx.cs
@@ -346,12 +346,11 @@ public partial class mod_filtro : ApplicationUserControl
set
{
chkFilt.Checked = value;
+ dlFilt.Visible = value;
updateChkLbl();
}
}
-
-
-
+
///
/// oggetto ODS con cui popolare il selettore, VINCOLO abbia campi value(key) / label
///
diff --git a/GMW/GMW/bin/GMW.dll b/GMW/GMW/bin/GMW.dll
index d21cf5a8..97fceb4d 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 691af20e..4ac965a3 100644
Binary files a/GMW/GMW/bin/GMW_data.dll and b/GMW/GMW/bin/GMW_data.dll differ
diff --git a/GMW/GMW/obj/Debug/GMW.dll b/GMW/GMW/obj/Debug/GMW.dll
index d21cf5a8..a1cbe26c 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 b22e4a5a..a96b62dd 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 ecb58bd7..97fceb4d 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 bf2e7b74..d93037e4 100644
Binary files a/GMW/GMW/obj/Release/ResolveAssemblyReference.cache and b/GMW/GMW/obj/Release/ResolveAssemblyReference.cache differ
diff --git a/GMW/GMW_data/DS_magazzino.Designer.cs b/GMW/GMW_data/DS_magazzino.Designer.cs
index 30ae7427..368e2e89 100644
--- a/GMW/GMW_data/DS_magazzino.Designer.cs
+++ b/GMW/GMW_data/DS_magazzino.Designer.cs
@@ -4938,6 +4938,8 @@ namespace GMW_data {
private global::System.Data.DataColumn columnEsponente;
+ private global::System.Data.DataColumn columnCodMagLog;
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public V_DettMagPartDataTable() {
this.TableName = "V_DettMagPart";
@@ -5052,6 +5054,13 @@ namespace GMW_data {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public global::System.Data.DataColumn CodMagLogColumn {
+ get {
+ return this.columnCodMagLog;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.ComponentModel.Browsable(false)]
public int Count {
@@ -5081,7 +5090,7 @@ namespace GMW_data {
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- public V_DettMagPartRow AddV_DettMagPartRow(string CodCS, string CodMag, string DescMag, int IdxBlocco, string CodBlocco, string Particolare, int NumUDC, System.DateTime Oldest, System.DateTime Newest, decimal QtaTotPz, string DescStato, string Esponente) {
+ public V_DettMagPartRow AddV_DettMagPartRow(string CodCS, string CodMag, string DescMag, int IdxBlocco, string CodBlocco, string Particolare, int NumUDC, System.DateTime Oldest, System.DateTime Newest, decimal QtaTotPz, string DescStato, string Esponente, int CodMagLog) {
V_DettMagPartRow rowV_DettMagPartRow = ((V_DettMagPartRow)(this.NewRow()));
object[] columnValuesArray = new object[] {
CodCS,
@@ -5095,7 +5104,8 @@ namespace GMW_data {
Newest,
QtaTotPz,
DescStato,
- Esponente};
+ Esponente,
+ CodMagLog};
rowV_DettMagPartRow.ItemArray = columnValuesArray;
this.Rows.Add(rowV_DettMagPartRow);
return rowV_DettMagPartRow;
@@ -5138,6 +5148,7 @@ namespace GMW_data {
this.columnQtaTotPz = base.Columns["QtaTotPz"];
this.columnDescStato = base.Columns["DescStato"];
this.columnEsponente = base.Columns["Esponente"];
+ this.columnCodMagLog = base.Columns["CodMagLog"];
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -5166,6 +5177,8 @@ namespace GMW_data {
base.Columns.Add(this.columnDescStato);
this.columnEsponente = new global::System.Data.DataColumn("Esponente", typeof(string), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnEsponente);
+ this.columnCodMagLog = new global::System.Data.DataColumn("CodMagLog", typeof(int), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnCodMagLog);
this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] {
this.columnEsponente,
this.columnCodMag,
@@ -5188,6 +5201,7 @@ namespace GMW_data {
this.columnDescStato.MaxLength = 50;
this.columnEsponente.AllowDBNull = false;
this.columnEsponente.MaxLength = 6;
+ this.columnCodMagLog.DefaultValue = ((int)(0));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -10610,6 +10624,21 @@ namespace GMW_data {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public int CodMagLog {
+ get {
+ try {
+ return ((int)(this[this.tableV_DettMagPart.CodMagLogColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("The value for column \'CodMagLog\' in table \'V_DettMagPart\' is DBNull.", e);
+ }
+ }
+ set {
+ this[this.tableV_DettMagPart.CodMagLogColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
public bool IsDescMagNull() {
return this.IsNull(this.tableV_DettMagPart.DescMagColumn);
@@ -10669,6 +10698,16 @@ namespace GMW_data {
public void SetQtaTotPzNull() {
this[this.tableV_DettMagPart.QtaTotPzColumn] = global::System.Convert.DBNull;
}
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public bool IsCodMagLogNull() {
+ return this.IsNull(this.tableV_DettMagPart.CodMagLogColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ public void SetCodMagLogNull() {
+ this[this.tableV_DettMagPart.CodMagLogColumn] = global::System.Convert.DBNull;
+ }
}
///
diff --git a/GMW/GMW_data/DS_magazzino.xsd b/GMW/GMW_data/DS_magazzino.xsd
index 262c4996..d422398c 100644
--- a/GMW/GMW_data/DS_magazzino.xsd
+++ b/GMW/GMW_data/DS_magazzino.xsd
@@ -2720,6 +2720,7 @@ SELECT IdxPosizione, DescPosizione FROM AnagPosizioni WHERE (IdxPosizione = @Idx
+
diff --git a/GMW/GMW_data/SqlScripts/GMW_00245.sql b/GMW/GMW_data/SqlScripts/GMW_00245.sql
index fd2af48f..29e35e90 100644
--- a/GMW/GMW_data/SqlScripts/GMW_00245.sql
+++ b/GMW/GMW_data/SqlScripts/GMW_00245.sql
@@ -419,6 +419,184 @@ commit
go
+set xact_abort on
+go
+
+begin transaction
+go
+
+set ANSI_NULLS on
+go
+
+/***************************************
+* STORED stp_paretoDettPartByFullSpecMagLog
+*
+* restituisce elenco particolari in logica pareto (quantità) per un dato blocco di magazzino e il particolare ed il magazzino logico!!!
+*
+* Steamware, S.E.L.
+* mod: 2010.09.15
+*
+****************************************/
+create PROCEDURE stp_paretoDettPartByFullSpecMagLog
+(
+ @CodCS VARCHAR(2),
+ @CodMag VARCHAR(50),
+ @IdxBlocco INT,
+ @Particolare VARCHAR(20),
+ @CodMagLog INT
+)
+AS
+
+ SELECT TOP (100) PERCENT AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, ElencoCartellini.Particolare,
+ ElencoCartellini.Esponente, COUNT(PosizioneUdcCorrente.UDC) AS NumUDC, ISNULL(MIN(PosizioneUdcCorrente.DataRif),
+ GETDATE()) AS Oldest, ISNULL(MAX(PosizioneUdcCorrente.DataRif), GETDATE()) AS Newest, SUM(ElencoCartellini.Qta) AS QtaTotPz,
+ AnagStatiProdotto.DescStato
+ FROM AnagMag INNER JOIN
+ Blocchi ON AnagMag.CodMag = Blocchi.CodMag AND AnagMag.CodCS = Blocchi.CodCS INNER JOIN
+ Celle INNER JOIN
+ ElencoCartellini INNER JOIN
+ PosizioneUdcCorrente ON ElencoCartellini.UDC = PosizioneUdcCorrente.UDC ON Celle.IdxCella = PosizioneUdcCorrente.IdxCella ON
+ Blocchi.IdxBlocco = Celle.IdxBlocco INNER JOIN
+ AnagStatiProdotto ON ElencoCartellini.CodStato = AnagStatiProdotto.CodStato
+ WHERE (Celle.Attiva = 1) AND (AnagMag.CodCS = @CodCS) AND (AnagMag.CodMag = @CodMag) AND (Blocchi.IdxBlocco = @IdxBlocco) AND
+ (ElencoCartellini.Particolare = @Particolare) AND ElencoCartellini.IdxPosizione = @CodMagLog
+ GROUP BY AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, Blocchi.NumX, Blocchi.NumY, Blocchi.NumZ,
+ ElencoCartellini.Particolare, ElencoCartellini.Esponente, AnagStatiProdotto.DescStato
+ ORDER BY QtaTotPz DESC
+
+
+RETURN
+go
+
+/***************************************
+* STORED stp_paretoPartByMagBloccoCodMagLog
+*
+* restituisce elenco particolari in logica pareto (quantità) per un dato blocco di magazzino ed un dato magazzino logico, aggregati (no stato)
+*
+* Steamware, S.E.L.
+* mod: 2010.09.15
+*
+****************************************/
+create PROCEDURE stp_paretoPartByMagBloccoCodMagLog
+(
+ @CodCS VARCHAR(2),
+ @CodMag VARCHAR(50),
+ @IdxBlocco INT,
+ @CodMagLog INT
+)
+AS
+
+ SELECT TOP (100) PERCENT
+ dbo.AnagMag.CodCS, dbo.AnagMag.CodMag, dbo.AnagMag.DescMag, dbo.Blocchi.IdxBlocco, dbo.Blocchi.CodBlocco,
+ dbo.ElencoCartellini.Particolare, '' as Esponente, COUNT(dbo.PosizioneUdcCorrente.UDC) AS NumUDC, ISNULL(MIN(dbo.PosizioneUdcCorrente.DataRif),
+ GETDATE()) AS Oldest, ISNULL(MAX(dbo.PosizioneUdcCorrente.DataRif), GETDATE()) AS Newest, SUM(dbo.ElencoCartellini.Qta) AS QtaTotPz,
+ '' AS DescStato
+ FROM dbo.AnagMag INNER JOIN
+ dbo.Blocchi ON dbo.AnagMag.CodMag = dbo.Blocchi.CodMag AND dbo.AnagMag.CodCS = dbo.Blocchi.CodCS INNER JOIN
+ dbo.Celle INNER JOIN
+ dbo.ElencoCartellini INNER JOIN
+ dbo.PosizioneUdcCorrente ON dbo.ElencoCartellini.UDC = dbo.PosizioneUdcCorrente.UDC
+ ON dbo.Celle.IdxCella = dbo.PosizioneUdcCorrente.IdxCella
+ ON dbo.Blocchi.IdxBlocco = dbo.Celle.IdxBlocco INNER JOIN
+ dbo.AnagStatiProdotto ON dbo.ElencoCartellini.CodStato = dbo.AnagStatiProdotto.CodStato
+WHERE (dbo.Celle.Attiva = 1) AND (AnagMag.CodCS = @CodCS) AND AnagMag.CodMag = @CodMag AND Blocchi.IdxBlocco = @IdxBlocco
+ AND ElencoCartellini.IdxPosizione = @CodMagLog
+GROUP BY dbo.AnagMag.CodCS, dbo.AnagMag.CodMag, dbo.AnagMag.DescMag, dbo.Blocchi.IdxBlocco, dbo.Blocchi.CodBlocco,
+ dbo.Blocchi.NumX, dbo.Blocchi.NumY, dbo.Blocchi.NumZ, dbo.ElencoCartellini.Particolare
+ORDER BY QtaTotPz DESC
+
+
+RETURN
+go
+
+/***************************************
+* STORED stp_UdcDetailGetByIdxBloccoCodMagLog
+*
+* ottiene l'elenco degli UDC con dettaglio posizioni OCCUPATE associati ad un dato blocco di magazzino ed ad un dato STATO LOGICO
+*
+* Steamware, S.E.L.
+* mod: 2010.09.15
+*
+****************************************/
+create PROCEDURE stp_UdcDetailGetByIdxBloccoCodMagLog
+(
+ @IdxBlocco INT,
+ @CodMagLog INT
+)
+AS
+
+SELECT ElencoCartellini.UDC, ElencoCartellini.RagSociale, ElencoCartellini.Particolare, ElencoCartellini.DescParticolare,
+ ElencoCartellini.DisegnoGrezzo, ElencoCartellini.Esponente, ElencoCartellini.DescImpianto, ElencoCartellini.DataFus,
+ ElencoCartellini.TurnoFus, ElencoCartellini.CodImballo, ElencoCartellini.Qta, AnagStatiProdotto.DescStato,
+ ElencoCartellini.ModDate, ISNULL(Blocchi.CodMag, N'') AS CodMag, ISNULL(Blocchi.CodBlocco, N'') AS CodBlocco,
+ ISNULL(Celle.CodCella, N'') AS CodCella, ISNULL(dbo.Celle.IdxCella, 0) AS IdxCella,
+ ISNULL(Celle.X, 0) AS X, ISNULL(Celle.Y, 0) AS Y, ISNULL(Celle.Z, 0) AS Z
+FROM Celle INNER JOIN
+ PosizioneUdcCorrente ON Celle.IdxCella = PosizioneUdcCorrente.IdxCella AND Celle.IdxCella = PosizioneUdcCorrente.IdxCella AND
+ Celle.IdxCella = PosizioneUdcCorrente.IdxCella INNER JOIN
+ Blocchi ON Celle.IdxBlocco = Blocchi.IdxBlocco INNER JOIN
+ AnagMag ON Blocchi.CodMag = AnagMag.CodMag AND Blocchi.CodCS = AnagMag.CodCS AND Blocchi.CodMag = AnagMag.CodMag AND
+ Blocchi.CodCS = AnagMag.CodCS AND Blocchi.CodMag = AnagMag.CodMag AND Blocchi.CodCS = AnagMag.CodCS INNER JOIN
+ ElencoCartellini ON PosizioneUdcCorrente.UDC = ElencoCartellini.UDC LEFT OUTER JOIN
+ AnagStatiProdotto ON ElencoCartellini.CodStato = AnagStatiProdotto.CodStato AND ElencoCartellini.CodStato = AnagStatiProdotto.CodStato
+WHERE (Celle.IdxBlocco = @IdxBlocco) AND ElencoCartellini.IdxPosizione = @CodMagLog
+
+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 AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, ElencoCartellini.Particolare,
+ ElencoCartellini.Esponente, COUNT(PosizioneUdcCorrente.UDC) AS NumUDC, ISNULL(MIN(PosizioneUdcCorrente.DataRif),
+ GETDATE()) AS Oldest, ISNULL(MAX(PosizioneUdcCorrente.DataRif), GETDATE()) AS Newest, SUM(ElencoCartellini.Qta) AS QtaTotPz,
+ AnagStatiProdotto.DescStato, ElencoCartellini.IdxPosizione AS CodMagLog
+ FROM AnagMag INNER JOIN
+ Blocchi ON AnagMag.CodMag = Blocchi.CodMag AND AnagMag.CodCS = Blocchi.CodCS INNER JOIN
+ Celle INNER JOIN
+ ElencoCartellini INNER JOIN
+ PosizioneUdcCorrente ON ElencoCartellini.UDC = PosizioneUdcCorrente.UDC ON Celle.IdxCella = PosizioneUdcCorrente.IdxCella ON
+ Blocchi.IdxBlocco = Celle.IdxBlocco INNER JOIN
+ AnagStatiProdotto ON ElencoCartellini.CodStato = AnagStatiProdotto.CodStato
+ WHERE (Celle.Attiva = 1) AND (AnagMag.CodCS = @CodCS) AND (ElencoCartellini.Particolare = @Particolare)
+ GROUP BY AnagMag.CodCS, AnagMag.CodMag, AnagMag.DescMag, Blocchi.IdxBlocco, Blocchi.CodBlocco, Blocchi.NumX, Blocchi.NumY, Blocchi.NumZ,
+ ElencoCartellini.Particolare, ElencoCartellini.Esponente, ElencoCartellini.IdxPosizione, AnagStatiProdotto.DescStato
+ ORDER BY QtaTotPz DESC
+
+
+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 691af20e..37e7c44d 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 8c4ea973..4ac965a3 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 691af20e..37e7c44d 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 99877a84..20a51aa7 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 8c4ea973..4ac965a3 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_installer/Release/GMW_installer.msi b/GMW/GMW_installer/Release/GMW_installer.msi
index 4e2c6ccf..9b5c1470 100644
Binary files a/GMW/GMW_installer/Release/GMW_installer.msi and b/GMW/GMW_installer/Release/GMW_installer.msi differ
|