primo repulisti da riferimenti a kanban... OCMPELTATO PRIMO GIRO, eliminate procedure ricaricamento kanban

This commit is contained in:
Samuele E. Locatelli
2017-01-19 13:54:58 +01:00
parent 8f6fb94641
commit 17075c004f
8 changed files with 123 additions and 190 deletions
Binary file not shown.
+1 -17
View File
@@ -171,6 +171,7 @@
<Content Include="approvazioneODL.aspx" />
<Content Include="approvazioneProd.aspx" />
<Content Include="App_Readme\Elmah.txt" />
<Content Include="caricaUpdateOperatori.aspx" />
<Content Include="Content\bootstrap-theme.css" />
<Content Include="Content\bootstrap-theme.min.css" />
<Content Include="Content\bootstrap.css" />
@@ -251,13 +252,6 @@
<Compile Include="calendChiusura.aspx.designer.cs">
<DependentUpon>calendChiusura.aspx</DependentUpon>
</Compile>
<Compile Include="caricaUpdateKanban.aspx.cs">
<DependentUpon>caricaUpdateKanban.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="caricaUpdateKanban.aspx.designer.cs">
<DependentUpon>caricaUpdateKanban.aspx</DependentUpon>
</Compile>
<Compile Include="caricaUpdateOperatori.aspx.cs">
<DependentUpon>caricaUpdateOperatori.aspx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -420,13 +414,6 @@
<Compile Include="WebUserControls\mod_calChiusura.ascx.designer.cs">
<DependentUpon>mod_calChiusura.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_caricaKanbanCSV.ascx.cs">
<DependentUpon>mod_caricaKanbanCSV.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
</Compile>
<Compile Include="WebUserControls\mod_caricaKanbanCSV.ascx.designer.cs">
<DependentUpon>mod_caricaKanbanCSV.ascx</DependentUpon>
</Compile>
<Compile Include="WebUserControls\mod_caricaOperatoriCSV.ascx.cs">
<DependentUpon>mod_caricaOperatoriCSV.ascx</DependentUpon>
<SubType>ASPXCodeBehind</SubType>
@@ -541,8 +528,6 @@
<Content Include="anagArticoli.aspx" />
<Content Include="aperturaImpianti.aspx" />
<Content Include="calendChiusura.aspx" />
<Content Include="caricaUpdateKanban.aspx" />
<Content Include="caricaUpdateOperatori.aspx" />
<Content Include="ExportPdf.aspx" />
<Content Include="forceUser.aspx" />
<Content Include="gestioneDatiMacchine.aspx" />
@@ -690,7 +675,6 @@
<Content Include="WebUserControls\mod_approvazioneODL.ascx" />
<Content Include="WebUserControls\mod_approvProd.ascx" />
<Content Include="WebUserControls\mod_calChiusura.ascx" />
<Content Include="WebUserControls\mod_caricaKanbanCSV.ascx" />
<Content Include="WebUserControls\mod_caricaOperatoriCSV.ascx" />
<Content Include="WebUserControls\mod_fixCal.ascx" />
<Content Include="WebUserControls\mod_gestioneDatiMacchine.ascx" />
+12 -13
View File
@@ -15188,8 +15188,7 @@ SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FR
this._commandCollection = new global::System.Data.SqlClient.SqlCommand[12];
this._commandCollection[0] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[0].Connection = this.Connection;
this._commandCollection[0].CommandText = "SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FRO" +
"M EventList";
this._commandCollection[0].CommandText = "SELECT * FROM EventList";
this._commandCollection[0].CommandType = global::System.Data.CommandType.Text;
this._commandCollection[1] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[1].Connection = this.Connection;
@@ -16495,12 +16494,12 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
this._commandCollection[17].CommandText = "dbo.stp_DDB_InsStato";
this._commandCollection[17].CommandType = global::System.Data.CommandType.StoredProcedure;
this._commandCollection[17].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[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].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, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatricolaKanban", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pallet", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[17].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pallet", global::System.Data.SqlDbType.NVarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18] = new global::System.Data.SqlClient.SqlCommand();
this._commandCollection[18].Connection = this.Connection;
this._commandCollection[18].CommandText = "dbo.stp_DDB_InsStatoBatch";
@@ -16509,7 +16508,7 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxMacchina", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@InizioStato", global::System.Data.SqlDbType.DateTime, 8, global::System.Data.ParameterDirection.Input, 23, 3, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@IdxStato", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatricolaKanban", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@CodArticolo", global::System.Data.SqlDbType.NVarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@Value", global::System.Data.SqlDbType.VarChar, 50, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@MatrOpr", global::System.Data.SqlDbType.Int, 4, global::System.Data.ParameterDirection.Input, 10, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
this._commandCollection[18].Parameters.Add(new global::System.Data.SqlClient.SqlParameter("@pallet", global::System.Data.SqlDbType.VarChar, 20, global::System.Data.ParameterDirection.Input, 0, 0, null, global::System.Data.DataRowVersion.Current, false, null, "", "", ""));
@@ -17395,7 +17394,7 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
[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 InsStato(string IdxMacchina, global::System.Nullable<int> IdxStato, string MatricolaKanban, string Value, global::System.Nullable<int> MatrOpr, string pallet) {
public virtual int InsStato(string IdxMacchina, global::System.Nullable<int> IdxStato, string CodArticolo, string Value, global::System.Nullable<int> MatrOpr, string pallet) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[17];
if ((IdxMacchina == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -17409,11 +17408,11 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
else {
command.Parameters[2].Value = global::System.DBNull.Value;
}
if ((MatricolaKanban == null)) {
if ((CodArticolo == null)) {
command.Parameters[3].Value = global::System.DBNull.Value;
}
else {
command.Parameters[3].Value = ((string)(MatricolaKanban));
command.Parameters[3].Value = ((string)(CodArticolo));
}
if ((Value == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
@@ -17453,7 +17452,7 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
[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 InsStatoBatch(string IdxMacchina, global::System.Nullable<global::System.DateTime> InizioStato, global::System.Nullable<int> IdxStato, string MatricolaKanban, string Value, global::System.Nullable<int> MatrOpr, string pallet) {
public virtual int InsStatoBatch(string IdxMacchina, global::System.Nullable<global::System.DateTime> InizioStato, global::System.Nullable<int> IdxStato, string CodArticolo, string Value, global::System.Nullable<int> MatrOpr, string pallet) {
global::System.Data.SqlClient.SqlCommand command = this.CommandCollection[18];
if ((IdxMacchina == null)) {
command.Parameters[1].Value = global::System.DBNull.Value;
@@ -17473,11 +17472,11 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
else {
command.Parameters[3].Value = global::System.DBNull.Value;
}
if ((MatricolaKanban == null)) {
if ((CodArticolo == null)) {
command.Parameters[4].Value = global::System.DBNull.Value;
}
else {
command.Parameters[4].Value = ((string)(MatricolaKanban));
command.Parameters[4].Value = ((string)(CodArticolo));
}
if ((Value == null)) {
command.Parameters[5].Value = global::System.DBNull.Value;
+6 -6
View File
@@ -548,7 +548,7 @@ SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FR
</InsertCommand>
<SelectCommand>
<DbCommand CommandType="Text" ModifiedByUser="true">
<CommandText>SELECT IdxMacchina, InizioStato, IdxTipo, CodArticolo, Value, MatrOpr, pallet FROM EventList</CommandText>
<CommandText>SELECT * FROM EventList</CommandText>
<Parameters />
</DbCommand>
</SelectCommand>
@@ -1095,12 +1095,12 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
<CommandText>dbo.stp_DDB_InsStato</CommandText>
<Parameters>
<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="varchar" DbType="AnsiString" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IdxStato" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@MatricolaKanban" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@Value" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@Value" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MatrOpr" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@pallet" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@pallet" Precision="0" ProviderType="NVarChar" Scale="0" Size="20" SourceColumnNullMapping="false" SourceVersion="Current" />
</Parameters>
</DbCommand>
</SelectCommand>
@@ -1114,7 +1114,7 @@ SELECT IdxMacchina, InizioStato, FineStato, IdxStato, DurataMinuti, Value, CodAr
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@IdxMacchina" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@InizioStato" Precision="23" ProviderType="DateTime" Scale="3" Size="8" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@IdxStato" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@MatricolaKanban" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="nvarchar" DbType="String" Direction="Input" ParameterName="@CodArticolo" Precision="0" ProviderType="NVarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@Value" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@MatrOpr" Precision="10" ProviderType="Int" Scale="0" Size="4" SourceColumnNullMapping="false" SourceVersion="Current" />
<Parameter AllowDbNull="true" AutogeneratedName="" DataSourceName="" DataTypeServer="varchar" DbType="AnsiString" Direction="Input" ParameterName="@pallet" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumnNullMapping="false" SourceVersion="Current" />
+67 -55
View File
@@ -4,34 +4,34 @@
Changes to this file may cause incorrect behavior and will be lost if
the code is regenerated.
</autogenerated>-->
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="-10" ViewPortY="-47" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<DiagramLayout xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" ex:showrelationlabel="False" ViewPortX="191" ViewPortY="-28" xmlns:ex="urn:schemas-microsoft-com:xml-msdatasource-layout-extended" xmlns="urn:schemas-microsoft-com:xml-msdatasource-layout">
<Shapes>
<Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="10" X="553" Y="715" Height="115" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:FamiglieMacchine" ZOrder="13" X="519" Y="1007" Height="115" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Macchine" ZOrder="9" X="619" Y="324" Height="234" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TransizioneStati" ZOrder="4" X="870" Y="916" Height="219" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="113" />
<Shape ID="DesignTable:StatoMacchine" ZOrder="33" X="223" Y="665" Height="324" Width="240" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:AnagraficaStati" ZOrder="20" X="245" Y="455" Height="164" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:EventList" ZOrder="5" X="920" Y="145" Height="305" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="178" />
<Shape ID="DesignTable:AnagraficaEventi" ZOrder="25" X="1285" Y="228" Height="134" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:DiarioDiBordo" ZOrder="3" X="230" Y="-18" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
<Shape ID="DesignTable:TransizioneEventi" ZOrder="17" X="1279" Y="409" Height="210" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:KeepAlive" ZOrder="8" X="1254" Y="899" Height="221" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="113" />
<Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="22" X="596" Y="1155" Height="130" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="31" X="943" Y="1212" Height="130" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="79" />
<Shape ID="DesignTable:TransizioneIngressi" ZOrder="14" X="238" Y="1197" Height="229" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaOperatori" ZOrder="16" X="965" Y="641" Height="210" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:Kanban2ins" ZOrder="26" X="1273" Y="2" Height="191" Width="212" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="23" X="1250" Y="1161" Height="172" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="6" X="1299" Y="634" Height="286" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:MicroStatoMacchina" ZOrder="15" X="231" Y="993" Height="191" Width="254" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:LinkMenuJQM" ZOrder="12" X="15" Y="266" Height="210" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:RemoteRebootLog" ZOrder="7" X="603" Y="1298" Height="229" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ParetoDurate" ZOrder="2" X="5" Y="14" Height="191" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:SignalLog" ZOrder="1" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:Macchine2FamiglieMacchine" ZOrder="13" X="553" Y="715" Height="115" Width="226" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:FamiglieMacchine" ZOrder="16" X="519" Y="1007" Height="115" Width="235" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:Macchine" ZOrder="12" X="619" Y="324" Height="234" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:TransizioneStati" ZOrder="9" X="870" Y="916" Height="219" Width="262" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="113" />
<Shape ID="DesignTable:StatoMacchine" ZOrder="3" X="237" Y="667" Height="305" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
<Shape ID="DesignTable:AnagraficaStati" ZOrder="23" X="245" Y="455" Height="164" Width="229" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:EventList" ZOrder="10" X="920" Y="145" Height="286" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="159" />
<Shape ID="DesignTable:AnagraficaEventi" ZOrder="28" X="1285" Y="228" Height="134" Width="238" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="64" />
<Shape ID="DesignTable:DiarioDiBordo" ZOrder="1" X="230" Y="-18" Height="419" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="235" />
<Shape ID="DesignTable:TransizioneEventi" ZOrder="20" X="1279" Y="409" Height="210" Width="242" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:KeepAlive" ZOrder="4" X="1296" Y="935" Height="221" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="113" />
<Shape ID="DesignTable:Macchine2FamigliaIngressi" ZOrder="25" X="596" Y="1155" Height="130" Width="236" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:FamigliaTipoIngressi" ZOrder="33" X="943" Y="1212" Height="130" Width="261" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="79" />
<Shape ID="DesignTable:TransizioneIngressi" ZOrder="17" X="238" Y="1197" Height="229" Width="266" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaOperatori" ZOrder="19" X="965" Y="641" Height="210" Width="263" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:AnagraficaOperatori2ins" ZOrder="26" X="1250" Y="1161" Height="172" Width="287" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="83" />
<Shape ID="DesignTable:DatiMacchine" ZOrder="2" X="1299" Y="634" Height="286" Width="224" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="216" />
<Shape ID="DesignTable:MicroStatoMacchina" ZOrder="18" X="231" Y="993" Height="191" Width="254" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="102" />
<Shape ID="DesignTable:LinkMenuJQM" ZOrder="15" X="15" Y="266" Height="210" Width="195" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:RemoteRebootLog" ZOrder="11" X="603" Y="1298" Height="229" Width="253" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:ParetoDurate" ZOrder="8" X="5" Y="14" Height="191" Width="208" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
<Shape ID="DesignTable:SignalLog" ZOrder="7" X="18" Y="523" Height="191" Width="202" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="140" />
<Shape ID="DesignTable:AnagArticoli" ZOrder="6" X="627" Y="31" Height="172" Width="217" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="121" />
</Shapes>
<Connectors>
<Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_FamiglieMacchine" ZOrder="42" LineWidth="11">
<Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_FamiglieMacchine" ZOrder="43" LineWidth="11">
<RoutePoints>
<Point>
<X>667</X>
@@ -43,7 +43,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_Macchine" ZOrder="41" LineWidth="11">
<Connector ID="DesignRelation:FK_Macchine2FamiglieMacchine_Macchine" ZOrder="42" LineWidth="11">
<RoutePoints>
<Point>
<X>699</X>
@@ -55,7 +55,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneStati_FamiglieMacchine" ZOrder="40" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneStati_FamiglieMacchine" ZOrder="41" LineWidth="11">
<RoutePoints>
<Point>
<X>754</X>
@@ -67,7 +67,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_StatoMacchine_Macchine" ZOrder="24" LineWidth="11">
<Connector ID="DesignRelation:FK_StatoMacchine_Macchine" ZOrder="27" LineWidth="11">
<RoutePoints>
<Point>
<X>636</X>
@@ -75,15 +75,15 @@
</Point>
<Point>
<X>636</X>
<Y>682</Y>
<Y>684</Y>
</Point>
<Point>
<X>463</X>
<Y>682</Y>
<X>500</X>
<Y>684</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaStati" ZOrder="39" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaStati" ZOrder="40" LineWidth="11">
<RoutePoints>
<Point>
<X>386</X>
@@ -99,19 +99,19 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaStati" ZOrder="38" LineWidth="11">
<Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaStati" ZOrder="39" LineWidth="11">
<RoutePoints>
<Point>
<X>322</X>
<X>336</X>
<Y>619</Y>
</Point>
<Point>
<X>322</X>
<Y>665</Y>
<X>336</X>
<Y>667</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_EventList_Macchine" ZOrder="37" LineWidth="11">
<Connector ID="DesignRelation:FK_EventList_Macchine" ZOrder="38" LineWidth="11">
<RoutePoints>
<Point>
<X>814</X>
@@ -123,7 +123,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="18" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneStati_AnagraficaEventi" ZOrder="21" LineWidth="11">
<RoutePoints>
<Point>
<X>1285</X>
@@ -147,7 +147,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_EventList_AnagraficaEventi" ZOrder="36" LineWidth="11">
<Connector ID="DesignRelation:FK_EventList_AnagraficaEventi" ZOrder="37" LineWidth="11">
<RoutePoints>
<Point>
<X>1285</X>
@@ -159,7 +159,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaStati" ZOrder="35" LineWidth="11">
<Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaStati" ZOrder="36" LineWidth="11">
<RoutePoints>
<Point>
<X>298</X>
@@ -167,11 +167,11 @@
</Point>
<Point>
<X>298</X>
<Y>363</Y>
<Y>401</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_DiarioDiBordo_Macchine" ZOrder="34" LineWidth="11">
<Connector ID="DesignRelation:FK_DiarioDiBordo_Macchine" ZOrder="35" LineWidth="11">
<RoutePoints>
<Point>
<X>619</X>
@@ -183,7 +183,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneEventi_AnagraficaEventi1" ZOrder="32" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneEventi_AnagraficaEventi1" ZOrder="34" LineWidth="11">
<RoutePoints>
<Point>
<X>1444</X>
@@ -195,7 +195,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="11" LineWidth="11">
<Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_Macchine" ZOrder="14" LineWidth="11">
<RoutePoints>
<Point>
<X>716</X>
@@ -207,7 +207,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" ZOrder="30" LineWidth="11">
<Connector ID="DesignRelation:FK_Macchine2FamigliaIngressi_FamigliaTipoIngressi" ZOrder="32" LineWidth="11">
<RoutePoints>
<Point>
<X>943</X>
@@ -219,7 +219,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="19" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneIngressi_AnagraficaEventi" ZOrder="22" LineWidth="11">
<RoutePoints>
<Point>
<X>1285</X>
@@ -239,7 +239,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="21" LineWidth="11">
<Connector ID="DesignRelation:FK_TransizioneIngressi_FamigliaTipoIngressi" ZOrder="24" LineWidth="11">
<RoutePoints>
<Point>
<X>943</X>
@@ -251,7 +251,7 @@
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaOperatori" ZOrder="29" LineWidth="11">
<Connector ID="DesignRelation:FK_DiarioDiBordo_AnagraficaOperatori" ZOrder="31" LineWidth="11">
<RoutePoints>
<Point>
<X>965</X>
@@ -263,11 +263,11 @@
</Point>
<Point>
<X>513</X>
<Y>363</Y>
<Y>401</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_EventList_AnagraficaOperatori" ZOrder="28" LineWidth="11">
<Connector ID="DesignRelation:FK_EventList_AnagraficaOperatori" ZOrder="30" LineWidth="11">
<RoutePoints>
<Point>
<X>1108</X>
@@ -275,11 +275,11 @@
</Point>
<Point>
<X>1108</X>
<Y>450</Y>
<Y>431</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaOperatori" ZOrder="27" LineWidth="11">
<Connector ID="DesignRelation:FK_StatoMacchine_AnagraficaOperatori" ZOrder="29" LineWidth="11">
<RoutePoints>
<Point>
<X>982</X>
@@ -287,11 +287,23 @@
</Point>
<Point>
<X>982</X>
<Y>890</Y>
<Y>892</Y>
</Point>
<Point>
<X>463</X>
<Y>890</Y>
<X>500</X>
<Y>892</Y>
</Point>
</RoutePoints>
</Connector>
<Connector ID="DesignRelation:AnagArticoli_DiarioDiBordo" ZOrder="5" LineWidth="11">
<RoutePoints>
<Point>
<X>627</X>
<Y>117</Y>
</Point>
<Point>
<X>530</X>
<Y>117</Y>
</Point>
</RoutePoints>
</Connector>
+23 -73
View File
@@ -77,7 +77,6 @@ namespace MapoDb
protected DS_applicazioneTableAdapters.AnagraficaEventiTableAdapter taAnagEv;
protected DS_applicazioneTableAdapters.AnagraficaStatiTableAdapter taAnagSt;
protected DS_applicazioneTableAdapters.MacchineTableAdapter taMacchine;
protected DS_applicazioneTableAdapters.KanbanTableAdapter taKanban;
protected DS_applicazioneTableAdapters.TransizioneEventiTableAdapter taTranEv;
protected DS_applicazioneTableAdapters.TransizioneStatiTableAdapter taTranSt;
protected DS_applicazioneTableAdapters.StatoMacchineTableAdapter taStatoMacchine;
@@ -103,7 +102,6 @@ namespace MapoDb
taAnagSt = new global::MapoDb.DS_applicazioneTableAdapters.AnagraficaStatiTableAdapter();
taAnagEv = new global::MapoDb.DS_applicazioneTableAdapters.AnagraficaEventiTableAdapter();
taMacchine = new global::MapoDb.DS_applicazioneTableAdapters.MacchineTableAdapter();
taKanban = new global::MapoDb.DS_applicazioneTableAdapters.KanbanTableAdapter();
taTranEv = new global::MapoDb.DS_applicazioneTableAdapters.TransizioneEventiTableAdapter();
taTranSt = new global::MapoDb.DS_applicazioneTableAdapters.TransizioneStatiTableAdapter();
taStatoMacchine = new global::MapoDb.DS_applicazioneTableAdapters.StatoMacchineTableAdapter();
@@ -127,7 +125,6 @@ namespace MapoDb
taAnagEv.Connection.ConnectionString = _connectionString;
taAnagSt.Connection.ConnectionString = _connectionString;
taMacchine.Connection.ConnectionString = _connectionString;
taKanban.Connection.ConnectionString = _connectionString;
taTranEv.Connection.ConnectionString = _connectionString;
taTranSt.Connection.ConnectionString = _connectionString;
taStatoMacchine.Connection.ConnectionString = _connectionString;
@@ -209,9 +206,11 @@ namespace MapoDb
/// <param name="IdxMacchina"></param>
/// <param name="InizioStato"></param>
/// <param name="IdxTipo"></param>
/// <param name="matrKanban"></param>
/// <param name="CodArt"></param>
/// <param name="Value"></param>
private void checkCambiaStatoBatch(tipoInputEvento tipoInput, string IdxMacchina, DateTime InizioStato, int IdxTipo, string matrKanban, string Value, int MatrOpr, string pallet)
/// <param name="MatrOpr"></param>
/// <param name="pallet"></param>
private void checkCambiaStatoBatch(tipoInputEvento tipoInput, string IdxMacchina, DateTime InizioStato, int IdxTipo, string CodArt, string Value, int MatrOpr, string pallet)
{
DS_applicazione.TransizioneStatiRow rigaTransStati;
switch (tipoInput)
@@ -221,7 +220,7 @@ namespace MapoDb
try
{
rigaTransStati = taTranSt.GetUserForcedTransitions(IdxMacchina, IdxTipo)[0];
taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, matrKanban, Value, MatrOpr, pallet);
taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet);
}
catch (Exception exc)
{
@@ -236,7 +235,7 @@ namespace MapoDb
rigaTransStati = taTranSt.GetHwTransitions(IdxMacchina, IdxTipo)[0];
if (rigaTransStati != null)
{
taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, matrKanban, Value, MatrOpr, pallet);
taDiario.InsStatoBatch(IdxMacchina, InizioStato, rigaTransStati.next_IdxStato, CodArt, Value, MatrOpr, pallet);
}
}
catch
@@ -767,14 +766,14 @@ namespace MapoDb
/// </summary>
/// <param name="IdxMacchina">codice macchina</param>
/// <param name="IdxStato">idx stato</param>
/// <param name="matrKanban">matricola prodotto (kanban)</param>
/// <param name="CodArticolo">Codice Articolo</param>
/// <param name="Value">valore</param>
/// <param name="MatrOpr">matricola operatore</param>
/// <param name="pallet">pallet (vuoto se nd)</param>
/// <param name="eventTime">data-ora dell'evento</param>
/// <param name="currentTime">data-ora corrente dell'invio</param>
/// <returns></returns>
public inputComando scriviRigaStato(string IdxMacchina, int IdxStato, string matrKanban, string Value, int MatrOpr, string pallet, DateTime eventTime, DateTime currentTime)
public inputComando scriviRigaStato(string IdxMacchina, int IdxStato, string CodArticolo, string Value, int MatrOpr, string pallet, DateTime eventTime, DateTime currentTime)
{
int inserito = 0;
try
@@ -784,11 +783,11 @@ namespace MapoDb
// calcolo dataOra reale (evento + delta(ora server - ora remota)
DateTime dataOra = eventTime.Add(DateTime.Now - currentTime);
// inserisco la nuova riga di stato mentre il trigger aggiorna le tab...
inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, matrKanban, "", null, null, MatrOpr, pallet);
inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, CodArticolo, null, null, MatrOpr, pallet);
}
catch
{
logger.lg.scriviLog(string.Format("Errore in fase di scrittura stato con i seguenti dati:{0} macchina {1}{0} IdxStato {2}{0} matrKanban {3}{0} Value {4}{0} MatrOpr {5}{0} Pallet {6}{0} eventTime {7}{0} currentTime {8}{0} eccezione: {0}{9}", Environment.NewLine, IdxMacchina, IdxStato, matrKanban, Value, MatrOpr, pallet, eventTime, currentTime), tipoLog.EXCEPTION);
logger.lg.scriviLog(string.Format("Errore in fase di scrittura stato con i seguenti dati:{0} macchina {1}{0} IdxStato {2}{0} CodArticolo {3}{0} Value {4}{0} MatrOpr {5}{0} Pallet {6}{0} eventTime {7}{0} currentTime {8}{0} eccezione: {0}{9}", Environment.NewLine, IdxMacchina, IdxStato, CodArticolo, Value, MatrOpr, pallet, eventTime, currentTime), tipoLog.EXCEPTION);
}
// formatto output
inputComando answ = new inputComando();
@@ -801,12 +800,12 @@ namespace MapoDb
/// </summary>
/// <param name="IdxMacchina">codice macchina</param>
/// <param name="IdxStato">idx stato</param>
/// <param name="matrKanban">matricola prodotto (kanban)</param>
/// <param name="CodArticolo">Codice Articolo</param>
/// <param name="Value">valore</param>
/// <param name="MatrOpr">matricola operatore</param>
/// <param name="pallet">pallet (vuoto se nd)</param>
/// <returns></returns>
public inputComando scriviRigaStato(string IdxMacchina, int IdxStato, string matrKanban, string Value, int MatrOpr, string pallet)
public inputComando scriviRigaStato(string IdxMacchina, int IdxStato, string CodArticolo, string Value, int MatrOpr, string pallet)
{
int inserito = 0;
try
@@ -814,11 +813,11 @@ namespace MapoDb
// verifico se esista la macchina altrimenti la creo...
verificaIdxMacchina(IdxMacchina);
// inserisco la nuova riga di stato mentre il trigger aggiorna le tab...
inserito = taDiario.InsStato(IdxMacchina, IdxStato, matrKanban, Value, MatrOpr, pallet);
inserito = taDiario.InsStato(IdxMacchina, IdxStato, CodArticolo, Value, MatrOpr, pallet);
}
catch
{
logger.lg.scriviLog(string.Format("Errore in fase di scrittura stato con i seguenti dati:{0} macchina {1}{0} IdxStato {2}{0} matrKanban {3}{0} Value {4}{0} MatrOpr {5}{0} Pallet {6}{0} eccezione: {0}{7}", Environment.NewLine, IdxMacchina, IdxStato, matrKanban, Value, MatrOpr, pallet), tipoLog.EXCEPTION);
logger.lg.scriviLog(string.Format("Errore in fase di scrittura stato con i seguenti dati:{0} macchina {1}{0} IdxStato {2}{0} CodArticolo {3}{0} Value {4}{0} MatrOpr {5}{0} Pallet {6}{0} eccezione: {0}{7}", Environment.NewLine, IdxMacchina, IdxStato, CodArticolo, Value, MatrOpr, pallet), tipoLog.EXCEPTION);
}
// formatto output
inputComando answ = new inputComando();
@@ -962,20 +961,20 @@ namespace MapoDb
#region scritture eventi simulati
public int scriviRigaEventoSimulata(DateTime dataOra, string IdxMacchina, int IdxTipo, string matrKanban, string Value, int MatrOpr, string pallet)
public int scriviRigaEventoSimulata(DateTime dataOra, string IdxMacchina, int IdxTipo, string CodArticolo, string Value, int MatrOpr, string pallet)
{
// verifico se esista la macchina altrimenti la creo...
verificaIdxMacchina(IdxMacchina);
// inserisco evento
int inserito = taEvList.Insert(IdxMacchina, dataOra, IdxTipo, matrKanban, Value, MatrOpr, pallet);
int inserito = taEvList.Insert(IdxMacchina, dataOra, IdxTipo, CodArticolo, Value, MatrOpr, pallet);
return inserito;
}
public int scriviRigaStatoSimulata(DateTime dataOra, string IdxMacchina, int IdxStato, string matrKanban, string Value, int MatrOpr, string pallet)
public int scriviRigaStatoSimulata(DateTime dataOra, string IdxMacchina, int IdxStato, string CodArticolo, string Value, int MatrOpr, string pallet)
{
// verifico se esista la macchina altrimenti la creo...
verificaIdxMacchina(IdxMacchina);
// inserisco la nuova riga di stato mentre il trigger aggiorna le tab...
int inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, matrKanban, "", null, null, MatrOpr, pallet);
int inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, CodArticolo, null, null, MatrOpr, pallet);
return inserito;
}
@@ -987,12 +986,12 @@ namespace MapoDb
int inserito = taEvList.Insert(IdxMacchina, dataOra, IdxTipo, matrKanban, Value, 0, "-");
return inserito;
}
public int scriviRigaStatoSimulata(DateTime dataOra, string IdxMacchina, int IdxStato, string matrKanban, string Value)
public int scriviRigaStatoSimulata(DateTime dataOra, string IdxMacchina, int IdxStato, string CodArticolo, string Value)
{
// verifico se esista la macchina altrimenti la creo...
verificaIdxMacchina(IdxMacchina);
// inserisco la nuova riga di stato mentre il trigger aggiorna le tab...
int inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, matrKanban, "", null, null, 0, "-");
int inserito = taDiario.Insert(IdxMacchina, dataOra, null, IdxStato, null, Value, CodArticolo, null, null, 0, "-");
return inserito;
}
@@ -1052,26 +1051,6 @@ namespace MapoDb
}
return answ;
}
/// <summary>
/// verifica kanban valido
/// </summary>
/// <param name="codice"></param>
/// <returns></returns>
public bool isKanban(string codice)
{
return (taKanban.GetDataByKanbanMatrCode(codice).Rows.Count > 0);
}
/// <summary>
/// verifica se sia un nuovo kanban
/// </summary>
/// <param name="codice"></param>
/// <returns></returns>
public bool isNewKanban(string codice)
{
// controlli validità kanban
bool check = codice.StartsWith("K");
return check;
}
/// <summary> verifica che il bar code sia un barcode Operatore
/// </summary>
@@ -1095,17 +1074,6 @@ namespace MapoDb
bool check = codice.StartsWith("C#");
return check;
}
/// <summary>
/// inserisce un nuovo kanban ignoto
/// </summary>
/// <param name="codice"></param>
/// <returns></returns>
public int insertUnknownKanban(string codice)
{
return taKanban.InsertUndefinedKanban(codice);
}
/// <summary>
/// verifica un codice se sia di tipo "comando"
/// </summary>
@@ -1405,11 +1373,11 @@ namespace MapoDb
{
if (rigaEv.IdxTipo <= 12) // è barcode
{
checkCambiaStatoBatch(tipoInputEvento.barcode, IdxMacchina, rigaEv.InizioStato, rigaEv.IdxTipo, rigaEv.MatricolaKanban, rigaEv.Value, rigaEv.MatrOpr, rigaEv.pallet);
checkCambiaStatoBatch(tipoInputEvento.barcode, IdxMacchina, rigaEv.InizioStato, rigaEv.IdxTipo, rigaEv.CodArticolo, rigaEv.Value, rigaEv.MatrOpr, rigaEv.pallet);
}
else // è hw
{
checkCambiaStatoBatch(tipoInputEvento.hw, IdxMacchina, rigaEv.InizioStato, rigaEv.IdxTipo, rigaEv.MatricolaKanban, rigaEv.Value, rigaEv.MatrOpr, rigaEv.pallet);
checkCambiaStatoBatch(tipoInputEvento.hw, IdxMacchina, rigaEv.InizioStato, rigaEv.IdxTipo, rigaEv.CodArticolo, rigaEv.Value, rigaEv.MatrOpr, rigaEv.pallet);
}
}
}
@@ -1422,25 +1390,7 @@ namespace MapoDb
{
return taTranEv.getByDescrComando(descrComando)[0];
}
/// <summary>
/// restituisce il kanban (CodArticolo) dalla matricola
/// </summary>
/// <param name="matricola">codice univoco della matricola</param>
/// <returns>restituisce il kanban (eventualmente comune a più matricole...)</returns>
public string getKanbanDaMatr(string matricola)
{
string answ = "";
try
{
answ = (taKanban.GetDataByKanbanMatrCode(matricola)[0]).KanbanCode;
}
catch
{ }
return answ;
}
/// <summary>
/// Dichiara esplicitamente produzione e tempo ciclo rilevato per il numero di pezzi indicati (real time, NON confermati)
/// </summary>
+11 -23
View File
@@ -164,25 +164,22 @@ public class resoconti
return _AnagraficaEventi;
}
}
protected MapoDb.DS_applicazioneTableAdapters.KanbanTableAdapter taKanban;
protected MapoDb.DS_applicazione.KanbanDataTable _Kanban;
protected MapoDb.DS_applicazione.KanbanDataTable Kanban
protected MapoDb.DS_applicazioneTableAdapters.AnagArticoliTableAdapter taAnagArt;
protected MapoDb.DS_applicazione.AnagArticoliDataTable _AnagArt;
protected MapoDb.DS_applicazione.AnagArticoliDataTable AnagArt
{
get
{
if (!memLayer.ML.isInCacheObject("Kanban"))
//if (HttpContext.Current.Cache["Kanban"] == null)
if (!memLayer.ML.isInCacheObject("AnagArt"))
{
_Kanban = taKanban.GetData();
SteamWare.memLayer.ML.setCacheVal("Kanban", _Kanban, true);
//HttpContext.Current.Cache["Kanban"] = _Kanban;
_AnagArt = taAnagArt.GetData();
SteamWare.memLayer.ML.setCacheVal("AnagArt", _AnagArt, true);
}
else
{
_Kanban = (MapoDb.DS_applicazione.KanbanDataTable)SteamWare.memLayer.ML.objCacheObj("Kanban");
//_Kanban = (MapoDb.DS_applicazione.KanbanDataTable)HttpContext.Current.Cache["Kanban"];
_AnagArt = (MapoDb.DS_applicazione.AnagArticoliDataTable)SteamWare.memLayer.ML.objCacheObj("AnagArt");
}
return _Kanban;
return _AnagArt;
}
}
protected MapoDb.DS_applicazioneTableAdapters.AnagraficaOperatoriTableAdapter taAnagOpr;
@@ -232,7 +229,7 @@ public class resoconti
taDiarioDiBordo = new MapoDb.DS_applicazioneTableAdapters.DiarioDiBordoTableAdapter();
taParetoDurate = new MapoDb.DS_applicazioneTableAdapters.ParetoDurateTableAdapter();
taAnagraficaEventi = new MapoDb.DS_applicazioneTableAdapters.AnagraficaEventiTableAdapter();
taKanban = new MapoDb.DS_applicazioneTableAdapters.KanbanTableAdapter();
taAnagArt= new MapoDb.DS_applicazioneTableAdapters.AnagArticoliTableAdapter();
taAnagOpr = new MapoDb.DS_applicazioneTableAdapters.AnagraficaOperatoriTableAdapter();
taTempiCiclo = new MapoDb.DS_ProdTempiTableAdapters.TempiCicloRilevatiTableAdapter();
}
@@ -248,7 +245,7 @@ public class resoconti
taDiarioDiBordo.Connection.ConnectionString = _connectionString;
taParetoDurate.Connection.ConnectionString = _connectionString;
taAnagraficaEventi.Connection.ConnectionString = _connectionString;
taKanban.Connection.ConnectionString = _connectionString;
taAnagArt.Connection.ConnectionString = _connectionString;
taAnagOpr.Connection.ConnectionString = _connectionString;
taTempiCiclo.Connection.ConnectionString = _connectionString;
}
@@ -438,15 +435,6 @@ public class resoconti
return AnagraficaEventi.FindByIdxTipo(idx).Nome;
}
/// <summary>
/// Kanban da Idx
/// </summary>
/// <param name="idx"></param>
/// <returns></returns>
public MapoDb.DS_applicazione.KanbanRow kanbanDaIdx(string idx)
{
return Kanban.FindByMatricolaKanban(idx);
}
/// <summary>
/// oggetto sequenza dati x sequencer
/// </summary>
/// <param name="idxMacchina">IdxMacchina</param>
@@ -461,7 +449,7 @@ public class resoconti
MapoDb.DS_applicazione.DiarioDiBordoDataTable tabSeq = taDiarioDiBordo.GetSequenza(idxMacchina, _intervallo.inizio, _intervallo.fine);
foreach (MapoDb.DS_applicazione.DiarioDiBordoRow riga in tabSeq.Rows)
{
_sequenza.serieDati.AddserieDatiRow(riga.DurataMinuti, semaforoDaIdxStato(riga.IdxStato), string.Format("{0} {1}", riga.KanbanCode, riga.MatricolaKanban), riga.InizioStato);
_sequenza.serieDati.AddserieDatiRow(riga.DurataMinuti, semaforoDaIdxStato(riga.IdxStato), riga.CodArticolo, riga.InizioStato);
}
// faccio trim x primo evento...
if (_sequenza.serieDati[0].timeData < _intervallo.inizio)
+3 -3
View File
@@ -48,7 +48,7 @@ public class utility
foreach (DS_applicazione.DiarioDiBordoRow riga in tabella)
{
// verifico se sia identica alla precedente...
if (rigaCumulo.IdxStato == idxStato2reduce && riga.IdxStato == idxStato2reduce && rigaCumulo.KanbanCode == riga.KanbanCode && rigaCumulo.MatricolaKanban == riga.MatricolaKanban)
if (rigaCumulo.IdxStato == idxStato2reduce && riga.IdxStato == idxStato2reduce && rigaCumulo.CodArticolo == riga.CodArticolo)
{
if (riga.InizioStato != rigaCumulo.InizioStato)
{
@@ -79,7 +79,7 @@ public class utility
DS_applicazione.EventListRow rigaEvPrev = (DS_applicazione.EventListRow)righe[0];
foreach (DS_applicazione.EventListRow riga in righe)
{
if (riga.IdxTipo == idxEvento2del && rigaEvPrev.IdxTipo == idxEvento2del && riga.MatricolaKanban == rigaEvPrev.MatricolaKanban)
if (riga.IdxTipo == idxEvento2del && rigaEvPrev.IdxTipo == idxEvento2del && riga.CodArticolo == rigaEvPrev.CodArticolo)
{
if (riga.InizioStato != rigaEvPrev.InizioStato)
{
@@ -106,7 +106,7 @@ public class utility
DS_applicazione.EventListRow rigaEvPrev = (DS_applicazione.EventListRow)righe[0];
foreach (DS_applicazione.EventListRow riga in righe)
{
if (riga.IdxTipo == idxEvento2del && rigaEvPrev.IdxTipo == idxEventoPre && riga.MatricolaKanban == rigaEvPrev.MatricolaKanban)
if (riga.IdxTipo == idxEvento2del && rigaEvPrev.IdxTipo == idxEventoPre && riga.CodArticolo == rigaEvPrev.CodArticolo)
{
if (riga.InizioStato != rigaEvPrev.InizioStato)
{