Skip to content

孙克 / RC1250-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 757ca089 由 LN
选项

增加异常列表。托盘禁用修改。

1 个父辈 0c4269a3
内嵌 并排
正在显示 17 个修改的文件 包含 599 行增加 和 85 行删除
source/AssemblyLineClient/AssemblyLineClient.csproj
......@@ -97,6 +97,12 @@
<Compile Include="FrmDisableTray.Designer.cs">
<DependentUpon>FrmDisableTray.cs</DependentUpon>
</Compile>
<Compile Include="FrmExceptionMsg.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmExceptionMsg.Designer.cs">
<DependentUpon>FrmExceptionMsg.cs</DependentUpon>
</Compile>
<Compile Include="FrmTrayInfo.cs">
<SubType>Form</SubType>
</Compile>
......@@ -191,6 +197,9 @@
<DependentUpon>FrmDisableTray.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="FrmExceptionMsg.resx">
<DependentUpon>FrmExceptionMsg.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmTrayInfo.resx">
<DependentUpon>FrmTrayInfo.cs</DependentUpon>
</EmbeddedResource>
......
source/AssemblyLineClient/FrmExceptionMsg.Designer.cs 0 → 100644
namespace OnlineStore.AssemblyLine
{
partial class FrmExceptionMsg
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.btnUpdate = new System.Windows.Forms.Button();
this.btnExit = new System.Windows.Forms.Button();
this.dataGridView1 = new System.Windows.Forms.DataGridView();
this.Column_Module = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Time = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.Column_Msg = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit();
this.SuspendLayout();
//
// btnUpdate
//
this.btnUpdate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnUpdate.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdate.Location = new System.Drawing.Point(936, 623);
this.btnUpdate.Name = "btnUpdate";
this.btnUpdate.Size = new System.Drawing.Size(115, 33);
this.btnUpdate.TabIndex = 4;
this.btnUpdate.Text = "刷新";
this.btnUpdate.UseVisualStyleBackColor = true;
this.btnUpdate.Click += new System.EventHandler(this.btnUpdate_Click);
//
// btnExit
//
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Location = new System.Drawing.Point(1057, 623);
this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(115, 33);
this.btnExit.TabIndex = 5;
this.btnExit.Text = "确定";
this.btnExit.UseVisualStyleBackColor = true;
this.btnExit.Click += new System.EventHandler(this.btnExit_Click);
//
// dataGridView1
//
this.dataGridView1.AllowUserToAddRows = false;
this.dataGridView1.AllowUserToDeleteRows = false;
this.dataGridView1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.Column_Module,
this.Column_Time,
this.Column_Name,
this.Column_Msg});
this.dataGridView1.Location = new System.Drawing.Point(13, 13);
this.dataGridView1.Name = "dataGridView1";
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.Size = new System.Drawing.Size(1159, 589);
this.dataGridView1.TabIndex = 6;
//
// Column_Module
//
this.Column_Module.HeaderText = "模块";
this.Column_Module.Name = "Column_Module";
this.Column_Module.Width = 140;
//
// Column_Time
//
this.Column_Time.HeaderText = "时间";
this.Column_Time.Name = "Column_Time";
this.Column_Time.Width = 140;
//
// Column_Name
//
this.Column_Name.HeaderText = "名称";
this.Column_Name.Name = "Column_Name";
this.Column_Name.Width = 150;
//
// Column_Msg
//
this.Column_Msg.HeaderText = "消息";
this.Column_Msg.Name = "Column_Msg";
this.Column_Msg.Width = 650;
//
// FrmExceptionMsg
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoSize = true;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ClientSize = new System.Drawing.Size(1191, 666);
this.Controls.Add(this.dataGridView1);
this.Controls.Add(this.btnExit);
this.Controls.Add(this.btnUpdate);
this.Name = "FrmExceptionMsg";
this.Text = "异常信息列表";
this.Load += new System.EventHandler(this.FrmTrayInfo_Load);
this.SizeChanged += new System.EventHandler(this.FrmTrayInfo_SizeChanged);
((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Button btnUpdate;
private System.Windows.Forms.Button btnExit;
private System.Windows.Forms.DataGridView dataGridView1;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Module;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Time;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Name;
private System.Windows.Forms.DataGridViewTextBoxColumn Column_Msg;
}
}
\ No newline at end of file
source/AssemblyLineClient/FrmExceptionMsg.cs 0 → 100644

