Skip to content

张东亮 / RC1250-DISTLineClient

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

功能实现，未测试

1 个父辈 4d517bad
内嵌 并排
正在显示 39 个修改的文件 包含 324 行增加 和 197 行删除
_system~.ini 0 → 100644
文件属性发生变化
dll/RFID/_system~.ini 0 → 100644
文件属性发生变化
dll/_system~.ini 0 → 100644
文件属性发生变化
dll/server模式/_system~.ini 0 → 100644
文件属性发生变化
source/Common/_system~.ini 0 → 100644
文件属性发生变化
source/Common/bean/_system~.ini 0 → 100644
文件属性发生变化
source/Common/util/_system~.ini 0 → 100644
文件属性发生变化
source/DISTLineClient/DISTLineClient.csproj
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid> <ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>DISTLineClient</RootNamespace>
<AssemblyName>DISTLineClient</AssemblyName> <AssemblyName>DISTLineClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>box.ico</ApplicationIcon> <ApplicationIcon>dist.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net">
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="box.ico" /> <Content Include="box.ico" />
<Content Include="dist.ico" />
<Content Include="记录.txt" /> <Content Include="记录.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
source/DISTLineClient/FrmDISTClient.Designer.cs
...@@ -39,6 +39,9 @@ ...@@ -39,6 +39,9 @@
this.btnDis = new System.Windows.Forms.Button(); this.btnDis = new System.Windows.Forms.Button();
this.btnInit = new System.Windows.Forms.Button(); this.btnInit = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.btnRollerRun = new System.Windows.Forms.Button();
this.btnTranverseRun = new System.Windows.Forms.Button();
this.btnTranverse = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.numericUpDown1 = new System.Windows.Forms.NumericUpDown(); this.numericUpDown1 = new System.Windows.Forms.NumericUpDown();
this.btnStopTDown = new System.Windows.Forms.Button(); this.btnStopTDown = new System.Windows.Forms.Button();
...@@ -99,24 +102,24 @@ ...@@ -99,24 +102,24 @@
this.toolStripSeparator8, this.toolStripSeparator8,
this.toolStripMenuItem1}); this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1"; this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.Size = new System.Drawing.Size(125, 74); 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(124, 32); 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 // toolStripSeparator8
// //
this.toolStripSeparator8.Name = "toolStripSeparator8"; this.toolStripSeparator8.Name = "toolStripSeparator8";
this.toolStripSeparator8.Size = new System.Drawing.Size(121, 6); 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(124, 32); this.toolStripMenuItem1.Size = new System.Drawing.Size(112, 26);
this.toolStripMenuItem1.Text = "退出"; this.toolStripMenuItem1.Text = "退出";
this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click); this.toolStripMenuItem1.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click);
// //
...@@ -131,11 +134,9 @@ ...@@ -131,11 +134,9 @@
this.groupBox5.Controls.Add(this.btnNeedLeave); this.groupBox5.Controls.Add(this.btnNeedLeave);
this.groupBox5.Controls.Add(this.btnDis); this.groupBox5.Controls.Add(this.btnDis);
this.groupBox5.Controls.Add(this.btnInit); this.groupBox5.Controls.Add(this.btnInit);
this.groupBox5.Location = new System.Drawing.Point(562, 165); this.groupBox5.Location = new System.Drawing.Point(450, 132);
this.groupBox5.Margin = new System.Windows.Forms.Padding(4);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Padding = new System.Windows.Forms.Padding(4); this.groupBox5.Size = new System.Drawing.Size(728, 77);
this.groupBox5.Size = new System.Drawing.Size(910, 96);
this.groupBox5.TabIndex = 277; this.groupBox5.TabIndex = 277;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "AGV调度通信"; this.groupBox5.Text = "AGV调度通信";
...@@ -145,10 +146,9 @@ ...@@ -145,10 +146,9 @@
this.chkBoxAGVCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkBoxAGVCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chkBoxAGVCancel.AutoSize = true; this.chkBoxAGVCancel.AutoSize = true;
this.chkBoxAGVCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkBoxAGVCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkBoxAGVCancel.Location = new System.Drawing.Point(723, 51); this.chkBoxAGVCancel.Location = new System.Drawing.Point(580, 41);
this.chkBoxAGVCancel.Margin = new System.Windows.Forms.Padding(4);
this.chkBoxAGVCancel.Name = "chkBoxAGVCancel"; this.chkBoxAGVCancel.Name = "chkBoxAGVCancel";
this.chkBoxAGVCancel.Size = new System.Drawing.Size(179, 28); this.chkBoxAGVCancel.Size = new System.Drawing.Size(142, 24);
this.chkBoxAGVCancel.TabIndex = 275; this.chkBoxAGVCancel.TabIndex = 275;
this.chkBoxAGVCancel.Text = "AGV_CancelState"; this.chkBoxAGVCancel.Text = "AGV_CancelState";
this.chkBoxAGVCancel.UseVisualStyleBackColor = true; this.chkBoxAGVCancel.UseVisualStyleBackColor = true;
...@@ -157,32 +157,29 @@ ...@@ -157,32 +157,29 @@
// txtShelfId // txtShelfId
// //
this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtShelfId.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtShelfId.Location = new System.Drawing.Point(375, 39); this.txtShelfId.Location = new System.Drawing.Point(300, 31);
this.txtShelfId.Margin = new System.Windows.Forms.Padding(4);
this.txtShelfId.MaxLength = 4; this.txtShelfId.MaxLength = 4;
this.txtShelfId.Name = "txtShelfId"; this.txtShelfId.Name = "txtShelfId";
this.txtShelfId.Size = new System.Drawing.Size(65, 31); this.txtShelfId.Size = new System.Drawing.Size(53, 26);
this.txtShelfId.TabIndex = 6; this.txtShelfId.TabIndex = 6;
this.txtShelfId.Text = "000"; this.txtShelfId.Text = "000";
// //
// txtname // txtname
// //
this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtname.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtname.Location = new System.Drawing.Point(299, 39); this.txtname.Location = new System.Drawing.Point(239, 31);
this.txtname.Margin = new System.Windows.Forms.Padding(4);
this.txtname.MaxLength = 4; this.txtname.MaxLength = 4;
this.txtname.Name = "txtname"; this.txtname.Name = "txtname";
this.txtname.Size = new System.Drawing.Size(65, 31); this.txtname.Size = new System.Drawing.Size(53, 26);
this.txtname.TabIndex = 5; this.txtname.TabIndex = 5;
this.txtname.Text = "C2"; this.txtname.Text = "C2";
// //
// btnNeedEntry // btnNeedEntry
// //
this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNeedEntry.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNeedEntry.Location = new System.Drawing.Point(586, 30); this.btnNeedEntry.Location = new System.Drawing.Point(469, 24);
this.btnNeedEntry.Margin = new System.Windows.Forms.Padding(4);
this.btnNeedEntry.Name = "btnNeedEntry"; this.btnNeedEntry.Name = "btnNeedEntry";
this.btnNeedEntry.Size = new System.Drawing.Size(125, 49); this.btnNeedEntry.Size = new System.Drawing.Size(100, 39);
this.btnNeedEntry.TabIndex = 4; this.btnNeedEntry.TabIndex = 4;
this.btnNeedEntry.Text = "NeedEnter"; this.btnNeedEntry.Text = "NeedEnter";
this.btnNeedEntry.UseVisualStyleBackColor = true; this.btnNeedEntry.UseVisualStyleBackColor = true;
...@@ -191,10 +188,9 @@ ...@@ -191,10 +188,9 @@
// btnNeedLeave // btnNeedLeave
// //
this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNeedLeave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNeedLeave.Location = new System.Drawing.Point(451, 30); this.btnNeedLeave.Location = new System.Drawing.Point(361, 24);
this.btnNeedLeave.Margin = new System.Windows.Forms.Padding(4);
this.btnNeedLeave.Name = "btnNeedLeave"; this.btnNeedLeave.Name = "btnNeedLeave";
this.btnNeedLeave.Size = new System.Drawing.Size(125, 49); this.btnNeedLeave.Size = new System.Drawing.Size(100, 39);
this.btnNeedLeave.TabIndex = 3; this.btnNeedLeave.TabIndex = 3;
this.btnNeedLeave.Text = "NeedLeave"; this.btnNeedLeave.Text = "NeedLeave";
this.btnNeedLeave.UseVisualStyleBackColor = true; this.btnNeedLeave.UseVisualStyleBackColor = true;
...@@ -203,10 +199,9 @@ ...@@ -203,10 +199,9 @@
// btnDis // btnDis
// //
this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDis.Location = new System.Drawing.Point(164, 30); this.btnDis.Location = new System.Drawing.Point(131, 24);
this.btnDis.Margin = new System.Windows.Forms.Padding(4);
this.btnDis.Name = "btnDis"; this.btnDis.Name = "btnDis";
this.btnDis.Size = new System.Drawing.Size(125, 49); this.btnDis.Size = new System.Drawing.Size(100, 39);
this.btnDis.TabIndex = 2; this.btnDis.TabIndex = 2;
this.btnDis.Text = "断开"; this.btnDis.Text = "断开";
this.btnDis.UseVisualStyleBackColor = true; this.btnDis.UseVisualStyleBackColor = true;
...@@ -215,10 +210,9 @@ ...@@ -215,10 +210,9 @@
// btnInit // btnInit
// //
this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInit.Location = new System.Drawing.Point(29, 30); this.btnInit.Location = new System.Drawing.Point(23, 24);
this.btnInit.Margin = new System.Windows.Forms.Padding(4);
this.btnInit.Name = "btnInit"; this.btnInit.Name = "btnInit";
this.btnInit.Size = new System.Drawing.Size(125, 49); this.btnInit.Size = new System.Drawing.Size(100, 39);
this.btnInit.TabIndex = 1; this.btnInit.TabIndex = 1;
this.btnInit.Text = "连接"; this.btnInit.Text = "连接";
this.btnInit.UseVisualStyleBackColor = true; this.btnInit.UseVisualStyleBackColor = true;
...@@ -228,6 +222,9 @@ ...@@ -228,6 +222,9 @@
// //
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)));
this.groupBox2.Controls.Add(this.btnRollerRun);
this.groupBox2.Controls.Add(this.btnTranverseRun);
this.groupBox2.Controls.Add(this.btnTranverse);
this.groupBox2.Controls.Add(this.label1); this.groupBox2.Controls.Add(this.label1);
this.groupBox2.Controls.Add(this.numericUpDown1); this.groupBox2.Controls.Add(this.numericUpDown1);
this.groupBox2.Controls.Add(this.btnStopTDown); this.groupBox2.Controls.Add(this.btnStopTDown);
...@@ -243,21 +240,51 @@ ...@@ -243,21 +240,51 @@
this.groupBox2.Controls.Add(this.btnOutL); this.groupBox2.Controls.Add(this.btnOutL);
this.groupBox2.Controls.Add(this.groupBox4); this.groupBox2.Controls.Add(this.groupBox4);
this.groupBox2.Controls.Add(this.groupBox1); this.groupBox2.Controls.Add(this.groupBox1);
this.groupBox2.Location = new System.Drawing.Point(12, 165); this.groupBox2.Location = new System.Drawing.Point(10, 132);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4); this.groupBox2.Size = new System.Drawing.Size(434, 551);
this.groupBox2.Size = new System.Drawing.Size(542, 689);
this.groupBox2.TabIndex = 276; this.groupBox2.TabIndex = 276;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// btnRollerRun
//
this.btnRollerRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRollerRun.Location = new System.Drawing.Point(298, 368);
this.btnRollerRun.Name = "btnRollerRun";
this.btnRollerRun.Size = new System.Drawing.Size(132, 39);
this.btnRollerRun.TabIndex = 289;
this.btnRollerRun.Text = "滚筒电机运转";
this.btnRollerRun.UseVisualStyleBackColor = true;
this.btnRollerRun.Click += new System.EventHandler(this.btnRollerRun_Click);
//
// btnTranverseRun
//
this.btnTranverseRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverseRun.Location = new System.Drawing.Point(298, 323);
this.btnTranverseRun.Name = "btnTranverseRun";
this.btnTranverseRun.Size = new System.Drawing.Size(132, 39);
this.btnTranverseRun.TabIndex = 288;
this.btnTranverseRun.Text = "横移电机运转";
this.btnTranverseRun.UseVisualStyleBackColor = true;
this.btnTranverseRun.Click += new System.EventHandler(this.btnTranverseRun_Click);
//
// btnTranverse
//
this.btnTranverse.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTranverse.Location = new System.Drawing.Point(298, 278);
this.btnTranverse.Name = "btnTranverse";
this.btnTranverse.Size = new System.Drawing.Size(132, 39);
this.btnTranverse.TabIndex = 287;
this.btnTranverse.Text = "横移机构下降";
this.btnTranverse.UseVisualStyleBackColor = true;
this.btnTranverse.Click += new System.EventHandler(this.btnTranverse_Click);
//
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(310, 551); this.label1.Location = new System.Drawing.Point(248, 441);
this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(30, 20); this.label1.Size = new System.Drawing.Size(25, 17);
this.label1.TabIndex = 286; this.label1.TabIndex = 286;
this.label1.Text = "ms"; this.label1.Text = "ms";
// //
...@@ -269,8 +296,7 @@ ...@@ -269,8 +296,7 @@
0, 0,
0, 0,
0}); 0});
this.numericUpDown1.Location = new System.Drawing.Point(226, 545); this.numericUpDown1.Location = new System.Drawing.Point(181, 436);
this.numericUpDown1.Margin = new System.Windows.Forms.Padding(4);
this.numericUpDown1.Maximum = new decimal(new int[] { this.numericUpDown1.Maximum = new decimal(new int[] {
300000, 300000,
0, 0,
...@@ -282,7 +308,7 @@ ...@@ -282,7 +308,7 @@
0, 0,
0}); 0});
this.numericUpDown1.Name = "numericUpDown1"; this.numericUpDown1.Name = "numericUpDown1";
this.numericUpDown1.Size = new System.Drawing.Size(76, 31); this.numericUpDown1.Size = new System.Drawing.Size(61, 26);
this.numericUpDown1.TabIndex = 285; this.numericUpDown1.TabIndex = 285;
this.numericUpDown1.Value = new decimal(new int[] { this.numericUpDown1.Value = new decimal(new int[] {
600, 600,
...@@ -293,10 +319,9 @@ ...@@ -293,10 +319,9 @@
// btnStopTDown // btnStopTDown
// //
this.btnStopTDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStopTDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStopTDown.Location = new System.Drawing.Point(349, 538); this.btnStopTDown.Location = new System.Drawing.Point(279, 430);
this.btnStopTDown.Margin = new System.Windows.Forms.Padding(4);
this.btnStopTDown.Name = "btnStopTDown"; this.btnStopTDown.Name = "btnStopTDown";
this.btnStopTDown.Size = new System.Drawing.Size(159, 49); this.btnStopTDown.Size = new System.Drawing.Size(127, 39);
this.btnStopTDown.TabIndex = 284; this.btnStopTDown.TabIndex = 284;
this.btnStopTDown.Text = "阻挡定时下降"; this.btnStopTDown.Text = "阻挡定时下降";
this.btnStopTDown.UseVisualStyleBackColor = true; this.btnStopTDown.UseVisualStyleBackColor = true;
...@@ -311,20 +336,18 @@ ...@@ -311,20 +336,18 @@
"分盘1进料线_阻挡", "分盘1进料线_阻挡",
"分盘1进料线_出口阻挡", "分盘1进料线_出口阻挡",
"分盘2出料线_阻挡"}); "分盘2出料线_阻挡"});
this.cmbStopList.Location = new System.Drawing.Point(28, 544); this.cmbStopList.Location = new System.Drawing.Point(22, 435);
this.cmbStopList.Margin = new System.Windows.Forms.Padding(4);
this.cmbStopList.Name = "cmbStopList"; this.cmbStopList.Name = "cmbStopList";
this.cmbStopList.Size = new System.Drawing.Size(190, 31); this.cmbStopList.Size = new System.Drawing.Size(153, 28);
this.cmbStopList.TabIndex = 283; this.cmbStopList.TabIndex = 283;
// //
// btnCloseA // btnCloseA
// //
this.btnCloseA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnCloseA.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseA.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseA.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseA.Location = new System.Drawing.Point(28, 619); this.btnCloseA.Location = new System.Drawing.Point(22, 495);
this.btnCloseA.Margin = new System.Windows.Forms.Padding(4);
this.btnCloseA.Name = "btnCloseA"; this.btnCloseA.Name = "btnCloseA";
this.btnCloseA.Size = new System.Drawing.Size(216, 49); this.btnCloseA.Size = new System.Drawing.Size(173, 39);
this.btnCloseA.TabIndex = 282; this.btnCloseA.TabIndex = 282;
this.btnCloseA.Text = "关闭所有DO"; this.btnCloseA.Text = "关闭所有DO";
this.btnCloseA.UseVisualStyleBackColor = true; this.btnCloseA.UseVisualStyleBackColor = true;
...@@ -334,10 +357,9 @@ ...@@ -334,10 +357,9 @@
// //
this.btnClearL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnClearL.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearL.Location = new System.Drawing.Point(376, 619); this.btnClearL.Location = new System.Drawing.Point(301, 495);
this.btnClearL.Margin = new System.Windows.Forms.Padding(4);
this.btnClearL.Name = "btnClearL"; this.btnClearL.Name = "btnClearL";
this.btnClearL.Size = new System.Drawing.Size(130, 49); this.btnClearL.Size = new System.Drawing.Size(104, 39);
this.btnClearL.TabIndex = 14; this.btnClearL.TabIndex = 14;
this.btnClearL.Text = "清理日志"; this.btnClearL.Text = "清理日志";
this.btnClearL.UseVisualStyleBackColor = true; this.btnClearL.UseVisualStyleBackColor = true;
...@@ -347,10 +369,9 @@ ...@@ -347,10 +369,9 @@
// //
this.btnLogDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.btnLogDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLogDebug.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLogDebug.Location = new System.Drawing.Point(245, 619); this.btnLogDebug.Location = new System.Drawing.Point(196, 495);
this.btnLogDebug.Margin = new System.Windows.Forms.Padding(4);
this.btnLogDebug.Name = "btnLogDebug"; this.btnLogDebug.Name = "btnLogDebug";
this.btnLogDebug.Size = new System.Drawing.Size(130, 49); this.btnLogDebug.Size = new System.Drawing.Size(104, 39);
this.btnLogDebug.TabIndex = 13; this.btnLogDebug.TabIndex = 13;
this.btnLogDebug.Text = "开启DEBUG"; this.btnLogDebug.Text = "开启DEBUG";
this.btnLogDebug.UseVisualStyleBackColor = true; this.btnLogDebug.UseVisualStyleBackColor = true;
...@@ -359,10 +380,9 @@ ...@@ -359,10 +380,9 @@
// btnOLOutStopDown // btnOLOutStopDown
// //
this.btnOLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLOutStopDown.Location = new System.Drawing.Point(291, 460); this.btnOLOutStopDown.Location = new System.Drawing.Point(160, 368);
this.btnOLOutStopDown.Margin = new System.Windows.Forms.Padding(4);
this.btnOLOutStopDown.Name = "btnOLOutStopDown"; this.btnOLOutStopDown.Name = "btnOLOutStopDown";
this.btnOLOutStopDown.Size = new System.Drawing.Size(216, 49); this.btnOLOutStopDown.Size = new System.Drawing.Size(132, 39);
this.btnOLOutStopDown.TabIndex = 281; this.btnOLOutStopDown.TabIndex = 281;
this.btnOLOutStopDown.Text = "分盘2线体出口阻挡下降"; this.btnOLOutStopDown.Text = "分盘2线体出口阻挡下降";
this.btnOLOutStopDown.UseVisualStyleBackColor = true; this.btnOLOutStopDown.UseVisualStyleBackColor = true;
...@@ -371,10 +391,9 @@ ...@@ -371,10 +391,9 @@
// btnOLInStopDown // btnOLInStopDown
// //
this.btnOLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLInStopDown.Location = new System.Drawing.Point(291, 404); this.btnOLInStopDown.Location = new System.Drawing.Point(160, 323);
this.btnOLInStopDown.Margin = new System.Windows.Forms.Padding(4);
this.btnOLInStopDown.Name = "btnOLInStopDown"; this.btnOLInStopDown.Name = "btnOLInStopDown";
this.btnOLInStopDown.Size = new System.Drawing.Size(216, 49); this.btnOLInStopDown.Size = new System.Drawing.Size(132, 39);
this.btnOLInStopDown.TabIndex = 280; this.btnOLInStopDown.TabIndex = 280;
this.btnOLInStopDown.Text = "分盘2线体阻挡下降"; this.btnOLInStopDown.Text = "分盘2线体阻挡下降";
this.btnOLInStopDown.UseVisualStyleBackColor = true; this.btnOLInStopDown.UseVisualStyleBackColor = true;
...@@ -383,10 +402,9 @@ ...@@ -383,10 +402,9 @@
// btnInLOutStopDown // btnInLOutStopDown
// //
this.btnInLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInLOutStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLOutStopDown.Location = new System.Drawing.Point(28, 460); this.btnInLOutStopDown.Location = new System.Drawing.Point(22, 368);
this.btnInLOutStopDown.Margin = new System.Windows.Forms.Padding(4);
this.btnInLOutStopDown.Name = "btnInLOutStopDown"; this.btnInLOutStopDown.Name = "btnInLOutStopDown";
this.btnInLOutStopDown.Size = new System.Drawing.Size(216, 49); this.btnInLOutStopDown.Size = new System.Drawing.Size(132, 39);
this.btnInLOutStopDown.TabIndex = 279; this.btnInLOutStopDown.TabIndex = 279;
this.btnInLOutStopDown.Text = "分盘1线体出口阻挡下降"; this.btnInLOutStopDown.Text = "分盘1线体出口阻挡下降";
this.btnInLOutStopDown.UseVisualStyleBackColor = true; this.btnInLOutStopDown.UseVisualStyleBackColor = true;
...@@ -395,10 +413,9 @@ ...@@ -395,10 +413,9 @@
// btnInLInStopDown // btnInLInStopDown
// //
this.btnInLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInLInStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLInStopDown.Location = new System.Drawing.Point(28, 404); this.btnInLInStopDown.Location = new System.Drawing.Point(22, 323);
this.btnInLInStopDown.Margin = new System.Windows.Forms.Padding(4);
this.btnInLInStopDown.Name = "btnInLInStopDown"; this.btnInLInStopDown.Name = "btnInLInStopDown";
this.btnInLInStopDown.Size = new System.Drawing.Size(216, 49); this.btnInLInStopDown.Size = new System.Drawing.Size(132, 39);
this.btnInLInStopDown.TabIndex = 278; this.btnInLInStopDown.TabIndex = 278;
this.btnInLInStopDown.Text = "分盘1线体阻挡下降"; this.btnInLInStopDown.Text = "分盘1线体阻挡下降";
this.btnInLInStopDown.UseVisualStyleBackColor = true; this.btnInLInStopDown.UseVisualStyleBackColor = true;
...@@ -407,10 +424,9 @@ ...@@ -407,10 +424,9 @@
// btnInLineRun // btnInLineRun
// //
this.btnInLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInLineRun.Location = new System.Drawing.Point(28, 348); this.btnInLineRun.Location = new System.Drawing.Point(22, 278);
this.btnInLineRun.Margin = new System.Windows.Forms.Padding(4);
this.btnInLineRun.Name = "btnInLineRun"; this.btnInLineRun.Name = "btnInLineRun";
this.btnInLineRun.Size = new System.Drawing.Size(216, 49); this.btnInLineRun.Size = new System.Drawing.Size(132, 39);
this.btnInLineRun.TabIndex = 276; this.btnInLineRun.TabIndex = 276;
this.btnInLineRun.Text = "分盘1线体运转"; this.btnInLineRun.Text = "分盘1线体运转";
this.btnInLineRun.UseVisualStyleBackColor = true; this.btnInLineRun.UseVisualStyleBackColor = true;
...@@ -419,10 +435,9 @@ ...@@ -419,10 +435,9 @@
// btnOutL // btnOutL
// //
this.btnOutL.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutL.Location = new System.Drawing.Point(291, 348); this.btnOutL.Location = new System.Drawing.Point(160, 278);
this.btnOutL.Margin = new System.Windows.Forms.Padding(4);
this.btnOutL.Name = "btnOutL"; this.btnOutL.Name = "btnOutL";
this.btnOutL.Size = new System.Drawing.Size(216, 49); this.btnOutL.Size = new System.Drawing.Size(132, 39);
this.btnOutL.TabIndex = 277; this.btnOutL.TabIndex = 277;
this.btnOutL.Text = "分盘2线体运转"; this.btnOutL.Text = "分盘2线体运转";
this.btnOutL.UseVisualStyleBackColor = true; this.btnOutL.UseVisualStyleBackColor = true;
...@@ -431,11 +446,9 @@ ...@@ -431,11 +446,9 @@
// groupBox4 // groupBox4
// //
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(272, 19); this.groupBox4.Location = new System.Drawing.Point(218, 15);
this.groupBox4.Margin = new System.Windows.Forms.Padding(4);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Padding = new System.Windows.Forms.Padding(4); this.groupBox4.Size = new System.Drawing.Size(208, 251);
this.groupBox4.Size = new System.Drawing.Size(260, 314);
this.groupBox4.TabIndex = 275; this.groupBox4.TabIndex = 275;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -445,25 +458,23 @@ ...@@ -445,25 +458,23 @@
this.tableLayoutPanel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.tableLayoutPanel2.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))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel2.AutoScroll = true;
this.tableLayoutPanel2.ColumnCount = 1; this.tableLayoutPanel2.ColumnCount = 1;
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel2.Location = new System.Drawing.Point(6, 18); this.tableLayoutPanel2.Location = new System.Drawing.Point(5, 14);
this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel2.Name = "tableLayoutPanel2"; this.tableLayoutPanel2.Name = "tableLayoutPanel2";
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(246, 289); this.tableLayoutPanel2.Size = new System.Drawing.Size(197, 231);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.tableLayoutPanel1); this.groupBox1.Controls.Add(this.tableLayoutPanel1);
this.groupBox1.Location = new System.Drawing.Point(8, 19); this.groupBox1.Location = new System.Drawing.Point(6, 15);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4); this.groupBox1.Size = new System.Drawing.Size(208, 251);
this.groupBox1.Size = new System.Drawing.Size(260, 314);
this.groupBox1.TabIndex = 274; this.groupBox1.TabIndex = 274;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DI列表"; this.groupBox1.Text = "DI列表";
...@@ -473,15 +484,15 @@ ...@@ -473,15 +484,15 @@
this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.tableLayoutPanel1.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))); | System.Windows.Forms.AnchorStyles.Right)));
this.tableLayoutPanel1.AutoScroll = true;
this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnCount = 1;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Location = new System.Drawing.Point(8, 18); this.tableLayoutPanel1.Location = new System.Drawing.Point(6, 14);
this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 21F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(246, 289); this.tableLayoutPanel1.Size = new System.Drawing.Size(197, 231);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// richTextBox1 // richTextBox1
...@@ -490,10 +501,9 @@ ...@@ -490,10 +501,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(562, 269); this.richTextBox1.Location = new System.Drawing.Point(450, 215);
this.richTextBox1.Margin = new System.Windows.Forms.Padding(4);
this.richTextBox1.Name = "richTextBox1"; this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(909, 584); this.richTextBox1.Size = new System.Drawing.Size(728, 468);
this.richTextBox1.TabIndex = 256; this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = ""; this.richTextBox1.Text = "";
this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged); this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
...@@ -505,11 +515,9 @@ ...@@ -505,11 +515,9 @@
this.groupBox3.Controls.Add(this.lblWarnMsg); this.groupBox3.Controls.Add(this.lblWarnMsg);
this.groupBox3.Controls.Add(this.panel1); this.groupBox3.Controls.Add(this.panel1);
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Location = new System.Drawing.Point(12, 8); this.groupBox3.Location = new System.Drawing.Point(10, 6);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4); this.groupBox3.Size = new System.Drawing.Size(1168, 124);
this.groupBox3.Size = new System.Drawing.Size(1460, 155);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
...@@ -518,10 +526,9 @@ ...@@ -518,10 +526,9 @@
// //
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(334, 82); this.lblWarnMsg.Location = new System.Drawing.Point(267, 66);
this.lblWarnMsg.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1070, 65); this.lblWarnMsg.Size = new System.Drawing.Size(856, 52);
this.lblWarnMsg.TabIndex = 224; this.lblWarnMsg.TabIndex = 224;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -536,10 +543,9 @@ ...@@ -536,10 +543,9 @@
this.panel1.Controls.Add(this.chbDebug); this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.btnDISTStop); this.panel1.Controls.Add(this.btnDISTStop);
this.panel1.Controls.Add(this.chbAuto); this.panel1.Controls.Add(this.chbAuto);
this.panel1.Location = new System.Drawing.Point(6, 19); this.panel1.Location = new System.Drawing.Point(5, 15);
this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1450, 60); this.panel1.Size = new System.Drawing.Size(1160, 48);
this.panel1.TabIndex = 273; this.panel1.TabIndex = 273;
// //
// chbMoveStop // chbMoveStop
...@@ -547,10 +553,9 @@ ...@@ -547,10 +553,9 @@
this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbMoveStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbMoveStop.AutoSize = true; this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(881, 12); this.chbMoveStop.Location = new System.Drawing.Point(704, 10);
this.chbMoveStop.Margin = new System.Windows.Forms.Padding(4);
this.chbMoveStop.Name = "chbMoveStop"; this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(104, 28); this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 274; this.chbMoveStop.TabIndex = 274;
this.chbMoveStop.Text = "暂停运动"; this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
...@@ -559,10 +564,9 @@ ...@@ -559,10 +564,9 @@
// lblInfo // lblInfo
// //
this.lblInfo.AutoSize = true; this.lblInfo.AutoSize = true;
this.lblInfo.Location = new System.Drawing.Point(346, 6); this.lblInfo.Location = new System.Drawing.Point(277, 5);
this.lblInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblInfo.Name = "lblInfo"; this.lblInfo.Name = "lblInfo";
this.lblInfo.Size = new System.Drawing.Size(69, 20); this.lblInfo.Size = new System.Drawing.Size(56, 17);
this.lblInfo.TabIndex = 273; this.lblInfo.TabIndex = 273;
this.lblInfo.Text = "运行信息"; this.lblInfo.Text = "运行信息";
// //
...@@ -570,10 +574,9 @@ ...@@ -570,10 +574,9 @@
// //
this.btnDISTExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnDISTExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDISTExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTExit.Location = new System.Drawing.Point(1279, 4); this.btnDISTExit.Location = new System.Drawing.Point(1023, 3);
this.btnDISTExit.Margin = new System.Windows.Forms.Padding(4);
this.btnDISTExit.Name = "btnDISTExit"; this.btnDISTExit.Name = "btnDISTExit";
this.btnDISTExit.Size = new System.Drawing.Size(165, 49); this.btnDISTExit.Size = new System.Drawing.Size(132, 39);
this.btnDISTExit.TabIndex = 4; this.btnDISTExit.TabIndex = 4;
this.btnDISTExit.Text = "退出"; this.btnDISTExit.Text = "退出";
this.btnDISTExit.UseVisualStyleBackColor = true; this.btnDISTExit.UseVisualStyleBackColor = true;
...@@ -582,10 +585,9 @@ ...@@ -582,10 +585,9 @@
// btnDISTStart // btnDISTStart
// //
this.btnDISTStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTStart.Location = new System.Drawing.Point(5, 4); this.btnDISTStart.Location = new System.Drawing.Point(4, 3);
this.btnDISTStart.Margin = new System.Windows.Forms.Padding(4);
this.btnDISTStart.Name = "btnDISTStart"; this.btnDISTStart.Name = "btnDISTStart";
this.btnDISTStart.Size = new System.Drawing.Size(165, 49); this.btnDISTStart.Size = new System.Drawing.Size(132, 39);
this.btnDISTStart.TabIndex = 0; this.btnDISTStart.TabIndex = 0;
this.btnDISTStart.Text = "启动"; this.btnDISTStart.Text = "启动";
this.btnDISTStart.UseVisualStyleBackColor = true; this.btnDISTStart.UseVisualStyleBackColor = true;
...@@ -596,10 +598,9 @@ ...@@ -596,10 +598,9 @@
this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(1166, 12); this.chbDebug.Location = new System.Drawing.Point(932, 10);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(104, 28); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
this.chbDebug.Text = "调试状态"; this.chbDebug.Text = "调试状态";
this.chbDebug.UseVisualStyleBackColor = true; this.chbDebug.UseVisualStyleBackColor = true;
...@@ -608,10 +609,9 @@ ...@@ -608,10 +609,9 @@
// btnDISTStop // btnDISTStop
// //
this.btnDISTStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDISTStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDISTStop.Location = new System.Drawing.Point(174, 4); this.btnDISTStop.Location = new System.Drawing.Point(139, 3);
this.btnDISTStop.Margin = new System.Windows.Forms.Padding(4);
this.btnDISTStop.Name = "btnDISTStop"; this.btnDISTStop.Name = "btnDISTStop";
this.btnDISTStop.Size = new System.Drawing.Size(165, 49); this.btnDISTStop.Size = new System.Drawing.Size(132, 39);
this.btnDISTStop.TabIndex = 1; this.btnDISTStop.TabIndex = 1;
this.btnDISTStop.Text = "停止"; this.btnDISTStop.Text = "停止";
this.btnDISTStop.UseVisualStyleBackColor = true; this.btnDISTStop.UseVisualStyleBackColor = true;
...@@ -622,10 +622,9 @@ ...@@ -622,10 +622,9 @@
this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chbAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.chbAuto.AutoSize = true; this.chbAuto.AutoSize = true;
this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAuto.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAuto.Location = new System.Drawing.Point(1014, 12); this.chbAuto.Location = new System.Drawing.Point(812, 10);
this.chbAuto.Margin = new System.Windows.Forms.Padding(4);
this.chbAuto.Name = "chbAuto"; this.chbAuto.Name = "chbAuto";
this.chbAuto.Size = new System.Drawing.Size(140, 28); this.chbAuto.Size = new System.Drawing.Size(112, 24);
this.chbAuto.TabIndex = 270; this.chbAuto.TabIndex = 270;
this.chbAuto.Text = "开机自动启动"; this.chbAuto.Text = "开机自动启动";
this.chbAuto.UseVisualStyleBackColor = true; this.chbAuto.UseVisualStyleBackColor = true;
...@@ -636,24 +635,23 @@ ...@@ -636,24 +635,23 @@
this.lblThisSta.AutoSize = true; this.lblThisSta.AutoSize = true;
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Green; this.lblThisSta.ForeColor = System.Drawing.Color.Green;
this.lblThisSta.Location = new System.Drawing.Point(10, 104); this.lblThisSta.Location = new System.Drawing.Point(8, 83);
this.lblThisSta.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(84, 25); this.lblThisSta.Size = new System.Drawing.Size(65, 19);
this.lblThisSta.TabIndex = 216; this.lblThisSta.TabIndex = 216;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
// //
// FrmDISTClient // FrmDISTClient
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(120F, 120F); 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(1480, 859); this.ClientSize = new System.Drawing.Size(1184, 687);
this.Controls.Add(this.groupBox5); this.Controls.Add(this.groupBox5);
this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox2);
this.Controls.Add(this.richTextBox1); this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.groupBox3); this.Controls.Add(this.groupBox3);
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5); this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false; this.MaximizeBox = false;
this.Name = "FrmDISTClient"; this.Name = "FrmDISTClient";
this.Opacity = 0D; this.Opacity = 0D;
...@@ -724,6 +722,9 @@ ...@@ -724,6 +722,9 @@
private System.Windows.Forms.TextBox txtShelfId; private System.Windows.Forms.TextBox txtShelfId;
private System.Windows.Forms.CheckBox chbMoveStop; private System.Windows.Forms.CheckBox chbMoveStop;
private System.Windows.Forms.CheckBox chkBoxAGVCancel; private System.Windows.Forms.CheckBox chkBoxAGVCancel;
private System.Windows.Forms.Button btnRollerRun;
private System.Windows.Forms.Button btnTranverseRun;
private System.Windows.Forms.Button btnTranverse;
} }
} }
source/DISTLineClient/FrmDISTClient.cs
...@@ -121,7 +121,7 @@ namespace OnlineStore.DISTLineClient ...@@ -121,7 +121,7 @@ namespace OnlineStore.DISTLineClient
return; return;
} }
ReadIOList(); ReadIOList();
lblThisSta.Text = LineManager.GetRunStr(distLine.runStatus)+" "+(distLine.IsSleep ? "休眠中" :""); lblThisSta.Text = LineManager.GetRunStr(distLine.runStatus) + " " + (distLine.IsSleep ? "休眠中" : "");
lblWarnMsg.Text = distLine.WarnMsg; lblWarnMsg.Text = distLine.WarnMsg;
lblInfo.Text = distLine.GetRunInfo(); lblInfo.Text = distLine.GetRunInfo();
} }
...@@ -145,7 +145,8 @@ namespace OnlineStore.DISTLineClient ...@@ -145,7 +145,8 @@ namespace OnlineStore.DISTLineClient
else if (distLine.StartRun()) else if (distLine.StartRun())
{ {
btnDISTStart.Text = "复位"; btnDISTStart.Text = "复位";
}else }
else
{ {
btnDISTStart.Text = "启动"; btnDISTStart.Text = "启动";
} }
...@@ -422,5 +423,30 @@ namespace OnlineStore.DISTLineClient ...@@ -422,5 +423,30 @@ namespace OnlineStore.DISTLineClient
{ {
AgvClient.SetCancelState(chkBoxAGVCancel.Checked); AgvClient.SetCancelState(chkBoxAGVCancel.Checked);
} }
private void btnTranverse_Click(object sender, EventArgs e)
{
if (btnTranverse.Text.Equals("横移机构下降"))
{
BtnMove(btnTranverse, "横移机构下降", "横移机构上升", IO_Type.Traverse_Up_SOL);
IOManager.IOMove(IO_Type.Traverse_Down_SOL,IO_VALUE.LOW);
}
else
{
BtnMove(btnTranverse, "横移机构上升", "横移机构下降", IO_Type.Traverse_Down_SOL);
IOManager.IOMove(IO_Type.Traverse_Up_SOL,IO_VALUE.LOW);
}
}
private void btnTranverseRun_Click(object sender, EventArgs e)
{
BtnMove(btnTranverseRun, "横移电机运转", "横移电机停止", IO_Type.Traverse_Run);
}
private void btnRollerRun_Click(object sender, EventArgs e)
{
BtnMove(btnRollerRun, "滚筒电机运转", "滚筒电机停止", IO_Type.Roller_Run);
}
} }
} }
source/DISTLineClient/FrmDISTClient.resx
此文件的差异太大，无法显示。
source/DISTLineClient/Properties/Resources.Designer.cs
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.DISTLineClient.Properties { namespace DISTLineClient.Properties {
using System; using System;
...@@ -19,7 +19,7 @@ namespace OnlineStore.DISTLineClient.Properties { ...@@ -19,7 +19,7 @@ namespace OnlineStore.DISTLineClient.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -39,7 +39,7 @@ namespace OnlineStore.DISTLineClient.Properties { ...@@ -39,7 +39,7 @@ namespace OnlineStore.DISTLineClient.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.DISTLineClient.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DISTLineClient.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
......
source/DISTLineClient/Properties/Settings.Designer.cs
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.DISTLineClient.Properties { namespace DISTLineClient.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/DISTLineClient/dist.ico 0 → 100644
此文件类型无法预览
source/DeviceLibrary/LineConfig/DISTLineConfig.csv
...@@ -3,38 +3,38 @@ PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16,,,,,,, ...@@ -3,38 +3,38 @@ PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16,,,,,,, PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,, PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X761,DI-01,0, DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X741,DI-01,0,
DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X762,DI-02,0, DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X742,DI-02,0,
DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X763,DI-03,0, DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X743,DI-03,0,
DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X764,DI-04,0, DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X744,DI-04,0,
DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X765,DI-05,0, DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X745,DI-05,0,
DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X766,DI-06,0, DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X746,DI-06,0,
DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X767,DI-07,0, DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X747,DI-07,0,
DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X768,DI-08,0, DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X748,DI-08,0,
,,,8,PRO_AOI_IP_1,0,,X769,DO-01,0, DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0,
,,,9,PRO_AOI_IP_1,0,,X770,DO-02,0, DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
,,,10,PRO_AOI_IP_1,0,,X771,DO-03,0, DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
,,,11,PRO_AOI_IP_1,0,,X772,DO-04,0, DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
,,,12,PRO_AOI_IP_1,0,,X773,DO-05,0, ,,,12,PRO_AOI_IP_1,0,,X753,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DO-06,0, ,,,13,PRO_AOI_IP_1,0,,X754,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DO-07,0, ,,,14,PRO_AOI_IP_1,0,,X755,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DO-08,0, ,,,15,PRO_AOI_IP_1,0,,X756,DI-16,0,
DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y762,DI-02,0, DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y741,D0-01,0,
DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y761,DI-01,0, DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y742,DO-02,0,
DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y763,DI-03,0, DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y743,DO-03,0,
DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y764,DI-04,0, DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y744,DO-04,0,
DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y765,DI-05,0, DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y745,DO-05,0,
DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y766,DI-06,0, DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DO-06,0,
,,,6,PRO_AOI_IP_1,0,,Y767,DI-07,0, DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0,
,,,7,PRO_AOI_IP_1,0,,Y768,DI-08,0, DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0,
,,,8,PRO_AOI_IP_1,0,,Y769,DO-01,0, DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-02,0, DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-03,0, ,,,10,PRO_AOI_IP_1,0,,Y751,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-04,0, ,,,11,PRO_AOI_IP_1,0,,Y752,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y773,DO-05,0, ,,,12,PRO_AOI_IP_1,0,,Y753,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y774,DO-06,0, ,,,13,PRO_AOI_IP_1,0,,Y754,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-07,0, ,,,14,PRO_AOI_IP_1,0,,Y755,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-08,0, ,,,15,PRO_AOI_IP_1,0,,Y756,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,分盘1线AGV节点名称,L1_AgvName,A8,,,,,,, PRO,分盘1线AGV节点名称,L1_AgvName,A8,,,,,,,
PRO,分盘2线AGV节点名称,L2_AgvName,A7,,,,,,, PRO,分盘2线AGV节点名称,L2_AgvName,A7,,,,,,,
......
source/DeviceLibrary/_system~.ini 0 → 100644
文件属性发生变化
source/DeviceLibrary/acDISTLine/DISTLineBean.cs
...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Interval = 300; mainTimer.Interval = 300;
mainTimer.AutoReset = true; mainTimer.AutoReset = true;
mainTimer.Enabled = false; mainTimer.Enabled = false;
mainTimer.Elapsed +=timersTimer_Elapsed; mainTimer.Elapsed += timersTimer_Elapsed;
//添加调试 //添加调试
IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1); IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1);
...@@ -103,7 +103,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,7 +103,8 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
AgvClient.SetStatus(Config.L2_AgvName); AgvClient.SetStatus(Config.L2_AgvName);
AgvClient.SetStatus(Config.L1_AgvName); AgvClient.SetStatus(Config.L1_AgvName);
mainTimer.Enabled = true; mainTimer.Enabled = true;
...@@ -178,7 +179,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -178,7 +179,7 @@ namespace OnlineStore.DeviceLibrary
public void Alarm(AlarmType alarmType) public void Alarm(AlarmType alarmType)
{ {
if (this.alarmType.Equals(alarmType) && alarmType != AlarmType.SuddenStop ) if (this.alarmType.Equals(alarmType) && alarmType != AlarmType.SuddenStop)
{ {
return; return;
} }
...@@ -202,6 +203,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,6 +203,10 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
} }
private bool InProcess = false; private bool InProcess = false;
...@@ -270,9 +275,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -270,9 +275,13 @@ namespace OnlineStore.DeviceLibrary
{ {
TimeSpan span = DateTime.Now - ol_lastSendShelfTime; TimeSpan span = DateTime.Now - ol_lastSendShelfTime;
bool manualSig = IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH);
bool l1_up_sig = IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
bool l2_up_sig = IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
//如果出口无料架，持续1000以上，放开阻挡放出一个料架 //如果出口无料架，持续1000以上，放开阻挡放出一个料架
//每次放料架时间间隔3秒 //每次放料架时间间隔3秒
if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH)&&IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3) if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3)
{ {
//如果出料线体出口无料架，放一个料架到出口 //如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch, 1000)) if (LineManager.checkWatch(ol_noshelfWatch, 1000))
...@@ -283,7 +292,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -283,7 +292,8 @@ namespace OnlineStore.DeviceLibrary
StopIOMove(IO_Type.L2_StopDown, StopDownMS); StopIOMove(IO_Type.L2_StopDown, StopDownMS);
} }
} }
else if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3) else if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && !manualSig && !l1_up_sig && span.TotalSeconds > 3)
{ {
//如果出料线体出口无料架，放一个料架到出口 //如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch1, 1000)) if (LineManager.checkWatch(ol_noshelfWatch1, 1000))
...@@ -306,7 +316,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -306,7 +316,7 @@ namespace OnlineStore.DeviceLibrary
if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW))
{ {
AgvClient.NeedEnter(Config.L1_AgvName, ""); AgvClient.NeedEnter(Config.L1_AgvName, "");
}else } else
{ {
AgvClient.SetToNone(Config.L1_AgvName, ""); AgvClient.SetToNone(Config.L1_AgvName, "");
} }
...@@ -354,29 +364,56 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,29 +364,56 @@ namespace OnlineStore.DeviceLibrary
{ {
il_outstopCheckWarch.Stop(); il_outstopCheckWarch.Stop();
LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] "); LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
AgvClient.SetToNone(Config.L2_AgvName, "" ); AgvClient.SetToNone(Config.L2_AgvName, "");
} }
//人工取料
//if(IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH))
//{
// if(IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH))
// {
// if(LineManager.checkWatch(il_manualCheckWatch,2000))
// {
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.HIGH);
// }
// }
//}
//else
//{
// il_manualCheckWatch.Stop();
// IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
//}
} }
private static void TranverseProcess()
{
LogUtil.info(" TranverseProcess");
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
IOManager.IOMove(IO_Type.Traverse_Up_SOL,IO_VALUE.HIGH);
Thread.Sleep(1000);
LogUtil.info(" 横移机构上升");
if (IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.HIGH))
{
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.HIGH);
LogUtil.info(" 滚筒电机、横移机构电机运行");
}
}
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
while(IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
if(stopwatch.Elapsed.TotalMinutes >=1)
{
stopwatch.Stop();
IOManager.CIOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
//IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
//Thread.Sleep(1000);
//IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
//Thread.Sleep(1000);
LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] [" + stopwatch.Elapsed.TotalMinutes + "] 秒");
break;
}
}
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 滚筒、横移电机停止");
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
LogUtil.info(" 横移机构下降");
}
private Task TranverseTask = new Task(new Action(TranverseProcess));
//private void LedProcess() //private void LedProcess()
//{ //{
// try // try
...@@ -415,6 +452,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -415,6 +452,31 @@ namespace OnlineStore.DeviceLibrary
public void IoCheckProcess() public void IoCheckProcess()
{ {
DateTime time = DateTime.Now; DateTime time = DateTime.Now;
//人工取料
if (IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH))
{
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
//if (LineManager.checkWatch(il_manualCheckWatch, 2000))
//{
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.HIGH);
//}
if(TranverseTask.Status.Equals(TaskStatus.Created))
{
TranverseTask.Start();
}
else if(TranverseTask.IsCompleted)
{
TranverseTask.Start();
}
}
}
else
{
//IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
//IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
}
//if (runStatus.Equals(RunStatus.Wait)) //if (runStatus.Equals(RunStatus.Wait))
//{ //{
// //获取新的Io状态 // //获取新的Io状态
......
source/DeviceLibrary/acDISTLine/DISTLineBean_Partial.cs
...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
if (needCheckList.Count <= 0) if (needCheckList.Count <= 0)
{ {
needCheckList.Add(IO_Type.L1_InCheck); needCheckList.Add(IO_Type.L1_InCheck);
needCheckList.Add(IO_Type.L1_ManualRecSig); //needCheckList.Add(IO_Type.L1_ManualRecSig);
needCheckList.Add(IO_Type.L1_OutCheck); needCheckList.Add(IO_Type.L1_OutCheck);
needCheckList.Add(IO_Type.L1_OutStopDown); needCheckList.Add(IO_Type.L1_OutStopDown);
needCheckList.Add(IO_Type.L1_StopCheck); needCheckList.Add(IO_Type.L1_StopCheck);
......
source/LoadCVSLibrary/Config/bean/IO_Type.cs
...@@ -57,6 +57,26 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -57,6 +57,26 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string L1_ManualRecSig = "L1_ManualRecSig"; public static string L1_ManualRecSig = "L1_ManualRecSig";
/// <summary>
/// DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0,
/// </summary>
public static string L1_UpDown_Up_Sig = "L1_UpDown_Up_Sig";
/// <summary>
/// DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
/// </summary>
public static string L1_UpDown_Down_Sig = "L1_UpDown_Down_Sig";
/// <summary>
/// DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
/// </summary>
public static string L2_UpDown_Up_Sig = "L2_UpDown_Up_Sig";
/// <summary>
/// DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
/// </summary>
public static string L2_UpDown_Down_Sig = "L2_UpDown_Down_Sig";
/// <summary> /// <summary>
/// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0, /// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0,
...@@ -82,6 +102,23 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -82,6 +102,23 @@ namespace OnlineStore.LoadCSVLibrary
/// DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DI-06,0, /// DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DI-06,0,
/// </summary> /// </summary>
public static string L2_OutStopDown = "L2_OutStopDown"; public static string L2_OutStopDown = "L2_OutStopDown";
/// <summary>
/// DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0,
/// </summary>
public static string Traverse_Up_SOL = "Traverse_Up_SOL";
/// <summary>
/// DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0,
/// </summary>
public static string Traverse_Down_SOL = "Traverse_Down_SOL";
/// <summary>
/// DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0,
/// </summary>
public static string Traverse_Run = "Traverse_Run";
/// <summary>
/// DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
/// </summary>
public static string Roller_Run = "Roller_Run";
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
source/_system~.ini 0 → 100644
文件属性发生变化
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!