diff --git a/ES3/MachineParams.aspx.cs b/ES3/MachineParams.aspx.cs index 56f6dcea..b0a8bba7 100644 --- a/ES3/MachineParams.aspx.cs +++ b/ES3/MachineParams.aspx.cs @@ -22,6 +22,18 @@ namespace ES3 } cmp_numRowConfWeek.eh_newNum += Cmp_numRowConfWeek_eh_newNum; cmp_numRowParams.eh_newNum += Cmp_numRowParams_eh_newNum; + cmp_machParams.eh_selected += Cmp_machParams_eh_selected; + cmp_machParams.eh_reset += Cmp_machParams_eh_reset; + } + + private void Cmp_machParams_eh_reset(object sender, EventArgs e) + { + cmp_machStats.idxMacchinaSel = ""; + } + + private void Cmp_machParams_eh_selected(object sender, EventArgs e) + { + cmp_machStats.idxMacchinaSel = cmp_machParams.idxMacchinaSel; } private void Cmp_numRowParams_eh_newNum(object sender, EventArgs e) diff --git a/ES3/WebUserControls/cmp_machParams.ascx b/ES3/WebUserControls/cmp_machParams.ascx index 7f0ac0a9..2525e3bc 100644 --- a/ES3/WebUserControls/cmp_machParams.ascx +++ b/ES3/WebUserControls/cmp_machParams.ascx @@ -3,7 +3,7 @@
- + diff --git a/ES3/WebUserControls/cmp_machParams.ascx.cs b/ES3/WebUserControls/cmp_machParams.ascx.cs index d3ad7a83..91613852 100644 --- a/ES3/WebUserControls/cmp_machParams.ascx.cs +++ b/ES3/WebUserControls/cmp_machParams.ascx.cs @@ -10,6 +10,8 @@ namespace ES3.WebUserControls { public partial class cmp_machParams : System.Web.UI.UserControl { + public event EventHandler eh_selected; + public event EventHandler eh_reset; protected void Page_Load(object sender, EventArgs e) { @@ -50,21 +52,12 @@ namespace ES3.WebUserControls /// public void resetSelezione() { -#if false - memLayer.ML.emptySessionVal(string.Format("{0}_sel", _idxGridView)); -#endif grView.SelectedIndex = -1; doUpdate(); -#if false - divEditQta.Visible = false; - mod_newPromessaODL.Visible = false; - lbtNewPODL.Visible = true; - lblWarning.Visible = false; - if (eh_resetSelezione != null) + if (eh_reset!= null) { - eh_resetSelezione(this, new EventArgs()); + eh_reset(this, new EventArgs()); } -#endif } protected void lbtAddNew_Click(object sender, EventArgs e) @@ -81,5 +74,29 @@ namespace ES3.WebUserControls if (e.InputParameters["SetupTime"] == null) e.InputParameters["SetupTime"] = "1"; if (e.InputParameters["CodConfAper"] == null) e.InputParameters["CodConfAper"] = "0"; } + + protected void grView_SelectedIndexChanged(object sender, EventArgs e) + { + // raise dell'evento + if (eh_selected != null) + { + eh_selected(this, new EventArgs()); + } + } + /// + /// Idx macchina selezionata + /// + public string idxMacchinaSel + { + get + { + string answ = ""; + if (grView.SelectedIndex >= 0) + { + answ = grView.SelectedValue.ToString(); + } + return answ; + } + } } } \ No newline at end of file diff --git a/ES3/WebUserControls/cmp_machStats.ascx b/ES3/WebUserControls/cmp_machStats.ascx index b5816ad0..78f087b2 100644 --- a/ES3/WebUserControls/cmp_machStats.ascx +++ b/ES3/WebUserControls/cmp_machStats.ascx @@ -2,11 +2,79 @@
- Statistiche SINGOLA macchina: -
    -
  • OEE 1Y/3M/1M/1W
    • -
  • Setup 1Y/3M/1M/1W
    • -
  • Ore/Week 1Y/3M/1M/1W
    • -
+ + +
+
+ No Stats Available +
+
+ + +
+
+

OEE %

+
+
+
+
+ TOT +

+

+
+
+ 30gg +

+

+
+
+
+
+
+
+

SetUp min

+
+
+
+
+ TOT +

+

+
+
+ 30gg +

+

+
+
+
+
+
+
+

Work Hrs /week

+
+
+
+
+ TOT +

+

+
+
+ 30gg +

+

+
+
+
+
+ + + + + + + +
diff --git a/ES3/WebUserControls/cmp_machStats.ascx.cs b/ES3/WebUserControls/cmp_machStats.ascx.cs index 91039997..52ddbd82 100644 --- a/ES3/WebUserControls/cmp_machStats.ascx.cs +++ b/ES3/WebUserControls/cmp_machStats.ascx.cs @@ -13,5 +13,28 @@ namespace ES3.WebUserControls { } + /// + /// Idx macchina selezionata + /// + public string idxMacchinaSel + { + set + { + hfIdxMacchina.Value = value; + frmView.DataBind(); + if (!string.IsNullOrEmpty(value)) + { + //frmView.Visible = true; + } + else + { + //frmView.Visible = false; + } + } + get + { + return hfIdxMacchina.Value; + } + } } } \ No newline at end of file diff --git a/ES3/WebUserControls/cmp_machStats.ascx.designer.cs b/ES3/WebUserControls/cmp_machStats.ascx.designer.cs index cfd0497b..c4193870 100644 --- a/ES3/WebUserControls/cmp_machStats.ascx.designer.cs +++ b/ES3/WebUserControls/cmp_machStats.ascx.designer.cs @@ -13,5 +13,32 @@ namespace ES3.WebUserControls public partial class cmp_machStats { + + /// + /// Controllo frmView. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.FormView frmView; + + /// + /// Controllo ods. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.ObjectDataSource ods; + + /// + /// Controllo hfIdxMacchina. + /// + /// + /// Campo generato automaticamente. + /// Per la modifica, spostare la dichiarazione di campo dal file di progettazione al file code-behind. + /// + protected global::System.Web.UI.WebControls.HiddenField hfIdxMacchina; } } diff --git a/MapoDb/DS_Plan.Designer.cs b/MapoDb/DS_Plan.Designer.cs index ee0cf8fa..8fb8ddc8 100644 --- a/MapoDb/DS_Plan.Designer.cs +++ b/MapoDb/DS_Plan.Designer.cs @@ -50,6 +50,8 @@ namespace MapoDb { private selConfWeekDataTable tableselConfWeek; + private planHistStatMacDataTable tableplanHistStatMac; + private global::System.Data.DataRelation relationFK_MachineParams_ConfWeek; private global::System.Data.DataRelation relationFK_MachineParams_ConfWeek1; @@ -121,6 +123,9 @@ namespace MapoDb { if ((ds.Tables["selConfWeek"] != null)) { base.Tables.Add(new selConfWeekDataTable(ds.Tables["selConfWeek"])); } + if ((ds.Tables["planHistStatMac"] != null)) { + base.Tables.Add(new planHistStatMacDataTable(ds.Tables["planHistStatMac"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -269,6 +274,16 @@ namespace MapoDb { } } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + [global::System.ComponentModel.DesignerSerializationVisibility(global::System.ComponentModel.DesignerSerializationVisibility.Content)] + public planHistStatMacDataTable planHistStatMac { + get { + return this.tableplanHistStatMac; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] [global::System.ComponentModel.BrowsableAttribute(true)] @@ -375,6 +390,9 @@ namespace MapoDb { if ((ds.Tables["selConfWeek"] != null)) { base.Tables.Add(new selConfWeekDataTable(ds.Tables["selConfWeek"])); } + if ((ds.Tables["planHistStatMac"] != null)) { + base.Tables.Add(new planHistStatMacDataTable(ds.Tables["planHistStatMac"])); + } this.DataSetName = ds.DataSetName; this.Prefix = ds.Prefix; this.Namespace = ds.Namespace; @@ -486,6 +504,12 @@ namespace MapoDb { this.tableselConfWeek.InitVars(); } } + this.tableplanHistStatMac = ((planHistStatMacDataTable)(base.Tables["planHistStatMac"])); + if ((initTable == true)) { + if ((this.tableplanHistStatMac != null)) { + this.tableplanHistStatMac.InitVars(); + } + } this.relationFK_MachineParams_ConfWeek = this.Relations["FK_MachineParams_ConfWeek"]; this.relationFK_MachineParams_ConfWeek1 = this.Relations["FK_MachineParams_ConfWeek1"]; } @@ -524,6 +548,8 @@ namespace MapoDb { base.Tables.Add(this.tableMachineParams); this.tableselConfWeek = new selConfWeekDataTable(); base.Tables.Add(this.tableselConfWeek); + this.tableplanHistStatMac = new planHistStatMacDataTable(); + base.Tables.Add(this.tableplanHistStatMac); this.relationFK_MachineParams_ConfWeek = new global::System.Data.DataRelation("FK_MachineParams_ConfWeek", new global::System.Data.DataColumn[] { this.tableConfWeek.CodConfAperColumn}, new global::System.Data.DataColumn[] { this.tableMachineParams.CodConfAperColumn}, false); @@ -612,6 +638,12 @@ namespace MapoDb { return false; } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private bool ShouldSerializeplanHistStatMac() { + return false; + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] private void SchemaChanged(object sender, global::System.ComponentModel.CollectionChangeEventArgs e) { @@ -706,6 +738,9 @@ namespace MapoDb { [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public delegate void selConfWeekRowChangeEventHandler(object sender, selConfWeekRowChangeEvent e); + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public delegate void planHistStatMacRowChangeEventHandler(object sender, planHistStatMacRowChangeEvent e); + /// ///Represents the strongly named DataTable class. /// @@ -5497,6 +5532,345 @@ namespace MapoDb { } } + /// + ///Represents the strongly named DataTable class. + /// + [global::System.Serializable()] + [global::System.Xml.Serialization.XmlSchemaProviderAttribute("GetTypedTableSchema")] + public partial class planHistStatMacDataTable : global::System.Data.TypedTableBase { + + private global::System.Data.DataColumn columnIdxMacchina; + + private global::System.Data.DataColumn columnOEE_All; + + private global::System.Data.DataColumn columnOEE_1M; + + private global::System.Data.DataColumn columnSetUp_All; + + private global::System.Data.DataColumn columnSetUp_1M; + + private global::System.Data.DataColumn columnWeekHrs; + + private global::System.Data.DataColumn columnWeekHrs_1M; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacDataTable() { + this.TableName = "planHistStatMac"; + this.BeginInit(); + this.InitClass(); + this.EndInit(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal planHistStatMacDataTable(global::System.Data.DataTable table) { + this.TableName = table.TableName; + if ((table.CaseSensitive != table.DataSet.CaseSensitive)) { + this.CaseSensitive = table.CaseSensitive; + } + if ((table.Locale.ToString() != table.DataSet.Locale.ToString())) { + this.Locale = table.Locale; + } + if ((table.Namespace != table.DataSet.Namespace)) { + this.Namespace = table.Namespace; + } + this.Prefix = table.Prefix; + this.MinimumCapacity = table.MinimumCapacity; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected planHistStatMacDataTable(global::System.Runtime.Serialization.SerializationInfo info, global::System.Runtime.Serialization.StreamingContext context) : + base(info, context) { + this.InitVars(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn IdxMacchinaColumn { + get { + return this.columnIdxMacchina; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OEE_AllColumn { + get { + return this.columnOEE_All; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn OEE_1MColumn { + get { + return this.columnOEE_1M; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn SetUp_AllColumn { + get { + return this.columnSetUp_All; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn SetUp_1MColumn { + get { + return this.columnSetUp_1M; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn WeekHrsColumn { + get { + return this.columnWeekHrs; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataColumn WeekHrs_1MColumn { + get { + return this.columnWeekHrs_1M; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Browsable(false)] + public int Count { + get { + return this.Rows.Count; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacRow this[int index] { + get { + return ((planHistStatMacRow)(this.Rows[index])); + } + } + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event planHistStatMacRowChangeEventHandler planHistStatMacRowChanging; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event planHistStatMacRowChangeEventHandler planHistStatMacRowChanged; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event planHistStatMacRowChangeEventHandler planHistStatMacRowDeleting; + + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public event planHistStatMacRowChangeEventHandler planHistStatMacRowDeleted; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void AddplanHistStatMacRow(planHistStatMacRow row) { + this.Rows.Add(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacRow AddplanHistStatMacRow(string IdxMacchina, double OEE_All, double OEE_1M, double SetUp_All, double SetUp_1M, double WeekHrs, double WeekHrs_1M) { + planHistStatMacRow rowplanHistStatMacRow = ((planHistStatMacRow)(this.NewRow())); + object[] columnValuesArray = new object[] { + IdxMacchina, + OEE_All, + OEE_1M, + SetUp_All, + SetUp_1M, + WeekHrs, + WeekHrs_1M}; + rowplanHistStatMacRow.ItemArray = columnValuesArray; + this.Rows.Add(rowplanHistStatMacRow); + return rowplanHistStatMacRow; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public override global::System.Data.DataTable Clone() { + planHistStatMacDataTable cln = ((planHistStatMacDataTable)(base.Clone())); + cln.InitVars(); + return cln; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataTable CreateInstance() { + return new planHistStatMacDataTable(); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal void InitVars() { + this.columnIdxMacchina = base.Columns["IdxMacchina"]; + this.columnOEE_All = base.Columns["OEE_All"]; + this.columnOEE_1M = base.Columns["OEE_1M"]; + this.columnSetUp_All = base.Columns["SetUp_All"]; + this.columnSetUp_1M = base.Columns["SetUp_1M"]; + this.columnWeekHrs = base.Columns["WeekHrs"]; + this.columnWeekHrs_1M = base.Columns["WeekHrs_1M"]; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitClass() { + this.columnIdxMacchina = new global::System.Data.DataColumn("IdxMacchina", typeof(string), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnIdxMacchina); + this.columnOEE_All = new global::System.Data.DataColumn("OEE_All", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOEE_All); + this.columnOEE_1M = new global::System.Data.DataColumn("OEE_1M", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnOEE_1M); + this.columnSetUp_All = new global::System.Data.DataColumn("SetUp_All", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSetUp_All); + this.columnSetUp_1M = new global::System.Data.DataColumn("SetUp_1M", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnSetUp_1M); + this.columnWeekHrs = new global::System.Data.DataColumn("WeekHrs", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWeekHrs); + this.columnWeekHrs_1M = new global::System.Data.DataColumn("WeekHrs_1M", typeof(double), null, global::System.Data.MappingType.Element); + base.Columns.Add(this.columnWeekHrs_1M); + this.columnIdxMacchina.AllowDBNull = false; + this.columnIdxMacchina.MaxLength = 50; + this.columnOEE_All.ReadOnly = true; + this.columnOEE_1M.ReadOnly = true; + this.columnSetUp_All.ReadOnly = true; + this.columnSetUp_1M.ReadOnly = true; + this.columnWeekHrs.ReadOnly = true; + this.columnWeekHrs_1M.ReadOnly = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacRow NewplanHistStatMacRow() { + return ((planHistStatMacRow)(this.NewRow())); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Data.DataRow NewRowFromBuilder(global::System.Data.DataRowBuilder builder) { + return new planHistStatMacRow(builder); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override global::System.Type GetRowType() { + return typeof(planHistStatMacRow); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanged(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanged(e); + if ((this.planHistStatMacRowChanged != null)) { + this.planHistStatMacRowChanged(this, new planHistStatMacRowChangeEvent(((planHistStatMacRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowChanging(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowChanging(e); + if ((this.planHistStatMacRowChanging != null)) { + this.planHistStatMacRowChanging(this, new planHistStatMacRowChangeEvent(((planHistStatMacRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleted(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleted(e); + if ((this.planHistStatMacRowDeleted != null)) { + this.planHistStatMacRowDeleted(this, new planHistStatMacRowChangeEvent(((planHistStatMacRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected override void OnRowDeleting(global::System.Data.DataRowChangeEventArgs e) { + base.OnRowDeleting(e); + if ((this.planHistStatMacRowDeleting != null)) { + this.planHistStatMacRowDeleting(this, new planHistStatMacRowChangeEvent(((planHistStatMacRow)(e.Row)), e.Action)); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void RemoveplanHistStatMacRow(planHistStatMacRow row) { + this.Rows.Remove(row); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public static global::System.Xml.Schema.XmlSchemaComplexType GetTypedTableSchema(global::System.Xml.Schema.XmlSchemaSet xs) { + global::System.Xml.Schema.XmlSchemaComplexType type = new global::System.Xml.Schema.XmlSchemaComplexType(); + global::System.Xml.Schema.XmlSchemaSequence sequence = new global::System.Xml.Schema.XmlSchemaSequence(); + DS_Plan ds = new DS_Plan(); + global::System.Xml.Schema.XmlSchemaAny any1 = new global::System.Xml.Schema.XmlSchemaAny(); + any1.Namespace = "http://www.w3.org/2001/XMLSchema"; + any1.MinOccurs = new decimal(0); + any1.MaxOccurs = decimal.MaxValue; + any1.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any1); + global::System.Xml.Schema.XmlSchemaAny any2 = new global::System.Xml.Schema.XmlSchemaAny(); + any2.Namespace = "urn:schemas-microsoft-com:xml-diffgram-v1"; + any2.MinOccurs = new decimal(1); + any2.ProcessContents = global::System.Xml.Schema.XmlSchemaContentProcessing.Lax; + sequence.Items.Add(any2); + global::System.Xml.Schema.XmlSchemaAttribute attribute1 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute1.Name = "namespace"; + attribute1.FixedValue = ds.Namespace; + type.Attributes.Add(attribute1); + global::System.Xml.Schema.XmlSchemaAttribute attribute2 = new global::System.Xml.Schema.XmlSchemaAttribute(); + attribute2.Name = "tableTypeName"; + attribute2.FixedValue = "planHistStatMacDataTable"; + type.Attributes.Add(attribute2); + type.Particle = sequence; + global::System.Xml.Schema.XmlSchema dsSchema = ds.GetSchemaSerializable(); + if (xs.Contains(dsSchema.TargetNamespace)) { + global::System.IO.MemoryStream s1 = new global::System.IO.MemoryStream(); + global::System.IO.MemoryStream s2 = new global::System.IO.MemoryStream(); + try { + global::System.Xml.Schema.XmlSchema schema = null; + dsSchema.Write(s1); + for (global::System.Collections.IEnumerator schemas = xs.Schemas(dsSchema.TargetNamespace).GetEnumerator(); schemas.MoveNext(); ) { + schema = ((global::System.Xml.Schema.XmlSchema)(schemas.Current)); + s2.SetLength(0); + schema.Write(s2); + if ((s1.Length == s2.Length)) { + s1.Position = 0; + s2.Position = 0; + for (; ((s1.Position != s1.Length) + && (s1.ReadByte() == s2.ReadByte())); ) { + ; + } + if ((s1.Position == s1.Length)) { + return type; + } + } + } + } + finally { + if ((s1 != null)) { + s1.Close(); + } + if ((s2 != null)) { + s2.Close(); + } + } + } + xs.Add(dsSchema); + return type; + } + } + /// ///Represents strongly named DataRow class. /// @@ -7463,6 +7837,200 @@ namespace MapoDb { } } + /// + ///Represents strongly named DataRow class. + /// + public partial class planHistStatMacRow : global::System.Data.DataRow { + + private planHistStatMacDataTable tableplanHistStatMac; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal planHistStatMacRow(global::System.Data.DataRowBuilder rb) : + base(rb) { + this.tableplanHistStatMac = ((planHistStatMacDataTable)(this.Table)); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public string IdxMacchina { + get { + return ((string)(this[this.tableplanHistStatMac.IdxMacchinaColumn])); + } + set { + this[this.tableplanHistStatMac.IdxMacchinaColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double OEE_All { + get { + try { + return ((double)(this[this.tableplanHistStatMac.OEE_AllColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'OEE_All\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.OEE_AllColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double OEE_1M { + get { + try { + return ((double)(this[this.tableplanHistStatMac.OEE_1MColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'OEE_1M\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.OEE_1MColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double SetUp_All { + get { + try { + return ((double)(this[this.tableplanHistStatMac.SetUp_AllColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'SetUp_All\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.SetUp_AllColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double SetUp_1M { + get { + try { + return ((double)(this[this.tableplanHistStatMac.SetUp_1MColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'SetUp_1M\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.SetUp_1MColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double WeekHrs { + get { + try { + return ((double)(this[this.tableplanHistStatMac.WeekHrsColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'WeekHrs\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.WeekHrsColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public double WeekHrs_1M { + get { + try { + return ((double)(this[this.tableplanHistStatMac.WeekHrs_1MColumn])); + } + catch (global::System.InvalidCastException e) { + throw new global::System.Data.StrongTypingException("Il valore della colonna \'WeekHrs_1M\' nella tabella \'planHistStatMac\' è DBNull.", e); + } + } + set { + this[this.tableplanHistStatMac.WeekHrs_1MColumn] = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsOEE_AllNull() { + return this.IsNull(this.tableplanHistStatMac.OEE_AllColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetOEE_AllNull() { + this[this.tableplanHistStatMac.OEE_AllColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsOEE_1MNull() { + return this.IsNull(this.tableplanHistStatMac.OEE_1MColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetOEE_1MNull() { + this[this.tableplanHistStatMac.OEE_1MColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsSetUp_AllNull() { + return this.IsNull(this.tableplanHistStatMac.SetUp_AllColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetSetUp_AllNull() { + this[this.tableplanHistStatMac.SetUp_AllColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsSetUp_1MNull() { + return this.IsNull(this.tableplanHistStatMac.SetUp_1MColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetSetUp_1MNull() { + this[this.tableplanHistStatMac.SetUp_1MColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsWeekHrsNull() { + return this.IsNull(this.tableplanHistStatMac.WeekHrsColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetWeekHrsNull() { + this[this.tableplanHistStatMac.WeekHrsColumn] = global::System.Convert.DBNull; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool IsWeekHrs_1MNull() { + return this.IsNull(this.tableplanHistStatMac.WeekHrs_1MColumn); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public void SetWeekHrs_1MNull() { + this[this.tableplanHistStatMac.WeekHrs_1MColumn] = global::System.Convert.DBNull; + } + } + /// ///Row event argument class /// @@ -7904,6 +8472,40 @@ namespace MapoDb { } } } + + /// + ///Row event argument class + /// + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public class planHistStatMacRowChangeEvent : global::System.EventArgs { + + private planHistStatMacRow eventRow; + + private global::System.Data.DataRowAction eventAction; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacRowChangeEvent(planHistStatMacRow row, global::System.Data.DataRowAction action) { + this.eventRow = row; + this.eventAction = action; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacRow Row { + get { + return this.eventRow; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public global::System.Data.DataRowAction Action { + get { + return this.eventAction; + } + } + } } } namespace MapoDb.DS_PlanTableAdapters { @@ -11799,6 +12401,193 @@ SELECT idxPromessa, KeyRichiesta, KeyBCode, Attivabile, IdxODL, CodArticolo, Cod } } + /// + ///Represents the connection and commands used to retrieve and save data. + /// + [global::System.ComponentModel.DesignerCategoryAttribute("code")] + [global::System.ComponentModel.ToolboxItem(true)] + [global::System.ComponentModel.DataObjectAttribute(true)] + [global::System.ComponentModel.DesignerAttribute("Microsoft.VSDesigner.DataSource.Design.TableAdapterDesigner, Microsoft.VSDesigner" + + ", Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + public partial class planHistStatMacTableAdapter : global::System.ComponentModel.Component { + + private global::System.Data.SqlClient.SqlDataAdapter _adapter; + + private global::System.Data.SqlClient.SqlConnection _connection; + + private global::System.Data.SqlClient.SqlTransaction _transaction; + + private global::System.Data.SqlClient.SqlCommand[] _commandCollection; + + private bool _clearBeforeFill; + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public planHistStatMacTableAdapter() { + this.ClearBeforeFill = true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected internal global::System.Data.SqlClient.SqlDataAdapter Adapter { + get { + if ((this._adapter == null)) { + this.InitAdapter(); + } + return this._adapter; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlConnection Connection { + get { + if ((this._connection == null)) { + this.InitConnection(); + } + return this._connection; + } + set { + this._connection = value; + if ((this.Adapter.InsertCommand != null)) { + this.Adapter.InsertCommand.Connection = value; + } + if ((this.Adapter.DeleteCommand != null)) { + this.Adapter.DeleteCommand.Connection = value; + } + if ((this.Adapter.UpdateCommand != null)) { + this.Adapter.UpdateCommand.Connection = value; + } + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + if ((this.CommandCollection[i] != null)) { + ((global::System.Data.SqlClient.SqlCommand)(this.CommandCollection[i])).Connection = value; + } + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + internal global::System.Data.SqlClient.SqlTransaction Transaction { + get { + return this._transaction; + } + set { + this._transaction = value; + for (int i = 0; (i < this.CommandCollection.Length); i = (i + 1)) { + this.CommandCollection[i].Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.DeleteCommand != null))) { + this.Adapter.DeleteCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.InsertCommand != null))) { + this.Adapter.InsertCommand.Transaction = this._transaction; + } + if (((this.Adapter != null) + && (this.Adapter.UpdateCommand != null))) { + this.Adapter.UpdateCommand.Transaction = this._transaction; + } + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + protected global::System.Data.SqlClient.SqlCommand[] CommandCollection { + get { + if ((this._commandCollection == null)) { + this.InitCommandCollection(); + } + return this._commandCollection; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + public bool ClearBeforeFill { + get { + return this._clearBeforeFill; + } + set { + this._clearBeforeFill = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitAdapter() { + this._adapter = new global::System.Data.SqlClient.SqlDataAdapter(); + global::System.Data.Common.DataTableMapping tableMapping = new global::System.Data.Common.DataTableMapping(); + tableMapping.SourceTable = "Table"; + tableMapping.DataSetTable = "planHistStatMac"; + tableMapping.ColumnMappings.Add("IdxMacchina", "IdxMacchina"); + tableMapping.ColumnMappings.Add("OEE_All", "OEE_All"); + tableMapping.ColumnMappings.Add("OEE_1M", "OEE_1M"); + tableMapping.ColumnMappings.Add("SetUp_All", "SetUp_All"); + tableMapping.ColumnMappings.Add("SetUp_1M", "SetUp_1M"); + tableMapping.ColumnMappings.Add("WeekHrs", "WeekHrs"); + tableMapping.ColumnMappings.Add("WeekHrs_1M", "WeekHrs_1M"); + this._adapter.TableMappings.Add(tableMapping); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitConnection() { + this._connection = new global::System.Data.SqlClient.SqlConnection(); + this._connection.ConnectionString = global::MapoDb.Properties.Settings.Default.MoonPro_ES3ConnectionString; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + private void InitCommandCollection() { + this._commandCollection = new global::System.Data.SqlClient.SqlCommand[1]; + this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand(); + this._commandCollection[0].Connection = this.Connection; + this._commandCollection[0].CommandText = "dbo.stp_HPSM_filt"; + this._commandCollection[0].CommandType = global::System.Data.CommandType.StoredProcedure; + this._commandCollection[0].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[0].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", "")); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Fill, true)] + public virtual int Fill(DS_Plan.planHistStatMacDataTable dataTable, string IdxMacchina) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((IdxMacchina == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina)); + } + if ((this.ClearBeforeFill == true)) { + dataTable.Clear(); + } + int returnValue = this.Adapter.Fill(dataTable); + return returnValue; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] + [global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")] + [global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, true)] + public virtual DS_Plan.planHistStatMacDataTable GetData(string IdxMacchina) { + this.Adapter.SelectCommand = this.CommandCollection[0]; + if ((IdxMacchina == null)) { + this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value; + } + else { + this.Adapter.SelectCommand.Parameters[1].Value = ((string)(IdxMacchina)); + } + DS_Plan.planHistStatMacDataTable dataTable = new DS_Plan.planHistStatMacDataTable(); + this.Adapter.Fill(dataTable); + return dataTable; + } + } + /// ///TableAdapterManager is used to coordinate TableAdapters in the dataset to enable Hierarchical Update scenarios /// diff --git a/MapoDb/DS_Plan.xsd b/MapoDb/DS_Plan.xsd index 19746e40..101e20ff 100644 --- a/MapoDb/DS_Plan.xsd +++ b/MapoDb/DS_Plan.xsd @@ -734,6 +734,31 @@ FROM v_selConfWeek + + + + + + dbo.stp_HPSM_filt + + + + + + + + + + + + + + + + + + + @@ -1172,6 +1197,25 @@ FROM v_selConfWeek + + + + + + + + + + + + + + + + + + + diff --git a/MapoDb/DS_Plan.xss b/MapoDb/DS_Plan.xss index f44a14ee..24381a3e 100644 --- a/MapoDb/DS_Plan.xss +++ b/MapoDb/DS_Plan.xss @@ -4,24 +4,25 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - - - - - - - - - + + + + + + + + + + + + + + - + 826 @@ -37,18 +38,18 @@ - + - 1441 - 390 + 1419 + 338 - 1441 + 1419 482 - 1120 + 1199 482