using OnlineStore.Common;
using OnlineStore.DeviceLibrary;
using System;
using System.Collections.Generic;
using System.Windows.Forms;
namespace OnlineStore.AssemblyLine
{
internal partial class FrmExceptionMsg : FrmBase
{
public FrmExceptionMsg()
{
InitializeComponent();
}
private void FrmTrayInfo_Load(object sender, EventArgs e)
{
loadMsg();
}
private void loadMsg()
{
try
{
List<ExceptionMsg> msgList = ExceptionMsgManager.getList();
dataGridView1.Rows.Clear();
foreach (ExceptionMsg msg in msgList)
{
try
{
if (msg == null)
{
continue;
}
DataGridViewRow row = new DataGridViewRow();
row.CreateCells(dataGridView1);
row.Cells[Column_Module.Index].Value = msg.module;
row.Cells[Column_Name.Index].Value = msg.name;
row.Cells[Column_Time.Index].Value = msg.updateTime.ToString("yyyy-MM-dd HH:mm:ss");
row.Cells[Column_Msg.Index].Value = msg.message;
dataGridView1.Rows.Add(row);
}
catch (Exception ex) { LogUtil.error("FrmExceptionMsg loadMsg error:" + ex.ToString()); }
}
}
catch (Exception ex) { LogUtil.error("FrmExceptionMsg loadMsg error:" + ex.ToString()); }
}
private void btnUpdate_Click(object sender, EventArgs e)
{
loadMsg();
}
private void btnExit_Click(object sender, EventArgs e)
{
this.Close();
}
private void FrmTrayInfo_SizeChanged(object sender, EventArgs e)
{
this.Left = Screen.PrimaryScreen.Bounds.Width / 2 - this.Width / 2;//桌面的宽度的一半减去自身宽的的一半
this.Top = Screen.PrimaryScreen.Bounds.Height / 2 - this.Height / 2;//桌面的高度的一半减去自身高度的一半
}
}
}
source/AssemblyLineClient/FrmExceptionMsg.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="Column_Module.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Time.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="Column_Msg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>
\ No newline at end of file
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -93,6 +93,8 @@
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.iO模块状态ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.托盘初始化ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
......@@ -119,6 +121,7 @@
this.toolStripSeparator19 = new System.Windows.Forms.ToolStripSeparator();
this.自动保存托盘信息ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.新托盘检测逻辑ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator20 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
......@@ -161,9 +164,9 @@
this.tabPage1.Controls.Add(this.listView1);
this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Controls.Add(this.groupBox3);
this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1328, 606);
this.tabPage1.Size = new System.Drawing.Size(1328, 609);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "状态信息";
this.tabPage1.UseVisualStyleBackColor = true;
......@@ -174,7 +177,7 @@
this.chbSaveImg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSaveImg.Location = new System.Drawing.Point(1187, 145);
this.chbSaveImg.Name = "chbSaveImg";
this.chbSaveImg.Size = new System.Drawing.Size(140, 28);
this.chbSaveImg.Size = new System.Drawing.Size(112, 24);
this.chbSaveImg.TabIndex = 285;
this.chbSaveImg.Text = "保存视觉图片";
this.chbSaveImg.UseVisualStyleBackColor = true;
......@@ -186,7 +189,7 @@
this.chbSaveImage.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbSaveImage.Location = new System.Drawing.Point(1059, 145);
this.chbSaveImage.Name = "chbSaveImage";
this.chbSaveImage.Size = new System.Drawing.Size(140, 28);
this.chbSaveImage.Size = new System.Drawing.Size(112, 24);
this.chbSaveImage.TabIndex = 203;
this.chbSaveImage.Text = "保存扫码图片";
this.chbSaveImage.UseVisualStyleBackColor = true;
......@@ -213,7 +216,7 @@
this.numTrayNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numTrayNum.Location = new System.Drawing.Point(66, 29);
this.numTrayNum.Name = "numTrayNum";
this.numTrayNum.Size = new System.Drawing.Size(71, 31);
this.numTrayNum.Size = new System.Drawing.Size(71, 26);
this.numTrayNum.TabIndex = 283;
this.numTrayNum.ValueChanged += new System.EventHandler(this.numTrayNum_ValueChanged);
//
......@@ -234,7 +237,7 @@
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(7, 32);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(68, 24);
this.label10.Size = new System.Drawing.Size(54, 20);
this.label10.TabIndex = 207;
this.label10.Text = "托盘号:";
//
......@@ -336,7 +339,7 @@
this.chbShunt.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt.Location = new System.Drawing.Point(8, 61);
this.chbShunt.Name = "chbShunt";
this.chbShunt.Size = new System.Drawing.Size(151, 28);
this.chbShunt.Size = new System.Drawing.Size(120, 24);
this.chbShunt.TabIndex = 200;
this.chbShunt.Text = "禁用分流横移1";
this.chbShunt.UseVisualStyleBackColor = true;
......@@ -348,7 +351,7 @@
this.chbShunt2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbShunt2.Location = new System.Drawing.Point(8, 86);
this.chbShunt2.Name = "chbShunt2";
this.chbShunt2.Size = new System.Drawing.Size(151, 28);
this.chbShunt2.Size = new System.Drawing.Size(120, 24);
this.chbShunt2.TabIndex = 202;
this.chbShunt2.Text = "禁用分流横移2";
this.chbShunt2.UseVisualStyleBackColor = true;
......@@ -360,7 +363,7 @@
this.chbTrayCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbTrayCheck.Location = new System.Drawing.Point(154, 17);
this.chbTrayCheck.Name = "chbTrayCheck";
this.chbTrayCheck.Size = new System.Drawing.Size(151, 24);
this.chbTrayCheck.Size = new System.Drawing.Size(123, 21);
this.chbTrayCheck.TabIndex = 197;
this.chbTrayCheck.Text = "启用托盘顺序检测";
this.chbTrayCheck.UseVisualStyleBackColor = true;
......@@ -373,7 +376,7 @@
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(8, 39);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(106, 24);
this.chbBuzzer.Size = new System.Drawing.Size(87, 21);
this.chbBuzzer.TabIndex = 196;
this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true;
......@@ -397,7 +400,7 @@
this.chbAGV.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAGV.Location = new System.Drawing.Point(154, 47);
this.chbAGV.Name = "chbAGV";
this.chbAGV.Size = new System.Drawing.Size(151, 24);
this.chbAGV.Size = new System.Drawing.Size(121, 21);
this.chbAGV.TabIndex = 198;
this.chbAGV.Text = "AGV cancelState";
this.chbAGV.UseVisualStyleBackColor = true;
......@@ -410,7 +413,7 @@
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(8, 17);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(121, 24);
this.chbAutoRun.Size = new System.Drawing.Size(99, 21);
this.chbAutoRun.TabIndex = 94;
this.chbAutoRun.Text = "开机自动启动";
this.chbAutoRun.UseVisualStyleBackColor = true;
......@@ -422,7 +425,7 @@
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(1230, 7);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(41, 24);
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
this.lblCID.Text = "CID";
this.lblCID.Visible = false;
......@@ -433,7 +436,7 @@
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(906, 9);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(34, 20);
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196;
this.lblMoveInfo.Text = "CID";
//
......@@ -449,7 +452,7 @@
this.listView1.Location = new System.Drawing.Point(9, 7);
this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(705, 596);
this.listView1.Size = new System.Drawing.Size(705, 599);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
......@@ -463,7 +466,7 @@
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(720, 253);
this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(600, 350);
this.logBox.Size = new System.Drawing.Size(600, 353);
this.logBox.TabIndex = 106;
this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
......@@ -494,7 +497,7 @@
this.chbInStoNG.AutoSize = true;
this.chbInStoNG.Location = new System.Drawing.Point(414, 24);
this.chbInStoNG.Name = "chbInStoNG";
this.chbInStoNG.Size = new System.Drawing.Size(84, 24);
this.chbInStoNG.Size = new System.Drawing.Size(70, 21);
this.chbInStoNG.TabIndex = 205;
this.chbInStoNG.Text = "入库NG";
this.chbInStoNG.UseVisualStyleBackColor = true;
......@@ -509,7 +512,7 @@
"出库"});
this.cmbTrayType.Location = new System.Drawing.Point(64, 22);
this.cmbTrayType.Name = "cmbTrayType";
this.cmbTrayType.Size = new System.Drawing.Size(78, 28);
this.cmbTrayType.Size = new System.Drawing.Size(78, 25);
this.cmbTrayType.TabIndex = 204;
//
// label4
......@@ -517,7 +520,7 @@
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(354, 26);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(28, 20);
this.label4.Size = new System.Drawing.Size(23, 17);
this.label4.TabIndex = 203;
this.label4.Text = "宽:";
//
......@@ -526,7 +529,7 @@
this.txtTrayW.Location = new System.Drawing.Point(381, 23);
this.txtTrayW.MaxLength = 2;
this.txtTrayW.Name = "txtTrayW";
this.txtTrayW.Size = new System.Drawing.Size(29, 27);
this.txtTrayW.Size = new System.Drawing.Size(29, 23);
this.txtTrayW.TabIndex = 202;
this.txtTrayW.Text = "7";
//
......@@ -535,7 +538,7 @@
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(294, 26);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(28, 20);
this.label3.Size = new System.Drawing.Size(23, 17);
this.label3.TabIndex = 201;
this.label3.Text = "高:";
//
......@@ -544,7 +547,7 @@
this.txtTrayH.Location = new System.Drawing.Point(321, 23);
this.txtTrayH.MaxLength = 2;
this.txtTrayH.Name = "txtTrayH";
this.txtTrayH.Size = new System.Drawing.Size(29, 27);
this.txtTrayH.Size = new System.Drawing.Size(29, 23);
this.txtTrayH.TabIndex = 200;
this.txtTrayH.Text = "8";
//
......@@ -553,7 +556,7 @@
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(146, 26);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(43, 20);
this.label2.Size = new System.Drawing.Size(35, 17);
this.label2.TabIndex = 199;
this.label2.Text = "库位:";
//
......@@ -561,7 +564,7 @@
//
this.txtTrayPosid.Location = new System.Drawing.Point(185, 23);
this.txtTrayPosid.Name = "txtTrayPosid";
this.txtTrayPosid.Size = new System.Drawing.Size(105, 27);
this.txtTrayPosid.Size = new System.Drawing.Size(105, 23);
this.txtTrayPosid.TabIndex = 198;
this.txtTrayPosid.Text = "11#AC1_1_1";
//
......@@ -571,7 +574,7 @@
this.cmbTray.FormattingEnabled = true;
this.cmbTray.Location = new System.Drawing.Point(9, 22);
this.cmbTray.Name = "cmbTray";
this.cmbTray.Size = new System.Drawing.Size(51, 28);
this.cmbTray.Size = new System.Drawing.Size(51, 25);
this.cmbTray.TabIndex = 194;
//
// btnUpdateTray
......@@ -589,9 +592,9 @@
// tabPage2
//
this.tabPage2.Controls.Add(this.picLine);
this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Location = new System.Drawing.Point(4, 29);
this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(1328, 606);
this.tabPage2.Size = new System.Drawing.Size(1328, 609);
this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 示意图 ";
this.tabPage2.UseVisualStyleBackColor = true;
......@@ -601,7 +604,7 @@
this.picLine.Dock = System.Windows.Forms.DockStyle.Fill;
this.picLine.Location = new System.Drawing.Point(0, 0);
this.picLine.Name = "picLine";
this.picLine.Size = new System.Drawing.Size(1328, 606);
this.picLine.Size = new System.Drawing.Size(1328, 609);
this.picLine.TabIndex = 0;
this.picLine.TabStop = false;
//
......@@ -612,7 +615,7 @@
this.lblStatus.ForeColor = System.Drawing.Color.Green;
this.lblStatus.Location = new System.Drawing.Point(29, 46);
this.lblStatus.Name = "lblStatus";
this.lblStatus.Size = new System.Drawing.Size(82, 24);
this.lblStatus.Size = new System.Drawing.Size(65, 20);
this.lblStatus.TabIndex = 92;
this.lblStatus.Text = "等待启动";
//
......@@ -646,24 +649,24 @@
this.toolStripSeparator8,
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74);
this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62);
//
// 显示ToolStripMenuItem
//
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(124, 32);
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6);
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6);
//
// toolStripMenuItem1
//
this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(124, 32);
this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
//
......@@ -685,60 +688,60 @@
this.toolStripSeparator2,
this.退出ToolStripMenuItem});
this.操作ToolStripMenuItem.Name = "操作ToolStripMenuItem";
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(118, 31);
this.操作ToolStripMenuItem.Size = new System.Drawing.Size(96, 25);
this.操作ToolStripMenuItem.Text = " 设备操作 ";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6);
//
// 启动AToolStripMenuItem
//
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
//
// toolStripSeparator4
//
this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6);
//
// 复位RToolStripMenuItem
//
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6);
//
// 停止TToolStripMenuItem
//
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
//
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(221, 6);
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6);
this.toolStripSeparator2.Visible = false;
//
// 退出ToolStripMenuItem
//
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(224, 32);
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26);
this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
//
......@@ -750,81 +753,96 @@
this.toolStripSeparator7,
this.iO模块状态ToolStripMenuItem,
this.toolStripSeparator9,
this.toolStripMenuItem2,
this.toolStripSeparator13,
this.toolStripMenuItem3,
this.toolStripSeparator20,
this.托盘初始化ToolStripMenuItem,
this.toolStripSeparator14,
this.查看托盘信息ToolStripMenuItem,
this.toolStripSeparator12,
this.清空托盘信息ToolStripMenuItem});
this.设置TToolStripMenuItem.Name = "设置TToolStripMenuItem";
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(112, 31);
this.设置TToolStripMenuItem.Size = new System.Drawing.Size(91, 25);
this.设置TToolStripMenuItem.Text = "设备调试 ";
//
// toolStripSeparator6
//
this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator6.Visible = false;
//
// 二维码学习ToolStripMenuItem
//
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
//
// toolStripSeparator7
//
this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// iO模块状态ToolStripMenuItem
//
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.iO模块状态ToolStripMenuItem.Text = "IO模块状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem2
//
this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "查看异常列表";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click_1);
//
// toolStripSeparator13
//
this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6);
//
// toolStripMenuItem3
//
this.toolStripMenuItem3.Name = "toolStripMenuItem3";
this.toolStripMenuItem3.Size = new System.Drawing.Size(218, 32);
this.toolStripMenuItem3.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem3.Text = "查看禁用托盘";
this.toolStripMenuItem3.Click += new System.EventHandler(this.toolStripMenuItem3_Click);
//
// 托盘初始化ToolStripMenuItem
//
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6);
//
// 查看托盘信息ToolStripMenuItem
//
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(215, 6);
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6);
//
// 清空托盘信息ToolStripMenuItem
//
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(218, 32);
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
//
......@@ -837,37 +855,37 @@
this.toolStripSeparator11,
this.版本号ToolStripMenuItem});
this.帮助ToolStripMenuItem.Name = "帮助ToolStripMenuItem";
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(84, 31);
this.帮助ToolStripMenuItem.Size = new System.Drawing.Size(69, 25);
this.帮助ToolStripMenuItem.Text = " 系统 ";
//
// 清空日志ToolStripMenuItem
//
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
//
// toolStripSeparator10
//
this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(175, 6);
this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
//
// 复制日志ToolStripMenuItem
//
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
//
// toolStripSeparator11
//
this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(175, 6);
this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
//
// 版本号ToolStripMenuItem
//
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(178, 32);
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
//
......@@ -883,7 +901,7 @@
this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1350, 35);
this.menuStrip1.Size = new System.Drawing.Size(1350, 29);
this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1";
//
......@@ -903,83 +921,88 @@
this.自动保存托盘信息ToolStripMenuItem,
this.新托盘检测逻辑ToolStripMenuItem});
this.运行参数ToolStripMenuItem.Name = "运行参数ToolStripMenuItem";
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(106, 31);
this.运行参数ToolStripMenuItem.Size = new System.Drawing.Size(86, 25);
this.运行参数ToolStripMenuItem.Text = "运行参数";
//
// 开机自动启动ToolStripMenuItem
//
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.开机自动启动ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.开机自动启动ToolStripMenuItem.Text = "开机自动启动";
this.开机自动启动ToolStripMenuItem.Click += new System.EventHandler(this.开机自动启动ToolStripMenuItem_Click);
//
// toolStripSeparator15
//
this.toolStripSeparator15.Name = "toolStripSeparator15";
this.toolStripSeparator15.Size = new System.Drawing.Size(262, 6);
this.toolStripSeparator15.Size = new System.Drawing.Size(211, 6);
//
// 启用蜂鸣器ToolStripMenuItem
//
this.启用蜂鸣器ToolStripMenuItem.Name = "启用蜂鸣器ToolStripMenuItem";
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用蜂鸣器ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(262, 6);
this.toolStripSeparator16.Size = new System.Drawing.Size(211, 6);
//
// aGVCancelStateToolStripMenuItem
//
this.aGVCancelStateToolStripMenuItem.Name = "aGVCancelStateToolStripMenuItem";
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.aGVCancelStateToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
this.aGVCancelStateToolStripMenuItem.Click += new System.EventHandler(this.aGVCancelStateToolStripMenuItem_Click);
//
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(262, 6);
this.toolStripSeparator17.Size = new System.Drawing.Size(211, 6);
//
// 启用分流横移1ToolStripMenuItem
//
this.启用分流横移1ToolStripMenuItem.Name = "启用分流横移1ToolStripMenuItem";
this.启用分流横移1ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用分流横移1ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.启用分流横移1ToolStripMenuItem.Text = "✔启用分流横移1";
this.启用分流横移1ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移1ToolStripMenuItem_Click);
//
// toolStripSeparator18
//
this.toolStripSeparator18.Name = "toolStripSeparator18";
this.toolStripSeparator18.Size = new System.Drawing.Size(262, 6);
this.toolStripSeparator18.Size = new System.Drawing.Size(211, 6);
//
// 启用分流横移2ToolStripMenuItem
//
this.启用分流横移2ToolStripMenuItem.Name = "启用分流横移2ToolStripMenuItem";
this.启用分流横移2ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.启用分流横移2ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.启用分流横移2ToolStripMenuItem.Text = "✔启用分流横移2";
this.启用分流横移2ToolStripMenuItem.Click += new System.EventHandler(this.启用分流横移2ToolStripMenuItem_Click);
//
// toolStripSeparator19
//
this.toolStripSeparator19.Name = "toolStripSeparator19";
this.toolStripSeparator19.Size = new System.Drawing.Size(262, 6);
this.toolStripSeparator19.Size = new System.Drawing.Size(211, 6);
//
// 自动保存托盘信息ToolStripMenuItem
//
this.自动保存托盘信息ToolStripMenuItem.Name = "自动保存托盘信息ToolStripMenuItem";
this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.自动保存托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.自动保存托盘信息ToolStripMenuItem.Text = "自动保存托盘信息";
this.自动保存托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.自动保存托盘信息ToolStripMenuItem_Click);
//
// 新托盘检测逻辑ToolStripMenuItem
//
this.新托盘检测逻辑ToolStripMenuItem.Name = "新托盘检测逻辑ToolStripMenuItem";
this.新托盘检测逻辑ToolStripMenuItem.Size = new System.Drawing.Size(265, 32);
this.新托盘检测逻辑ToolStripMenuItem.Size = new System.Drawing.Size(214, 26);
this.新托盘检测逻辑ToolStripMenuItem.Text = "✔新托盘检测逻辑";
this.新托盘检测逻辑ToolStripMenuItem.Click += new System.EventHandler(this.新托盘检测逻辑ToolStripMenuItem_Click);
//
// toolStripSeparator20
//
this.toolStripSeparator20.Name = "toolStripSeparator20";
this.toolStripSeparator20.Size = new System.Drawing.Size(177, 6);
//
// FrmLineStore
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......@@ -1112,6 +1135,9 @@
private System.Windows.Forms.CheckBox chbSaveImg;
private System.Windows.Forms.Button btnOpenRfid;
private System.Windows.Forms.ToolStripMenuItem 新托盘检测逻辑ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator20;
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -1462,5 +1462,11 @@ namespace OnlineStore.AssemblyLine
}
LogUtil.info(Name + " 点击：" + 新托盘检测逻辑ToolStripMenuItem.Text);
}
private void toolStripMenuItem2_Click_1(object sender, EventArgs e)
{
FrmExceptionMsg frm = new FrmExceptionMsg();
frm.ShowDialog();
}
}
}
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -84,6 +84,7 @@
<Compile Include="assemblyLine\FeedingEquip_InStore.cs" />
<Compile Include="assemblyLine\ProvidingEquip.cs" />
<Compile Include="assemblyLine\FeedingEquip.cs" />
<Compile Include="assemblymanager\ExceptionMsgManager.cs" />
<Compile Include="assemblymanager\RFIDManagercs.cs" />
<Compile Include="assemblymanager\SServerManager.cs" />
<Compile Include="assemblymanager\TrayManager.cs" />
......
source/DeviceLibrary/assemblyLine/ProvidingEquip_Partial.cs
......@@ -181,7 +181,7 @@ namespace OnlineStore.DeviceLibrary
if(resCode==-1)
{
TrayDisableManager.AddDisableTray(trayNum);
TrayDisableManager.AddDisableTray(trayNum,Name, "【屏蔽料盘二次判断】【-1】");
LogUtil.info($"【屏蔽料盘二次判断】【-1】【需要禁用该托盘】【{tray.ToStr()}】");
}
else if (resCode==100)
......@@ -239,7 +239,7 @@ namespace OnlineStore.DeviceLibrary
(int resCode, taskInfo task) = SServerManager.getTaskInfo(barcode);
if (resCode == -1)
{
TrayDisableManager.AddDisableTray(trayNum);
TrayDisableManager.AddDisableTray(trayNum,Name, "【屏蔽料盘二次判断】【-1】【初次无料，第二次有料】");
LogUtil.info($"【屏蔽料盘二次判断】【-1】【初次无料，第二次有料】 【禁用该托盘】【{tray.ToStr()}】");
}
else if (resCode == 100)
......
source/DeviceLibrary/assemblymanager/ExceptionMsgManager.cs 0 → 100644
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary
{
/// <summary>
/// 异常信息管理
/// </summary>
public class ExceptionMsgManager
{
public static Dictionary<string, ExceptionMsg> msgMap = new Dictionary<string, ExceptionMsg>();
public static void updateMsg(string module, string name, string msg = "")
{
try
{
string key = module + "-" + name;
if (msgMap.ContainsKey(key))
{
if (!string.IsNullOrEmpty(msg))
{
ExceptionMsg obj = new ExceptionMsg(module, name, msg);
msgMap[key] = obj;
}
else
{
msgMap.Remove(key);
}
}
else
{
if (!string.IsNullOrEmpty(msg))
{
ExceptionMsg obj = new ExceptionMsg(module, name, msg);
msgMap.Add(key, obj);
}
}
}
catch (Exception ex)
{
LogUtil.error($"updateMsg[{module}][{name}][{msg}] error :" + ex.ToString());
}
}
public static List<ExceptionMsg> getList()
{
return new List<ExceptionMsg>(msgMap.Values);
}
}
public class ExceptionMsg
{
public ExceptionMsg()
{
updateTime = DateTime.Now;
}
public ExceptionMsg(string module,string name,string msg)
{
this.module = module;
this.name = name;
this.message = msg;
updateTime = DateTime.Now;
}
public string module { get; set; }
public string name { get; set; }
public DateTime updateTime { get; set; }
public string message { get; set; }
}
}
source/DeviceLibrary/assemblymanager/RFIDManagercs.cs
......@@ -153,6 +153,7 @@ namespace OnlineStore.DeviceLibrary
string ip = GetRFIP(subType);
//获取盘号
RFIDData data = ReadRFID(ip, isClear);
string rfidT = DeviceConfig.RFIP_Str + "_" + subType.ToString().PadLeft(3, '0');
if (data != null)
{
if (data.RFType.Equals('E'))
......@@ -162,10 +163,12 @@ namespace OnlineStore.DeviceLibrary
if (!result)
{
LogUtil.error("RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 缓存验证失败，返回盘号 0");
ExceptionMsgManager.updateMsg(rfidT, ip, "读到数据 " + data.NumStr() + " 缓存验证失败，返回盘号 0");
return 0;
}
else
{
{
ExceptionMsgManager.updateMsg(rfidT, ip);
return data.Num;
}
}
......@@ -177,9 +180,14 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.debug("RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 返回盘号 0");
}
ExceptionMsgManager.updateMsg(rfidT, ip, "读到数据 " + data.NumStr() + " 返回盘号 0");
return 0;
}
else
{
ExceptionMsgManager.updateMsg(rfidT, ip, "读到数据为空，返回盘号 0");
}
return 0;
}
......
source/DeviceLibrary/assemblymanager/TrayDisableManager.cs
......@@ -108,10 +108,12 @@ namespace OnlineStore.DeviceLibrary
}
}
public static void AddDisableTray(int trayNum)
public static void AddDisableTray(int trayNum,string deviceName,string describe )
{
TrayDisableInfo t = new TrayDisableInfo();
t.TrayCode = trayNum;
t.DDescribe = describe;
t.DDeviceName = deviceName;
if (TrayDisableMap.ContainsKey(trayNum))
{
TrayDisableMap[trayNum] = t;
......
source/DeviceLibrary/baan/AxisBean.cs
......@@ -67,6 +67,7 @@ namespace OnlineStore.DeviceLibrary
//判断轴是否正常
string portName = Config.DeviceName;
int slvAddr = Config.GetAxisValue();
ExceptionMsgManager.updateMsg(AxisName, portName + "_" + slvAddr);
if (ACServerManager.ServerOnStatus(portName, slvAddr))
{
LogUtil.info(AxisName + "成功打开");
......@@ -88,6 +89,8 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.ServoOff(portName, slvAddr);
msg = "打开轴" + Config.Explain + "失败 ";
LogUtil.info(AxisName + msg);
ExceptionMsgManager.updateMsg(AxisName, portName+"_"+slvAddr, msg);
return false;
}
}
......
source/DeviceLibrary/deviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -49,6 +49,11 @@ namespace OnlineStore.DeviceLibrary
if (!aio.IsConn)
{
msg += $"[{aio.IP}]";
ExceptionMsgManager.updateMsg("IO模块", aio.IP, "IO模块" + aio.IP + "未连接");
}
else
{
ExceptionMsgManager.updateMsg("IO模块", aio.IP );
}
}
if (!String.IsNullOrEmpty(msg))
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
......@@ -134,9 +134,14 @@ namespace OnlineStore.DeviceLibrary
if (ho_Image == null)
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
ExceptionMsgManager.updateMsg(deviceName, cameraName, "取图片失败，关闭相机");
CloseCamera(cameraName);
continue;
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName, "");
}
LogUtil.debug(deviceName + " 【" + cameraName + "】取图片完成，开始扫码");
......@@ -166,6 +171,11 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
eyemNoCode = true;
ExceptionMsgManager.updateMsg(deviceName, cameraName, "eyem扫码超时");
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName );
}
if (!isPreScan)
{
......@@ -293,8 +303,13 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
ExceptionMsgManager.updateMsg(deviceName, cameraName, "取图片失败，关闭相机");
continue;
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName, "");
}
LogUtil.debug(deviceName + " 【" + cameraName + "】取图片完成，开始扫码");
......@@ -321,8 +336,13 @@ namespace OnlineStore.DeviceLibrary
if (!taskResult)
{
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
ExceptionMsgManager.updateMsg(deviceName, cameraName, "eyem扫码超时");
//eyemNoCode = true;
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName );
}
code = ProcessCode(codeList);
findCode = string.IsNullOrEmpty(code) ? false : true;
......@@ -585,8 +605,13 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error(deviceName + " 【" + cameraName + "】取图片失败[" + Camera._cam.ErrInfo + "]，关闭相机");
CloseCamera(cameraName);
ExceptionMsgManager.updateMsg(deviceName, cameraName, "取图片失败，关闭相机");
continue;
}
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName);
}
//取照片完成，先检测是否有料，有料才需要扫码，否则直接返回
hasReel = EyemManager.ReelCheck(bmp);
......@@ -621,8 +646,13 @@ namespace OnlineStore.DeviceLibrary
if (!taskResult)
{
LogUtil.error(deviceName + " 【" + cameraName + "】eyem扫码超时");
ExceptionMsgManager.updateMsg(deviceName, cameraName, "eyem扫码超时");
eyemNoCode = true;
}
else
{
ExceptionMsgManager.updateMsg(deviceName, cameraName );
}
if (!findRightCode)
{
......
source/DeviceLibrary/deviceLibrary/reelCheck/ReelCheckUtil.cs
......@@ -71,7 +71,7 @@ dMinorStep 步进，默认1.0。
///////////////////使用///////////////////
public static int[] ReelCheck(int deviceID, string cameraName ,out string imgName)
public static int[] ReelCheck(int deviceID, string cameraName, out string imgName)
{
imgName = "";
if (String.IsNullOrEmpty(cameraName))
......@@ -81,7 +81,7 @@ dMinorStep 步进，默认1.0。
Bitmap bitmap = MyCamera.AcqImage(cameraName);
if (bitmap == null)
{
string file =ConfigAppSettings.GetValue("TESTFILE", @"D:\皮带线料盘识别\128\r-camera-1-20220128-13134651.bmp");
string file = ConfigAppSettings.GetValue("TESTFILE", @"D:\皮带线料盘识别\128\r-camera-1-20220128-13134651.bmp");
if (File.Exists(file))
{
bitmap = new Bitmap(file);
......@@ -89,9 +89,14 @@ dMinorStep 步进，默认1.0。
}
if (bitmap == null)
{
LogUtil.error("ReelCheckUtil :ReelCheck [" + cameraName + "] 获取图片失败 ");
LogUtil.error("ReelCheckUtil :ReelCheck [" + cameraName + "] 获取图片失败 ");
ExceptionMsgManager.updateMsg("ReelCheck", cameraName, "ReelCheck [" + cameraName + "] 获取图片失败");
return null;
}
else
{
ExceptionMsgManager.updateMsg("ReelCheck", cameraName );
}
//if (SaveImage)
//{
// string path = "D:\\image\\"+ cameraName + "\\SourceImg\\";
......
source/DeviceLibrary/model/KTK_Store.cs
......@@ -612,6 +612,11 @@ namespace OnlineStore.DeviceLibrary
}
}
ExceptionMsgManager.updateMsg(Name,"",msg);
}
else
{
ExceptionMsgManager.updateMsg(Name, "");
}
if (!warnParam.AlarmType.Equals(alarmType))
......
source/DeviceLibrary/model/TrayInfo.cs
......@@ -105,7 +105,8 @@ namespace OnlineStore.DeviceLibrary
public class TrayDisableInfo
{
public TrayDisableInfo()
{
{
DisableTime = DateTime.Now;
}
public TrayDisableInfo(int trayNum,string deviceName,string describle)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!