From a3f56546b1a5542ecff9be8ee222d50d31d11c07 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 May 2021 17:45:02 +0200 Subject: [PATCH 1/2] new rel 1421 --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 766acfc3..b65d8347 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -13,7 +13,7 @@ pipeline { steps { /* calcolo numero versione... diverso x branch MASTER/DEVELOP */ script { - withEnv(['NEXT_BUILD_NUMBER=1420']) { + withEnv(['NEXT_BUILD_NUMBER=1421']) { // env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true) env.versionNumber = VersionNumber(versionNumberString : '6.13.${BUILD_DATE_FORMATTED, "yyMM"}.${BUILDS_ALL_TIME}', projectStartDate : '2006-01-01', skipFailedBuilds: true, overrideBuildsAllTime: '${NEXT_BUILD_NUMBER}') env.APP_NAME = 'MAPO' From 24516d31d9c09dd282662f172e661c2d0cb46724 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 3 May 2021 17:45:11 +0200 Subject: [PATCH 2/2] Update x report odette --- MagData/DS_Report.Designer.cs | 238 +++++++++++++--------------------- MagData/DS_Report.xsd | 204 ++++++++++++++--------------- MagData/DS_Report.xss | 13 +- 3 files changed, 196 insertions(+), 259 deletions(-) diff --git a/MagData/DS_Report.Designer.cs b/MagData/DS_Report.Designer.cs index 8450c18e..73da6634 100644 --- a/MagData/DS_Report.Designer.cs +++ b/MagData/DS_Report.Designer.cs @@ -994,8 +994,6 @@ namespace MagData { private global::System.Data.DataColumn columnCampo16_5; - private global::System.Data.DataColumn columnCampo9_21; - private global::System.Data.DataColumn columnBarcodeBaseUrl; [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -1719,14 +1717,6 @@ namespace MagData { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public global::System.Data.DataColumn Campo9_21Column { - get { - return this.columnCampo9_21; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public global::System.Data.DataColumn BarcodeBaseUrlColumn { @@ -1815,7 +1805,7 @@ namespace MagData { string Campo8_4, string Campo8_5, string Campo9_1, - string Campo9_2, + int Campo9_2, string Campo9_3, string Campo9_4, string Campo9_5, @@ -1859,7 +1849,6 @@ namespace MagData { string Campo16_3, string Campo16_4, string Campo16_5, - int Campo9_21, string BarcodeBaseUrl) { stp_prt_CartellinoFinitiOdetteRow rowstp_prt_CartellinoFinitiOdetteRow = ((stp_prt_CartellinoFinitiOdetteRow)(this.NewRow())); object[] columnValuesArray = new object[] { @@ -1949,7 +1938,6 @@ namespace MagData { Campo16_3, Campo16_4, Campo16_5, - Campo9_21, BarcodeBaseUrl}; rowstp_prt_CartellinoFinitiOdetteRow.ItemArray = columnValuesArray; this.Rows.Add(rowstp_prt_CartellinoFinitiOdetteRow); @@ -1958,10 +1946,9 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public stp_prt_CartellinoFinitiOdetteRow FindByCampoUDCCampo15_2(string CampoUDC, string Campo15_2) { + public stp_prt_CartellinoFinitiOdetteRow FindByCampoUDC(string CampoUDC) { return ((stp_prt_CartellinoFinitiOdetteRow)(this.Rows.Find(new object[] { - CampoUDC, - Campo15_2}))); + CampoUDC}))); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] @@ -2067,7 +2054,6 @@ namespace MagData { this.columnCampo16_3 = base.Columns["Campo16_3"]; this.columnCampo16_4 = base.Columns["Campo16_4"]; this.columnCampo16_5 = base.Columns["Campo16_5"]; - this.columnCampo9_21 = base.Columns["Campo9_21"]; this.columnBarcodeBaseUrl = base.Columns["BarcodeBaseUrl"]; } @@ -2158,7 +2144,7 @@ namespace MagData { base.Columns.Add(this.columnCampo8_5); this.columnCampo9_1 = new global::System.Data.DataColumn("Campo9_1", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCampo9_1); - this.columnCampo9_2 = new global::System.Data.DataColumn("Campo9_2", typeof(string), null, global::System.Data.MappingType.Element); + this.columnCampo9_2 = new global::System.Data.DataColumn("Campo9_2", typeof(int), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCampo9_2); this.columnCampo9_3 = new global::System.Data.DataColumn("Campo9_3", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCampo9_3); @@ -2246,196 +2232,183 @@ namespace MagData { base.Columns.Add(this.columnCampo16_4); this.columnCampo16_5 = new global::System.Data.DataColumn("Campo16_5", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnCampo16_5); - this.columnCampo9_21 = new global::System.Data.DataColumn("Campo9_21", typeof(int), null, global::System.Data.MappingType.Element); - base.Columns.Add(this.columnCampo9_21); this.columnBarcodeBaseUrl = new global::System.Data.DataColumn("BarcodeBaseUrl", typeof(string), null, global::System.Data.MappingType.Element); base.Columns.Add(this.columnBarcodeBaseUrl); this.Constraints.Add(new global::System.Data.UniqueConstraint("Constraint1", new global::System.Data.DataColumn[] { - this.columnCampoUDC, - this.columnCampo15_2}, true)); + this.columnCampoUDC}, true)); this.columnCampoUDC.AllowDBNull = false; this.columnCampoUDC.ReadOnly = true; + this.columnCampoUDC.Unique = true; this.columnCampoUDC.MaxLength = 250; this.columnCampo1_1.ReadOnly = true; - this.columnCampo1_1.MaxLength = 250; + this.columnCampo1_1.MaxLength = 12; this.columnCampo1_2.AllowDBNull = false; - this.columnCampo1_2.ReadOnly = true; - this.columnCampo1_2.MaxLength = 250; + this.columnCampo1_2.MaxLength = 500; this.columnCampo1_3.AllowDBNull = false; - this.columnCampo1_3.ReadOnly = true; this.columnCampo1_3.MaxLength = 250; this.columnCampo1_4.ReadOnly = true; - this.columnCampo1_4.MaxLength = 250; + this.columnCampo1_4.MaxLength = 363; this.columnCampo1_5.ReadOnly = true; - this.columnCampo1_5.MaxLength = 250; + this.columnCampo1_5.MaxLength = 8; this.columnCampo2_1.ReadOnly = true; - this.columnCampo2_1.MaxLength = 250; + this.columnCampo2_1.MaxLength = 13; this.columnCampo2_2.ReadOnly = true; - this.columnCampo2_2.MaxLength = 250; + this.columnCampo2_2.MaxLength = 1; this.columnCampo2_3.ReadOnly = true; - this.columnCampo2_3.MaxLength = 250; + this.columnCampo2_3.MaxLength = 1; this.columnCampo2_4.ReadOnly = true; - this.columnCampo2_4.MaxLength = 250; + this.columnCampo2_4.MaxLength = 1; this.columnCampo2_5.ReadOnly = true; - this.columnCampo2_5.MaxLength = 250; + this.columnCampo2_5.MaxLength = 8; this.columnCampo3_1.ReadOnly = true; - this.columnCampo3_1.MaxLength = 250; + this.columnCampo3_1.MaxLength = 21; this.columnCampo3_2.ReadOnly = true; - this.columnCampo3_2.MaxLength = 250; + this.columnCampo3_2.MaxLength = 1; this.columnCampo3_3.ReadOnly = true; - this.columnCampo3_3.MaxLength = 250; + this.columnCampo3_3.MaxLength = 1; this.columnCampo3_4.ReadOnly = true; - this.columnCampo3_4.MaxLength = 250; + this.columnCampo3_4.MaxLength = 8; this.columnCampo3_5.ReadOnly = true; - this.columnCampo3_5.MaxLength = 250; + this.columnCampo3_5.MaxLength = 8; this.columnCampo4_1.ReadOnly = true; - this.columnCampo4_1.MaxLength = 250; + this.columnCampo4_1.MaxLength = 24; this.columnCampo4_2.ReadOnly = true; - this.columnCampo4_2.MaxLength = 250; + this.columnCampo4_2.MaxLength = 18; this.columnCampo4_3.ReadOnly = true; - this.columnCampo4_3.MaxLength = 250; + this.columnCampo4_3.MaxLength = 8; this.columnCampo4_4.ReadOnly = true; - this.columnCampo4_4.MaxLength = 250; + this.columnCampo4_4.MaxLength = 8; this.columnCampo4_5.ReadOnly = true; - this.columnCampo4_5.MaxLength = 250; + this.columnCampo4_5.MaxLength = 8; this.columnCampo5_1.ReadOnly = true; - this.columnCampo5_1.MaxLength = 250; + this.columnCampo5_1.MaxLength = 17; this.columnCampo5_2.ReadOnly = true; - this.columnCampo5_2.MaxLength = 250; + this.columnCampo5_2.MaxLength = 1; this.columnCampo5_3.ReadOnly = true; - this.columnCampo5_3.MaxLength = 250; + this.columnCampo5_3.MaxLength = 8; this.columnCampo5_4.ReadOnly = true; - this.columnCampo5_4.MaxLength = 250; + this.columnCampo5_4.MaxLength = 8; this.columnCampo5_5.ReadOnly = true; - this.columnCampo5_5.MaxLength = 250; + this.columnCampo5_5.MaxLength = 8; this.columnCampo6_1.ReadOnly = true; - this.columnCampo6_1.MaxLength = 250; + this.columnCampo6_1.MaxLength = 18; this.columnCampo6_2.ReadOnly = true; - this.columnCampo6_2.MaxLength = 250; + this.columnCampo6_2.MaxLength = 1; this.columnCampo6_3.ReadOnly = true; - this.columnCampo6_3.MaxLength = 250; + this.columnCampo6_3.MaxLength = 8; this.columnCampo6_4.ReadOnly = true; - this.columnCampo6_4.MaxLength = 250; + this.columnCampo6_4.MaxLength = 8; this.columnCampo6_5.ReadOnly = true; - this.columnCampo6_5.MaxLength = 250; + this.columnCampo6_5.MaxLength = 8; this.columnCampo7_1.ReadOnly = true; - this.columnCampo7_1.MaxLength = 250; + this.columnCampo7_1.MaxLength = 19; this.columnCampo7_2.ReadOnly = true; - this.columnCampo7_2.MaxLength = 250; + this.columnCampo7_2.MaxLength = 1; this.columnCampo7_3.ReadOnly = true; - this.columnCampo7_3.MaxLength = 250; + this.columnCampo7_3.MaxLength = 8; this.columnCampo7_4.ReadOnly = true; - this.columnCampo7_4.MaxLength = 250; + this.columnCampo7_4.MaxLength = 8; this.columnCampo7_5.ReadOnly = true; - this.columnCampo7_5.MaxLength = 250; + this.columnCampo7_5.MaxLength = 8; this.columnCampo8_1.ReadOnly = true; - this.columnCampo8_1.MaxLength = 250; + this.columnCampo8_1.MaxLength = 19; this.columnCampo8_2.AllowDBNull = false; - this.columnCampo8_2.ReadOnly = true; - this.columnCampo8_2.MaxLength = 250; + this.columnCampo8_2.MaxLength = 50; this.columnCampo8_3.ReadOnly = true; - this.columnCampo8_3.MaxLength = 250; + this.columnCampo8_3.MaxLength = 51; this.columnCampo8_4.ReadOnly = true; - this.columnCampo8_4.MaxLength = 250; + this.columnCampo8_4.MaxLength = 8; this.columnCampo8_5.ReadOnly = true; - this.columnCampo8_5.MaxLength = 250; + this.columnCampo8_5.MaxLength = 8; this.columnCampo9_1.ReadOnly = true; - this.columnCampo9_1.MaxLength = 250; + this.columnCampo9_1.MaxLength = 16; this.columnCampo9_2.ReadOnly = true; - this.columnCampo9_2.MaxLength = 250; this.columnCampo9_3.ReadOnly = true; - this.columnCampo9_3.MaxLength = 250; + this.columnCampo9_3.MaxLength = 11; this.columnCampo9_4.ReadOnly = true; - this.columnCampo9_4.MaxLength = 250; + this.columnCampo9_4.MaxLength = 8; this.columnCampo9_5.ReadOnly = true; - this.columnCampo9_5.MaxLength = 250; + this.columnCampo9_5.MaxLength = 8; this.columnCampo10_1.ReadOnly = true; - this.columnCampo10_1.MaxLength = 250; + this.columnCampo10_1.MaxLength = 16; this.columnCampo10_2.AllowDBNull = false; - this.columnCampo10_2.ReadOnly = true; this.columnCampo10_2.MaxLength = 250; this.columnCampo10_3.ReadOnly = true; - this.columnCampo10_3.MaxLength = 250; + this.columnCampo10_3.MaxLength = 9; this.columnCampo10_4.ReadOnly = true; - this.columnCampo10_4.MaxLength = 250; + this.columnCampo10_4.MaxLength = 9; this.columnCampo10_5.ReadOnly = true; - this.columnCampo10_5.MaxLength = 250; + this.columnCampo10_5.MaxLength = 9; this.columnCampo11_1_1.ReadOnly = true; - this.columnCampo11_1_1.MaxLength = 250; + this.columnCampo11_1_1.MaxLength = 11; this.columnCampo11_1_2.ReadOnly = true; - this.columnCampo11_1_2.MaxLength = 250; + this.columnCampo11_1_2.MaxLength = 11; this.columnCampo11_1_3.ReadOnly = true; - this.columnCampo11_1_3.MaxLength = 250; + this.columnCampo11_1_3.MaxLength = 11; this.columnCampo11_1_4.ReadOnly = true; - this.columnCampo11_1_4.MaxLength = 250; + this.columnCampo11_1_4.MaxLength = 11; this.columnCampo11_1_5.ReadOnly = true; - this.columnCampo11_1_5.MaxLength = 250; + this.columnCampo11_1_5.MaxLength = 11; this.columnCampo11_2_1.ReadOnly = true; - this.columnCampo11_2_1.MaxLength = 250; + this.columnCampo11_2_1.MaxLength = 27; this.columnCampo11_2_2.AllowDBNull = false; - this.columnCampo11_2_2.ReadOnly = true; - this.columnCampo11_2_2.MaxLength = 250; + this.columnCampo11_2_2.MaxLength = 50; this.columnCampo11_2_3.AllowDBNull = false; - this.columnCampo11_2_3.ReadOnly = true; - this.columnCampo11_2_3.MaxLength = 250; + this.columnCampo11_2_3.MaxLength = 50; this.columnCampo11_2_4.ReadOnly = true; - this.columnCampo11_2_4.MaxLength = 250; + this.columnCampo11_2_4.MaxLength = 11; this.columnCampo11_2_5.ReadOnly = true; - this.columnCampo11_2_5.MaxLength = 250; + this.columnCampo11_2_5.MaxLength = 11; this.columnCampo12_1.ReadOnly = true; - this.columnCampo12_1.MaxLength = 250; + this.columnCampo12_1.MaxLength = 22; this.columnCampo12_2.ReadOnly = true; - this.columnCampo12_2.MaxLength = 250; + this.columnCampo12_2.MaxLength = 1; this.columnCampo12_3.ReadOnly = true; - this.columnCampo12_3.MaxLength = 250; + this.columnCampo12_3.MaxLength = 1; this.columnCampo12_4.ReadOnly = true; - this.columnCampo12_4.MaxLength = 250; + this.columnCampo12_4.MaxLength = 9; this.columnCampo12_5.ReadOnly = true; - this.columnCampo12_5.MaxLength = 250; + this.columnCampo12_5.MaxLength = 9; this.columnCampo13_1.ReadOnly = true; - this.columnCampo13_1.MaxLength = 250; + this.columnCampo13_1.MaxLength = 9; this.columnCampo13_2.ReadOnly = true; - this.columnCampo13_2.MaxLength = 250; + this.columnCampo13_2.MaxLength = 9; this.columnCampo13_3.ReadOnly = true; - this.columnCampo13_3.MaxLength = 250; + this.columnCampo13_3.MaxLength = 9; this.columnCampo13_4.ReadOnly = true; - this.columnCampo13_4.MaxLength = 250; + this.columnCampo13_4.MaxLength = 9; this.columnCampo13_5.ReadOnly = true; - this.columnCampo13_5.MaxLength = 250; + this.columnCampo13_5.MaxLength = 9; this.columnCampo14_1.ReadOnly = true; - this.columnCampo14_1.MaxLength = 250; + this.columnCampo14_1.MaxLength = 12; this.columnCampo14_2.ReadOnly = true; - this.columnCampo14_2.MaxLength = 250; + this.columnCampo14_2.MaxLength = 1; this.columnCampo14_3.ReadOnly = true; - this.columnCampo14_3.MaxLength = 250; + this.columnCampo14_3.MaxLength = 9; this.columnCampo14_4.ReadOnly = true; - this.columnCampo14_4.MaxLength = 250; + this.columnCampo14_4.MaxLength = 9; this.columnCampo14_5.ReadOnly = true; - this.columnCampo14_5.MaxLength = 250; + this.columnCampo14_5.MaxLength = 9; this.columnCampo15_1.ReadOnly = true; - this.columnCampo15_1.MaxLength = 250; + this.columnCampo15_1.MaxLength = 21; this.columnCampo15_2.AllowDBNull = false; - this.columnCampo15_2.ReadOnly = true; - this.columnCampo15_2.MaxLength = 250; + this.columnCampo15_2.MaxLength = 50; this.columnCampo15_3.ReadOnly = true; - this.columnCampo15_3.MaxLength = 250; + this.columnCampo15_3.MaxLength = 51; this.columnCampo15_4.ReadOnly = true; - this.columnCampo15_4.MaxLength = 250; + this.columnCampo15_4.MaxLength = 9; this.columnCampo15_5.ReadOnly = true; - this.columnCampo15_5.MaxLength = 250; + this.columnCampo15_5.MaxLength = 9; this.columnCampo16_1.ReadOnly = true; - this.columnCampo16_1.MaxLength = 250; + this.columnCampo16_1.MaxLength = 24; this.columnCampo16_2.AllowDBNull = false; - this.columnCampo16_2.ReadOnly = true; - this.columnCampo16_2.MaxLength = 250; + this.columnCampo16_2.MaxLength = 50; this.columnCampo16_3.ReadOnly = true; - this.columnCampo16_3.MaxLength = 250; + this.columnCampo16_3.MaxLength = 51; this.columnCampo16_4.ReadOnly = true; - this.columnCampo16_4.MaxLength = 250; + this.columnCampo16_4.MaxLength = 9; this.columnCampo16_5.ReadOnly = true; - this.columnCampo16_5.MaxLength = 250; - this.columnCampo9_21.ReadOnly = true; - this.columnCampo9_21.Caption = "Campo9_2"; + this.columnCampo16_5.MaxLength = 9; this.columnBarcodeBaseUrl.ReadOnly = true; this.columnBarcodeBaseUrl.MaxLength = 250; } @@ -5483,10 +5456,10 @@ namespace MagData { [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public string Campo9_2 { + public int Campo9_2 { get { try { - return ((string)(this[this.tablestp_prt_CartellinoFinitiOdette.Campo9_2Column])); + return ((int)(this[this.tablestp_prt_CartellinoFinitiOdette.Campo9_2Column])); } catch (global::System.InvalidCastException e) { throw new global::System.Data.StrongTypingException("The value for column \'Campo9_2\' in table \'stp_prt_CartellinoFinitiOdette\' is DBNu" + @@ -6199,23 +6172,6 @@ namespace MagData { } } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public int Campo9_21 { - get { - try { - return ((int)(this[this.tablestp_prt_CartellinoFinitiOdette.Campo9_21Column])); - } - catch (global::System.InvalidCastException e) { - throw new global::System.Data.StrongTypingException("The value for column \'Campo9_21\' in table \'stp_prt_CartellinoFinitiOdette\' is DBN" + - "ull.", e); - } - } - set { - this[this.tablestp_prt_CartellinoFinitiOdette.Campo9_21Column] = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public string BarcodeBaseUrl { @@ -7157,18 +7113,6 @@ namespace MagData { this[this.tablestp_prt_CartellinoFinitiOdette.Campo16_5Column] = global::System.Convert.DBNull; } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public bool IsCampo9_21Null() { - return this.IsNull(this.tablestp_prt_CartellinoFinitiOdette.Campo9_21Column); - } - - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] - public void SetCampo9_21Null() { - this[this.tablestp_prt_CartellinoFinitiOdette.Campo9_21Column] = global::System.Convert.DBNull; - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")] public bool IsBarcodeBaseUrlNull() { @@ -9512,6 +9456,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast tableMapping.ColumnMappings.Add("Campo8_4", "Campo8_4"); tableMapping.ColumnMappings.Add("Campo8_5", "Campo8_5"); tableMapping.ColumnMappings.Add("Campo9_1", "Campo9_1"); + tableMapping.ColumnMappings.Add("Campo9_2", "Campo9_2"); tableMapping.ColumnMappings.Add("Campo9_3", "Campo9_3"); tableMapping.ColumnMappings.Add("Campo9_4", "Campo9_4"); tableMapping.ColumnMappings.Add("Campo9_5", "Campo9_5"); @@ -9555,7 +9500,6 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast tableMapping.ColumnMappings.Add("Campo16_3", "Campo16_3"); tableMapping.ColumnMappings.Add("Campo16_4", "Campo16_4"); tableMapping.ColumnMappings.Add("Campo16_5", "Campo16_5"); - tableMapping.ColumnMappings.Add("Campo9_2", "Campo9_21"); tableMapping.ColumnMappings.Add("BarcodeBaseUrl", "BarcodeBaseUrl"); this._adapter.TableMappings.Add(tableMapping); } diff --git a/MagData/DS_Report.xsd b/MagData/DS_Report.xsd index 35f4cc00..c062047a 100644 --- a/MagData/DS_Report.xsd +++ b/MagData/DS_Report.xsd @@ -245,6 +245,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast + @@ -288,7 +289,6 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - @@ -446,7 +446,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -478,7 +478,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -491,18 +491,18 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + - + - + - + @@ -512,305 +512,299 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - + + - + - + - + - + - + @@ -820,270 +814,269 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - @@ -1094,7 +1087,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -1152,7 +1145,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -1209,7 +1202,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -1275,7 +1268,7 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - + @@ -1486,7 +1479,6 @@ SELECT IdxPrintJob, TipoReport, KeyParam, prtName, dtStart, dtEnd, stato, dtLast - diff --git a/MagData/DS_Report.xss b/MagData/DS_Report.xss index 6881f195..91141735 100644 --- a/MagData/DS_Report.xss +++ b/MagData/DS_Report.xss @@ -4,13 +4,14 @@ Changes to this file may cause incorrect behavior and will be lost if the code is regenerated. --> - + - - - - - + + + + + + \ No newline at end of file