Skip to content

孙克 / RC1250-ACPackingStore

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

rfid，io更新，界面调整

1 个父辈 3b0cd387
内嵌 并排
正在显示 17 个修改的文件 包含 397 行增加 和 438 行删除
dll/Asa.IOModule.AIOBOX.xml
...@@ -331,11 +331,12 @@ ...@@ -331,11 +331,12 @@
日志操作类 日志操作类
</summary> </summary>
</member> </member>
<member name="M:Asa.IOModule.LogFile.#ctor(System.String)"> <member name="M:Asa.IOModule.LogFile.#ctor(System.String,System.String)">
<summary> <summary>
日志 日志
</summary> </summary>
<param name="path">文件夹路径</param> <param name="path">文件夹路径</param>
<param name="args"></param>
</member> </member>
<member name="M:Asa.IOModule.LogFile.Close"> <member name="M:Asa.IOModule.LogFile.Close">
<summary> <summary>
......
dll/RFID/Asa.RFID.xml
...@@ -9,26 +9,11 @@ ...@@ -9,26 +9,11 @@
RFID读卡器 RFID读卡器
</summary> </summary>
</member> </member>
<member name="E:Asa.RFID.Reader.Data_Received">
<summary>
自动扫描接收到的数据
</summary>
</member>
<member name="M:Asa.RFID.Reader.#ctor"> <member name="M:Asa.RFID.Reader.#ctor">
<summary> <summary>
RFID读卡器 RFID读卡器
</summary> </summary>
</member> </member>
<member name="P:Asa.RFID.Reader.LocalIP">
<summary>
本地IP地址，用于查找或修改远程IP
</summary>
</member>
<member name="P:Asa.RFID.Reader.RemoteIP">
<summary>
远程IP地址
</summary>
</member>
<member name="P:Asa.RFID.Reader.IsConn"> <member name="P:Asa.RFID.Reader.IsConn">
<summary> <summary>
是否连接 是否连接
...@@ -44,35 +29,33 @@ ...@@ -44,35 +29,33 @@
是否存在ID卡 是否存在ID卡
</summary> </summary>
</member> </member>
<member name="M:Asa.RFID.Reader.Connect"> <member name="P:Asa.RFID.Reader.ErrCode">
<summary> <summary>
连接 错误代码
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.RFID.Reader.Close"> <member name="P:Asa.RFID.Reader.ID">
<summary> <summary>
关闭 ID号码
</summary> </summary>
</member> </member>
<member name="M:Asa.RFID.Reader.FindRFID"> <member name="M:Asa.RFID.Reader.Connect(System.String,System.Boolean)">
<summary> <summary>
查找电子标签 连接
</summary> </summary>
<param name="ip">设备IP地址</param>
<param name="autoScan">自动扫描</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.RFID.Reader.AutoScan(System.Boolean,System.Int32)"> <member name="M:Asa.RFID.Reader.Close">
<summary> <summary>
自动读取扫描，使用查找模式 关闭
</summary> </summary>
<param name="open">扫描模式开启，true扫描</param>
<param name="time">间隔时间</param>
</member> </member>
<member name="M:Asa.RFID.Reader.AutoScan(System.Boolean)"> <member name="M:Asa.RFID.Reader.FindRFID">
<summary> <summary>
自动读取扫描，使用扫描模式，扫描模式只读 查找电子标签，扫描模式不能使用
</summary> </summary>
<param name="open">扫描模式开启，true扫描</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.RFID.Reader.Read"> <member name="M:Asa.RFID.Reader.Read">
...@@ -91,38 +74,20 @@ ...@@ -91,38 +74,20 @@
</member> </member>
<member name="M:Asa.RFID.Reader.Write(System.Byte[])"> <member name="M:Asa.RFID.Reader.Write(System.Byte[])">
<summary> <summary>
写入数据到电子标签 写入数据到电子标签，扫描模式不能使用
</summary> </summary>
<param name="buff">数据，必须小于等于112字节</param> <param name="buff">数据，必须小于等于112字节</param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.RFID.Reader.Write(System.Byte[],System.Int32)"> <member name="M:Asa.RFID.Reader.Write(System.Byte[],System.Int32)">
<summary> <summary>
写入数据到电子标签 写入数据到电子标签，扫描模式不能使用
</summary> </summary>
<param name="buff"></param> <param name="buff"></param>
<param name="start"></param> <param name="start"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.RFID.Reader.FindIP"> <member name="M:Asa.RFID.Reader.Receive">
<summary>
查找IP地址，需要设置LocalIP
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader.ModifyIP(System.String)">
<summary>
修改IP地址
</summary>
<param name="IP"></param>
</member>
<member name="M:Asa.RFID.Reader.Receive(System.Object)">
<summary>
自动扫描接受数据事件
</summary>
<param name="param"></param>
</member>
<member name="M:Asa.RFID.Reader.Receive2">
<summary> <summary>
自动扫描接受数据事件 自动扫描接受数据事件
</summary> </summary>
...@@ -153,25 +118,156 @@ ...@@ -153,25 +118,156 @@
<param name="start"></param> <param name="start"></param>
<param name="len"></param> <param name="len"></param>
</member> </member>
<member name="T:Asa.RFID.ReaderInfo"> <member name="T:Asa.RFID.Reader2">
<summary>
RFID读卡器
</summary>
</member>
<member name="M:Asa.RFID.Reader2.#ctor">
<summary>
RFID读卡器
</summary>
</member>
<member name="M:Asa.RFID.Reader2.IsConn(System.Int32)">
<summary>
是否连接
</summary>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.AddIP(System.String[])">
<summary>
添加设备IP地址
</summary>
<param name="ip"></param>
</member>
<member name="M:Asa.RFID.Reader2.Connect(System.Boolean)">
<summary>
连接
</summary>
<param name="autoScan">自动扫描</param>
</member>
<member name="M:Asa.RFID.Reader2.Connect(System.Int32,System.Boolean)">
<summary>
连接
</summary>
<param name="index"></param>
<param name="autoScan">自动扫描</param>
</member>
<member name="M:Asa.RFID.Reader2.Close">
<summary>
关闭所有
</summary>
</member>
<member name="M:Asa.RFID.Reader2.Close(System.Int32)">
<summary>
关闭
</summary>
<param name="index"></param>
</member>
<member name="M:Asa.RFID.Reader2.FindRFID(System.Int32)">
<summary>
查找电子标签
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.GetID(System.Int32)">
<summary>
ID号码
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Read(System.Int32)">
<summary>
读取电子标签
</summary>
<param name="index"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Read(System.Int32,System.Int32,System.Int32)">
<summary>
读取电子标签
</summary>
<param name="index"></param>
<param name="start"></param>
<param name="len"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.Write(System.Int32,System.Byte[],System.Int32)">
<summary>
写入数据到电子标签
</summary>
<param name="index"></param>
<param name="buff"></param>
<param name="start"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.Reader2.AutoScan(System.Int32,System.Boolean)">
<summary>
自动读取扫描，扫描模式只读
</summary>
<param name="idx"></param>
<param name="open"></param>
</member>
<member name="M:Asa.RFID.Reader2.Receive(System.Object)">
<summary>
自动扫描接受数据事件
</summary>
</member>
<member name="M:Asa.RFID.Reader2.Find(System.Int32)">
<summary>
查找电子标签
</summary>
<param name="idx"></param>
</member>
<member name="M:Asa.RFID.Reader2.ReadRFID(System.Int32)">
<summary>
读取电子标签内所有数据
</summary>
<param name="idx"></param>
</member>
<member name="M:Asa.RFID.Reader2.ReadRFID(System.Int32,System.Int32)">
<summary> <summary>
读卡设备信息 读取电子标签指定块
</summary> </summary>
<param name="idx"></param>
<param name="num"></param>
</member> </member>
<member name="F:Asa.RFID.ReaderInfo.IP"> <member name="M:Asa.RFID.Reader2.WriteRFID(System.Int32,System.Int32)">
<summary> <summary>
IP地址 写入指定块数据到电子标签
</summary> </summary>
<param name="idx"></param>
<param name="num"></param>
<returns></returns>
</member> </member>
<member name="F:Asa.RFID.ReaderInfo.Mac"> <member name="T:Asa.RFID.IP">
<summary> <summary>
MAC地址 IP地址操作
</summary> </summary>
</member> </member>
<member name="F:Asa.RFID.ReaderInfo.Port"> <member name="M:Asa.RFID.IP.Find(System.String)">
<summary> <summary>
端口 查找IP地址
</summary> </summary>
<param name="localIP"></param>
<returns></returns>
</member>
<member name="M:Asa.RFID.IP.Modify(System.String,System.String,System.String)">
<summary>
修改IP地址，需要先查找IP
</summary>
<param name="localIP">本地IP</param>
<param name="beforeIP">修改前的IP</param>
<param name="afterIP">修改后的IP</param>
<returns></returns>
</member>
<member name="M:Asa.RFID.IP.GetLocal">
<summary>
获取本地IPv4地址
</summary>
<returns></returns>
</member> </member>
</members> </members>
</doc> </doc>
dll/RFID/ClassLibrary1.dll 0 → 100644
此文件类型无法预览
dll/RFID/ConsoleApp1.exe 0 → 100644
此文件类型无法预览
dll/RFID/ReadMe.txt 0 → 100644
1.0.0.0 2019-11-19
1、钉盘上传
\ No newline at end of file \ No newline at end of file
source/ACPackingStore/FrmBox.Designer.cs
...@@ -147,9 +147,9 @@ ...@@ -147,9 +147,9 @@
this.groupShelf.Controls.Add(this.btnUpdownP102); this.groupShelf.Controls.Add(this.btnUpdownP102);
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(517, 201); this.groupShelf.Location = new System.Drawing.Point(517, 191);
this.groupShelf.Name = "groupShelf"; this.groupShelf.Name = "groupShelf";
this.groupShelf.Size = new System.Drawing.Size(236, 574); this.groupShelf.Size = new System.Drawing.Size(236, 520);
this.groupShelf.TabIndex = 274; this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false; this.groupShelf.TabStop = false;
this.groupShelf.Text = "料架位置"; this.groupShelf.Text = "料架位置";
...@@ -457,10 +457,10 @@ ...@@ -457,10 +457,10 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Location = new System.Drawing.Point(759, 71); this.tabControl1.Location = new System.Drawing.Point(759, 63);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(595, 704); this.tabControl1.Size = new System.Drawing.Size(595, 648);
this.tabControl1.TabIndex = 272; this.tabControl1.TabIndex = 272;
// //
// tabPage1 // tabPage1
...@@ -470,7 +470,7 @@ ...@@ -470,7 +470,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(587, 671); this.tabPage1.Size = new System.Drawing.Size(587, 615);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服调试 "; this.tabPage1.Text = " 伺服调试 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -487,9 +487,9 @@ ...@@ -487,9 +487,9 @@
this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.label1);
this.groupBox1.Enabled = false; this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(14, 529); this.groupBox1.Location = new System.Drawing.Point(14, 492);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(559, 131); this.groupBox1.Size = new System.Drawing.Size(559, 114);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "压紧轴位置配置"; this.groupBox1.Text = "压紧轴位置配置";
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control; this.btnSaveCom.BackColor = System.Drawing.SystemColors.Control;
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(379, 77); this.btnSaveCom.Location = new System.Drawing.Point(379, 59);
this.btnSaveCom.Name = "btnSaveCom"; this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(105, 38); this.btnSaveCom.Size = new System.Drawing.Size(105, 38);
this.btnSaveCom.TabIndex = 256; this.btnSaveCom.TabIndex = 256;
...@@ -514,7 +514,7 @@ ...@@ -514,7 +514,7 @@
this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMax.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(413, 35); this.txtComMax.Location = new System.Drawing.Point(413, 27);
this.txtComMax.MaxLength = 12; this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax"; this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -528,7 +528,7 @@ ...@@ -528,7 +528,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default; this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText; this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(392, 38); this.label47.Location = new System.Drawing.Point(392, 30);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(13, 17); this.label47.Size = new System.Drawing.Size(13, 17);
...@@ -542,7 +542,7 @@ ...@@ -542,7 +542,7 @@
this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComMin.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(302, 35); this.txtComMin.Location = new System.Drawing.Point(302, 27);
this.txtComMin.MaxLength = 12; this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin"; this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default; this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText; this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(211, 38); this.label48.Location = new System.Drawing.Point(211, 30);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(83, 17); this.label48.Size = new System.Drawing.Size(83, 17);
...@@ -573,7 +573,7 @@ ...@@ -573,7 +573,7 @@
this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCMove.ForeColor = System.Drawing.Color.Purple; this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(95, 82); this.btnCMove.Location = new System.Drawing.Point(95, 64);
this.btnCMove.Name = "btnCMove"; this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(174, 33); this.btnCMove.Size = new System.Drawing.Size(174, 33);
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbPlateH.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true; this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(95, 32); this.cmbPlateH.Location = new System.Drawing.Point(95, 24);
this.cmbPlateH.Name = "cmbPlateH"; this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(95, 28); this.cmbPlateH.Size = new System.Drawing.Size(95, 28);
this.cmbPlateH.TabIndex = 176; this.cmbPlateH.TabIndex = 176;
...@@ -600,7 +600,7 @@ ...@@ -600,7 +600,7 @@
this.label1.Cursor = System.Windows.Forms.Cursors.Default; this.label1.Cursor = System.Windows.Forms.Cursors.Default;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ForeColor = System.Drawing.SystemColors.ControlText; this.label1.ForeColor = System.Drawing.SystemColors.ControlText;
this.label1.Location = new System.Drawing.Point(30, 38); this.label1.Location = new System.Drawing.Point(30, 30);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label1.Size = new System.Drawing.Size(59, 17); this.label1.Size = new System.Drawing.Size(59, 17);
...@@ -613,7 +613,7 @@ ...@@ -613,7 +613,7 @@
this.axisMoveControl1.Enabled = false; this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(7, 7); this.axisMoveControl1.Location = new System.Drawing.Point(7, 7);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(574, 529); this.axisMoveControl1.Size = new System.Drawing.Size(574, 473);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// tabPage2 // tabPage2
...@@ -747,7 +747,7 @@ ...@@ -747,7 +747,7 @@
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbDebug); this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Location = new System.Drawing.Point(7, 73); this.groupBox3.Location = new System.Drawing.Point(7, 65);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(746, 124); this.groupBox3.Size = new System.Drawing.Size(746, 124);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
...@@ -844,9 +844,9 @@ ...@@ -844,9 +844,9 @@
this.groupInout.Controls.Add(this.btnUpDownP3); this.groupInout.Controls.Add(this.btnUpDownP3);
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(7, 201); this.groupInout.Location = new System.Drawing.Point(7, 191);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(503, 574); this.groupInout.Size = new System.Drawing.Size(503, 520);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
...@@ -856,7 +856,7 @@ ...@@ -856,7 +856,7 @@
this.lblTemp.AutoSize = true; this.lblTemp.AutoSize = true;
this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTemp.ForeColor = System.Drawing.Color.Black; this.lblTemp.ForeColor = System.Drawing.Color.Black;
this.lblTemp.Location = new System.Drawing.Point(11, 494); this.lblTemp.Location = new System.Drawing.Point(10, 468);
this.lblTemp.Name = "lblTemp"; this.lblTemp.Name = "lblTemp";
this.lblTemp.Size = new System.Drawing.Size(159, 20); this.lblTemp.Size = new System.Drawing.Size(159, 20);
this.lblTemp.TabIndex = 270; this.lblTemp.TabIndex = 270;
...@@ -878,7 +878,7 @@ ...@@ -878,7 +878,7 @@
this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control; this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(362, 490); this.btnSavePosition.Location = new System.Drawing.Point(379, 468);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(105, 38); this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
this.btnSavePosition.TabIndex = 217; this.btnSavePosition.TabIndex = 217;
...@@ -1438,7 +1438,7 @@ ...@@ -1438,7 +1438,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1364, 787); this.ClientSize = new System.Drawing.Size(1364, 713);
this.Controls.Add(this.groupShelf); this.Controls.Add(this.groupShelf);
this.Controls.Add(this.panel1); this.Controls.Add(this.panel1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
......
source/ACPackingStore/FrmRFIPEdit.Designer.cs
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblResult = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.numNum)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numNum)).BeginInit();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
...@@ -56,7 +57,7 @@ ...@@ -56,7 +57,7 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(80, 36); this.label1.Location = new System.Drawing.Point(83, 36);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(107, 20); this.label1.Size = new System.Drawing.Size(107, 20);
this.label1.TabIndex = 0; this.label1.TabIndex = 0;
...@@ -67,7 +68,7 @@ ...@@ -67,7 +68,7 @@
// //
this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBack.Location = new System.Drawing.Point(295, 235); this.btnBack.Location = new System.Drawing.Point(283, 257);
this.btnBack.Name = "btnBack"; this.btnBack.Name = "btnBack";
this.btnBack.Size = new System.Drawing.Size(120, 45); this.btnBack.Size = new System.Drawing.Size(120, 45);
this.btnBack.TabIndex = 274; this.btnBack.TabIndex = 274;
...@@ -78,7 +79,7 @@ ...@@ -78,7 +79,7 @@
// txtIP // txtIP
// //
this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtIP.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtIP.Location = new System.Drawing.Point(196, 82); this.txtIP.Location = new System.Drawing.Point(195, 78);
this.txtIP.Name = "txtIP"; this.txtIP.Name = "txtIP";
this.txtIP.Size = new System.Drawing.Size(233, 26); this.txtIP.Size = new System.Drawing.Size(233, 26);
this.txtIP.TabIndex = 276; this.txtIP.TabIndex = 276;
...@@ -88,7 +89,7 @@ ...@@ -88,7 +89,7 @@
this.comboxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.comboxType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comboxType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.comboxType.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comboxType.FormattingEnabled = true; this.comboxType.FormattingEnabled = true;
this.comboxType.Location = new System.Drawing.Point(196, 33); this.comboxType.Location = new System.Drawing.Point(195, 33);
this.comboxType.Name = "comboxType"; this.comboxType.Name = "comboxType";
this.comboxType.Size = new System.Drawing.Size(233, 28); this.comboxType.Size = new System.Drawing.Size(233, 28);
this.comboxType.TabIndex = 277; this.comboxType.TabIndex = 277;
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(109, 84); this.label2.Location = new System.Drawing.Point(111, 80);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(78, 20); this.label2.Size = new System.Drawing.Size(78, 20);
this.label2.TabIndex = 278; this.label2.TabIndex = 278;
...@@ -118,7 +119,7 @@ ...@@ -118,7 +119,7 @@
"C", "C",
"D", "D",
"E"}); "E"});
this.comType.Location = new System.Drawing.Point(196, 129); this.comType.Location = new System.Drawing.Point(195, 158);
this.comType.Name = "comType"; this.comType.Name = "comType";
this.comType.Size = new System.Drawing.Size(120, 28); this.comType.Size = new System.Drawing.Size(120, 28);
this.comType.TabIndex = 280; this.comType.TabIndex = 280;
...@@ -128,7 +129,7 @@ ...@@ -128,7 +129,7 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(122, 132); this.label3.Location = new System.Drawing.Point(122, 161);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(65, 20); this.label3.Size = new System.Drawing.Size(65, 20);
this.label3.TabIndex = 279; this.label3.TabIndex = 279;
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
// //
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.button1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(151, 235); this.button1.Location = new System.Drawing.Point(139, 257);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(120, 45); this.button1.Size = new System.Drawing.Size(120, 45);
this.button1.TabIndex = 281; this.button1.TabIndex = 281;
...@@ -152,7 +153,7 @@ ...@@ -152,7 +153,7 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(136, 180); this.label4.Location = new System.Drawing.Point(136, 207);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(51, 20); this.label4.Size = new System.Drawing.Size(51, 20);
this.label4.TabIndex = 282; this.label4.TabIndex = 282;
...@@ -162,7 +163,7 @@ ...@@ -162,7 +163,7 @@
// numNum // numNum
// //
this.numNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.numNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numNum.Location = new System.Drawing.Point(196, 178); this.numNum.Location = new System.Drawing.Point(195, 203);
this.numNum.Name = "numNum"; this.numNum.Name = "numNum";
this.numNum.Size = new System.Drawing.Size(120, 26); this.numNum.Size = new System.Drawing.Size(120, 26);
this.numNum.TabIndex = 283; this.numNum.TabIndex = 283;
...@@ -222,6 +223,7 @@ ...@@ -222,6 +223,7 @@
this.groupBox1.TabIndex = 290; this.groupBox1.TabIndex = 290;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "搜索RFID"; this.groupBox1.Text = "搜索RFID";
this.groupBox1.Visible = false;
// //
// label6 // label6
// //
...@@ -237,8 +239,10 @@ ...@@ -237,8 +239,10 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left))); | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox2.Controls.Add(this.lblResult);
this.groupBox2.Controls.Add(this.comboxType); this.groupBox2.Controls.Add(this.comboxType);
this.groupBox2.Controls.Add(this.label1); this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.button1); this.groupBox2.Controls.Add(this.button1);
...@@ -249,18 +253,30 @@ ...@@ -249,18 +253,30 @@
this.groupBox2.Controls.Add(this.label3); this.groupBox2.Controls.Add(this.label3);
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.comType); this.groupBox2.Controls.Add(this.comType);
this.groupBox2.Location = new System.Drawing.Point(22, 160); this.groupBox2.Location = new System.Drawing.Point(22, 12);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(614, 319); this.groupBox2.Size = new System.Drawing.Size(489, 325);
this.groupBox2.TabIndex = 291; this.groupBox2.TabIndex = 291;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "读取RFID"; this.groupBox2.Text = "读取RFID";
// //
// lblResult
//
this.lblResult.AutoSize = true;
this.lblResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblResult.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblResult.Location = new System.Drawing.Point(195, 121);
this.lblResult.Name = "lblResult";
this.lblResult.Size = new System.Drawing.Size(79, 20);
this.lblResult.TabIndex = 284;
this.lblResult.Text = "读取到数据";
this.lblResult.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// FrmRFIPEdit // FrmRFIPEdit
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(662, 503); this.ClientSize = new System.Drawing.Size(560, 361);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
...@@ -295,5 +311,6 @@ ...@@ -295,5 +311,6 @@
private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.GroupBox groupBox2; private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label lblResult;
} }
} }
\ No newline at end of file \ No newline at end of file
source/ACPackingStore/FrmRFIPEdit.cs
...@@ -74,7 +74,9 @@ namespace OnlineStore.ACPackingStore ...@@ -74,7 +74,9 @@ namespace OnlineStore.ACPackingStore
} }
} }
lblResult.Text = resul;
MessageBox.Show("读取到数据：" + resul); MessageBox.Show("读取到数据：" + resul);
} }
private void comboxType_SelectedIndexChanged(object sender, EventArgs e) private void comboxType_SelectedIndexChanged(object sender, EventArgs e)
...@@ -94,8 +96,8 @@ namespace OnlineStore.ACPackingStore ...@@ -94,8 +96,8 @@ namespace OnlineStore.ACPackingStore
private void btnSearch_Click(object sender, EventArgs e) private void btnSearch_Click(object sender, EventArgs e)
{ {
string text = cmbLocalIp.Text; string text = cmbLocalIp.Text;
string ip = RFIDManager.SearchIP(text); // string ip = RFIDManager.SearchIP(text);
txtSearchIp.Text = ip; // txtSearchIp.Text = ip;
} }
} }
} }
source/ACPackingStore/FrmStore.Designer.cs
...@@ -61,9 +61,9 @@ ...@@ -61,9 +61,9 @@
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.显示ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
...@@ -78,11 +78,11 @@ ...@@ -78,11 +78,11 @@
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed; this.tabControl1.DrawMode = System.Windows.Forms.TabDrawMode.OwnerDrawFixed;
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(12, 76); this.tabControl1.Location = new System.Drawing.Point(5, 75);
this.tabControl1.Multiline = true; this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1740, 652); this.tabControl1.Size = new System.Drawing.Size(1342, 650);
this.tabControl1.TabIndex = 0; this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
// //
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1732, 619); this.tabPage1.Size = new System.Drawing.Size(1334, 617);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 日志信息 "; this.tabPage1.Text = " 日志信息 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
// //
this.chbUseBuzzer.AutoSize = true; this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(623, 31); this.chbUseBuzzer.Location = new System.Drawing.Point(623, 13);
this.chbUseBuzzer.Name = "chbUseBuzzer"; this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24); this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195; this.chbUseBuzzer.TabIndex = 195;
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
// //
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(285, 30); this.chkDebug.Location = new System.Drawing.Point(285, 12);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24); this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(437, 30); this.chbAutoRun.Location = new System.Drawing.Point(437, 12);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24); this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
// //
this.btnCopyLog.BackColor = System.Drawing.Color.White; this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(19, 25); this.btnCopyLog.Location = new System.Drawing.Point(19, 7);
this.btnCopyLog.Name = "btnCopyLog"; this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35); this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191; this.btnCopyLog.TabIndex = 191;
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
// //
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(130, 25); this.btnClearLog.Location = new System.Drawing.Point(130, 7);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -167,9 +167,9 @@ ...@@ -167,9 +167,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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(10, 80); this.logBox.Location = new System.Drawing.Point(10, 48);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1714, 533); this.logBox.Size = new System.Drawing.Size(1316, 563);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
// //
...@@ -179,9 +179,9 @@ ...@@ -179,9 +179,9 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarnMsg.ForeColor = System.Drawing.Color.Red; this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
this.lblWarnMsg.Location = new System.Drawing.Point(601, 4); this.lblWarnMsg.Location = new System.Drawing.Point(281, 4);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1141, 69); this.lblWarnMsg.Size = new System.Drawing.Size(1045, 69);
this.lblWarnMsg.TabIndex = 96; this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -195,7 +195,7 @@ ...@@ -195,7 +195,7 @@
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1766, 29); this.menuStrip1.Size = new System.Drawing.Size(1350, 29);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -343,19 +343,24 @@ ...@@ -343,19 +343,24 @@
this.toolStripSeparator8, this.toolStripSeparator8,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(181, 84); this.contextMenuStrip1.Size = new System.Drawing.Size(113, 62);
// //
// 显示ToolStripMenuItem // 显示ToolStripMenuItem
// //
this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem"; this.显示ToolStripMenuItem.Name = "显示ToolStripMenuItem";
this.显示ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.显示ToolStripMenuItem.Size = new System.Drawing.Size(112, 26);
this.显示ToolStripMenuItem.Text = "显示"; this.显示ToolStripMenuItem.Text = "显示";
this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click); this.显示ToolStripMenuItem.Click += new System.EventHandler(this.显示ToolStripMenuItem_Click);
// //
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(109, 6);
//
// toolStripMenuItem1 // toolStripMenuItem1
// //
this.toolStripMenuItem1.Name = "toolStripMenuItem1"; this.toolStripMenuItem1.Name = "toolStripMenuItem1";
this.toolStripMenuItem1.Size = new System.Drawing.Size(180, 26); this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.toolStripMenuItem1_Click);
// //
...@@ -364,17 +369,12 @@ ...@@ -364,17 +369,12 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// toolStripSeparator8
//
this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(177, 6);
//
// FrmStore // FrmStore
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1766, 733); this.ClientSize = new System.Drawing.Size(1350, 729);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
......
source/ACPackingStore/useControl/AxisMoveControl.Designer.cs
...@@ -66,10 +66,14 @@ ...@@ -66,10 +66,14 @@
this.comboBox1 = new System.Windows.Forms.ComboBox(); this.comboBox1 = new System.Windows.Forms.ComboBox();
this.label49 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.axis_4_Alarm = new UserFromControl.IOStatusControl();
this.txt4Target = new System.Windows.Forms.TextBox(); this.txt4Target = new System.Windows.Forms.TextBox();
this.lblTargetP4 = new System.Windows.Forms.TextBox(); this.lblTargetP4 = new System.Windows.Forms.TextBox();
this.lblActual4 = new System.Windows.Forms.TextBox(); this.lblActual4 = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label(); this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox(); this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox(); this.txtInoutTarget = new System.Windows.Forms.TextBox();
...@@ -86,10 +90,6 @@ ...@@ -86,10 +90,6 @@
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.label43 = new System.Windows.Forms.Label(); this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label(); this.label42 = new System.Windows.Forms.Label();
this.axis_4_Alarm = new UserFromControl.IOStatusControl();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupAxis.Location = new System.Drawing.Point(5, 5); this.groupAxis.Location = new System.Drawing.Point(5, 5);
this.groupAxis.Name = "groupAxis"; this.groupAxis.Name = "groupAxis";
this.groupAxis.Size = new System.Drawing.Size(539, 320); this.groupAxis.Size = new System.Drawing.Size(539, 279);
this.groupAxis.TabIndex = 217; this.groupAxis.TabIndex = 217;
this.groupAxis.TabStop = false; this.groupAxis.TabStop = false;
this.groupAxis.Text = "伺服运动"; this.groupAxis.Text = "伺服运动";
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
// label7 // label7
// //
this.label7.AutoSize = true; this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(51, 172); this.label7.Location = new System.Drawing.Point(51, 144);
this.label7.Name = "label7"; this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(59, 17); this.label7.Size = new System.Drawing.Size(59, 17);
this.label7.TabIndex = 328; this.label7.TabIndex = 328;
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
// txtServoStatue // txtServoStatue
// //
this.txtServoStatue.Enabled = false; this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(112, 169); this.txtServoStatue.Location = new System.Drawing.Point(112, 141);
this.txtServoStatue.Name = "txtServoStatue"; this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23); this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327; this.txtServoStatue.TabIndex = 327;
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
// label17 // label17
// //
this.label17.AutoSize = true; this.label17.AutoSize = true;
this.label17.Location = new System.Drawing.Point(150, 272); this.label17.Location = new System.Drawing.Point(150, 244);
this.label17.Name = "label17"; this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(71, 17); this.label17.Size = new System.Drawing.Size(71, 17);
this.label17.TabIndex = 316; this.label17.TabIndex = 316;
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
// txtLimit2 // txtLimit2
// //
this.txtLimit2.Enabled = false; this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(226, 269); this.txtLimit2.Location = new System.Drawing.Point(226, 241);
this.txtLimit2.Name = "txtLimit2"; this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23); this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313; this.txtLimit2.TabIndex = 313;
...@@ -181,7 +181,7 @@ ...@@ -181,7 +181,7 @@
// label19 // label19
// //
this.label19.AutoSize = true; this.label19.AutoSize = true;
this.label19.Location = new System.Drawing.Point(150, 238); this.label19.Location = new System.Drawing.Point(150, 210);
this.label19.Name = "label19"; this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(71, 17); this.label19.Size = new System.Drawing.Size(71, 17);
this.label19.TabIndex = 312; this.label19.TabIndex = 312;
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
// txtLimit1 // txtLimit1
// //
this.txtLimit1.Enabled = false; this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(226, 235); this.txtLimit1.Location = new System.Drawing.Point(226, 207);
this.txtLimit1.Name = "txtLimit1"; this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23); this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309; this.txtLimit1.TabIndex = 309;
...@@ -199,7 +199,7 @@ ...@@ -199,7 +199,7 @@
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(162, 204); this.label6.Location = new System.Drawing.Point(162, 176);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17); this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300; this.label6.TabIndex = 300;
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
// txtHomeSingle // txtHomeSingle
// //
this.txtHomeSingle.Enabled = false; this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(226, 201); this.txtHomeSingle.Location = new System.Drawing.Point(226, 173);
this.txtHomeSingle.Name = "txtHomeSingle"; this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23); this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297; this.txtHomeSingle.TabIndex = 297;
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
// label11 // label11
// //
this.label11.AutoSize = true; this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(5, 272); this.label11.Location = new System.Drawing.Point(5, 244);
this.label11.Name = "label11"; this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17); this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.TabIndex = 292; this.label11.TabIndex = 292;
...@@ -225,7 +225,7 @@ ...@@ -225,7 +225,7 @@
// txtHomeStatus // txtHomeStatus
// //
this.txtHomeStatus.Enabled = false; this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(112, 269); this.txtHomeStatus.Location = new System.Drawing.Point(112, 241);
this.txtHomeStatus.Name = "txtHomeStatus"; this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23); this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291; this.txtHomeStatus.TabIndex = 291;
...@@ -233,7 +233,7 @@ ...@@ -233,7 +233,7 @@
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(44, 238); this.label10.Location = new System.Drawing.Point(44, 210);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17); this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289; this.label10.TabIndex = 289;
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
// txtBusyStatus // txtBusyStatus
// //
this.txtBusyStatus.Enabled = false; this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(112, 235); this.txtBusyStatus.Location = new System.Drawing.Point(112, 207);
this.txtBusyStatus.Name = "txtBusyStatus"; this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23); this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288; this.txtBusyStatus.TabIndex = 288;
...@@ -250,7 +250,7 @@ ...@@ -250,7 +250,7 @@
// label2 // label2
// //
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(51, 204); this.label2.Location = new System.Drawing.Point(51, 176);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(59, 17); this.label2.Size = new System.Drawing.Size(59, 17);
this.label2.TabIndex = 286; this.label2.TabIndex = 286;
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
// txtAlarmStatus // txtAlarmStatus
// //
this.txtAlarmStatus.Enabled = false; this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(112, 201); this.txtAlarmStatus.Location = new System.Drawing.Point(112, 173);
this.txtAlarmStatus.Name = "txtAlarmStatus"; this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23); this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285; this.txtAlarmStatus.TabIndex = 285;
...@@ -268,7 +268,7 @@ ...@@ -268,7 +268,7 @@
// //
this.btnGetAlarm.BackColor = System.Drawing.SystemColors.Control; this.btnGetAlarm.BackColor = System.Drawing.SystemColors.Control;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(301, 205); this.btnGetAlarm.Location = new System.Drawing.Point(301, 190);
this.btnGetAlarm.Name = "btnGetAlarm"; this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(105, 33); this.btnGetAlarm.Size = new System.Drawing.Size(105, 33);
this.btnGetAlarm.TabIndex = 284; this.btnGetAlarm.TabIndex = 284;
...@@ -283,7 +283,7 @@ ...@@ -283,7 +283,7 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText; this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(416, 244); this.btnReadPosition.Location = new System.Drawing.Point(416, 229);
this.btnReadPosition.Name = "btnReadPosition"; this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(105, 33); this.btnReadPosition.Size = new System.Drawing.Size(105, 33);
...@@ -296,7 +296,7 @@ ...@@ -296,7 +296,7 @@
// //
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(143, 171); this.label8.Location = new System.Drawing.Point(143, 143);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17); this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255; this.label8.TabIndex = 255;
...@@ -336,7 +336,7 @@ ...@@ -336,7 +336,7 @@
// //
// txtP // txtP
// //
this.txtP.Location = new System.Drawing.Point(207, 169); this.txtP.Location = new System.Drawing.Point(207, 141);
this.txtP.Name = "txtP"; this.txtP.Name = "txtP";
this.txtP.ReadOnly = true; this.txtP.ReadOnly = true;
this.txtP.Size = new System.Drawing.Size(87, 23); this.txtP.Size = new System.Drawing.Size(87, 23);
...@@ -349,7 +349,7 @@ ...@@ -349,7 +349,7 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText; this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(189, 111); this.txtASpeed.Location = new System.Drawing.Point(189, 102);
this.txtASpeed.MaxLength = 12; this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed"; this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -363,7 +363,7 @@ ...@@ -363,7 +363,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default; this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText; this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(152, 112); this.label47.Location = new System.Drawing.Point(152, 103);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(35, 17); this.label47.Size = new System.Drawing.Size(35, 17);
...@@ -410,7 +410,7 @@ ...@@ -410,7 +410,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText; this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(416, 205); this.btnAxisReturnHome.Location = new System.Drawing.Point(416, 190);
this.btnAxisReturnHome.Name = "btnAxisReturnHome"; this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(105, 33); this.btnAxisReturnHome.Size = new System.Drawing.Size(105, 33);
...@@ -439,7 +439,7 @@ ...@@ -439,7 +439,7 @@
// //
this.btnComAlarmClear.BackColor = System.Drawing.SystemColors.Control; this.btnComAlarmClear.BackColor = System.Drawing.SystemColors.Control;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(301, 244); this.btnComAlarmClear.Location = new System.Drawing.Point(301, 229);
this.btnComAlarmClear.Name = "btnComAlarmClear"; this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(105, 33); this.btnComAlarmClear.Size = new System.Drawing.Size(105, 33);
this.btnComAlarmClear.TabIndex = 50; this.btnComAlarmClear.TabIndex = 50;
...@@ -453,7 +453,7 @@ ...@@ -453,7 +453,7 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(189, 72); this.txtAPosition.Location = new System.Drawing.Point(189, 68);
this.txtAPosition.MaxLength = 12; this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition"; this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -467,7 +467,7 @@ ...@@ -467,7 +467,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default; this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText; this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(152, 73); this.label48.Location = new System.Drawing.Point(152, 69);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(35, 17); this.label48.Size = new System.Drawing.Size(35, 17);
...@@ -477,7 +477,7 @@ ...@@ -477,7 +477,7 @@
// //
// btnAxisStop // btnAxisStop
// //
this.btnAxisStop.BackColor = System.Drawing.SystemColors.Control; this.btnAxisStop.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(255)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default; this.btnAxisStop.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
...@@ -485,7 +485,7 @@ ...@@ -485,7 +485,7 @@
this.btnAxisStop.Location = new System.Drawing.Point(416, 106); this.btnAxisStop.Location = new System.Drawing.Point(416, 106);
this.btnAxisStop.Name = "btnAxisStop"; this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(105, 33); this.btnAxisStop.Size = new System.Drawing.Size(105, 71);
this.btnAxisStop.TabIndex = 246; this.btnAxisStop.TabIndex = 246;
this.btnAxisStop.Text = " 停止运动"; this.btnAxisStop.Text = " 停止运动";
this.btnAxisStop.UseVisualStyleBackColor = false; this.btnAxisStop.UseVisualStyleBackColor = false;
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
// txtAxisValue // txtAxisValue
// //
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(88, 109); this.txtAxisValue.Location = new System.Drawing.Point(88, 100);
this.txtAxisValue.MaxLength = 10; this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue"; this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true; this.txtAxisValue.ReadOnly = true;
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
// txtAxisDeviceName // txtAxisDeviceName
// //
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(88, 70); this.txtAxisDeviceName.Location = new System.Drawing.Point(88, 66);
this.txtAxisDeviceName.MaxLength = 10; this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName"; this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true; this.txtAxisDeviceName.ReadOnly = true;
...@@ -518,7 +518,7 @@ ...@@ -518,7 +518,7 @@
this.label45.AutoSize = true; this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(31, 75); this.label45.Location = new System.Drawing.Point(31, 71);
this.label45.Name = "label45"; this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(47, 17); this.label45.Size = new System.Drawing.Size(47, 17);
this.label45.TabIndex = 240; this.label45.TabIndex = 240;
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
this.label46.AutoSize = true; this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(43, 114); this.label46.Location = new System.Drawing.Point(43, 105);
this.label46.Name = "label46"; this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17); this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.TabIndex = 239; this.label46.TabIndex = 239;
...@@ -590,13 +590,23 @@ ...@@ -590,13 +590,23 @@
this.groupBox1.Controls.Add(this.label43); this.groupBox1.Controls.Add(this.label43);
this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label42);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(5, 331); this.groupBox1.Location = new System.Drawing.Point(5, 286);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(539, 182); this.groupBox1.Size = new System.Drawing.Size(539, 175);
this.groupBox1.TabIndex = 218; this.groupBox1.TabIndex = 218;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态"; this.groupBox1.Text = "伺服状态";
// //
// axis_4_Alarm
//
this.axis_4_Alarm.IOName = "";
this.axis_4_Alarm.IOValue = 0;
this.axis_4_Alarm.isCanClick = false;
this.axis_4_Alarm.Location = new System.Drawing.Point(432, 39);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_4_Alarm.TabIndex = 271;
//
// txt4Target // txt4Target
// //
this.txt4Target.Location = new System.Drawing.Point(409, 143); this.txt4Target.Location = new System.Drawing.Point(409, 143);
...@@ -631,6 +641,36 @@ ...@@ -631,6 +641,36 @@
this.label1.TabIndex = 267; this.label1.TabIndex = 267;
this.label1.Text = "轴四:压紧轴"; this.label1.Text = "轴四:压紧轴";
// //
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(127, 40);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(329, 40);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(224, 40);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38 // label38
// //
this.label38.AutoSize = true; this.label38.AutoSize = true;
...@@ -773,53 +813,13 @@ ...@@ -773,53 +813,13 @@
this.label42.TabIndex = 24; this.label42.TabIndex = 24;
this.label42.Text = "编码器计数:"; this.label42.Text = "编码器计数:";
// //
// axis_4_Alarm
//
this.axis_4_Alarm.IOName = "";
this.axis_4_Alarm.IOValue = 0;
this.axis_4_Alarm.isCanClick = false;
this.axis_4_Alarm.Location = new System.Drawing.Point(432, 39);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_4_Alarm.TabIndex = 271;
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(127, 40);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(329, 40);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(224, 40);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// AxisMoveControl // AxisMoveControl
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.Controls.Add(this.groupBox1); this.Controls.Add(this.groupBox1);
this.Controls.Add(this.groupAxis); this.Controls.Add(this.groupAxis);
this.Name = "AxisMoveControl"; this.Name = "AxisMoveControl";
this.Size = new System.Drawing.Size(552, 525); this.Size = new System.Drawing.Size(552, 467);
this.groupAxis.ResumeLayout(false); this.groupAxis.ResumeLayout(false);
this.groupAxis.PerformLayout(); this.groupAxis.PerformLayout();
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
private int ComTargetPosition = 0; private int ComTargetPosition = 0;
private int LastWidth = 0; private int LastWidth = 0;
private int LastHeight = 0; private int LastHeight = 0;
private RFIDData LastShelfData = new RFIDData(0); private RFIDData LastShelfData = new RFIDData(0,0);
......
source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs
...@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -77,7 +77,7 @@ namespace OnlineStore.DeviceLibrary
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
{ {
RFIDManager.ConnectRFIOList(rfidList); // RFIDManager.RfidReader.Open(rfidList.ToArray());
IOManager.instance.ConnectionIOList(ioList); IOManager.instance.ConnectionIOList(ioList);
addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check)); addLastDI(IO_Type.Airpressure_Check, IOValue(IO_Type.Airpressure_Check));
addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN)); addLastDI(IO_Type.SuddenStop_BTN, IOValue(IO_Type.SuddenStop_BTN));
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
<Reference Include="Asa.IOModule.AIOBOX"> <Reference Include="Asa.IOModule.AIOBOX">
<HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath> <HintPath>..\..\dll\Asa.IOModule.AIOBOX.dll</HintPath>
</Reference> </Reference>
<Reference Include="Asa.RFID"> <Reference Include="ClassLibrary1">
<HintPath>..\..\dll\RFID\Asa.RFID.dll</HintPath> <HintPath>..\..\..\RC1250-AssemblyLine\dll\RFID\ClassLibrary1.dll</HintPath>
</Reference> </Reference>
<Reference Include="Client"> <Reference Include="Client">
<HintPath>..\..\dll\Client.dll</HintPath> <HintPath>..\..\dll\Client.dll</HintPath>
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID, 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.104.21#16;192.168.104.22#16;192.168.104.23#16,,,,, PRO,IO模块对应的DI数量,IO_DILength,192.168.105.21#16;192.168.105.22#16;192.168.105.23#16,,,,,
PRO,IO模块对应的DO数量,IO_DOLength,192.168.104.21#16;192.168.104.22#16;192.168.104.23#16,,,,, PRO,IO模块对应的DO数量,IO_DOLength,192.168.105.21#16;192.168.105.22#16;192.168.105.23#16,,,,,
PRO,第一块IO模块IP,PRO_AOI_IP_1,192.168.104.21,,,,,,, PRO,第一块IO模块IP,PRO_AOI_IP_1,192.168.105.21,,,,,,,
PRO,第二块IO模块IP,PRO_AOI_IP_2,192.168.104.22,,,,,,, PRO,第二块IO模块IP,PRO_AOI_IP_2,192.168.105.22,,,,,,,
PRO,第三块IO模块IP,PRO_AOI_IP_3,192.168.104.23,,,,,,, PRO,第三块IO模块IP,PRO_AOI_IP_3,192.168.105.23,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0, DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
......
source/DeviceLibrary/device/RFID/RFIDManager.cs
using Asa.RFID; 
using Asa;
using OnlineStore.Common; using OnlineStore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -9,251 +10,93 @@ using System.Threading.Tasks; ...@@ -9,251 +10,93 @@ using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
public class RFIDManager public class RFIDManager
{ {
public static Dictionary<string, Reader> RFReaderMap = new Dictionary<string, Reader>(); public static RFID RfidReader = new RFID();
// private static int DefaultTrayNum = ConfigAppSettings.GetIntValue(Setting_Init.DefaultTrayNum);
///// <summary>
///// 获取托盘编码
///// </summary>
//public static int GetTrayNum(int subType, bool isClear = false)
//{
// if (DefaultTrayNum > 0)
// {
// return DefaultTrayNum;
// }
// // return 9;
// if (subType.Equals(104))
// {
// return LineManager.Line.Sw23TrayNum;
// }
// else if (subType.Equals(101))
// {
// return LineManager.Line.Sw41TrayNum;
// }
private static List<string> RfIPList = new List<string>(); // string ip = GetRFIP(subType);
private static System.Timers.Timer conTimer = null; // //获取盘号
// RFIDData data = ReadRFID(ip, isClear);
// if (data != null)
// {
// if (data.RFType.Equals((byte)'E'))
// {
// return data.Num;
// }
// return 0;
// }
internal static void ConnectRFIOList(List<string> rfioNameList) // return 0;
{ //}
try {
if (conTimer == null)
{ public static RFIDData ReadData(string ip, bool isClear = false)
conTimer = new System.Timers.Timer();
conTimer.AutoReset = true;
conTimer.Interval = 60000;
conTimer.Elapsed += ConTimer_Elapsed;
}
conTimer.Enabled = false;
RfIPList = new List<string>(rfioNameList);
foreach (string ip in rfioNameList)
{
ConnectionIP(ip);
}
if (RfIPList.Count > 0)
{
conTimer.Start();
}
}catch(Exception ex)
{
LogUtil.error("ConnectRFIOList出错：" + ex.ToString());
}
}
private static bool isProcess = false;
private static DateTime lastTime = DateTime.Now;
private static void ConTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
{ {
TimeSpan span = DateTime.Now - lastTime;
if (span.TotalMinutes < RfIPList.Count && isProcess)
{
return;
}
isProcess = true;
lastTime = DateTime.Now;
try try
{ {
List<string> list = new List<string>(RfIPList); // if (String.IsNullOrEmpty(ip).Equals(false) && LineManager.Line.rfidList.Contains(ip))
if (list.Count > 0)
{ {
LogUtil.info("开始重连RFIP模块 ------------"); RFIDData data = new RFIDData(RfidReader.Read(ip));
foreach (string ip in list) if (isClear)
{ {
ConnectionIP(ip); RfidReader.Clear(ip);
} }
LogUtil.info("结束重连RFIP模块 ------------"); return data;
} }
GC.Collect();
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("RFIP ConTimer_Elapsed 出错： " + ex.ToString()); //LogUtil.error("ReadRFID["+ip+"]出错：" + ex.ToString());
} }
isProcess = false; return new RFIDData(-1, -1);
} }
internal static void ConnectionIP(string rfid) //public static string GetRFIP(int subType, int rtType = 0)
{
Reader rfidReader = null;
if (RFReaderMap.ContainsKey(rfid))
{
rfidReader = RFReaderMap[rfid];
if (null != rfidReader)
{
rfidReader.Close();
rfidReader = null;
}
RFReaderMap.Remove(rfid);
}
string logName = "RFIP模块[" + rfid + "] ";
try
{
LogUtil.debug("开始连接" + logName + "，尝试重连3次");
for (int i = 1; i <= 3; i++)
{
rfidReader = new Reader();
// rfidReader.LocalIP = "192.168.100.101";
rfidReader.RemoteIP = rfid;
bool result = rfidReader.Connect();
if (result)
{
rfidReader.AutoScan(true);
LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：");
Thread.Sleep(10);
RFReaderMap.Add(rfid, rfidReader);
if (RfIPList.Contains(rfid))
{
RfIPList.Remove(rfid);
}
break;
}
else
{
LogUtil.error("第【" + i + "】次连接 " + logName + " 失败：" + "");
}
Thread.Sleep(5);
}
}
catch (Exception error)
{
LogUtil.error("连接RFIP模块 " + logName + " 出错：" + error.ToString());
}
}
internal static void CloseAllConnection()
{
foreach (Reader reader in RFReaderMap.Values)
{
reader.Close();
}
}
public static bool WriteData(string IP, RFIDData obj)
{
byte[] sendData = obj.ToData();
return WriteData(IP, sendData, 3);
}
public static RFIDData ReadData(string IP)
{
byte[] reviceData = ReadData(IP, 3);
if (reviceData != null)
{
return new RFIDData(reviceData);
}
return null;
}
//public static byte[] ReadData(string IP)
//{ //{
// byte[] reviceData = ReadData(IP, 3); // string ip = "";
// return reviceData; // string rtName = DeviceConfig.RFIP_Str + "_" + subType.ToString().PadLeft(3, '0');
// if (rtType > 0)
// {
// rtName += "-" + rtType.ToString();
// }
// if (DeviceConfig.ProRFIpMap.ContainsKey(rtName))
// {
// ip = DeviceConfig.ProRFIpMap[rtName];
// }
// return ip;
//} //}
public static string SearchIP(string localIp)
{
string ip = "";
try
{
Reader rfReader = new Reader();
rfReader.LocalIP = localIp;
ip = rfReader.FindIP();
}
catch (Exception ex)
{
}
return ip;
}
public static bool FindRFID(string IP)
{
try
{
Reader rfReader = getRfReader(IP);
if (rfReader != null)
{
return rfReader.FindRFID();
}
}
catch (Exception ex)
{
LogUtil.error("RFIP FindRFID [" + IP + "] 出错 ：" + ex.ToString());
}
return false;
}
public static byte[] ReadData(string IP, int reReadCount = 1,int startIndex=0,int readLength=8)
{
try
{
Reader rfReader = getRfReader(IP);
if (rfReader == null)
{
return null;
}
for (int i = 1; i <= reReadCount; i++)
{
byte[] reviceData = rfReader.Read(startIndex, readLength);
if (reviceData != null)
{
return reviceData;
}
LogUtil.error("RFIP ReadData [" + IP + "] 第" + i + "次失败 ");
}
}
catch (Exception ex)
{
LogUtil.error("RFIP ReadData [" + IP + "] 出错 ：" + ex.ToString());
}
return null;
}
public static bool WriteData(string IP, byte[] data, int reWriteCount = 1)
{
try
{
Reader rfReader = getRfReader(IP);
if (rfReader == null)
{
return false;
}
for (int i = 1; i <= reWriteCount; i++)
{
bool result = rfReader.Write(data);
if (result)
{
return result;
}
LogUtil.error("RFIP WriteData [" + IP + "] 第" + i + "次失败：");
}
}
catch (Exception ex)
{
LogUtil.error("RFIP WriteData [" + IP + "] 出错 ：" + ex.ToString());
}
return false;
}
private static Reader getRfReader(string IP)
{
Reader rfReader = null;
if (RFReaderMap.ContainsKey(IP))
{
rfReader = RFReaderMap[IP];
}
else
{
LogUtil.error("getRfReader 没有连接RFIP模块：" + IP);
}
return rfReader;
}
} }
public class RFIDData public class RFIDData
{ {
/// <summary> /// <summary>
/// RFID类型，区分是料架还是托盘，托盘=E /// RFID类型，区分是料架还是托盘，托盘E=69,A=65
/// </summary> /// </summary>
public char RFType= 'E'; public int RFType = 0;
/// <summary> /// <summary>
/// 托盘编号，从1-32 /// 托盘编号，从1-32
/// </summary> /// </summary>
public int Num = 0; public int Num = 0;
public RFIDData (int num,char t='A') public RFIDData(int num, int t)
{ {
this.RFType = t; this.RFType = t;
this.Num = num; this.Num = num;
...@@ -263,28 +106,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -263,28 +106,26 @@ namespace OnlineStore.DeviceLibrary
{ {
try try
{ {
RFType =(char)data[1]; if (data != null && data.Length > 2)
Num = Convert.ToInt32(data[2]); {
RFType = data[1];
Num = Convert.ToInt32(data[2]);
}
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error("RFIP 数据【" + data + "】 获取编码失败"); LogUtil.error("RFIP 数据【" + data + "】 获取编码失败");
} }
} }
public byte[] ToData(int dataLength=10) public byte[] ToData()
{ {
byte[] sendData = new byte[dataLength]; return new byte[] { (byte)RFType, (byte)Num };
for (int i = 0; i < sendData.Length; i++)
{
sendData[i] = 0x00;
}
sendData[0] = (byte)RFType;
sendData[1] = (byte)Num;
return sendData;
} }
public string ToStr() public string ToStr()
{ {
return "Type=["+RFType+"],Num=["+Num+"]"; return " [" + RFType + "],[" + Num + "] ";
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!