Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit cf88750c 由 张东亮
选项

添加盘点功能

1 个父辈 262366e5
内嵌 并排
正在显示 13 个修改的文件 包含 286 行增加 和 265 行删除
dll/Asa.IOModule.AIOBOX.xml
...@@ -6,19 +6,7 @@ ...@@ -6,19 +6,7 @@
<members> <members>
<member name="T:Asa.IOModule.AIOBOX"> <member name="T:Asa.IOModule.AIOBOX">
<summary> <summary>
AIOBOX操作类 零点IO模块操作类
</summary>
</member>
<member name="F:Asa.IOModule.AIOBOX.SEND_SLEEP">
<summary>
每条命令发送的间隔
不能小于15，会出现IO接收不到的情况
小于30时，会出现接收数据连包的情况
</summary>
</member>
<member name="F:Asa.IOModule.AIOBOX.PORT">
<summary>
ModBus端口
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.DIO_Changed"> <member name="T:Asa.IOModule.AIOBOX.DIO_Changed">
...@@ -38,108 +26,57 @@ ...@@ -38,108 +26,57 @@
自动读取DO事件触发 自动读取DO事件触发
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.AIOBOX.AIO_Changed"> <member name="M:Asa.IOModule.AIOBOX.#ctor(System.String)">
<summary>
自动读取AI委托
</summary>
<param name="box">AIOBOX</param>
<param name="val">所有AI的值</param>
</member>
<member name="E:Asa.IOModule.AIOBOX.AI_Changed_Event">
<summary>
自动读取AI事件触发
</summary>
</member>
<member name="E:Asa.IOModule.AIOBOX.AO_Changed_Event">
<summary>
自动读取AO事件触发
</summary>
</member>
<member name="M:Asa.IOModule.AIOBOX.#ctor">
<summary> <summary>
AIOBOX 零点IO模块操作类
</summary> </summary>
<param name="logName"></param>
</member> </member>
<member name="P:Asa.IOModule.AIOBOX.IP"> <member name="P:Asa.IOModule.AIOBOX.IP">
<summary> <summary>
IP地址 IP地址
</summary> </summary>
</member> </member>
<member name="P:Asa.IOModule.AIOBOX.IsConn"> <member name="P:Asa.IOModule.AIOBOX.Upload">
<summary>
是否连接
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.ErrInfo">
<summary>
错误信息
</summary>
</member>
<member name="M:Asa.IOModule.AIOBOX.LogPath(System.String,Asa.IOModule.LogType)">
<summary> <summary>
日志路径，连接前设置路径会自动保存日志 输入主动上传
</summary> </summary>
<param name="path">文件夹路径</param>
<param name="type">输出类型</param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.SetInput(Asa.IOModule.Box_Type,System.Int32)"> <member name="P:Asa.IOModule.AIOBOX.IsConn">
<summary> <summary>
设置输入端 是否连接
</summary> </summary>
<param name="type">类型</param>
<param name="count">数量</param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.SetOutput(Asa.IOModule.Box_Type,System.Int32)"> <member name="P:Asa.IOModule.AIOBOX.InputCount">
<summary> <summary>
设置输出端 DI总数
</summary> </summary>
<param name="type">类型</param>
<param name="count">数量</param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.AutoIP(System.String)"> <member name="P:Asa.IOModule.AIOBOX.OutputCount">
<summary> <summary>
自动获取IP地址，未连接前使用，必须在同一网段 DO总数
</summary> </summary>
<param name="localIP">本地IP地址</param>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.CheckIP(System.String)"> <member name="M:Asa.IOModule.AIOBOX.SetType(Asa.IOModule.Box_Type,System.Int32,Asa.IOModule.Box_Type,System.Int32)">
<summary> <summary>
检查IP地址 设置输入输出的类型
</summary> </summary>
<param name="ip"></param> <param name="input"></param>
<returns></returns> <param name="inputCount"></param>
<param name="output"></param>
<param name="outputCount"></param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Connect"> <member name="M:Asa.IOModule.AIOBOX.Connect">
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Close"> <member name="M:Asa.IOModule.AIOBOX.Close">
<summary> <summary>
关闭连接 关闭连接
</summary> </summary>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.AutoReadInput(System.Boolean,System.Int32)">
<summary>
自动读取输入端并触发事件（主动上传数据 = 禁止）
</summary>
<param name="read">是否自动读取</param>
<param name="sleep">间隔，必须大于等于15ms</param>
</member>
<member name="M:Asa.IOModule.AIOBOX.AutoReadInput(System.Boolean)">
<summary>
自动读取输入端并触发事件（主动上传数据 = 使能）
</summary>
<param name="read">是否自动读取</param>
</member>
<member name="M:Asa.IOModule.AIOBOX.AutoReadOutput(System.Boolean,System.Int32)">
<summary>
自动读取输出端，触发事件
</summary>
<param name="read">是否自动读取</param>
<param name="sleep">间隔，必须大于等于15ms</param>
</member>
<member name="M:Asa.IOModule.AIOBOX.ReverseStatus(Asa.IOModule.Box_Sta)"> <member name="M:Asa.IOModule.AIOBOX.ReverseStatus(Asa.IOModule.Box_Sta)">
<summary> <summary>
相反状态(ON/OFF) 相反状态(ON/OFF)
...@@ -229,62 +166,66 @@ ...@@ -229,62 +166,66 @@
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Send"> <member name="M:Asa.IOModule.AIOBOX.Send">
<summary> <summary>
发送命令 发送命令线程
</summary> </summary>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Receive"> <member name="M:Asa.IOModule.AIOBOX.GetReadDI_Command">
<summary> <summary>
接收命令 获取ReadDI的命令
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadSingle(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.GetReadDO_Command">
<summary> <summary>
读取写入单个DO，功能码5 获取ReadDO的命令
</summary> </summary>
<param name="buff"></param> <returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadDO(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.Listen">
<summary> <summary>
读取所有DO状态，功能码1 监听网络线程
</summary> </summary>
<param name="buff"></param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadDI(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.CommandProcess(System.Byte[])">
<summary> <summary>
读取所有DI状态，功能码2 接收到的命令处理方法，（task多线程）
</summary> </summary>
<param name="cmd"></param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.ReadAI(System.Byte[])"> <member name="M:Asa.IOModule.AIOBOX.Reconn">
<summary> <summary>
读取所有AI的值，功能码4 重连线程
</summary> </summary>
<param name="buff"></param>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Command"> <member name="M:Asa.IOModule.AIOBOX.Open">
<summary> <summary>
命令，前7个字节 打开socket建立连接
</summary> </summary>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.TriggerDIO"> <member name="M:Asa.IOModule.AIOBOX.CheckIP(System.String)">
<summary> <summary>
触发DIO改变事件 检查IP地址
</summary> </summary>
<param name="ip"></param>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.AutoReadInput"> <member name="M:Asa.IOModule.AIOBOX.AutoIP(System.String)">
<summary> <summary>
自动读取输入端线程 自动获取IP地址，未连接前使用，必须在同一网段
</summary> </summary>
<param name="localIP">本地IP地址</param>
<returns></returns>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.AutoReadOutput"> <member name="M:Asa.IOModule.AIOBOX.GetIP">
<summary> <summary>
自动读取输出端线程 获取IO模块IP地址
</summary> </summary>
</member> </member>
<member name="M:Asa.IOModule.AIOBOX.Listen"> <member name="M:Asa.IOModule.AIOBOX.Command">
<summary> <summary>
监听结果线程 命令，前7个字节
</summary> </summary>
<returns></returns>
</member> </member>
<member name="T:Asa.IOModule.Box_Type"> <member name="T:Asa.IOModule.Box_Type">
<summary> <summary>
...@@ -326,62 +267,5 @@ ...@@ -326,62 +267,5 @@
闭合，打开，高电平 闭合，打开，高电平
</summary> </summary>
</member> </member>
<member name="T:Asa.IOModule.LogType">
<summary>
日志类型
</summary>
</member>
<member name="F:Asa.IOModule.LogType.OnlyError">
<summary>
仅错误信息
</summary>
</member>
<member name="F:Asa.IOModule.LogType.All">
<summary>
所有
</summary>
</member>
<member name="T:Asa.IOModule.LogFile">
<summary>
日志操作类
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.#ctor(System.String,System.String)">
<summary>
日志
</summary>
<param name="path">文件夹路径</param>
<param name="ip"></param>
</member>
<member name="M:Asa.IOModule.LogFile.Close">
<summary>
关闭文件
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.OutError(System.String)">
<summary>
输出错误
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutInfo(System.String)">
<summary>
输出信息
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String,System.Byte[])">
<summary>
输出数据
</summary>
<param name="tr"></param>
<param name="buff"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String)">
<summary>
输出数据
</summary>
<param name="s"></param>
</member>
</members> </members>
</doc> </doc>
source/ACSingleStore/FrmStoreBox.Designer.cs
...@@ -65,14 +65,10 @@ ...@@ -65,14 +65,10 @@
this.label49 = new System.Windows.Forms.Label(); this.label49 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox(); this.richTextBox1 = new System.Windows.Forms.RichTextBox();
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.label7 = new System.Windows.Forms.Label(); this.label7 = 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();
...@@ -90,6 +86,8 @@ ...@@ -90,6 +86,8 @@
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.groupInout = new System.Windows.Forms.GroupBox(); this.groupInout = new System.Windows.Forms.GroupBox();
this.txtUpDownP9 = new System.Windows.Forms.TextBox();
this.btnUpDownP9 = new System.Windows.Forms.Button();
this.btnStartAutoCheck = new System.Windows.Forms.Button(); this.btnStartAutoCheck = new System.Windows.Forms.Button();
this.btnCheckPos = new System.Windows.Forms.Button(); this.btnCheckPos = new System.Windows.Forms.Button();
this.txtMiddleP3 = new System.Windows.Forms.TextBox(); this.txtMiddleP3 = new System.Windows.Forms.TextBox();
...@@ -198,6 +196,10 @@ ...@@ -198,6 +196,10 @@
this.btnSetNum = new System.Windows.Forms.Button(); this.btnSetNum = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button(); this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button(); this.btnLogDebug = new System.Windows.Forms.Button();
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.groupInout.SuspendLayout(); this.groupInout.SuspendLayout();
...@@ -789,17 +791,6 @@ ...@@ -789,17 +791,6 @@
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(540, 49);
this.axis_4_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(54, 49);
this.axis_4_Alarm.TabIndex = 271;
//
// txt4Target // txt4Target
// //
this.txt4Target.Location = new System.Drawing.Point(511, 179); this.txt4Target.Location = new System.Drawing.Point(511, 179);
...@@ -838,39 +829,6 @@ ...@@ -838,39 +829,6 @@
this.label7.TabIndex = 267; this.label7.TabIndex = 267;
this.label7.Text = "轴四:压紧轴"; this.label7.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(159, 50);
this.axis_1_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(54, 49);
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(411, 50);
this.axis_3_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(54, 49);
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(280, 50);
this.axis_2_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(54, 49);
this.axis_2_Alarm.TabIndex = 265;
//
// label38 // label38
// //
this.label38.AutoSize = true; this.label38.AutoSize = true;
...@@ -1031,6 +989,8 @@ ...@@ -1031,6 +989,8 @@
// //
// groupInout // groupInout
// //
this.groupInout.Controls.Add(this.txtUpDownP9);
this.groupInout.Controls.Add(this.btnUpDownP9);
this.groupInout.Controls.Add(this.btnStartAutoCheck); this.groupInout.Controls.Add(this.btnStartAutoCheck);
this.groupInout.Controls.Add(this.btnCheckPos); this.groupInout.Controls.Add(this.btnCheckPos);
this.groupInout.Controls.Add(this.txtMiddleP3); this.groupInout.Controls.Add(this.txtMiddleP3);
...@@ -1087,6 +1047,41 @@ ...@@ -1087,6 +1047,41 @@
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作"; this.groupInout.Text = "料仓操作";
// //
// txtUpDownP9
//
this.txtUpDownP9.AcceptsReturn = true;
this.txtUpDownP9.BackColor = System.Drawing.SystemColors.Window;
this.txtUpDownP9.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtUpDownP9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP9.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP9.Location = new System.Drawing.Point(495, 425);
this.txtUpDownP9.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP9.MaxLength = 20;
this.txtUpDownP9.Name = "txtUpDownP9";
this.txtUpDownP9.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtUpDownP9.Size = new System.Drawing.Size(110, 27);
this.txtUpDownP9.TabIndex = 276;
this.txtUpDownP9.Text = "-12388";
//
// btnUpDownP9
//
this.btnUpDownP9.AutoSize = true;
this.btnUpDownP9.BackColor = System.Drawing.SystemColors.Control;
this.btnUpDownP9.Cursor = System.Windows.Forms.Cursors.Default;
this.btnUpDownP9.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpDownP9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP9.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP9.Location = new System.Drawing.Point(315, 418);
this.btnUpDownP9.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP9.Name = "btnUpDownP9";
this.btnUpDownP9.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP9.Size = new System.Drawing.Size(175, 41);
this.btnUpDownP9.TabIndex = 275;
this.btnUpDownP9.Text = "升降轴盘点P9:";
this.btnUpDownP9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP9.UseVisualStyleBackColor = false;
this.btnUpDownP9.Click += new System.EventHandler(this.btnUpDownP9_Click);
//
// btnStartAutoCheck // btnStartAutoCheck
// //
this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control; this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control;
...@@ -1122,7 +1117,7 @@ ...@@ -1122,7 +1117,7 @@
this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP3.Location = new System.Drawing.Point(192, 475); this.txtMiddleP3.Location = new System.Drawing.Point(494, 475);
this.txtMiddleP3.Margin = new System.Windows.Forms.Padding(4); this.txtMiddleP3.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP3.MaxLength = 20; this.txtMiddleP3.MaxLength = 20;
this.txtMiddleP3.Name = "txtMiddleP3"; this.txtMiddleP3.Name = "txtMiddleP3";
...@@ -1140,7 +1135,7 @@ ...@@ -1140,7 +1135,7 @@
this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP3.Location = new System.Drawing.Point(13, 468); this.btnMiddleP3.Location = new System.Drawing.Point(315, 468);
this.btnMiddleP3.Margin = new System.Windows.Forms.Padding(4); this.btnMiddleP3.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP3.Name = "btnMiddleP3"; this.btnMiddleP3.Name = "btnMiddleP3";
this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1180,7 +1175,7 @@ ...@@ -1180,7 +1175,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(414, 677); this.btnSavePosition.Location = new System.Drawing.Point(423, 690);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4); this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(131, 48); this.btnSavePosition.Size = new System.Drawing.Size(131, 48);
...@@ -1230,7 +1225,7 @@ ...@@ -1230,7 +1225,7 @@
this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(192, 585); this.txtComP1.Location = new System.Drawing.Point(192, 632);
this.txtComP1.Margin = new System.Windows.Forms.Padding(4); this.txtComP1.Margin = new System.Windows.Forms.Padding(4);
this.txtComP1.MaxLength = 20; this.txtComP1.MaxLength = 20;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
...@@ -1262,7 +1257,7 @@ ...@@ -1262,7 +1257,7 @@
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(494, 474); this.txtInOutP1.Location = new System.Drawing.Point(494, 527);
this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4); this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP1.MaxLength = 20; this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1"; this.txtInOutP1.Name = "txtInOutP1";
...@@ -1358,7 +1353,7 @@ ...@@ -1358,7 +1353,7 @@
this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(194, 634); this.txtComP3.Location = new System.Drawing.Point(495, 577);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4); this.txtComP3.Margin = new System.Windows.Forms.Padding(4);
this.txtComP3.MaxLength = 20; this.txtComP3.MaxLength = 20;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
...@@ -1374,7 +1369,7 @@ ...@@ -1374,7 +1369,7 @@
this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(495, 586); this.txtComP2.Location = new System.Drawing.Point(495, 626);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4); this.txtComP2.Margin = new System.Windows.Forms.Padding(4);
this.txtComP2.MaxLength = 20; this.txtComP2.MaxLength = 20;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
...@@ -1390,7 +1385,7 @@ ...@@ -1390,7 +1385,7 @@
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(495, 528); this.txtInOutP3.Location = new System.Drawing.Point(193, 583);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4); this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP3.MaxLength = 20; this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
...@@ -1406,7 +1401,7 @@ ...@@ -1406,7 +1401,7 @@
this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(495, 425); this.txtMiddleP2.Location = new System.Drawing.Point(193, 479);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4); this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP2.MaxLength = 20; this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
...@@ -1543,7 +1538,7 @@ ...@@ -1543,7 +1538,7 @@
this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP1.ForeColor = System.Drawing.Color.Purple; this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(13, 579); this.btnComP1.Location = new System.Drawing.Point(13, 626);
this.btnComP1.Margin = new System.Windows.Forms.Padding(4); this.btnComP1.Margin = new System.Windows.Forms.Padding(4);
this.btnComP1.Name = "btnComP1"; this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1583,7 +1578,7 @@ ...@@ -1583,7 +1578,7 @@
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green; this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(315, 468); this.btnInOutP1.Location = new System.Drawing.Point(315, 521);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4); this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP1.Name = "btnInOutP1"; this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1702,7 +1697,7 @@ ...@@ -1702,7 +1697,7 @@
this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple; this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(14, 628); this.btnComP3.Location = new System.Drawing.Point(315, 571);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4); this.btnComP3.Margin = new System.Windows.Forms.Padding(4);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1721,7 +1716,7 @@ ...@@ -1721,7 +1716,7 @@
this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple; this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(315, 580); this.btnComP2.Location = new System.Drawing.Point(315, 620);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4); this.btnComP2.Margin = new System.Windows.Forms.Padding(4);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1740,7 +1735,7 @@ ...@@ -1740,7 +1735,7 @@
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green; this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(315, 522); this.btnInOutP3.Location = new System.Drawing.Point(13, 577);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4); this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP3.Name = "btnInOutP3"; this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1759,7 +1754,7 @@ ...@@ -1759,7 +1754,7 @@
this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(315, 419); this.btnMiddleP2.Location = new System.Drawing.Point(13, 473);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4); this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1851,7 +1846,7 @@ ...@@ -1851,7 +1846,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(388, 667); this.btnClearLog.Location = new System.Drawing.Point(388, 576);
this.btnClearLog.Margin = new System.Windows.Forms.Padding(4); this.btnClearLog.Margin = new System.Windows.Forms.Padding(4);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(131, 48); this.btnClearLog.Size = new System.Drawing.Size(131, 48);
...@@ -2002,7 +1997,7 @@ ...@@ -2002,7 +1997,7 @@
this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(182, 667); this.btnCloseDoor.Location = new System.Drawing.Point(182, 576);
this.btnCloseDoor.Margin = new System.Windows.Forms.Padding(4); this.btnCloseDoor.Margin = new System.Windows.Forms.Padding(4);
this.btnCloseDoor.Name = "btnCloseDoor"; this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(131, 48); this.btnCloseDoor.Size = new System.Drawing.Size(131, 48);
...@@ -2016,7 +2011,7 @@ ...@@ -2016,7 +2011,7 @@
this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(36, 667); this.btnOpenDoor.Location = new System.Drawing.Point(36, 576);
this.btnOpenDoor.Margin = new System.Windows.Forms.Padding(4); this.btnOpenDoor.Margin = new System.Windows.Forms.Padding(4);
this.btnOpenDoor.Name = "btnOpenDoor"; this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(131, 48); this.btnOpenDoor.Size = new System.Drawing.Size(131, 48);
...@@ -2392,11 +2387,11 @@ ...@@ -2392,11 +2387,11 @@
this.tabControl2.Controls.Add(this.tabPage5); this.tabControl2.Controls.Add(this.tabPage5);
this.tabControl2.Controls.Add(this.tabPage6); this.tabControl2.Controls.Add(this.tabPage6);
this.tabControl2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabControl2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl2.Location = new System.Drawing.Point(8, 5); this.tabControl2.Location = new System.Drawing.Point(8, 13);
this.tabControl2.Margin = new System.Windows.Forms.Padding(4); this.tabControl2.Margin = new System.Windows.Forms.Padding(4);
this.tabControl2.Name = "tabControl2"; this.tabControl2.Name = "tabControl2";
this.tabControl2.SelectedIndex = 0; this.tabControl2.SelectedIndex = 0;
this.tabControl2.Size = new System.Drawing.Size(1350, 100); this.tabControl2.Size = new System.Drawing.Size(1350, 92);
this.tabControl2.TabIndex = 271; this.tabControl2.TabIndex = 271;
// //
// tabPage4 // tabPage4
...@@ -2489,7 +2484,7 @@ ...@@ -2489,7 +2484,7 @@
this.tabPage5.Margin = new System.Windows.Forms.Padding(4); this.tabPage5.Margin = new System.Windows.Forms.Padding(4);
this.tabPage5.Name = "tabPage5"; this.tabPage5.Name = "tabPage5";
this.tabPage5.Padding = new System.Windows.Forms.Padding(4); this.tabPage5.Padding = new System.Windows.Forms.Padding(4);
this.tabPage5.Size = new System.Drawing.Size(1342, 60); this.tabPage5.Size = new System.Drawing.Size(1342, 52);
this.tabPage5.TabIndex = 1; this.tabPage5.TabIndex = 1;
this.tabPage5.Text = " 设备调试 "; this.tabPage5.Text = " 设备调试 ";
this.tabPage5.UseVisualStyleBackColor = true; this.tabPage5.UseVisualStyleBackColor = true;
...@@ -2575,7 +2570,7 @@ ...@@ -2575,7 +2570,7 @@
this.tabPage6.Location = new System.Drawing.Point(4, 36); this.tabPage6.Location = new System.Drawing.Point(4, 36);
this.tabPage6.Margin = new System.Windows.Forms.Padding(4); this.tabPage6.Margin = new System.Windows.Forms.Padding(4);
this.tabPage6.Name = "tabPage6"; this.tabPage6.Name = "tabPage6";
this.tabPage6.Size = new System.Drawing.Size(1342, 60); this.tabPage6.Size = new System.Drawing.Size(1342, 52);
this.tabPage6.TabIndex = 2; this.tabPage6.TabIndex = 2;
this.tabPage6.Text = " 其他 "; this.tabPage6.Text = " 其他 ";
this.tabPage6.UseVisualStyleBackColor = true; this.tabPage6.UseVisualStyleBackColor = true;
...@@ -2628,6 +2623,50 @@ ...@@ -2628,6 +2623,50 @@
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click); this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
// //
// 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(540, 49);
this.axis_4_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_4_Alarm.Name = "axis_4_Alarm";
this.axis_4_Alarm.Size = new System.Drawing.Size(54, 49);
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(159, 50);
this.axis_1_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(54, 49);
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(411, 50);
this.axis_3_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(54, 49);
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(280, 50);
this.axis_2_Alarm.Margin = new System.Windows.Forms.Padding(5);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(54, 49);
this.axis_2_Alarm.TabIndex = 265;
//
// FrmStoreBox // FrmStoreBox
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F);
...@@ -2851,6 +2890,8 @@ ...@@ -2851,6 +2890,8 @@
public System.Windows.Forms.Button btnMiddleP3; public System.Windows.Forms.Button btnMiddleP3;
private System.Windows.Forms.Button btnCheckPos; private System.Windows.Forms.Button btnCheckPos;
private System.Windows.Forms.Button btnStartAutoCheck; private System.Windows.Forms.Button btnStartAutoCheck;
public System.Windows.Forms.TextBox txtUpDownP9;
public System.Windows.Forms.Button btnUpDownP9;
} }
} }
source/ACSingleStore/FrmStoreBox.cs
...@@ -104,6 +104,7 @@ namespace OnlineStore.ACSingleStore ...@@ -104,6 +104,7 @@ namespace OnlineStore.ACSingleStore
txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString(); txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString(); txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString(); txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString();
txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString();
txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString(); txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString();
txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString(); txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString(); txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString();
...@@ -287,6 +288,10 @@ namespace OnlineStore.ACSingleStore ...@@ -287,6 +288,10 @@ namespace OnlineStore.ACSingleStore
{ {
btnStartAuTo.Text = "开始自动出入库"; btnStartAuTo.Text = "开始自动出入库";
} }
if (btnStartAutoCheck.Text.Equals("停止自动盘点"))
{
btnStartAutoCheck.Text = "开始自动盘点";
}
} }
} }
else else
...@@ -417,6 +422,7 @@ namespace OnlineStore.ACSingleStore ...@@ -417,6 +422,7 @@ namespace OnlineStore.ACSingleStore
ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6); ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7); ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8); ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
ktk.UpDown_P9 = FormUtil.GetIntValue(txtUpDownP9);
return ktk; return ktk;
} }
private void btnComAlarmClear_Click(object sender, EventArgs e) private void btnComAlarmClear_Click(object sender, EventArgs e)
...@@ -444,6 +450,7 @@ namespace OnlineStore.ACSingleStore ...@@ -444,6 +450,7 @@ namespace OnlineStore.ACSingleStore
txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString(); txtUpDownP4.Text = ktkPosition.UpDownAxis_ILPosition_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString(); txtUpDownP5.Text = ktkPosition.UpDownAxis_OLPosition_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString(); txtUpDownP6.Text = ktkPosition.UpDownAxis_OHPosition_P6.ToString();
txtUpDownP9.Text = ktkPosition.UpDownAxis_Position_P9.ToString();
txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString(); txtComP2.Text = ktkPosition.CompressAxis_Position_P2.ToString();
txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString(); txtComP3.Text = ktkPosition.CompressAxis_CPosition_P3.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString(); txtInOutP3.Text = ktkPosition.InOutAxis_Position_P3.ToString();
...@@ -609,14 +616,15 @@ namespace OnlineStore.ACSingleStore ...@@ -609,14 +616,15 @@ namespace OnlineStore.ACSingleStore
{ {
ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2); ktkPosition.MiddleAxis_Position_P2 = FormUtil.GetIntValue(txtMiddleP2);
ktkPosition.MiddleAxis_Position_P3 = FormUtil.GetIntValue(txtMiddleP3); ktkPosition.MiddleAxis_Position_P3 = FormUtil.GetIntValue(txtMiddleP3);
ktkPosition.UpDownAxis_IHPosition_P3 = FormUtil.GetIntValue(txtUpDownP3); ktkPosition.UpDownAxis_IHPosition_P3 = FormUtil.GetIntValue(txtUpDownP3);
ktkPosition.UpDownAxis_ILPosition_P4 = FormUtil.GetIntValue(txtUpDownP4); ktkPosition.UpDownAxis_ILPosition_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.UpDownAxis_OLPosition_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpDownAxis_OHPosition_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.UpDownAxis_Position_P9 = FormUtil.GetIntValue(txtUpDownP9);
ktkPosition.UpDownAxis_ILPosition_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.InOutAxis_Position_P3 = FormUtil.GetIntValue(txtInOutP3); ktkPosition.InOutAxis_Position_P3 = FormUtil.GetIntValue(txtInOutP3);
ktkPosition.CompressAxis_CPosition_P3 = FormUtil.GetIntValue(txtComP3); ktkPosition.CompressAxis_CPosition_P3 = FormUtil.GetIntValue(txtComP3);
ktkPosition.UpDownAxis_OLPosition_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpDownAxis_OHPosition_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.CompressAxis_Position_P2 = FormUtil.GetIntValue(txtComP2); ktkPosition.CompressAxis_Position_P2 = FormUtil.GetIntValue(txtComP2);
ktkPosition.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2); ktkPosition.InOutAxis_DoorPosition_P2 = FormUtil.GetIntValue(txtInOutP2);
//ktkPosition.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2); //ktkPosition.UpDownAxis_DoorIPosition_P2 = FormUtil.GetIntValue(txtUpDownP2);
...@@ -803,7 +811,14 @@ namespace OnlineStore.ACSingleStore ...@@ -803,7 +811,14 @@ namespace OnlineStore.ACSingleStore
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P6_Speed); AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P6_Speed);
} }
} }
private void btnUpDownP9_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
int value = FormUtil.GetIntValue(txtUpDownP9);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P5_Speed);
}
}
private void btnMiddleP1_Click(object sender, EventArgs e) private void btnMiddleP1_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) if (InOutIsIsP1())
......
source/ACSingleStore/记录.txt
...@@ -32,3 +32,5 @@ ...@@ -32,3 +32,5 @@
20200408 20200408
入库时仓门口必须有料。 入库时仓门口必须有料。
20200616
盘点
source/DeviceLibrary/IO/AIOBOX/AIOBOXManager.cs
...@@ -95,25 +95,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -95,25 +95,25 @@ namespace OnlineStore.DeviceLibrary
{ {
// Create new modbus master and add event functions // Create new modbus master and add event functions
aioBox = new AIOBOX(); aioBox = new AIOBOX();
aioBox.SetType(Box_Type.DI, DILength, Box_Type.DO, DOLength);
aioBox.LogPath(Application.StartupPath + @"\logs\aio\", LogType.OnlyError); //aioBox.LogPath(Application.StartupPath + @"\logs\aio\", LogType.OnlyError);
aioBox.IP = ioIp; aioBox.IP = ioIp;
// bool rtn = aioBox.AutoIP(ioIp); // bool rtn = aioBox.AutoIP(ioIp);
aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength); // aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength);
aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength); // aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength);
//DI主动上传 //DI主动上传
aioBox.AutoReadInput(true, DIMS); // aioBox.AutoReadInput(true, DIMS);
aioBox.AutoReadOutput(false, DOMS); // aioBox.AutoReadOutput(false, DOMS);
aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ; aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ;
aioBox.DO_Changed_Event += AioBox_DO_Changed_Event; aioBox.DO_Changed_Event += AioBox_DO_Changed_Event;
LogUtil.info("开始连接：" + logName + "：" + aioBox.ErrInfo);
aioBox.Connect();
bool conRes = aioBox.Connect();
LogUtil.info("开始连接：" + logName + "：" + conRes.ToString());
AIOMap.Add(ioIp, aioBox); AIOMap.Add(ioIp, aioBox);
Thread.Sleep(5); Thread.Sleep(5);
//读取所有的DO //读取所有的DO
...@@ -143,6 +143,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -143,6 +143,7 @@ namespace OnlineStore.DeviceLibrary
try try
{ {
UpdateAllDI(box.IP, sta); UpdateAllDI(box.IP, sta);
// LogUtil.info("ReadAllDI [" + box.IP + "]：" + string.Join(" ", sta));
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -286,7 +287,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -286,7 +287,7 @@ namespace OnlineStore.DeviceLibrary
bool result = aioBox.WriteDO(StartAddress, GetBox_Sta(onOff)); bool result = aioBox.WriteDO(StartAddress, GetBox_Sta(onOff));
if (!result) if (!result)
{ {
LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 失败：" + aioBox.ErrInfo); LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 失败：");
} }
} }
else else
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -71,6 +71,7 @@ PRO,ᣨ2P5ٶ,UpDownAxis_P5_Speed,1000,,,,,,,,,,, ...@@ -71,6 +71,7 @@ PRO,ᣨ2P5ٶ,UpDownAxis_P5_Speed,1000,,,,,,,,,,,
PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P6速度,UpDownAxis_P6_Speed,100,,,,,,,,,,,
PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,, PRO,升降轴（轴2）P7速度,UpDownAxis_P7_Speed,100,,,,,, ,,,,,
PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,, PRO,升降轴（轴2）P8速度,UpDownAxis_P8_Speed,100,,,,,,,,,,,
PRO,升降轴（轴2）P9速度,UpDownAxis_P9_Speed,50,,,,,,,,,,,
PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P1速度,MiddleAxis_P1_Speed,500,,,,,,,,,,,
PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,500,,,,,,,,,,, PRO,旋转轴（轴1）P2速度,MiddleAxis_P2_Speed,500,,,,,,,,,,,
PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,500,,,,,,,,,,, PRO,进出轴（轴3）P1速度,InOutAxis_P1_Speed,500,,,,,,,,,,,
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Inventory.cs
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
...@@ -27,28 +27,69 @@ namespace OnlineStore.DeviceLibrary ...@@ -27,28 +27,69 @@ namespace OnlineStore.DeviceLibrary
} }
if (StoreMove.MoveStep == StoreMoveStep.SC_01_InOutAxisHome) if (StoreMove.MoveStep == StoreMoveStep.SC_01_InOutAxisHome)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SC_02_MoveToBag); StoreMove.NextMoveStep(StoreMoveStep.SC_02_MoveToLBag);
CheckPositionLog("盘点定位：SC_02_MoveToBag，旋转轴 至P3（料叉背向库位点）升降轴到P6(库位高点） ");
ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P2_Speed); ACAxisMove(Config.Middle_Axis, moveP.Middle_P3, Config.MiddleAxis_P2_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed); int outCount = ACServerManager.GetActualtPosition(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
int disCount = Math.Abs(outCount - moveP.UpDown_P5);
//CheckPositionLog("升降轴当前位置与目标位置距离为(高低速距离阈值为150000)" + disCount.ToString());
if (disCount > 150000)
{
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P5_Speed=" + Config.UpDownAxis_P5_Speed.ToString());
}
else
{
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P6_Speed);
CheckPositionLog(" 旋转轴 至P3（料叉背向库位点）升降轴到P5(库位低点) UpDownAxis_P6_Speed=" + Config.UpDownAxis_P6_Speed.ToString());
}
}
else if (StoreMove.MoveStep == StoreMoveStep.SC_02_MoveToLBag)
{
StoreMove.NextMoveStep(StoreMoveStep.SC_03_MoveToHBag);
CheckPositionLog(" 升降轴到库位高点P9, UpDownAxis_P9_Speed=" + Config.UpDownAxis_P9_Speed.ToString());
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P9, Config.UpDownAxis_P9_Speed);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.CheckPos, IO_VALUE.HIGH));
StoreMove.OneWaitCanEndStep = true;
} }
else if (StoreMove.MoveStep == StoreMoveStep.SC_02_MoveToBag) else if (StoreMove.MoveStep == StoreMoveStep.SC_03_MoveToHBag)
{
ACServerManager.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
StoreMove.NextMoveStep(StoreMoveStep.SC_04_Inventory);
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(2000));
int outCount = ACServerManager.GetActualtPosition(Config.UpDown_Axis);
int errorCount = Math.Abs(outCount - moveP.UpDown_P9);
if (errorCount <= Config.UpDown_Axis.CanErrorCountMax)
{
CheckPositionLog(" 升降轴到目标位置停止, 当前位置=" + ACServerManager.GetActualtPosition(Config.UpDown_Axis));
}
else
{
CheckPositionLog(" 升降轴未到目标停止, 当前位置=" + ACServerManager.GetActualtPosition(Config.UpDown_Axis));
}
// if (ACAxisMoveIsEnd(Config.UpDown_Axis, moveP.UpDown_P9,Config.UpDownAxis_P9_Speed, out string msg))
//{
//}
//else
//{
// //IsExist = true;
// //IsExist = IOManager.IOValue(IO_Type.CheckPos).Equals(IO_VALUE.HIGH);
//}
}
else if (StoreMove.MoveStep == StoreMoveStep.SC_04_Inventory)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SC_03_Inventory);
IsExist = IOManager.IOValue(IO_Type.CheckPos).Equals(IO_VALUE.HIGH); IsExist = IOManager.IOValue(IO_Type.CheckPos).Equals(IO_VALUE.HIGH);
Dictionary<string, string> paramMap = new Dictionary<string, string>(); Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("cid", CID);//cid = 料仓CID paramMap.Add("cid", CID);//cid = 料仓CID
paramMap.Add("pos", StoreMove.MoveParam.PosInfo.PosId); // 库位 paramMap.Add("pos", StoreMove.MoveParam.PosInfo.PosId); // 库位
paramMap.Add("hasReel", IsExist.ToString()); // 是否有料 paramMap.Add("hasReel", IsExist.ToString()); // 是否有料
string server =StoreManager.GetAddr(StoreManager.Addr_posReelCheck, paramMap); string server = StoreManager.GetAddr(StoreManager.Addr_posReelCheck, paramMap);
string resultStr = HttpHelper.Post(server, ""); string resultStr = HttpHelper.Post(server, "");
CheckPositionLog("盘点仓位: [CID=" + CID + "] [" + StoreMove.MoveParam.PosInfo.PosId + "] [IO_Type.CheckPos=" + IsExist.ToString() + "] [resultStr=" + resultStr + "]");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
CheckPositionLog("盘点仓位：SC_03_Inventory [CID="+CID+"] [" + StoreMove.MoveParam.PosInfo.PosId + "] [IO_Type.CheckPos=" + IsExist.ToString() + "] [resultStr=" + resultStr + "]");
}
else if (StoreMove.MoveStep == StoreMoveStep.SC_03_Inventory)
{
StoreMove.EndMove(); StoreMove.EndMove();
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
//设备连接，盘点后，BOX恢复原始状态 //设备连接，盘点后，BOX恢复原始状态
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -73,6 +73,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -73,6 +73,7 @@ namespace OnlineStore.DeviceLibrary
p.UpDown_P4 = position.UpDownAxis_ILPosition_P4; p.UpDown_P4 = position.UpDownAxis_ILPosition_P4;
p.UpDown_P5 = position.UpDownAxis_OLPosition_P5; p.UpDown_P5 = position.UpDownAxis_OLPosition_P5;
p.UpDown_P6 = position.UpDownAxis_OHPosition_P6; p.UpDown_P6 = position.UpDownAxis_OHPosition_P6;
p.UpDown_P9 = position.UpDownAxis_Position_P9;
param.MoveP = p; param.MoveP = p;
if (param.PosInfo.PlateH <= 0) if (param.PosInfo.PlateH <= 0)
...@@ -158,6 +159,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -158,6 +159,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg); wait.IsEnd = ACAxisMoveIsEnd(wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg);
} }
if (!msg.Equals("")) if (!msg.Equals(""))
{ {
...@@ -175,10 +177,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -175,10 +177,20 @@ namespace OnlineStore.DeviceLibrary
{ {
timeOutMs = 650000; timeOutMs = 650000;
} }
if (StoreMove.MoveStep.Equals(StoreMoveStep.SC_03_MoveToHBag))
{
timeOutMs = 20000;
}
if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs) if ((!wait.IsEnd) && span.TotalMilliseconds > timeOutMs)
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 "; WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待" + io.DisplayStr + "=" + wait.IoValue + "超时 ";
if (WarnMsg.Contains("CheckPos") || WarnMsg.Contains("X03_点检"))
{
WarnMsg = "";
break;
}
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, StoreMove.MoveType);
LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14); LogUtil.error(LOGGER, StoreName + wait.IoType + "等待信号(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", 14);
isOk = false; isOk = false;
...@@ -250,6 +262,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -250,6 +262,12 @@ namespace OnlineStore.DeviceLibrary
{ {
WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待超时 [" + NotOkMsg WarnMsg = StoreName + "[" + StoreMove.MoveType + "][" + StoreMove.MoveStep + "] 等待超时 [" + NotOkMsg
+ "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
if (WarnMsg.Contains("CheckPos") || WarnMsg.Contains("X03_点检"))
{
WarnMsg = "";
return;
}
LogUtil.error(LOGGER, WarnMsg,100); LogUtil.error(LOGGER, WarnMsg,100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
} }
......
source/DeviceLibrary/store/LineMoveP.cs
...@@ -44,7 +44,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -44,7 +44,10 @@ namespace OnlineStore.DeviceLibrary
/// 轴2（ 升降轴） 进料口出料缓冲点P8 /// 轴2（ 升降轴） 进料口出料缓冲点P8
/// </summary> /// </summary>
public int UpDown_P8 { get; set; } public int UpDown_P8 { get; set; }
/// <summary>
/// 升降轴库位盘点点P9
/// </summary>
public int UpDown_P9 { get; set; }
/// <summary> /// <summary>
/// 轴1旋转轴 待机原位点 P1 /// 轴1旋转轴 待机原位点 P1
/// </summary> /// </summary>
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -341,13 +341,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -341,13 +341,17 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
SC_01_InOutAxisHome, SC_01_InOutAxisHome,
/// <summary> /// <summary>
/// 料叉背面移动到库位 /// 料叉背面移动到库位低点
/// </summary> /// </summary>
SC_02_MoveToBag, SC_02_MoveToLBag,
/// <summary>
/// 料叉背面移动到库位高点
/// </summary>
SC_03_MoveToHBag,
/// <summary> /// <summary>
/// 盘点仓位 /// 盘点仓位
/// </summary> /// </summary>
SC_03_Inventory, SC_04_Inventory,
#endregion #endregion
} }
......
source/LoadCVSLibrary/position/ACStorePosition.cs
...@@ -44,6 +44,12 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -44,6 +44,12 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("升降轴库位入料缓冲点P4")] [CSVAttribute("升降轴库位入料缓冲点P4")]
public int UpDownAxis_ILPosition_P4 { get; set; } public int UpDownAxis_ILPosition_P4 { get; set; }
/// <summary>
/// 升降轴库位盘点点P9
/// </summary>
[CSVAttribute("升降轴库位盘点点P9")]
public int UpDownAxis_Position_P9 { get; set; }
/// <summary> /// <summary>
/// 进出轴（库位点取料点）P3 /// 进出轴（库位点取料点）P3
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -209,6 +209,11 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -209,6 +209,11 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_P8_Speed { get; set; } public int UpDownAxis_P8_Speed { get; set; }
/// <summary> /// <summary>
/// PRO 升降轴（轴2）P9速度 UpDownAxis_P9_Speed
/// </summary>
[ConfigProAttribute("UpDownAxis_P9_Speed")]
public int UpDownAxis_P9_Speed { get; set; }
/// <summary>
/// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed /// PRO 旋转轴（轴1）P1速度 MiddleAxis_P1_Speed
/// </summary> /// </summary>
[ConfigProAttribute("MiddleAxis_P1_Speed")] [ConfigProAttribute("MiddleAxis_P1_Speed")]
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!