diff --git a/MapoDb/DS_applicazione.Designer.cs b/MapoDb/DS_applicazione.Designer.cs
index 55dbe240..4f319851 100644
--- a/MapoDb/DS_applicazione.Designer.cs
+++ b/MapoDb/DS_applicazione.Designer.cs
@@ -8643,6 +8643,8 @@ namespace MapoDb {
private global::System.Data.DataColumn columnExplodeBit;
+ private global::System.Data.DataColumn columnNumBit;
+
private global::System.Data.DataColumn columnIdxMicroStato;
private global::System.Data.DataColumn columnIdxFamiglia;
@@ -8806,6 +8808,14 @@ namespace MapoDb {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public global::System.Data.DataColumn NumBitColumn {
+ get {
+ return this.columnNumBit;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public global::System.Data.DataColumn IdxMicroStatoColumn {
@@ -8930,6 +8940,7 @@ namespace MapoDb {
int MaxVal,
int BSR,
bool ExplodeBit,
+ int NumBit,
int IdxMicroStato,
int IdxFamiglia,
int IdxStato,
@@ -8955,6 +8966,7 @@ namespace MapoDb {
MaxVal,
BSR,
ExplodeBit,
+ NumBit,
IdxMicroStato,
IdxFamiglia,
IdxStato,
@@ -9007,6 +9019,7 @@ namespace MapoDb {
this.columnMaxVal = base.Columns["MaxVal"];
this.columnBSR = base.Columns["BSR"];
this.columnExplodeBit = base.Columns["ExplodeBit"];
+ this.columnNumBit = base.Columns["NumBit"];
this.columnIdxMicroStato = base.Columns["IdxMicroStato"];
this.columnIdxFamiglia = base.Columns["IdxFamiglia"];
this.columnIdxStato = base.Columns["IdxStato"];
@@ -9049,6 +9062,8 @@ namespace MapoDb {
base.Columns.Add(this.columnBSR);
this.columnExplodeBit = new global::System.Data.DataColumn("ExplodeBit", typeof(bool), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnExplodeBit);
+ this.columnNumBit = new global::System.Data.DataColumn("NumBit", typeof(int), null, global::System.Data.MappingType.Element);
+ base.Columns.Add(this.columnNumBit);
this.columnIdxMicroStato = new global::System.Data.DataColumn("IdxMicroStato", typeof(int), null, global::System.Data.MappingType.Element);
base.Columns.Add(this.columnIdxMicroStato);
this.columnIdxFamiglia = new global::System.Data.DataColumn("IdxFamiglia", typeof(int), null, global::System.Data.MappingType.Element);
@@ -9088,6 +9103,7 @@ namespace MapoDb {
this.columnMaxVal.ReadOnly = true;
this.columnBSR.ReadOnly = true;
this.columnExplodeBit.ReadOnly = true;
+ this.columnNumBit.ReadOnly = true;
this.columnIdxMicroStato.ReadOnly = true;
this.columnIdxFamiglia.ReadOnly = true;
this.columnIdxStato.ReadOnly = true;
@@ -12637,6 +12653,22 @@ namespace MapoDb {
}
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public int NumBit {
+ get {
+ try {
+ return ((int)(this[this.tableMSFD.NumBitColumn]));
+ }
+ catch (global::System.InvalidCastException e) {
+ throw new global::System.Data.StrongTypingException("Il valore della colonna \'NumBit\' nella tabella \'MSFD\' è DBNull.", e);
+ }
+ }
+ set {
+ this[this.tableMSFD.NumBitColumn] = value;
+ }
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public int IdxMicroStato {
@@ -12937,6 +12969,18 @@ namespace MapoDb {
this[this.tableMSFD.ExplodeBitColumn] = global::System.Convert.DBNull;
}
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public bool IsNumBitNull() {
+ return this.IsNull(this.tableMSFD.NumBitColumn);
+ }
+
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
+ public void SetNumBitNull() {
+ this[this.tableMSFD.NumBitColumn] = global::System.Convert.DBNull;
+ }
+
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")]
public bool IsIdxMicroStatoNull() {
@@ -24871,6 +24915,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli
tableMapping.ColumnMappings.Add("MaxVal", "MaxVal");
tableMapping.ColumnMappings.Add("BSR", "BSR");
tableMapping.ColumnMappings.Add("ExplodeBit", "ExplodeBit");
+ tableMapping.ColumnMappings.Add("NumBit", "NumBit");
tableMapping.ColumnMappings.Add("IdxMicroStato", "IdxMicroStato");
tableMapping.ColumnMappings.Add("IdxFamiglia", "IdxFamiglia");
tableMapping.ColumnMappings.Add("IdxStato", "IdxStato");
diff --git a/MapoDb/DS_applicazione.xsd b/MapoDb/DS_applicazione.xsd
index 1db86bd6..bdc52d4b 100644
--- a/MapoDb/DS_applicazione.xsd
+++ b/MapoDb/DS_applicazione.xsd
@@ -2362,6 +2362,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli
+
@@ -3024,6 +3025,7 @@ SELECT CodArticolo, DescArticolo, CurrRev, ProdRev, FlagIsNew FROM AnagArticoli
+
diff --git a/MapoDb/DS_applicazione.xss b/MapoDb/DS_applicazione.xss
index 5b3dd701..169202e3 100644
--- a/MapoDb/DS_applicazione.xss
+++ b/MapoDb/DS_applicazione.xss
@@ -15,7 +15,7 @@
-
+
diff --git a/MapoDb/DataLayer.cs b/MapoDb/DataLayer.cs
index 2cabdbc5..403ba214 100644
--- a/MapoDb/DataLayer.cs
+++ b/MapoDb/DataLayer.cs
@@ -576,11 +576,13 @@ namespace MapoDb
int BitFilt = 0;
int BSR = 0;
bool ExplodeBit = false;
+ int NumBit = 0;
int newValInt = 0;
// recupero parametri...
int.TryParse(DataLayer.mDatiMacchinaVal(idxMacchina, "BitFilt"), out BitFilt);
int.TryParse(DataLayer.mDatiMacchinaVal(idxMacchina, "BSR"), out BSR);
Boolean.TryParse(DataLayer.mDatiMacchinaVal(idxMacchina, "ExplodeBit"), out ExplodeBit);
+ int.TryParse(DataLayer.mDatiMacchinaVal(idxMacchina, "NumBit"), out NumBit);
// recupero valore
valINT = int.Parse(valore, System.Globalization.NumberStyles.HexNumber);
// filtro
@@ -588,17 +590,13 @@ namespace MapoDb
// effettuo eventuale BitShiftRight
if (BSR > 0)
{
- newValInt = newValInt << BSR;
+ newValInt = newValInt >> BSR;
}
// effettuo eventuale esplosione in BIT esclusivi
if (ExplodeBit)
{
- // esplodo a tanti BIT quanto è il MAX dei valori gestiti...
-
- //... e poi a int...
-
+ newValInt = 1 << newValInt;
}
-
// riconverto a STRING HEX!!!
newVal = newValInt.ToString("X");
}
@@ -719,6 +717,7 @@ namespace MapoDb
answ.Add("MaxVal", rigaMSFD.MaxVal.ToString());
answ.Add("BSR", rigaMSFD.BSR.ToString());
answ.Add("ExplodeBit", rigaMSFD.ExplodeBit.ToString());
+ answ.Add("NumBit", rigaMSFD.NumBit.ToString());
answ.Add("IdxFamMacc", rigaMSFD.IdxFamiglia.ToString());
answ.Add("simplePallet", rigaMSFD.simplePallet.ToString());
answ.Add("palletChange", rigaMSFD.palletChange.ToString());