Egalware/GMW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vers 3.5.884 corretta x gestione specifiche

Browse Source
This commit is contained in:
Samuele E. Locatelli
2016-07-29 11:33:10 +02:00
parent fd7348cbaf
commit 24eea76ab5
16 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GMW-RT/bin/GMW-RT.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-RT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW-UT.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW-UT/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/WebUserControls/mod_specDmtx.ascx
+3 -1
View File
@@ -3,7 +3,7 @@
{ %>
<link href="../Content/Style.css" rel="stylesheet" type="text/css" />
<% } %>
<asp:GridView ID="grView" runat="server" DataSourceID="ods" DataKeyNames="FormatoDtmx,CodSpec" AutoGenerateColumns="False" AllowSorting="True" Width="100%" OnSelectedIndexChanged="grView_SelectedIndexChanged" CssClass="table table-striped table-condensed table-responsive">
<asp:GridView ID="grView" runat="server" DataSourceID="ods" DataKeyNames="FormatoDtmx,CodSpec,ValoreInt" AutoGenerateColumns="False" AllowSorting="True" Width="100%" OnSelectedIndexChanged="grView_SelectedIndexChanged" CssClass="table table-striped table-condensed table-responsive">
<HeaderStyle CssClass="default" />
<PagerStyle CssClass="active GridPager" />
<PagerSettings Mode="NumericFirstLast" />
@@ -125,6 +125,7 @@
<DeleteParameters>
<asp:Parameter Name="Original_FormatoDtmx" Type="String" />
<asp:Parameter Name="Original_CodSpec" Type="String" />
<asp:Parameter Name="Original_ValoreInt" Type="Int32" />
</DeleteParameters>
<InsertParameters>
<asp:Parameter Name="FormatoDtmx" Type="String" />
@@ -146,6 +147,7 @@
<asp:Parameter Name="Attivo" Type="Boolean" />
<asp:Parameter Name="Original_FormatoDtmx" Type="String" />
<asp:Parameter Name="Original_CodSpec" Type="String" />
<asp:Parameter Name="Original_ValoreInt" Type="Int32" />
</UpdateParameters>
</asp:ObjectDataSource>
<asp:HiddenField runat="server" ID="hfFormatoDtmx" />
GMW/bin/GMW.dll
BIN
View File
Binary file not shown.
GMW/bin/GMW_data.dll
BIN
View File
Binary file not shown.
GMW/bin/SteamWare.dll
BIN
View File
Binary file not shown.
GMW/bin/VersGen.dll
BIN
View File
Binary file not shown.
GMW_data/DS_DataMatrix.xsd
+2
View File
@@ -1087,6 +1087,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="ReturnValue" ParameterName="@RETURN_VALUE" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_FormatoDtmx" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_CodSpec" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_ValoreInt" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -1115,6 +1116,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@Attivo" Precision="1" ProviderType="Bit" Scale="0" Size="1" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_FormatoDtmx" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Original_CodSpec" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_ValoreInt" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
GMW_data/DS_DataMatrix.xss
+6 -6
View File
@@ -19,14 +19,14 @@
<Shape ID="DesignTable:Attr2Dtx" ZOrder="15" X="71" Y="36" Height="229" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:v_Attr2Dtx" ZOrder="16" X="390" Y="69" Height="210" Width="191" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:stp_DtxCheckBlocked" ZOrder="14" X="463" Y="469" Height="96" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="45" />
<Shape ID="DesignTable:AnagFormatiDtmx" ZOrder="5" X="1227" Y="188" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:AnagFormatiDtmx" ZOrder="6" X="1227" Y="188" Height="343" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:Dmtx_ByAttr" ZOrder="12" X="961" Y="549" Height="286" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:v_ElencoDmtx" ZOrder="10" X="1030" Y="885" Height="130" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:AnagSpecDtx" ZOrder="7" X="1255" Y="884" Height="134" Width="223" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:TabSpecDtx" ZOrder="6" X="1241" Y="579" Height="267" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TrascFormatoDmtx" ZOrder="4" X="1541" Y="603" Height="153" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TrascPartNum" ZOrder="3" X="1596" Y="419" Height="115" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TrascDatamatrix" ZOrder="2" X="1563" Y="837" Height="191" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:TabSpecDtx" ZOrder="1" X="1241" Y="579" Height="267" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TrascFormatoDmtx" ZOrder="5" X="1541" Y="603" Height="153" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TrascPartNum" ZOrder="4" X="1596" Y="419" Height="115" Width="227" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:TrascDatamatrix" ZOrder="3" X="1563" Y="837" Height="191" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_TabSpecDtx_AnagFormatiDtmx" ZOrder="9" LineWidth="11">
@@ -53,7 +53,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TrascDatamatrix_AnagFormatiDtmx" ZOrder="1" LineWidth="11">
<Connector ID="DesignRelation:FK_TrascDatamatrix_AnagFormatiDtmx" ZOrder="2" LineWidth="11">
<RoutePoints>
<Point>
<X>1510</X>
GMW_data/DS_DataMatrix1.Designer.cs
Generated
+16 -2
View File
@@ -16558,6 +16558,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
this._commandCollection[1].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[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FormatoDtmx", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSpec", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[1].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValoreInt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[2] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[2].Connection = this.Connection;
this._commandCollection[2].CommandText = "dmtx.stp_getSpecDmtxByTipo";
@@ -16576,6 +16577,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Attivo", global::System.Data.SqlDbType.Bit, 1, global::System.Data.ParameterDirection.Input, 1, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_FormatoDtmx", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_CodSpec", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[3].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Original_ValoreInt", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
@@ -16623,7 +16625,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
[global::System.ComponentModel.DataObjectMethodAttribute(global::System.ComponentModel.DataObjectMethodType.Select, false)]
public virtual DS_DataMatrix.TabSpecDtxDataTable updateQuery(string ValoreStr, global::System.Nullable<int> ValoreInt, string Note, global::System.Nullable<int> Peso, global::System.Nullable<bool> Attivo, string Original_FormatoDtmx, string Original_CodSpec) {
public virtual DS_DataMatrix.TabSpecDtxDataTable updateQuery(string ValoreStr, global::System.Nullable<int> ValoreInt, string Note, global::System.Nullable<int> Peso, global::System.Nullable<bool> Attivo, string Original_FormatoDtmx, string Original_CodSpec, global::System.Nullable<int> Original_ValoreInt) {
this.Adapter.SelectCommand = this.CommandCollection[3];
if ((ValoreStr == null)) {
this.Adapter.SelectCommand.Parameters[1].Value = global::System.DBNull.Value;
@@ -16667,6 +16669,12 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
else {
this.Adapter.SelectCommand.Parameters[7].Value = ((string)(Original_CodSpec));
}
if ((Original_ValoreInt.HasValue == true)) {
this.Adapter.SelectCommand.Parameters[8].Value = ((int)(Original_ValoreInt.Value));
}
else {
this.Adapter.SelectCommand.Parameters[8].Value = global::System.DBNull.Value;
}
DS_DataMatrix.TabSpecDtxDataTable dataTable = new DS_DataMatrix.TabSpecDtxDataTable();
this.Adapter.Fill(dataTable);
return dataTable;
@@ -16883,7 +16891,7 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "4.0.0.0")]
[global::System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")]
public virtual int deleteQuery(string Original_FormatoDtmx, string Original_CodSpec) {
public virtual int deleteQuery(string Original_FormatoDtmx, string Original_CodSpec, global::System.Nullable<int> Original_ValoreInt) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[1];
if ((Original_FormatoDtmx == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -16897,6 +16905,12 @@ SELECT FormatoDtmx, CodSpec, ValoreStr, ValoreInt, Note, Peso, Attivo FROM TabSp
else {
command.Parameters[2].Value = ((string)(Original_CodSpec));
}
if ((Original_ValoreInt.HasValue == true)) {
command.Parameters[3].Value = ((int)(Original_ValoreInt.Value));
}
else {
command.Parameters[3].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)) {
VersGen/GMW.cs
+2 -2
View File
@@ -5,7 +5,7 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.874.2400")]
[assembly: AssemblyFileVersion("3.5.874.2400")]
[assembly: AssemblyVersion("3.5.884.2401")]
[assembly: AssemblyFileVersion("3.5.884.2401")]
[assembly: AssemblyCopyright("Steamware © 2007-2016")]
[assembly: AssemblyCompany("Steamware")]
VersGen/GMW.tt
+2 -2
View File
@@ -6,8 +6,8 @@
using System.Reflection;
[assembly: AssemblyVersion("3.5.874.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.874.<#= this.RevisionNumber #>")]
[assembly: AssemblyVersion("3.5.884.<#= this.RevisionNumber #>")]
[assembly: AssemblyFileVersion("3.5.884.<#= this.RevisionNumber #>")]
[assembly: AssemblyCopyright("Steamware © 2007-<#= DateTime.Now.Year #>")]
[assembly: AssemblyCompany("Steamware")]
<#+