Skip to content

李娜 / RC1271-DUOStore

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

界面调整

1 个父辈 2b40314a
内嵌 并排
正在显示 37 个修改的文件 包含 1091 行增加 和 452 行删除
source/DUOStore/DUOStore.csproj
...@@ -82,6 +82,12 @@ ...@@ -82,6 +82,12 @@
<Compile Include="FrmBase.Designer.cs"> <Compile Include="FrmBase.Designer.cs">
<DependentUpon>FrmBase.cs</DependentUpon> <DependentUpon>FrmBase.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="FrmAxisMove.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmAxisMove.Designer.cs">
<DependentUpon>FrmAxisMove.cs</DependentUpon>
</Compile>
<Compile Include="FrmStore.cs"> <Compile Include="FrmStore.cs">
<SubType>Form</SubType> <SubType>Form</SubType>
</Compile> </Compile>
...@@ -130,6 +136,9 @@ ...@@ -130,6 +136,9 @@
<EmbeddedResource Include="FrmBase.resx"> <EmbeddedResource Include="FrmBase.resx">
<DependentUpon>FrmBase.cs</DependentUpon> <DependentUpon>FrmBase.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="FrmAxisMove.resx">
<DependentUpon>FrmAxisMove.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmStore.resx"> <EmbeddedResource Include="FrmStore.resx">
<DependentUpon>FrmStore.cs</DependentUpon> <DependentUpon>FrmStore.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
source/DUOStore/FormManager.cs
...@@ -8,7 +8,7 @@ using System.Text; ...@@ -8,7 +8,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public class FormManager public class FormManager
{ {
......
source/DUOStore/FrmAbout.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmAbout partial class FrmAbout
{ {
......
source/DUOStore/FrmAbout.cs
...@@ -10,7 +10,7 @@ using System.Text; ...@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmAbout : FrmBase public partial class FrmAbout : FrmBase
{ {
......
source/DUOStore/FrmAxisDebug.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmAxisDebug partial class FrmAxisDebug
{ {
......
source/DUOStore/FrmAxisDebug.cs
...@@ -14,7 +14,7 @@ using System.Text; ...@@ -14,7 +14,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmAxisDebug : FrmBase public partial class FrmAxisDebug : FrmBase
......
source/DUOStore/FrmAxisMove.Designer.cs 0 → 100644
using OnlineStore.DUOStore;
namespace OnlineStore.DUOStore
{
partial class FrmAxisMove
{
/// <summary>
/// 必需的设计器变量。
/// </summary>
private System.ComponentModel.IContainer components = null;
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows 窗体设计器生成的代码
/// <summary>
/// 设计器支持所需的方法 - 不要
/// 使用代码编辑器修改此方法的内容。
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmAxisMove));
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.groupInout = new System.Windows.Forms.GroupBox();
this.txtInOutP2 = new System.Windows.Forms.TextBox();
this.txtInOutP1 = new System.Windows.Forms.TextBox();
this.txtMiddleP1 = new System.Windows.Forms.TextBox();
this.txtBatchP1 = new System.Windows.Forms.TextBox();
this.txtBatchP2 = new System.Windows.Forms.TextBox();
this.txtMiddleP2 = new System.Windows.Forms.TextBox();
this.btnInOutP2 = new System.Windows.Forms.Button();
this.btnInOutP1 = new System.Windows.Forms.Button();
this.btnMiddleP1 = new System.Windows.Forms.Button();
this.btnBatchP1 = new System.Windows.Forms.Button();
this.btnBatchP2 = new System.Windows.Forms.Button();
this.btnMiddleP2 = new System.Windows.Forms.Button();
this.txtInoutP11 = new System.Windows.Forms.TextBox();
this.btnInoutP11 = new System.Windows.Forms.Button();
this.txtMiddleP11 = new System.Windows.Forms.TextBox();
this.btnMiddleP11 = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.DUOStore.AxisMoveControl();
this.btnAxisOff = new System.Windows.Forms.Button();
this.btnAxisOn = new System.Windows.Forms.Button();
this.groupInout.SuspendLayout();
this.SuspendLayout();
//
// timer1
//
this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// groupInout
//
this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupInout.Controls.Add(this.txtInOutP2);
this.groupInout.Controls.Add(this.txtInOutP1);
this.groupInout.Controls.Add(this.txtMiddleP1);
this.groupInout.Controls.Add(this.txtBatchP1);
this.groupInout.Controls.Add(this.txtBatchP2);
this.groupInout.Controls.Add(this.txtMiddleP2);
this.groupInout.Controls.Add(this.btnInOutP2);
this.groupInout.Controls.Add(this.btnInOutP1);
this.groupInout.Controls.Add(this.btnMiddleP1);
this.groupInout.Controls.Add(this.btnBatchP1);
this.groupInout.Controls.Add(this.btnBatchP2);
this.groupInout.Controls.Add(this.btnMiddleP2);
this.groupInout.Controls.Add(this.txtInoutP11);
this.groupInout.Controls.Add(this.btnInoutP11);
this.groupInout.Controls.Add(this.txtMiddleP11);
this.groupInout.Controls.Add(this.btnMiddleP11);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 320);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(750, 287);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
//
// txtInOutP2
//
this.txtInOutP2.AcceptsReturn = true;
this.txtInOutP2.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(641, 30);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP2.Size = new System.Drawing.Size(89, 23);
this.txtInOutP2.TabIndex = 306;
this.txtInOutP2.Text = "999999";
//
// txtInOutP1
//
this.txtInOutP1.AcceptsReturn = true;
this.txtInOutP1.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(640, 69);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP1.Size = new System.Drawing.Size(89, 23);
this.txtInOutP1.TabIndex = 304;
this.txtInOutP1.Text = "999999";
//
// txtMiddleP1
//
this.txtMiddleP1.AcceptsReturn = true;
this.txtMiddleP1.BackColor = System.Drawing.SystemColors.Window;
this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(392, 30);
this.txtMiddleP1.MaxLength = 20;
this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP1.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP1.TabIndex = 302;
this.txtMiddleP1.Text = "999999";
//
// txtBatchP1
//
this.txtBatchP1.AcceptsReturn = true;
this.txtBatchP1.BackColor = System.Drawing.SystemColors.Window;
this.txtBatchP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP1.Location = new System.Drawing.Point(150, 30);
this.txtBatchP1.MaxLength = 20;
this.txtBatchP1.Name = "txtBatchP1";
this.txtBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBatchP1.Size = new System.Drawing.Size(89, 23);
this.txtBatchP1.TabIndex = 294;
this.txtBatchP1.Text = "999999";
//
// txtBatchP2
//
this.txtBatchP2.AcceptsReturn = true;
this.txtBatchP2.BackColor = System.Drawing.SystemColors.Window;
this.txtBatchP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtBatchP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtBatchP2.Location = new System.Drawing.Point(150, 67);
this.txtBatchP2.MaxLength = 20;
this.txtBatchP2.Name = "txtBatchP2";
this.txtBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtBatchP2.Size = new System.Drawing.Size(89, 23);
this.txtBatchP2.TabIndex = 296;
this.txtBatchP2.Text = "999999";
//
// txtMiddleP2
//
this.txtMiddleP2.AcceptsReturn = true;
this.txtMiddleP2.BackColor = System.Drawing.SystemColors.Window;
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.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(391, 67);
this.txtMiddleP2.MaxLength = 20;
this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP2.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP2.TabIndex = 286;
this.txtMiddleP2.Text = "999999";
//
// btnInOutP2
//
this.btnInOutP2.AutoSize = true;
this.btnInOutP2.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(497, 25);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
this.btnInOutP2.TabIndex = 305;
this.btnInOutP2.Text = "进出轴取料点P2:";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
//
// btnInOutP1
//
this.btnInOutP1.AutoSize = true;
this.btnInOutP1.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(497, 64);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
this.btnInOutP1.TabIndex = 303;
this.btnInOutP1.Text = "进出轴待机点P1:";
this.btnInOutP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.UseVisualStyleBackColor = false;
//
// btnMiddleP1
//
this.btnMiddleP1.AutoSize = true;
this.btnMiddleP1.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(248, 25);
this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP1.TabIndex = 301;
this.btnMiddleP1.Text = "旋转轴待机点P1:";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.UseVisualStyleBackColor = false;
//
// btnBatchP1
//
this.btnBatchP1.AutoSize = true;
this.btnBatchP1.BackColor = System.Drawing.SystemColors.Control;
this.btnBatchP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnBatchP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBatchP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP1.ForeColor = System.Drawing.Color.Red;
this.btnBatchP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP1.Location = new System.Drawing.Point(6, 25);
this.btnBatchP1.Name = "btnBatchP1";
this.btnBatchP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP1.Size = new System.Drawing.Size(140, 33);
this.btnBatchP1.TabIndex = 293;
this.btnBatchP1.Text = "升降轴入料口低点P1:";
this.btnBatchP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP1.UseVisualStyleBackColor = false;
//
// btnBatchP2
//
this.btnBatchP2.AutoSize = true;
this.btnBatchP2.BackColor = System.Drawing.SystemColors.Control;
this.btnBatchP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnBatchP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBatchP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnBatchP2.ForeColor = System.Drawing.Color.Red;
this.btnBatchP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.Location = new System.Drawing.Point(6, 62);
this.btnBatchP2.Name = "btnBatchP2";
this.btnBatchP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBatchP2.Size = new System.Drawing.Size(140, 33);
this.btnBatchP2.TabIndex = 295;
this.btnBatchP2.Text = "升降轴入料口高点P2:";
this.btnBatchP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnBatchP2.UseVisualStyleBackColor = false;
//
// btnMiddleP2
//
this.btnMiddleP2.AutoSize = true;
this.btnMiddleP2.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleP2.Cursor = System.Windows.Forms.Cursors.Default;
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.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(248, 62);
this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP2.TabIndex = 285;
this.btnMiddleP2.Text = "旋转轴库位点P2:";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP2.UseVisualStyleBackColor = false;
//
// txtInoutP11
//
this.txtInoutP11.AcceptsReturn = true;
this.txtInoutP11.BackColor = System.Drawing.SystemColors.Window;
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(640, 108);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP11.Size = new System.Drawing.Size(77, 23);
this.txtInoutP11.TabIndex = 227;
this.txtInoutP11.Text = "999999";
//
// btnInoutP11
//
this.btnInoutP11.AutoSize = true;
this.btnInoutP11.BackColor = System.Drawing.SystemColors.Control;
this.btnInoutP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInoutP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(497, 103);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(140, 33);
this.btnInoutP11.TabIndex = 226;
this.btnInoutP11.Text = "进出轴出料口点P11:";
this.btnInoutP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.UseVisualStyleBackColor = false;
//
// txtMiddleP11
//
this.txtMiddleP11.AcceptsReturn = true;
this.txtMiddleP11.BackColor = System.Drawing.SystemColors.Window;
this.txtMiddleP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(391, 106);
this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP11.Size = new System.Drawing.Size(77, 23);
this.txtMiddleP11.TabIndex = 225;
this.txtMiddleP11.Text = "999999";
//
// btnMiddleP11
//
this.btnMiddleP11.AutoSize = true;
this.btnMiddleP11.BackColor = System.Drawing.SystemColors.Control;
this.btnMiddleP11.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMiddleP11.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(248, 101);
this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(140, 33);
this.btnMiddleP11.TabIndex = 224;
this.btnMiddleP11.Text = "旋转轴出料口点P11:";
this.btnMiddleP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.UseVisualStyleBackColor = false;
//
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 3);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.TabIndex = 274;
//
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(898, 24);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
this.btnAxisOff.Text = "料仓运转OFF";
this.btnAxisOff.UseVisualStyleBackColor = true;
//
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(768, 24);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
this.btnAxisOn.Text = "料仓运转ON";
this.btnAxisOn.UseVisualStyleBackColor = true;
//
// FrmAxisMove
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1224, 626);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.btnAxisOff);
this.Controls.Add(this.btnAxisOn);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmAxisMove";
this.Opacity = 0D;
this.Text = "取料提升机构";
this.Load += new System.EventHandler(this.FrmTest_Load);
this.groupInout.ResumeLayout(false);
this.groupInout.PerformLayout();
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.GroupBox groupInout;
public System.Windows.Forms.TextBox txtInoutP11;
public System.Windows.Forms.Button btnInoutP11;
public System.Windows.Forms.TextBox txtMiddleP11;
public System.Windows.Forms.Button btnMiddleP11;
public System.Windows.Forms.TextBox txtInOutP2;
public System.Windows.Forms.TextBox txtInOutP1;
public System.Windows.Forms.TextBox txtMiddleP1;
public System.Windows.Forms.TextBox txtBatchP1;
public System.Windows.Forms.TextBox txtBatchP2;
public System.Windows.Forms.TextBox txtMiddleP2;
public System.Windows.Forms.Button btnInOutP2;
public System.Windows.Forms.Button btnInOutP1;
public System.Windows.Forms.Button btnMiddleP1;
public System.Windows.Forms.Button btnBatchP1;
public System.Windows.Forms.Button btnBatchP2;
public System.Windows.Forms.Button btnMiddleP2;
private AxisMoveControl axisMoveControl1;
private System.Windows.Forms.Button btnAxisOff;
private System.Windows.Forms.Button btnAxisOn;
}
}
source/DUOStore/FrmAxisMove.cs 0 → 100644
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Windows.Forms;
using System.Runtime.CompilerServices;
using System.Threading;
using System.IO;
using System.Runtime.InteropServices;
using OnlineStore.Common;
using System.Reflection;
using log4net;
using OnlineStore.DeviceLibrary;
using System.IO.Ports;
using OnlineStore.LoadCSVLibrary;
using CodeLibrary;
using DeviceLib;
using UserFromControl;
namespace OnlineStore.DUOStore
{
public partial class FrmAxisMove : FrmBase
{
public FrmAxisMove()
{
Control.CheckForIllegalCrossThreadCalls = false;
InitializeComponent();
}
#region "初始化界面数据"
private bool LoadOk = false;
private void FrmTest_Load(object sender, EventArgs e)
{
}
#endregion
private void timer1_Tick(object sender, EventArgs e)
{
if (!this.Visible)
{
return;
}
}
private void LoadPostion()
{
}
private void btnSavePosition_Click(object sender, EventArgs e)
{
}
}
}
source/DUOStore/FrmAxisMove.resx 0 → 100644
此文件的差异太大，无法显示。
source/DUOStore/FrmBase.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmBase partial class FrmBase
{ {
......
source/DUOStore/FrmBase.cs
...@@ -9,7 +9,7 @@ using System.Text; ...@@ -9,7 +9,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmBase : Form public partial class FrmBase : Form
{ {
......
source/DUOStore/FrmBox.Designer.cs
此文件的差异太大，无法显示。
source/DUOStore/FrmBox.cs
...@@ -18,14 +18,14 @@ using System.IO.Ports; ...@@ -18,14 +18,14 @@ using System.IO.Ports;
using OnlineStore.LoadCSVLibrary; using OnlineStore.LoadCSVLibrary;
using CodeLibrary; using CodeLibrary;
using DeviceLib; using DeviceLib;
using UserFromControl;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmBox : FrmBase public partial class FrmBox : FrmBase
{ {
public BoxBean BoxBean = null; public BoxBean BoxBean = null;
// public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public FrmBox() public FrmBox()
{ {
Control.CheckForIllegalCrossThreadCalls = false; Control.CheckForIllegalCrossThreadCalls = false;
...@@ -38,6 +38,7 @@ namespace OnlineStore.ACPackingStore ...@@ -38,6 +38,7 @@ namespace OnlineStore.ACPackingStore
private void FrmTest_Load(object sender, EventArgs e) private void FrmTest_Load(object sender, EventArgs e)
{ {
LoadStore(); LoadStore();
LoadIOList();
} }
public void LoadStore() public void LoadStore()
{ {
...@@ -49,7 +50,7 @@ namespace OnlineStore.ACPackingStore ...@@ -49,7 +50,7 @@ namespace OnlineStore.ACPackingStore
} }
this.groupBox3.Text = "设备[" + BoxBean.CID + "]状态"; this.groupBox3.Text = "设备[" + BoxBean.CID + "]状态";
this.Text = BoxBean.Name; this.Text = BoxBean.Name;
axisMoveControl1.LoadData( new AxisBean[] { }); axisMoveControl1.LoadData(new AxisBean[] { });
ACBoxPosition ktkPosition = null; ACBoxPosition ktkPosition = null;
if (BoxBean.PositionNumList.Count > 0) if (BoxBean.PositionNumList.Count > 0)
{ {
...@@ -62,17 +63,17 @@ namespace OnlineStore.ACPackingStore ...@@ -62,17 +63,17 @@ namespace OnlineStore.ACPackingStore
txtMiddleP1.Text = BoxBean.Config.MiddleAxis_P1.ToString(); txtMiddleP1.Text = BoxBean.Config.MiddleAxis_P1.ToString();
txtUpDownP1.Text = BoxBean.Config.UpDownAxis_P1.ToString(); txtUpDownP1.Text = BoxBean.Config.UpDownAxis_P1.ToString();
txtInOutP1.Text = BoxBean.Config.InOutAxis_P1 .ToString(); txtInOutP1.Text = BoxBean.Config.InOutAxis_P1.ToString();
txtComP1.Text = BoxBean.Config.CompAxis_P1 .ToString(); txtComP1.Text = BoxBean.Config.CompAxis_P1.ToString();
txtUpDownP2.Text = BoxBean.Config.UpDownAxis_P2.ToString(); txtUpDownP2.Text = BoxBean.Config.UpDownAxis_P2.ToString();
txtInOutP2.Text = BoxBean.Config.InOutAxis_P2 .ToString(); txtInOutP2.Text = BoxBean.Config.InOutAxis_P2.ToString();
txtMiddleP11.Text = BoxBean.Config.MiddleAxis_P11.ToString(); txtMiddleP11.Text = BoxBean.Config.MiddleAxis_P11.ToString();
txtUpdownP11.Text = BoxBean.Config.UpDownAxis_P11.ToString(); txtUpdownP11.Text = BoxBean.Config.UpDownAxis_P11.ToString();
txtUpdownP12.Text = BoxBean.Config.UpDownAxis_P12.ToString(); txtUpdownP12.Text = BoxBean.Config.UpDownAxis_P12.ToString();
txtInOutP2.Text = BoxBean.Config.InOutAxis_P2 .ToString(); txtInOutP2.Text = BoxBean.Config.InOutAxis_P2.ToString();
txtInoutP11.Text = BoxBean.Config.InOutAxis_P11 .ToString(); txtInoutP11.Text = BoxBean.Config.InOutAxis_P11.ToString();
//txtInOutP2.Text = BoxBean.Config.InOutAxis_DoorPosition_P2.ToString(); //txtInOutP2.Text = BoxBean.Config.InOutAxis_DoorPosition_P2.ToString();
txtUpDownP1.Text = BoxBean.Config.UpDownAxis_P1.ToString(); txtUpDownP1.Text = BoxBean.Config.UpDownAxis_P1.ToString();
LoadPData(ktkPosition); LoadPData(ktkPosition);
...@@ -111,6 +112,7 @@ namespace OnlineStore.ACPackingStore ...@@ -111,6 +112,7 @@ namespace OnlineStore.ACPackingStore
{ {
return; return;
} }
ReadIOList();
if (chbDebug.Checked.Equals(BoxBean.IsDebug).Equals(false)) if (chbDebug.Checked.Equals(BoxBean.IsDebug).Equals(false))
{ {
LoadOk = false; LoadOk = false;
...@@ -297,18 +299,12 @@ namespace OnlineStore.ACPackingStore ...@@ -297,18 +299,12 @@ namespace OnlineStore.ACPackingStore
int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh); int comP2 = BoxBean.Config.GetComP2(acPosition.BagHigh);
txtComP2.Text = comP2.ToString(); txtComP2.Text = comP2.ToString();
txtComP3.Text =BoxBean.Config.CompAxis_P3.ToString(); txtComP3.Text = BoxBean.Config.CompAxis_P3.ToString();
btnComP2.Text = "" + acPosition.BagHigh + "mm压紧点P2:";
btnComP3.Text = "" + acPosition.BagHigh + "mm压紧前点P3:";
lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh; lblSize.Text = "尺寸：" + acPosition.BagWidth + "*" + acPosition.BagHigh;
txtInOutP3.Text = acPosition.InoutAxis_P3.ToString(); txtInOutP3.Text = acPosition.InoutAxis_P3.ToString();
txtInOutP2.Text = BoxBean.Config.InOutAxis_P2 .ToString(); txtInOutP2.Text = BoxBean.Config.InOutAxis_P2.ToString();
//txtUpDownP2.Text = ktkPosition.UpDownAxis_P2.ToString();
//txtUpDownP7.Text = ktkPosition.UpDownAxis_DoorOBPosition_P7.ToString();
//txtUpDownP8.Text = ktkPosition.UpDownAxis_DoorIBPosition_P8.ToString();
//txtInOutP2.Text = ktkPosition.InOutAxis_DoorPosition_P2.ToString();
//txtUpDownP1.Text = ktkPosition.UpDownAxis_P1.ToString();
} }
} }
...@@ -428,9 +424,6 @@ namespace OnlineStore.ACPackingStore ...@@ -428,9 +424,6 @@ namespace OnlineStore.ACPackingStore
} }
/// <summary>
/// 判断进出轴是否在P1点
/// </summary>
private bool InOutIsIsP1() private bool InOutIsIsP1()
{ {
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition); int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
...@@ -443,118 +436,102 @@ namespace OnlineStore.ACPackingStore ...@@ -443,118 +436,102 @@ namespace OnlineStore.ACPackingStore
return false; return false;
} }
private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed) private void AxisABSMove(ConfigMoveAxis moveAxis, TextBox txtValue, int targetSpeed)
{
if (moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis) || moveAxis.IsSameAxis(BoxBean.Config.UpDown_Axis))
{
if (!InOutIsIsP1())
{ {
return;
}
}
int targetPosition = FormUtil.GetIntValue(txtValue);
moveAxis.TargetPosition = targetPosition; moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed); ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
} }
private void btnUpDownP1_Click(object sender, EventArgs e) private void btnUpDownP1_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP1, BoxBean.Config.UpDownAxis_P1_Speed);
{
int value = FormUtil.GetIntValue(txtUpDownP1);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P1_Speed);
}
} }
private void btnUpDownP2_Click(object sender, EventArgs e) private void btnUpDownP2_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP2, BoxBean.Config.UpDownAxis_P2_Speed);
{
int value = FormUtil.GetIntValue(txtUpDownP2);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P2_Speed);
}
} }
private void btnUpDownP3_Click(object sender, EventArgs e) private void btnUpDownP3_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP3, BoxBean.Config.UpDownAxis_P3_Speed);
{
int value = FormUtil.GetIntValue(txtUpDownP3);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P3_Speed);
}
} }
private void btnUpDownP4_Click(object sender, EventArgs e) private void btnUpDownP4_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP4, BoxBean.Config.UpDownAxis_P4_Speed);
{
int value = FormUtil.GetIntValue(txtUpDownP4);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P4_Speed);
}
} }
private void btnUpDownP5_Click(object sender, EventArgs e) private void btnUpDownP5_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP5, BoxBean.Config.UpDownAxis_P5_Speed);
{
int value = FormUtil.GetIntValue(txtUpDownP5);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P5_Speed);
}
} }
private void btnUpDownP6_Click(object sender, EventArgs e) private void btnUpDownP6_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpDownP6, BoxBean.Config.UpDownAxis_P6_Speed);
}
private void btnUpdownP11_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtUpDownP6); AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpdownP11, BoxBean.Config.UpDownAxis_P11_Speed);
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P6_Speed);
} }
private void btnInoutP11_Click(object sender, EventArgs e)
{
AxisABSMove(BoxBean.Config.UpDown_Axis, txtInoutP11, BoxBean.Config.InOutAxis_P11_Speed);
} }
private void btnMiddleP1_Click(object sender, EventArgs e) private void btnMiddleP11_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{ {
int value = FormUtil.GetIntValue(txtMiddleP1); AxisABSMove(BoxBean.Config.UpDown_Axis, txtMiddleP11, BoxBean.Config.MiddleAxis_P11_Speed);
AxisABSMove(BoxBean.Config.Middle_Axis, value, BoxBean.Config.MiddleAxis_P1_Speed);
} }
private void btnMiddleP1_Click(object sender, EventArgs e)
{
AxisABSMove(BoxBean.Config.Middle_Axis, txtMiddleP1, BoxBean.Config.MiddleAxis_P1_Speed);
} }
private void btnMiddleP2_Click(object sender, EventArgs e) private void btnMiddleP2_Click(object sender, EventArgs e)
{ {
if (InOutIsIsP1()) AxisABSMove(BoxBean.Config.Middle_Axis, txtMiddleP2, BoxBean.Config.MiddleAxis_P2_Speed);
{
int value = FormUtil.GetIntValue(txtMiddleP2);
AxisABSMove(BoxBean.Config.Middle_Axis, value, BoxBean.Config.MiddleAxis_P2_Speed);
}
} }
private void btnInOutP1_Click(object sender, EventArgs e) private void btnInOutP1_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtInOutP1); AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP1, BoxBean.Config.InOutAxis_P1_Speed);
AxisABSMove(BoxBean.Config.InOut_Axis, value, BoxBean.Config.InOutAxis_P1_Speed);
} }
private void btnInOutP3_Click(object sender, EventArgs e) private void btnInOutP3_Click(object sender, EventArgs e)
{ {
AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP3, BoxBean.Config.InOutAxis_P3_Speed);
int value = FormUtil.GetIntValue(txtInOutP3);
AxisABSMove(BoxBean.Config.InOut_Axis, value, BoxBean.Config.InOutAxis_P3_Speed);
} }
private void btnInOutP2_Click(object sender, EventArgs e) private void btnInOutP2_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtInOutP2); AxisABSMove(BoxBean.Config.InOut_Axis, txtInOutP2, BoxBean.Config.InOutAxis_P2_Speed);
AxisABSMove(BoxBean.Config.InOut_Axis, value, BoxBean.Config.InOutAxis_P2_Speed);
} }
private void btnComP2_Click(object sender, EventArgs e) private void btnComP2_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtComP2); AxisABSMove(BoxBean.Config.Comp_Axis, txtComP2, BoxBean.Config.CompAxis_P2_Speed);
AxisABSMove(BoxBean.Config.Comp_Axis, value, BoxBean.Config.CompAxis_P2_Speed);
} }
private void btnComP1_Click(object sender, EventArgs e) private void btnComP1_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtComP1); AxisABSMove(BoxBean.Config.Comp_Axis, txtComP1, BoxBean.Config.CompAxis_P1_Speed);
AxisABSMove(BoxBean.Config.Comp_Axis, value, BoxBean.Config.CompAxis_P1_Speed);
} }
private void btnComP3_Click(object sender, EventArgs e) private void btnComP3_Click(object sender, EventArgs e)
{ {
int value = FormUtil.GetIntValue(txtComP3); AxisABSMove(BoxBean.Config.Comp_Axis, txtComP3, BoxBean.Config.CompAxis_P3_Speed);
AxisABSMove(BoxBean.Config.Comp_Axis, value, BoxBean.Config.CompAxis_P3_Speed);
} }
int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度 int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度 int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
...@@ -663,24 +640,6 @@ namespace OnlineStore.ACPackingStore ...@@ -663,24 +640,6 @@ namespace OnlineStore.ACPackingStore
LogUtil.info("料仓运转OFF完成"); LogUtil.info("料仓运转OFF完成");
} }
private void 回待机点ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (BoxBean.storeRunStatus >= StoreRunStatus.HomeMoving)
{
if (BoxBean.MoveInfo.MoveType.Equals(StoreMoveType.None) && BoxBean.alarmType.Equals(StoreAlarmType.None))
{
BoxBean.MoveToP1();
}
else
{
MessageBox.Show("无报警，无出入库或者重置操作时，才可以回待机点！");
}
}
else
{
MessageBox.Show("请先启动料仓！");
}
}
private void FrmStoreBox_Shown(object sender, EventArgs e) private void FrmStoreBox_Shown(object sender, EventArgs e)
{ {
...@@ -705,8 +664,6 @@ namespace OnlineStore.ACPackingStore ...@@ -705,8 +664,6 @@ namespace OnlineStore.ACPackingStore
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)))));
} }
private void btnTempInit_Click(object sender, EventArgs e) private void btnTempInit_Click(object sender, EventArgs e)
{ {
string port = txtTempPort.Text.ToString(); string port = txtTempPort.Text.ToString();
...@@ -784,23 +741,70 @@ namespace OnlineStore.ACPackingStore ...@@ -784,23 +741,70 @@ namespace OnlineStore.ACPackingStore
} }
private void btnUpdownP11_Click(object sender, EventArgs e) private void btnUpdownP12_Click(object sender, EventArgs e)
{
AxisABSMove(BoxBean.Config.UpDown_Axis, txtUpdownP12, BoxBean.Config.UpDownAxis_P1_Speed);
}
#region IO处理
Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
private void LoadIOList()
{ {
if (InOutIsIsP1()) int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = BoxBean.Config.DIList.Count;
foreach (ConfigIO ioValue in BoxBean.Config.DIList.Values)
{ {
int value = FormUtil.GetIntValue(txtUpdownP11); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P2_Speed); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
DIControlList.Add(ioValue.ProName, control);
} }
tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = BoxBean.Config.DOList.Count;
roleindex = 0;
foreach (ConfigIO ioValue in BoxBean.Config.DOList.Values)
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
DOControlList.Add(ioValue.ProName, control);
} }
this.SuspendLayout();
private void btnUpdownP12_Click(object sender, EventArgs e) }
private void ReadIOList()
{
foreach (string key in DIControlList.Keys)
{ {
if (InOutIsIsP1()) IOTextControl control = DIControlList[key];
int iov = (int)BoxBean.IOValue(key);
if (iov != control.IOValue)
{ {
int value = FormUtil.GetIntValue(txtUpdownP12); control.IOValue = iov;
AxisABSMove(BoxBean.Config.UpDown_Axis, value, BoxBean.Config.UpDownAxis_P1_Speed); control.ShowData();
} }
} }
foreach (string key in this.DOControlList.Keys)
{
IOTextControl control = DOControlList[key];
int iov = (int)BoxBean.IOValue(key);
if (iov != control.IOValue)
{
control.IOValue = iov;
control.ShowData();
}
}
}
#endregion
} }
......
source/DUOStore/FrmIOStatus.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmIOStatus partial class FrmIOStatus
{ {
...@@ -19,22 +19,28 @@ ...@@ -19,22 +19,28 @@
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.btnOpenAxisBreak = new System.Windows.Forms.Button(); this.btnRDoorDown = new System.Windows.Forms.Button();
this.btnBlow = new System.Windows.Forms.Button(); this.btnRDoorUp = new System.Windows.Forms.Button();
this.btnStoreOn = new System.Windows.Forms.Button(); this.btnLDoorDown = new System.Windows.Forms.Button();
this.btnLDoorUp = new System.Windows.Forms.Button();
this.btnRelax = new System.Windows.Forms.Button();
this.btnClamp = new System.Windows.Forms.Button();
this.btnLineStop = new System.Windows.Forms.Button();
this.btnLineRun = new System.Windows.Forms.Button();
this.btnDeviceLed = new System.Windows.Forms.Button();
this.btnCamerLed = new System.Windows.Forms.Button(); this.btnCamerLed = new System.Windows.Forms.Button();
this.btnTopDown = new System.Windows.Forms.Button(); this.btnTopDown = new System.Windows.Forms.Button();
this.btnTopUp = new System.Windows.Forms.Button(); this.btnTopUp = new System.Windows.Forms.Button();
this.btnOpenDo = new System.Windows.Forms.Button(); this.btnOpenDo = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.btnCloseDO = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox(); this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox(); this.txtDoName = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.txtWriteTime = new System.Windows.Forms.TextBox(); this.txtWriteTime = new System.Windows.Forms.TextBox();
this.btnLocationDown = new System.Windows.Forms.Button(); this.btnBack = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label();
this.btnLocationUp = new System.Windows.Forms.Button(); this.btnFoward = new System.Windows.Forms.Button();
this.cmbWriteIO = new System.Windows.Forms.ComboBox(); this.cmbWriteIO = new System.Windows.Forms.ComboBox();
this.groupBox4 = new System.Windows.Forms.GroupBox(); this.groupBox4 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel(); this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
...@@ -53,9 +59,10 @@ ...@@ -53,9 +59,10 @@
// button1 // button1
// //
this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.button1.Location = new System.Drawing.Point(652, 555); this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Location = new System.Drawing.Point(653, 559);
this.button1.Name = "button1"; this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(126, 37); this.button1.Size = new System.Drawing.Size(125, 37);
this.button1.TabIndex = 254; this.button1.TabIndex = 254;
this.button1.Text = "关闭"; this.button1.Text = "关闭";
this.button1.UseVisualStyleBackColor = true; this.button1.UseVisualStyleBackColor = true;
...@@ -65,22 +72,28 @@ ...@@ -65,22 +72,28 @@
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox1.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.groupBox1.Controls.Add(this.btnOpenAxisBreak); this.groupBox1.Controls.Add(this.btnRDoorDown);
this.groupBox1.Controls.Add(this.btnBlow); this.groupBox1.Controls.Add(this.btnRDoorUp);
this.groupBox1.Controls.Add(this.btnStoreOn); this.groupBox1.Controls.Add(this.btnLDoorDown);
this.groupBox1.Controls.Add(this.btnLDoorUp);
this.groupBox1.Controls.Add(this.btnRelax);
this.groupBox1.Controls.Add(this.btnClamp);
this.groupBox1.Controls.Add(this.btnLineStop);
this.groupBox1.Controls.Add(this.btnLineRun);
this.groupBox1.Controls.Add(this.btnDeviceLed);
this.groupBox1.Controls.Add(this.btnCamerLed); this.groupBox1.Controls.Add(this.btnCamerLed);
this.groupBox1.Controls.Add(this.btnTopDown); this.groupBox1.Controls.Add(this.btnTopDown);
this.groupBox1.Controls.Add(this.btnTopUp); this.groupBox1.Controls.Add(this.btnTopUp);
this.groupBox1.Controls.Add(this.btnOpenDo); this.groupBox1.Controls.Add(this.btnOpenDo);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.btnCloseDO);
this.groupBox1.Controls.Add(this.txtDOIndex); this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName); this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.label17); this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14); this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.txtWriteTime); this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.btnLocationDown); this.groupBox1.Controls.Add(this.btnBack);
this.groupBox1.Controls.Add(this.label5); this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btnLocationUp); this.groupBox1.Controls.Add(this.btnFoward);
this.groupBox1.Controls.Add(this.cmbWriteIO); this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(485, 8); this.groupBox1.Location = new System.Drawing.Point(485, 8);
...@@ -90,41 +103,107 @@ ...@@ -90,41 +103,107 @@
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
// //
// btnOpenAxisBreak // btnRDoorDown
// //
this.btnOpenAxisBreak.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxisBreak.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRDoorDown.Location = new System.Drawing.Point(168, 410);
this.btnOpenAxisBreak.Location = new System.Drawing.Point(14, 447); this.btnRDoorDown.Name = "btnRDoorDown";
this.btnOpenAxisBreak.Name = "btnOpenAxisBreak"; this.btnRDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnOpenAxisBreak.Size = new System.Drawing.Size(125, 34); this.btnRDoorDown.TabIndex = 301;
this.btnOpenAxisBreak.TabIndex = 252; this.btnRDoorDown.Text = "右侧出料口门下降";
this.btnOpenAxisBreak.Text = "打开刹车"; this.btnRDoorDown.UseVisualStyleBackColor = true;
this.btnOpenAxisBreak.UseVisualStyleBackColor = false; this.btnRDoorDown.Click += new System.EventHandler(this.btnRDoorDown_Click);
this.btnOpenAxisBreak.Click += new System.EventHandler(this.btnOpenAxisBreak_Click); //
// // btnRDoorUp
// btnBlow //
// this.btnRDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnBlow.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnRDoorUp.Location = new System.Drawing.Point(168, 370);
this.btnBlow.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnRDoorUp.Name = "btnRDoorUp";
this.btnBlow.Location = new System.Drawing.Point(188, 447); this.btnRDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnBlow.Name = "btnBlow"; this.btnRDoorUp.TabIndex = 300;
this.btnBlow.Size = new System.Drawing.Size(125, 34); this.btnRDoorUp.Text = "右侧出料口门上升";
this.btnBlow.TabIndex = 294; this.btnRDoorUp.UseVisualStyleBackColor = true;
this.btnBlow.Text = "开始吹气"; this.btnRDoorUp.Click += new System.EventHandler(this.btnRDoorUp_Click);
this.btnBlow.UseVisualStyleBackColor = false; //
this.btnBlow.Click += new System.EventHandler(this.btnBlow_Click); // btnLDoorDown
// //
// btnStoreOn this.btnLDoorDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
// this.btnLDoorDown.Location = new System.Drawing.Point(14, 410);
this.btnStoreOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnLDoorDown.Name = "btnLDoorDown";
this.btnStoreOn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnLDoorDown.Size = new System.Drawing.Size(125, 34);
this.btnStoreOn.Location = new System.Drawing.Point(188, 495); this.btnLDoorDown.TabIndex = 299;
this.btnStoreOn.Name = "btnStoreOn"; this.btnLDoorDown.Text = "左侧出料口门下降";
this.btnStoreOn.Size = new System.Drawing.Size(125, 34); this.btnLDoorDown.UseVisualStyleBackColor = true;
this.btnStoreOn.TabIndex = 293; this.btnLDoorDown.Click += new System.EventHandler(this.btnLDoorDown_Click);
this.btnStoreOn.Text = "料仓运转ON"; //
this.btnStoreOn.UseVisualStyleBackColor = false; // btnLDoorUp
this.btnStoreOn.Click += new System.EventHandler(this.btnStoreOn_Click); //
this.btnLDoorUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLDoorUp.Location = new System.Drawing.Point(14, 370);
this.btnLDoorUp.Name = "btnLDoorUp";
this.btnLDoorUp.Size = new System.Drawing.Size(125, 34);
this.btnLDoorUp.TabIndex = 298;
this.btnLDoorUp.Text = "左侧出料口门上升";
this.btnLDoorUp.UseVisualStyleBackColor = true;
this.btnLDoorUp.Click += new System.EventHandler(this.btnLDoorUp_Click);
//
// btnRelax
//
this.btnRelax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnRelax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRelax.Location = new System.Drawing.Point(168, 312);
this.btnRelax.Name = "btnRelax";
this.btnRelax.Size = new System.Drawing.Size(125, 34);
this.btnRelax.TabIndex = 297;
this.btnRelax.Text = "取料气缸放松";
this.btnRelax.UseVisualStyleBackColor = false;
this.btnRelax.Click += new System.EventHandler(this.btnRelax_Click);
//
// btnClamp
//
this.btnClamp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClamp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClamp.Location = new System.Drawing.Point(168, 275);
this.btnClamp.Name = "btnClamp";
this.btnClamp.Size = new System.Drawing.Size(125, 34);
this.btnClamp.TabIndex = 296;
this.btnClamp.Text = "取料气缸夹紧";
this.btnClamp.UseVisualStyleBackColor = false;
this.btnClamp.Click += new System.EventHandler(this.btnClamp_Click);
//
// btnLineStop
//
this.btnLineStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStop.Location = new System.Drawing.Point(14, 312);
this.btnLineStop.Name = "btnLineStop";
this.btnLineStop.Size = new System.Drawing.Size(125, 34);
this.btnLineStop.TabIndex = 295;
this.btnLineStop.Text = "线体停止";
this.btnLineStop.UseVisualStyleBackColor = false;
//
// btnLineRun
//
this.btnLineRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineRun.Location = new System.Drawing.Point(14, 275);
this.btnLineRun.Name = "btnLineRun";
this.btnLineRun.Size = new System.Drawing.Size(125, 34);
this.btnLineRun.TabIndex = 294;
this.btnLineRun.Text = "线体正转";
this.btnLineRun.UseVisualStyleBackColor = false;
//
// btnDeviceLed
//
this.btnDeviceLed.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDeviceLed.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDeviceLed.Location = new System.Drawing.Point(168, 495);
this.btnDeviceLed.Name = "btnDeviceLed";
this.btnDeviceLed.Size = new System.Drawing.Size(125, 34);
this.btnDeviceLed.TabIndex = 293;
this.btnDeviceLed.Text = "打开设备光源";
this.btnDeviceLed.UseVisualStyleBackColor = false;
this.btnDeviceLed.Click += new System.EventHandler(this.btnStoreOn_Click);
// //
// btnCamerLed // btnCamerLed
// //
...@@ -134,7 +213,7 @@ ...@@ -134,7 +213,7 @@
this.btnCamerLed.Name = "btnCamerLed"; this.btnCamerLed.Name = "btnCamerLed";
this.btnCamerLed.Size = new System.Drawing.Size(125, 34); this.btnCamerLed.Size = new System.Drawing.Size(125, 34);
this.btnCamerLed.TabIndex = 290; this.btnCamerLed.TabIndex = 290;
this.btnCamerLed.Text = "打开光源"; this.btnCamerLed.Text = "打开相机光源";
this.btnCamerLed.UseVisualStyleBackColor = false; this.btnCamerLed.UseVisualStyleBackColor = false;
this.btnCamerLed.Click += new System.EventHandler(this.btnCamerLed_Click); this.btnCamerLed.Click += new System.EventHandler(this.btnCamerLed_Click);
// //
...@@ -142,11 +221,11 @@ ...@@ -142,11 +221,11 @@
// //
this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopDown.Location = new System.Drawing.Point(14, 401); this.btnTopDown.Location = new System.Drawing.Point(14, 218);
this.btnTopDown.Name = "btnTopDown"; this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(125, 34); this.btnTopDown.Size = new System.Drawing.Size(125, 34);
this.btnTopDown.TabIndex = 289; this.btnTopDown.TabIndex = 289;
this.btnTopDown.Text = "顶升装置下降"; this.btnTopDown.Text = "顶升气缸下降";
this.btnTopDown.UseVisualStyleBackColor = false; this.btnTopDown.UseVisualStyleBackColor = false;
this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click); this.btnTopDown.Click += new System.EventHandler(this.btnTopDown_Click);
// //
...@@ -154,11 +233,11 @@ ...@@ -154,11 +233,11 @@
// //
this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTopUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnTopUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopUp.Location = new System.Drawing.Point(14, 364); this.btnTopUp.Location = new System.Drawing.Point(14, 181);
this.btnTopUp.Name = "btnTopUp"; this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(125, 34); this.btnTopUp.Size = new System.Drawing.Size(125, 34);
this.btnTopUp.TabIndex = 288; this.btnTopUp.TabIndex = 288;
this.btnTopUp.Text = "顶升装置上升"; this.btnTopUp.Text = "顶升气缸上升";
this.btnTopUp.UseVisualStyleBackColor = false; this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click); this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
// //
...@@ -175,17 +254,18 @@ ...@@ -175,17 +254,18 @@
this.btnOpenDo.UseVisualStyleBackColor = false; this.btnOpenDo.UseVisualStyleBackColor = false;
this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click); this.btnOpenDo.Click += new System.EventHandler(this.btnOpenDo_Click);
// //
// button2 // btnCloseDO
// //
this.button2.BackColor = System.Drawing.Color.White; this.btnCloseDO.BackColor = System.Drawing.Color.White;
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(165, 111); this.btnCloseDO.Location = new System.Drawing.Point(165, 111);
this.button2.Name = "button2"; this.btnCloseDO.Name = "btnCloseDO";
this.button2.Size = new System.Drawing.Size(125, 34); this.btnCloseDO.Size = new System.Drawing.Size(125, 34);
this.button2.TabIndex = 281; this.btnCloseDO.TabIndex = 281;
this.button2.Text = "关闭"; this.btnCloseDO.Text = "关闭";
this.button2.UseVisualStyleBackColor = false; this.btnCloseDO.UseVisualStyleBackColor = false;
this.btnCloseDO.Click += new System.EventHandler(this.btnCloseDO_Click);
// //
// txtDOIndex // txtDOIndex
// //
...@@ -241,18 +321,18 @@ ...@@ -241,18 +321,18 @@
this.txtWriteTime.TabIndex = 238; this.txtWriteTime.TabIndex = 238;
this.txtWriteTime.Text = "0"; this.txtWriteTime.Text = "0";
// //
// btnLocationDown // btnBack
// //
this.btnLocationDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnBack.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnBack.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationDown.Location = new System.Drawing.Point(188, 401); this.btnBack.Location = new System.Drawing.Point(168, 218);
this.btnLocationDown.Name = "btnLocationDown"; this.btnBack.Name = "btnBack";
this.btnLocationDown.Size = new System.Drawing.Size(125, 34); this.btnBack.Size = new System.Drawing.Size(125, 34);
this.btnLocationDown.TabIndex = 251; this.btnBack.TabIndex = 251;
this.btnLocationDown.Text = "定位装置下降"; this.btnBack.Text = "提升机构后退";
this.btnLocationDown.UseVisualStyleBackColor = false; this.btnBack.UseVisualStyleBackColor = false;
this.btnLocationDown.Visible = false; this.btnBack.Visible = false;
this.btnLocationDown.Click += new System.EventHandler(this.btnLocationDown_Click); this.btnBack.Click += new System.EventHandler(this.btnLocationDown_Click);
// //
// label5 // label5
// //
...@@ -266,18 +346,18 @@ ...@@ -266,18 +346,18 @@
this.label5.Text = "定时(ms):"; this.label5.Text = "定时(ms):";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnLocationUp // btnFoward
// //
this.btnLocationUp.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnFoward.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLocationUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnFoward.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLocationUp.Location = new System.Drawing.Point(188, 364); this.btnFoward.Location = new System.Drawing.Point(168, 181);
this.btnLocationUp.Name = "btnLocationUp"; this.btnFoward.Name = "btnFoward";
this.btnLocationUp.Size = new System.Drawing.Size(125, 34); this.btnFoward.Size = new System.Drawing.Size(125, 34);
this.btnLocationUp.TabIndex = 250; this.btnFoward.TabIndex = 250;
this.btnLocationUp.Text = "定位装置上升"; this.btnFoward.Text = "提升机构前进";
this.btnLocationUp.UseVisualStyleBackColor = false; this.btnFoward.UseVisualStyleBackColor = false;
this.btnLocationUp.Visible = false; this.btnFoward.Visible = false;
this.btnLocationUp.Click += new System.EventHandler(this.btnLocationUp_Click); this.btnFoward.Click += new System.EventHandler(this.btnLocationUp_Click);
// //
// cmbWriteIO // cmbWriteIO
// //
...@@ -389,17 +469,23 @@ ...@@ -389,17 +469,23 @@
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.ComboBox cmbWriteIO; private System.Windows.Forms.ComboBox cmbWriteIO;
private System.Windows.Forms.TextBox txtDoName; private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.Button btnLocationDown; private System.Windows.Forms.Button btnBack;
private System.Windows.Forms.Button btnLocationUp; private System.Windows.Forms.Button btnFoward;
private System.Windows.Forms.Button btnOpenAxisBreak;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button btnOpenDo; private System.Windows.Forms.Button btnOpenDo;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button btnCloseDO;
private System.Windows.Forms.Button btnTopDown; private System.Windows.Forms.Button btnTopDown;
private System.Windows.Forms.Button btnTopUp; private System.Windows.Forms.Button btnTopUp;
private System.Windows.Forms.Button btnCamerLed; private System.Windows.Forms.Button btnCamerLed;
private System.Windows.Forms.Button btnStoreOn; private System.Windows.Forms.Button btnDeviceLed;
private System.Windows.Forms.Button btnBlow; private System.Windows.Forms.Button btnLineStop;
private System.Windows.Forms.Button btnLineRun;
private System.Windows.Forms.Button btnRelax;
private System.Windows.Forms.Button btnClamp;
private System.Windows.Forms.Button btnRDoorDown;
private System.Windows.Forms.Button btnRDoorUp;
private System.Windows.Forms.Button btnLDoorDown;
private System.Windows.Forms.Button btnLDoorUp;
} }
} }
source/DUOStore/FrmIOStatus.cs
...@@ -18,7 +18,7 @@ using OnlineStore.LoadCSVLibrary; ...@@ -18,7 +18,7 @@ using OnlineStore.LoadCSVLibrary;
using OnlineStore.Common; using OnlineStore.Common;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmIOStatus : FrmBase public partial class FrmIOStatus : FrmBase
{ {
...@@ -204,13 +204,12 @@ namespace OnlineStore.ACPackingStore ...@@ -204,13 +204,12 @@ namespace OnlineStore.ACPackingStore
private void btnLocationUp_Click(object sender, EventArgs e) private void btnLocationUp_Click(object sender, EventArgs e)
{ {
StoreManager.Store.hoisterCylinder.StartForward(null);
// StoreManager.Store.CylinderMove(null, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up);
} }
private void btnLocationDown_Click(object sender, EventArgs e) private void btnLocationDown_Click(object sender, EventArgs e)
{ {
// StoreManager.Store.CylinderMove(null, IO_Type.LocationCylinder_Up, IO_Type.LocationCylinder_Down); StoreManager.Store.hoisterCylinder.StartBack(null);
} }
private void FrmIOStatus_Shown(object sender, EventArgs e) private void FrmIOStatus_Shown(object sender, EventArgs e)
...@@ -218,16 +217,6 @@ namespace OnlineStore.ACPackingStore ...@@ -218,16 +217,6 @@ namespace OnlineStore.ACPackingStore
timer1.Start(); timer1.Start();
} }
private void btnOpenAxisBreak_Click(object sender, EventArgs e)
{
// BtnMove(btnOpenAxisBreak, "打开刹车", "关闭刹车", IO_Type.Axis_Brake);
}
private void btnCloseAxisBreak_Click(object sender, EventArgs e)
{
// StoreManager.Store.IOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
}
private void button1_Click(object sender, EventArgs e) private void button1_Click(object sender, EventArgs e)
{ {
this.Close(); this.Close();
...@@ -267,38 +256,14 @@ namespace OnlineStore.ACPackingStore ...@@ -267,38 +256,14 @@ namespace OnlineStore.ACPackingStore
{ {
StoreManager.Store.CylinderMove(null, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down); StoreManager.Store.CylinderMove(null, IO_Type.TopCylinder_Up, IO_Type.TopCylinder_Down);
} }
private void btnNGDoorUp_Click(object sender, EventArgs e)
{
// StoreManager.Store.CylinderMove(null, IO_Type.NGDoorCylinder_Down, IO_Type.NGDoowCylinder_Up);
}
private void btnNGDoorDown_Click(object sender, EventArgs e)
{
// StoreManager.Store.CylinderMove(null, IO_Type.NGDoowCylinder_Up, IO_Type.NGDoorCylinder_Down);
}
private void btnCamerLed_Click(object sender, EventArgs e) private void btnCamerLed_Click(object sender, EventArgs e)
{ {
BtnMove(btnCamerLed, "打开光源", "关闭光源", IO_Type.Camera_Led); BtnMove(btnCamerLed, "打开相机光源", "关闭相机光源", IO_Type.Camera_Led);
}
private void button4_Click(object sender, EventArgs e)
{
}
private void btnStopMove_Click(object sender, EventArgs e)
{
} }
private void btnStoreOn_Click(object sender, EventArgs e) private void btnStoreOn_Click(object sender, EventArgs e)
{ {
// BtnMove(btnStoreOn, "料仓运转ON", "料仓运转OFF", IO_Type.Run_Signal); BtnMove(btnCamerLed, "打开设备电源", "关闭设备电源", IO_Type.Device_Led);
}
private void btnBlow_Click(object sender, EventArgs e)
{
// BtnMove(btnBlow, "开始吹气", "停止吹气", IO_Type.StartOrStopBlow);
} }
private void btnCloseCyDo_Click(object sender, EventArgs e) private void btnCloseCyDo_Click(object sender, EventArgs e)
...@@ -313,19 +278,39 @@ namespace OnlineStore.ACPackingStore ...@@ -313,19 +278,39 @@ namespace OnlineStore.ACPackingStore
// StoreManager.Store.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW); // StoreManager.Store.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
} }
private void btnClamp_Click(object sender, EventArgs e)
{
StoreManager.Store.CylinderMove(null, IO_Type.ClampCylinder_Relax, IO_Type.ClampCylinder_Clamp);
}
private void btnNgLine_Click(object sender, EventArgs e) private void btnRelax_Click(object sender, EventArgs e)
{ {
// StoreManager.Store.IOMove(IO_Type.NGLine_Run, IO_VALUE.HIGH); StoreManager.Store.CylinderMove(null, IO_Type.ClampCylinder_Clamp, IO_Type.ClampCylinder_Relax);
} }
private void btnNGlineStop_Click(object sender, EventArgs e) private void btnLDoorUp_Click(object sender, EventArgs e)
{ {
// StoreManager.Store.IOMove(IO_Type.NGLine_Run, IO_VALUE.LOW); StoreManager.Store.BoxMap[1].CylinderMove(null, IO_Type.OutDoor_Down, IO_Type.OutDoor_Up);
} }
private void btnLineBack_Click(object sender, EventArgs e) private void btnLDoorDown_Click(object sender, EventArgs e)
{ {
StoreManager.Store.BoxMap[1].CylinderMove(null, IO_Type.OutDoor_Up, IO_Type.OutDoor_Down);
}
private void btnRDoorUp_Click(object sender, EventArgs e)
{
StoreManager.Store.BoxMap[2].CylinderMove(null, IO_Type.OutDoor_Down, IO_Type.OutDoor_Up);
}
private void btnRDoorDown_Click(object sender, EventArgs e)
{
StoreManager.Store.BoxMap[2].CylinderMove(null, IO_Type.OutDoor_Up, IO_Type.OutDoor_Down);
}
private void btnCloseDO_Click(object sender, EventArgs e)
{
WriteDO(IO_VALUE.LOW);
} }
} }
} }
source/DUOStore/FrmPwd.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmPwd partial class FrmPwd
{ {
......
source/DUOStore/FrmPwd.cs
...@@ -10,7 +10,7 @@ using System.Text; ...@@ -10,7 +10,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmPwd : FrmBase public partial class FrmPwd : FrmBase
{ {
......
source/DUOStore/FrmStore.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmStore partial class FrmStore
{ {
...@@ -57,6 +57,8 @@ ...@@ -57,6 +57,8 @@
this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.二维码学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.二维码学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.扫码测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components); this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
...@@ -65,8 +67,6 @@ ...@@ -65,8 +67,6 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.扫码测试ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.menuStrip1.SuspendLayout(); this.menuStrip1.SuspendLayout();
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
this.tabControl1.Multiline = true; this.tabControl1.Multiline = true;
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1342, 675); this.tabControl1.Size = new System.Drawing.Size(1242, 667);
this.tabControl1.TabIndex = 0; this.tabControl1.TabIndex = 0;
this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem); this.tabControl1.DrawItem += new System.Windows.Forms.DrawItemEventHandler(this.tabControl1_DrawItem);
this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged); this.tabControl1.SelectedIndexChanged += new System.EventHandler(this.tabControl1_SelectedIndexChanged);
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Size = new System.Drawing.Size(1334, 642); this.tabPage1.Size = new System.Drawing.Size(1234, 634);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 日志信息 "; this.tabPage1.Text = " 日志信息 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
// //
this.chbDoorCanMove.AutoSize = true; this.chbDoorCanMove.AutoSize = true;
this.chbDoorCanMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDoorCanMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDoorCanMove.Location = new System.Drawing.Point(40, 107); this.chbDoorCanMove.Location = new System.Drawing.Point(52, 416);
this.chbDoorCanMove.Name = "chbDoorCanMove"; this.chbDoorCanMove.Name = "chbDoorCanMove";
this.chbDoorCanMove.Size = new System.Drawing.Size(126, 24); this.chbDoorCanMove.Size = new System.Drawing.Size(126, 24);
this.chbDoorCanMove.TabIndex = 197; this.chbDoorCanMove.TabIndex = 197;
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
// //
this.chbUseBuzzer.AutoSize = true; this.chbUseBuzzer.AutoSize = true;
this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbUseBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbUseBuzzer.Location = new System.Drawing.Point(40, 60); this.chbUseBuzzer.Location = new System.Drawing.Point(52, 369);
this.chbUseBuzzer.Name = "chbUseBuzzer"; this.chbUseBuzzer.Name = "chbUseBuzzer";
this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24); this.chbUseBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbUseBuzzer.TabIndex = 195; this.chbUseBuzzer.TabIndex = 195;
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
// //
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(40, 157); this.chkDebug.Location = new System.Drawing.Point(52, 466);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(132, 24); this.chkDebug.Size = new System.Drawing.Size(132, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(40, 19); this.chbAutoRun.Location = new System.Drawing.Point(52, 328);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24); this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
// //
this.btnCopyLog.BackColor = System.Drawing.Color.White; this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(18, 301); this.btnCopyLog.Location = new System.Drawing.Point(52, 517);
this.btnCopyLog.Name = "btnCopyLog"; this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35); this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191; this.btnCopyLog.TabIndex = 191;
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
// //
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(129, 301); this.btnClearLog.Location = new System.Drawing.Point(52, 558);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -194,9 +194,9 @@ ...@@ -194,9 +194,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(241, 3); this.logBox.Location = new System.Drawing.Point(241, 138);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1085, 616); this.logBox.Size = new System.Drawing.Size(985, 473);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -208,9 +208,9 @@ ...@@ -208,9 +208,9 @@
this.lblWarnMsg.BackColor = System.Drawing.Color.Transparent; this.lblWarnMsg.BackColor = System.Drawing.Color.Transparent;
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(281, 4); this.lblWarnMsg.Location = new System.Drawing.Point(464, 4);
this.lblWarnMsg.Name = "lblWarnMsg"; this.lblWarnMsg.Name = "lblWarnMsg";
this.lblWarnMsg.Size = new System.Drawing.Size(1062, 72); this.lblWarnMsg.Size = new System.Drawing.Size(779, 72);
this.lblWarnMsg.TabIndex = 96; this.lblWarnMsg.TabIndex = 96;
this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
...@@ -224,7 +224,7 @@ ...@@ -224,7 +224,7 @@
this.帮助ToolStripMenuItem}); this.帮助ToolStripMenuItem});
this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Size = new System.Drawing.Size(1350, 29); this.menuStrip1.Size = new System.Drawing.Size(1250, 29);
this.menuStrip1.TabIndex = 4; this.menuStrip1.TabIndex = 4;
this.menuStrip1.Text = "menuStrip1"; this.menuStrip1.Text = "menuStrip1";
// //
...@@ -247,54 +247,54 @@ ...@@ -247,54 +247,54 @@
// toolStripSeparator1 // toolStripSeparator1
// //
this.toolStripSeparator1.Name = "toolStripSeparator1"; this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator1.Size = new System.Drawing.Size(177, 6);
// //
// 启动AToolStripMenuItem // 启动AToolStripMenuItem
// //
this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem"; this.启动AToolStripMenuItem.Name = "启动AToolStripMenuItem";
this.启动AToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.启动AToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.启动AToolStripMenuItem.Text = "启动 "; this.启动AToolStripMenuItem.Text = "启动 ";
this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click); this.启动AToolStripMenuItem.Click += new System.EventHandler(this.启动所有料仓AToolStripMenuItem_Click);
// //
// toolStripSeparator4 // toolStripSeparator4
// //
this.toolStripSeparator4.Name = "toolStripSeparator4"; this.toolStripSeparator4.Name = "toolStripSeparator4";
this.toolStripSeparator4.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator4.Size = new System.Drawing.Size(177, 6);
// //
// 复位RToolStripMenuItem // 复位RToolStripMenuItem
// //
this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem"; this.复位RToolStripMenuItem.Name = "复位RToolStripMenuItem";
this.复位RToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.复位RToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.复位RToolStripMenuItem.Text = "复位"; this.复位RToolStripMenuItem.Text = "复位";
this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click); this.复位RToolStripMenuItem.Click += new System.EventHandler(this.复位RToolStripMenuItem_Click);
// //
// toolStripSeparator3 // toolStripSeparator3
// //
this.toolStripSeparator3.Name = "toolStripSeparator3"; this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator3.Size = new System.Drawing.Size(177, 6);
// //
// 停止TToolStripMenuItem // 停止TToolStripMenuItem
// //
this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem"; this.停止TToolStripMenuItem.Name = "停止TToolStripMenuItem";
this.停止TToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.停止TToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.停止TToolStripMenuItem.Text = "停止"; this.停止TToolStripMenuItem.Text = "停止";
this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click); this.停止TToolStripMenuItem.Click += new System.EventHandler(this.停止所有料仓TToolStripMenuItem_Click);
// //
// toolStripSeparator5 // toolStripSeparator5
// //
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(177, 6);
// //
// toolStripSeparator2 // toolStripSeparator2
// //
this.toolStripSeparator2.Name = "toolStripSeparator2"; this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(114, 6); this.toolStripSeparator2.Size = new System.Drawing.Size(177, 6);
this.toolStripSeparator2.Visible = false; this.toolStripSeparator2.Visible = false;
// //
// 退出ToolStripMenuItem // 退出ToolStripMenuItem
// //
this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem"; this.退出ToolStripMenuItem.Name = "退出ToolStripMenuItem";
this.退出ToolStripMenuItem.Size = new System.Drawing.Size(117, 26); this.退出ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.退出ToolStripMenuItem.Text = "退出"; this.退出ToolStripMenuItem.Text = "退出";
this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1); this.退出ToolStripMenuItem.Click += new System.EventHandler(this.退出ToolStripMenuItem_Click_1);
// //
...@@ -314,26 +314,38 @@ ...@@ -314,26 +314,38 @@
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(160, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "启用调试"; this.toolStripMenuItem2.Text = "启用调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(157, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(160, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 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);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(157, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
//
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
// //
// 帮助ToolStripMenuItem // 帮助ToolStripMenuItem
// //
...@@ -346,7 +358,7 @@ ...@@ -346,7 +358,7 @@
// 版本号ToolStripMenuItem // 版本号ToolStripMenuItem
// //
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem"; this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26); this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 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);
// //
...@@ -392,24 +404,12 @@ ...@@ -392,24 +404,12 @@
this.timer1.Interval = 1000; this.timer1.Interval = 1000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// 扫码测试ToolStripMenuItem
//
this.扫码测试ToolStripMenuItem.Name = "扫码测试ToolStripMenuItem";
this.扫码测试ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.扫码测试ToolStripMenuItem.Text = "扫码测试";
this.扫码测试ToolStripMenuItem.Click += new System.EventHandler(this.扫码测试ToolStripMenuItem_Click);
//
// toolStripSeparator9
//
this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6);
//
// FrmStore // FrmStore
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1350, 729); this.ClientSize = new System.Drawing.Size(1250, 721);
this.Controls.Add(this.lblWarnMsg); this.Controls.Add(this.lblWarnMsg);
this.Controls.Add(this.menuStrip1); this.Controls.Add(this.menuStrip1);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
......
source/DUOStore/FrmStore.cs
...@@ -17,7 +17,7 @@ using System.Threading.Tasks; ...@@ -17,7 +17,7 @@ using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
using UserFromControl; using UserFromControl;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
internal partial class FrmStore : Form internal partial class FrmStore : Form
{ {
...@@ -37,6 +37,8 @@ namespace OnlineStore.ACPackingStore ...@@ -37,6 +37,8 @@ namespace OnlineStore.ACPackingStore
private void FrmMain_Load(object sender, EventArgs e) private void FrmMain_Load(object sender, EventArgs e)
{ {
try
{
FrmBase.GetVersion(); FrmBase.GetVersion();
store = StoreManager.InitStore(); store = StoreManager.InitStore();
if (store == null) if (store == null)
...@@ -44,24 +46,31 @@ namespace OnlineStore.ACPackingStore ...@@ -44,24 +46,31 @@ namespace OnlineStore.ACPackingStore
this.Close(); this.Close();
return; return;
} }
AddForm(" IO状态查看 ", new FrmIOStatus());
foreach (BoxBean box in store.BoxMap.Values) foreach (BoxBean box in store.BoxMap.Values)
{ {
FrmBox frm = new FrmBox(); FrmBox frm = new FrmBox();
frm.BoxBean = box; frm.BoxBean = box;
AddForm(box.Name, frm); AddForm(box.Name, frm);
} }
AddForm(" 取料提升机构 ", new FrmAxisMove());
AddForm(" IO状态查看 ", new FrmIOStatus());
chbAutoRun.Checked = store.UseBuzzer; chbAutoRun.Checked = store.UseBuzzer;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title); this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
chbAutoRun.Checked =( ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1)); chbAutoRun.Checked = (ConfigAppSettings.GetIntValue(Setting_Init.App_AutoRun).Equals(1));
chbDoorCanMove.Checked =( ConfigAppSettings.GetIntValue(Setting_Init.UseDoor).Equals(1)); chbDoorCanMove.Checked = (ConfigAppSettings.GetIntValue(Setting_Init.UseDoor).Equals(1));
// LogUtil.logBox = this.logBox; // LogUtil.logBox = this.logBox;
// HideForm(); // HideForm();
LoadOk = true; LoadOk = true;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
this.timer1.Start(); this.timer1.Start();
} }
catch (Exception ex)
{
LogUtil.error(ex.ToString());
MessageBox.Show(ex.ToString());
}
}
private void AddForm(string text, Form form) private void AddForm(string text, Form form)
{ {
......
source/DUOStore/ManagerUtil.cs
...@@ -5,7 +5,7 @@ using System.Text; ...@@ -5,7 +5,7 @@ using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public class ManagerUtil public class ManagerUtil
{ {
......
source/DUOStore/Program.cs
using log4net; using log4net;
using log4net.Config; using log4net.Config;
using OnlineStore.Common; using OnlineStore.Common;
using OnlineStore.ACPackingStore; using OnlineStore.DUOStore;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices; ...@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
static class Program static class Program
{ {
......
source/DUOStore/positionTool/FrmPositionTool.Designer.cs
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
partial class FrmPositionTool partial class FrmPositionTool
{ {
......
source/DUOStore/positionTool/FrmPositionTool.cs
...@@ -16,7 +16,7 @@ using System.Threading; ...@@ -16,7 +16,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows.Forms; using System.Windows.Forms;
namespace OnlineStore.ACPackingStore namespace OnlineStore.DUOStore
{ {
public partial class FrmPositionTool : FrmBase public partial class FrmPositionTool : FrmBase
{ {
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -78,7 +78,7 @@ ...@@ -78,7 +78,7 @@
<Compile Include="duoStore\BoxBean.cs" /> <Compile Include="duoStore\BoxBean.cs" />
<Compile Include="duoStore\BoxBean_Partial.cs" /> <Compile Include="duoStore\BoxBean_Partial.cs" />
<Compile Include="duoStore\BoxBean_Shelf.cs" /> <Compile Include="duoStore\BoxBean_Shelf.cs" />
<Compile Include="duoStore\EnteryDoorBean.cs" /> <Compile Include="duoStore\HoisterCylinder.cs" />
<Compile Include="duoStore\HumitureBean.cs" /> <Compile Include="duoStore\HumitureBean.cs" />
<Compile Include="duoStore\DUOStoreBean.cs" /> <Compile Include="duoStore\DUOStoreBean.cs" />
<Compile Include="duoStore\StoreManager.cs" /> <Compile Include="duoStore\StoreManager.cs" />
......
source/DeviceLibrary/StoreConfig/BoxConfig_1.csv
...@@ -5,9 +5,9 @@ AXIS,,L3_进出轴,InOut_Axis,3,COM1,,100,300,300,20,60,200,10,1000,0,0 ...@@ -5,9 +5,9 @@ AXIS,,L3_进出轴,InOut_Axis,3,COM1,,100,300,300,20,60,200,10,1000,0,0
AXIS,,L4_压紧轴,Comp_Axis,4,COM1,,100,300,300,20,60,200,10,1000,0,0 AXIS,,L4_压紧轴,Comp_Axis,4,COM1,,100,300,300,20,60,200,10,1000,0,0
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P1待机点/扫码放料低点,UpDownAxis_P1,585000,,,,,,,,,,,, PRO,,L2_上下轴_P1待机点/入料口低点,UpDownAxis_P1,585000,,,,,,,,,,,,
PRO,,L2_上下轴_P2扫码放料高点缓冲点,UpDownAxis_P2,604500,,,,,,,,,,,, PRO,,L2_上下轴_P2入料口高点,UpDownAxis_P2,604500,,,,,,,,,,,,
PRO,,L1_旋转轴_P1待机点/扫码放料点,MiddleAxis_P1,307200,,,,,,,,,,,, PRO,,L1_旋转轴_P1待机点/入料口位置,MiddleAxis_P1,307200,,,,,,,,,,,,
PRO,,L3_进出轴_P1待机点,InOutAxis_P1,1000,,,,,,,,,,,, PRO,,L3_进出轴_P1待机点,InOutAxis_P1,1000,,,,,,,,,,,,
PRO,,L4_压紧轴_P1待机点,CompAxis_P1,140000,,,,,,,,,,,, PRO,,L4_压紧轴_P1待机点,CompAxis_P1,140000,,,,,,,,,,,,
PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,180000,,,,,,,,,,,, PRO,,L4_压紧轴_P3压紧前点,CompAxis_P3,180000,,,,,,,,,,,,
...@@ -36,10 +36,10 @@ PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,, ...@@ -36,10 +36,10 @@ PRO,,L4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,, PRO,,L4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,, PRO,,L4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,L2_上下轴_P101速度,UpDownAxis_P101_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P11速度,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,L2_上下轴_P102速度,UpDownAxis_P102_Speed,600,,,,,,,,,,,, PRO,,L2_上下轴_P12速度,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,L3_进出轴_P101速度,InOutAxis_P101_Speed,300,,,,,,,,,,,, PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,L1_旋转轴_P101速度,MiddleAxis_P101_Speed,300,,,,,,,,,,,, PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,, PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,, PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/BoxConfig_2.csv
...@@ -36,10 +36,10 @@ PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,, ...@@ -36,10 +36,10 @@ PRO,,R4_压紧轴_P1速度,CompAxis_P1_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,, PRO,,R4_压紧轴_P2速度,CompAxis_P2_Speed,400,,,,,,,,,,,,
PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,, PRO,,R4_压紧轴_P3速度,CompAxis_P3_Speed,400,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,R2_上下轴_P101速度,UpDownAxis_P101_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P11速度,UpDownAxis_P11_Speed,600,,,,,,,,,,,,
PRO,,R2_上下轴_P102速度,UpDownAxis_P102_Speed,600,,,,,,,,,,,, PRO,,R2_上下轴_P12速度,UpDownAxis_P12_Speed,600,,,,,,,,,,,,
PRO,,R3_进出轴_P101速度,InOutAxis_P101_Speed,300,,,,,,,,,,,, PRO,,R3_进出轴_P11速度,InOutAxis_P11_Speed,300,,,,,,,,,,,,
PRO,,R1_旋转轴_P101速度,MiddleAxis_P101_Speed,300,,,,,,,,,,,, PRO,,R1_旋转轴_P11速度,MiddleAxis_P11_Speed,300,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,, PRO,,温湿度端口号,Humiture_Port,COM5,,,,,,,,,,,,
PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,, PRO,,是否是调试状态,IsInDebug,0,,,,,,,,,,,,
source/DeviceLibrary/StoreConfig/StoreConfig.csv
...@@ -97,6 +97,32 @@ DO,0,设备内部照明ON,Device_Led,2,PRO_AIO_IP_3,Y43,,,,,,,,,, ...@@ -97,6 +97,32 @@ DO,0,设备内部照明ON,Device_Led,2,PRO_AIO_IP_3,Y43,,,,,,,,,,
,0,,,6,PRO_AIO_IP_3,Y47,,,,,,,,,, ,0,,,6,PRO_AIO_IP_3,Y47,,,,,,,,,,
,0,,,7,PRO_AIO_IP_3,Y48,,,,,,,,,, ,0,,,7,PRO_AIO_IP_3,Y48,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,0,T1_提升轴待机点 P1,BatchAxis_P1,5000,,,,, ,,,,,,,
PRO,0,T1_提升轴上升目标点_P2,BatchAxis_P2,4000,,,,, ,,,,,,,
PRO,0,T1_提升轴P1速度,BatchAxis_P1Speed,4000,,,,,,,,,,,,
PRO,0,T1_提升轴P2速度,BatchAxis_P2Speed,500,,,,, ,,,,,,,
PRO,0,T1_提升轴高度转换系数（1mm对应的脉冲）,BatchAxis_ChangeValue,11000,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,T2_旋转轴待机点/取放料点 P1,MiddleAxis_P1,5000,,,,,,,,,,,,
PRO,0,T2_旋转轴左侧料仓取放料点_P2,MiddleAxis_P2,59000,,,,,,,,,,,,
PRO,0,T2_旋转轴右侧料仓取放料点_P3,MiddleAxis_P3,59000,,,,,,,,,,,,
PRO,0,T2_旋转轴P1速度,MiddleAxis_P1Speed,500,,,,,,,,,,,,
PRO,0,T2_旋转轴P2速度,MiddleAxis_P2Speed,500,,,,,,,,,,,,
PRO,0,T2_旋转轴P3速度,MiddleAxis_P3Speed,500,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,0,T3_升降轴料串取放料低点 P1,UpdownAxis_P1,5000,,,,,,,,,,,,
PRO,0,T3_升降轴料串取放料高点 P2,UpdownAxis_P2,5001,,,,,,,,,,,,
PRO,0,T3_升降轴左侧料仓取放料低点 P3,UpdownAxis_P3,5002,,,,,,,,,,,,
PRO,0,T3_升降轴左侧料仓取放料高点 P4,UpdownAxis_P4,5003,,,,,,,,,,,,
PRO,0,T3_升降轴右侧料仓取放料低点 P5,UpdownAxis_P5,5004,,,,,,,,,,,,
PRO,0,T3_升降轴右侧料仓取放料高点 P6,UpdownAxis_P6,5005,,,,,,,,,,,,
PRO,0,T2_升降轴P1速度,UpdownAxis_P1Speed,500,,,,,,,,,,,,
PRO,0,T2_升降轴P2速度,UpdownAxis_P2Speed,501,,,,,,,,,,,,
PRO,0,T2_升降轴P3速度,UpdownAxis_P3Speed,502,,,,,,,,,,,,
PRO,0,T2_升降轴P4速度,UpdownAxis_P4Speed,503,,,,,,,,,,,,
PRO,0,T2_升降轴P5速度,UpdownAxis_P5Speed,504,,,,,,,,,,,,
PRO,0,T2_升降轴P6速度,UpdownAxis_P6Speed,505,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,, ,,,,,,,,,,,,,,,,
PRO,,预警温度,WarnTemperate,80,,,,,,,,,,,, PRO,,预警温度,WarnTemperate,80,,,,,,,,,,,,
PRO,,预警湿度,WarnHumidity,80,,,,,,,,,,,, PRO,,预警湿度,WarnHumidity,80,,,,,,,,,,,,
......
source/DeviceLibrary/duoStore/BoxBean.cs
...@@ -19,8 +19,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,8 +19,6 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public partial class BoxBean : KTK_Store public partial class BoxBean : KTK_Store
{ {
private TaskData taskData = null;
public HoisterCylinder DoorBean = null;
private bool IsIntSlvBlock = false; private bool IsIntSlvBlock = false;
public AutoInoutInfo AutoInout = new AutoInoutInfo(); public AutoInoutInfo AutoInout = new AutoInoutInfo();
public string CID = ""; public string CID = "";
...@@ -29,23 +27,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -29,23 +27,11 @@ namespace OnlineStore.DeviceLibrary
public StoreStatus lastPosIdStatus = StoreStatus.StoreOnline; public StoreStatus lastPosIdStatus = StoreStatus.StoreOnline;
public List<ConfigMoveAxis> moveAxisList = new List<ConfigMoveAxis>(); public List<ConfigMoveAxis> moveAxisList = new List<ConfigMoveAxis>();
/// <summary>
/// 所有料仓库位列表
/// </summary>
public List<string> PositionNumList = new List<string>(); public List<string> PositionNumList = new List<string>();
/// <summary>
/// 所有料架库位列表
/// </summary>
public List<string> ShelfPosList = new List<string>();
public HumitureBean humBean = null; public HumitureBean humBean = null;
private System.Timers.Timer serverConnectTimer = new System.Timers.Timer(); private System.Timers.Timer serverConnectTimer = new System.Timers.Timer();
private System.Timers.Timer IoCheckTimer = new System.Timers.Timer(); private System.Timers.Timer IoCheckTimer = new System.Timers.Timer();
/// <summary>
/// 是否有料架在来的路上
/// </summary>
public bool WaitShelfEnter=false;
private int logType = 1000; private int logType = 1000;
public BoxBean(BOX_Config config) public BoxBean(BOX_Config config)
{ {
...@@ -62,18 +48,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -62,18 +48,15 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.AutoReset = true; IoCheckTimer.AutoReset = true;
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
IoCheckTimer.Elapsed += IoCheckTimer_Elapsed; IoCheckTimer.Elapsed += IoCheckTimer_Elapsed;
logType = 1000 * config.Id;
logType = config.Id * 1000;
//添加调试 //添加调试
IsDebug = config.IsInDebug.Equals(1); IsDebug = config.IsInDebug.Equals(1);
Name = (" BOX_" + config.Id + " ").ToUpper(); Name = (" BOX_" + config.Id + " ").ToUpper();
this.ID = config.Id; ; this.ID = config.Id; ;
this.Config = config; this.Config = config;
DoorBean = new HoisterCylinder(ID);
//温湿度 //温湿度
humBean = new HumitureBean(config.Humiture_Port, Name); humBean = new HumitureBean(config.Humiture_Port, Name);
// humBean.Init();
moveAxisList = new List<ConfigMoveAxis>();
MoveAxisConfig(); MoveAxisConfig();
List<ACBoxPosition> positionList = CSVPositionReader<ACBoxPosition>.getPositionList(); List<ACBoxPosition> positionList = CSVPositionReader<ACBoxPosition>.getPositionList();
PositionNumList = new List<string>(); PositionNumList = new List<string>();
...@@ -117,6 +100,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -117,6 +100,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public void MoveAxisConfig() public void MoveAxisConfig()
{ {
Config.UpDown_Axis.BreakOnDO = IO_Type.UpdownAxis_Break;
moveAxisList = new List<ConfigMoveAxis>(); moveAxisList = new List<ConfigMoveAxis>();
moveAxisList.Add(Config.Middle_Axis); moveAxisList.Add(Config.Middle_Axis);
moveAxisList.Add(Config.UpDown_Axis); moveAxisList.Add(Config.UpDown_Axis);
...@@ -205,7 +190,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -205,7 +190,6 @@ namespace OnlineStore.DeviceLibrary
private void ReturnHome() private void ReturnHome()
{ {
CurrShelfID = ""; CurrShelfID = "";
WaitShelfEnter = false;
lastPosId = ""; lastPosId = "";
lastPosIdStatus = StoreStatus.ResetMove; lastPosIdStatus = StoreStatus.ResetMove;
AutoInout.ClearCount(); AutoInout.ClearCount();
...@@ -249,7 +233,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -249,7 +233,6 @@ namespace OnlineStore.DeviceLibrary
isInSuddenDown = false; isInSuddenDown = false;
isNoAirCheck = false; isNoAirCheck = false;
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
DoorBean.Stop();
//开始复位动作 //开始复位动作
MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_InOutBack); MoveInfo.NextMoveStep(StoreMoveStep.BOX_H01_InOutBack);
...@@ -807,7 +790,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -807,7 +790,6 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public override void StopMove() public override void StopMove()
{ {
DoorBean.Stop();
IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.LOW); IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.LOW);
MoveInfo.EndMove(); MoveInfo.EndMove();
IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.LOW); IOMove(IO_Type.UpdownAxis_Break, IO_VALUE.LOW);
......
source/DeviceLibrary/duoStore/BoxBean_Partial.cs
...@@ -355,8 +355,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -355,8 +355,8 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition); MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，走到料架位置，旋转轴至P101，升降轴至P102"); InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，走到料架位置，旋转轴至P101，升降轴至P102");
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_HP102, Config.UpDownAxis_P102_Speed); ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P101, Config.MiddleAxis_P101_Speed); ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P101, Config.MiddleAxis_P11_Speed);
} }
protected override void InStoreProcess() protected override void InStoreProcess()
{ {
...@@ -415,21 +415,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -415,21 +415,21 @@ namespace OnlineStore.DeviceLibrary
//{ //{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf); // MoveInfo.NextMoveStep(StoreMoveStep.BI_12_MoveToShelf);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴到P101低点，旋转轴到P101点，压紧轴到压紧前点"); // InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴到P101低点，旋转轴到P101点，压紧轴到压紧前点");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed); // ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// ACAxisMove(Config.Comp_Axis, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed); // ACAxisMove(Config.Comp_Axis, Config.CompAxis_Max_P3, Config.CompAxis_P3_Speed);
//} //}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf)) //else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_12_MoveToShelf))
//{ //{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101); // MoveInfo.NextMoveStep(StoreMoveStep.BI_13_InoutToP101);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子前进到P101点"); // InOutStoreLog("料架取料 " + MoveInfo.SLog + "：叉子前进到P101点");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed); // ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//} //}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101)) //else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_13_InoutToP101))
//{ //{
// MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102); // MoveInfo.NextMoveStep(StoreMoveStep.BI_14_UpdownToP102);
// InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴上升到P102点"); // InOutStoreLog("料架取料 " + MoveInfo.SLog + "：升降轴上升到P102点");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
//} //}
//else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102)) //else if (MoveInfo.MoveStep.Equals(StoreMoveStep.BI_14_UpdownToP102))
//{ //{
...@@ -707,7 +707,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -707,7 +707,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf); MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101"); InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed); ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf) else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
...@@ -715,7 +715,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -715,7 +715,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel); MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null "); InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed); ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
} }
else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_PutReel) else if (MoveInfo.MoveStep == StoreMoveStep.SO_12_PutReel)
...@@ -782,18 +782,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -782,18 +782,13 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】失败，忙碌或报警中 ，storeStatus：" + storeRunStatus + ",MoveType：" + MoveInfo.MoveType + ",isInSuddenDown：" + isInSuddenDown + ",isNoAirCheck：" + isNoAirCheck); LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】失败，忙碌或报警中 ，storeStatus：" + storeRunStatus + ",MoveType：" + MoveInfo.MoveType + ",isInSuddenDown：" + isInSuddenDown + ",isNoAirCheck：" + isNoAirCheck);
return false; return false;
} }
if (WaitShelfEnter)
{
LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】失败，WaitShelfEnter=true ，需要等待入库结束才能出库");
return false;
}
if (!StoreManager.LoadInoutParam(param, false, this)) if (!StoreManager.LoadInoutParam(param, false, this))
{ {
LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】出错，找不到库位信息"); LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】出错，找不到库位信息");
return false; return false;
} }
taskData = null;
storeStatus = StoreStatus.OutStoreExecute; storeStatus = StoreStatus.OutStoreExecute;
storeRunStatus = StoreRunStatus.Busy; storeRunStatus = StoreRunStatus.Busy;
MoveInfo.NewMove(StoreMoveType.OutStore, param); MoveInfo.NewMove(StoreMoveType.OutStore, param);
...@@ -931,8 +926,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -931,8 +926,8 @@ namespace OnlineStore.DeviceLibrary
// CompressSigTimeOut = false; // CompressSigTimeOut = false;
// MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition); // MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 "); // InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 ");
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P12_Speed);
// ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P101_Speed); // ACAxisMove(Config.Middle_Axis, moveP.Middle_P101, Config.MiddleAxis_P11_Speed);
// } // }
//} //}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_ToShelfPosition) //else if (MoveInfo.MoveStep == StoreMoveStep.SO_08_ToShelfPosition)
...@@ -949,7 +944,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -949,7 +944,7 @@ namespace OnlineStore.DeviceLibrary
//{ //{
// MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf); // MoveInfo.NextMoveStep(StoreMoveStep.SO_11_ToShelf);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101"); // InOutStoreLog("出库 " + MoveInfo.SLog + "：叉子进出料口，进出轴至P101");
// ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P101_Speed); // ACAxisMove(Config.InOut_Axis, moveP.InOut_P101, Config.InOutAxis_P11_Speed);
//} //}
//else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf) //else if (MoveInfo.MoveStep == StoreMoveStep.SO_11_ToShelf)
...@@ -957,7 +952,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -957,7 +952,7 @@ namespace OnlineStore.DeviceLibrary
// MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel); // MoveInfo.NextMoveStep(StoreMoveStep.SO_12_PutReel);
// InOutStoreLog("出库 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null "); // InOutStoreLog("出库 " + MoveInfo.SLog + "：放下物品，压紧轴到P1，升降轴至P101,清空 taskData=null ");
// ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed); // ACAxisMove(Config.Comp_Axis, moveP.ComPress_P1, Config.CompAxis_P1_Speed);
// ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P101_Speed); // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_LP101, Config.UpDownAxis_P11_Speed);
// MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); // MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
// taskData = null; // taskData = null;
// Task.Factory.StartNew(delegate // Task.Factory.StartNew(delegate
......
source/DeviceLibrary/duoStore/BoxBean_Shelf.cs
...@@ -377,80 +377,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -377,80 +377,6 @@ namespace OnlineStore.DeviceLibrary
#endregion #endregion
#region AGV
internal bool ProcessAGVAction(string name, string rfid, ClientAction action)
{
string logN = name + "收到调度" + name + "=" + action + ",RFID[" + rfid + "]";
//Arrive收到后打开门
if (!action.Equals(ClientAction.Arrive))
{
LogUtil.info(Name + logN + " ，未找到相关处理");
return false;
}
//出库处理中不处理
if (MoveInfo.MoveStep.Equals(StoreMoveStep.BS_03_WaitEmptyAgv))
{
if (!rfid.Equals(""))
{
string mark = GetMarkInfo();
LogUtil.error(Name + logN + " 当前 BS_03_WaitEmptyAgv，RFID[" + rfid + "]不是空车，不处理agv，重发 NeedLeave [" + mark + "][" + CurrShelfID + "]");
// AgvClient.SetStatus(Config.AgvNodeName, mark, CurrShelfID, ClientAction.NeedLeave, ClientLevel.High, true);
return false;
}
//等待空车到达
LogUtil.info(Name + logN + ",当前 BS_03_WaitEmptyAgv，正在等待料架到达");
MoveInfo.NextMoveStep(StoreMoveStep.BS_04_DoorOpen);
InOutStoreLog("送出料架等待空车" + MoveInfo.SLog + "：agv到达,打开入料口移门");
DoorBean.StartBack(MoveInfo);
return true;
}
else if (MoveInfo.MoveType.Equals(StoreMoveType.OutStore) && MoveInfo.MoveStep.Equals(StoreMoveStep.BI_00_ReadyShelf))
{
if (rfid.Equals(""))
{
string mark = GetMarkInfo();
// LogUtil.error(Name + logN + " 当前出库中 BI_00_ReadyShelf，RFID无效，不处理agv，重发 NeedEnter [" + mark + "][" + MoveInfo.MoveParam.rfid + "]");
// AgvClient.SetStatus(Config.AgvNodeName, mark, MoveInfo.MoveParam.rfid, ClientAction.NeedEnter, ClientLevel.High, true);
return false;
}
//出库等待料架到达
LogUtil.info(Name + logN + ",当前出库中 BI_00_ReadyShelf，正在等待料架到达");
MoveInfo.NextMoveStep(StoreMoveStep.BI_01_DoorOpen);
InOutStoreLog("出库等待料架" + MoveInfo.SLog + " agv已到达，打开入料口移门");
DoorBean.StartBack(MoveInfo);
return true;
}
//else if (storeRunStatus.Equals(StoreRunStatus.Runing) &&
// MoveInfo.MoveType.Equals(StoreMoveType.None) &&
// IOValue(IO_Type.LineTake_Check).Equals(IO_VALUE.LOW))
//{
// //agv到达，开始处理
// if (rfid.Equals(""))
// {
// LogUtil.error(Name + logN + " ，RFID无效，不需要入库处理");
// return false;
// }
// LogUtil.info(Name + logN + " ，检测到料架，开始料架入库");
// StartShelfInStore();
// return true;
//}
//else
//{
// LogUtil.error(Name + logN + " ，[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]未找到相关处理");
//}
return false;
}
#endregion
#region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作 #region 与服务器通信定时器，每1秒向服务器通知一次状态,同时执行出库操作
private string CodeMsg = ""; private string CodeMsg = "";
...@@ -639,7 +565,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -639,7 +565,6 @@ namespace OnlineStore.DeviceLibrary
index++; index++;
string plateW = plateWArray[index]; string plateW = plateWArray[index];
string plateH = plateHArray[index]; string plateH = plateHArray[index];
string shelfPosID = StoreManager.GetShelfIDByLoc(rfidLoc, ShelfPosList);
InOutParam inoutParam = new InOutParam(barcode, posId, plateW, plateH); InOutParam inoutParam = new InOutParam(barcode, posId, plateW, plateH);
//根据发送的posId获取位置列表 //根据发送的posId获取位置列表
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
...@@ -30,6 +30,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,6 +30,11 @@ namespace OnlineStore.DeviceLibrary
public Store_Config Config { get; set; } public Store_Config Config { get; set; }
public bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
public bool AutoShelfInstore = ConfigAppSettings.GetIntValue(Setting_Init.AutoShelfInstore).Equals(1); public bool AutoShelfInstore = ConfigAppSettings.GetIntValue(Setting_Init.AutoShelfInstore).Equals(1);
public HoisterCylinder hoisterCylinder = new HoisterCylinder(0);
public AxisBean T1_BatchAxis = null;
public AxisBean T2_MiddleAxis = null;
public AxisBean T3_UpdownAxis = null;
#region 初始化 #region 初始化
internal bool canStart = false; internal bool canStart = false;
...@@ -47,13 +52,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -47,13 +52,10 @@ namespace OnlineStore.DeviceLibrary
this.Config = lineConfig; this.Config = lineConfig;
this.ID = lineConfig.Id; this.ID = lineConfig.Id;
MoveInfo = new StoreMoveInfo(ID ); MoveInfo = new StoreMoveInfo(ID);
Name = (" Store_" + Config.CID + " ").ToUpper(); Name = (" DUO料仓_" + Config.CID + " ").ToUpper();
List<string> ioList = new List<string>(); List<string> ioList = new List<string>();
AddDeviceName(ioList, Config.IOIPList); AddDeviceName(ioList, Config.IOIPList);
foreach (BOX_Config config in configList.Values) foreach (BOX_Config config in configList.Values)
{ {
BoxBean equip = new BoxBean(config); BoxBean equip = new BoxBean(config);
...@@ -62,11 +64,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -62,11 +64,13 @@ namespace OnlineStore.DeviceLibrary
BoxMap.Add(config.Id, equip); BoxMap.Add(config.Id, equip);
BoxConfigMap.Add(config.Id, config); BoxConfigMap.Add(config.Id, config);
} }
Config.T3_Updown_Axis.BreakOnDO = IO_Type.MoveAxis_Break;
Config.T1_Batch_Axis.BreakOnDO = IO_Type.MoveAxis_Break;
T1_BatchAxis = new AxisBean(Config.T1_Batch_Axis, Name);
T2_MiddleAxis = new AxisBean(Config.T2_Middle_Axis,Name);
T3_UpdownAxis = new AxisBean(Config.T3_Updown_Axis,Name);
IOManager.Init(); IOManager.Init();
//先初始化设备
//初始化摄像机配置
CodeManager.LoadConfig(); CodeManager.LoadConfig();
Task.Factory.StartNew(delegate Task.Factory.StartNew(delegate
......
source/DeviceLibrary/duoStore/StoreManager.cs
...@@ -85,6 +85,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -85,6 +85,7 @@ namespace OnlineStore.DeviceLibrary
string storeIdConfig = Setting_Init.Store_CID + "_" + i; string storeIdConfig = Setting_Init.Store_CID + "_" + i;
string boxCid = ConfigAppSettings.GetValue(storeIdConfig); string boxCid = ConfigAppSettings.GetValue(storeIdConfig);
BOX_Config moveConfig = CSVConfigReader.LoadBoxConfig(i, boxCid, "BOX", config); BOX_Config moveConfig = CSVConfigReader.LoadBoxConfig(i, boxCid, "BOX", config);
moveConfig.SetIO(i);
AllConfigMap.Add(i, moveConfig); AllConfigMap.Add(i, moveConfig);
storeConfig.Add(i, moveConfig); storeConfig.Add(i, moveConfig);
} }
......
source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs
...@@ -104,9 +104,9 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -104,9 +104,9 @@ namespace OnlineStore.LoadCSVLibrary
{ {
return DeviceName + "_" + GetAxisValue(); return DeviceName + "_" + GetAxisValue();
} }
public bool IsSameAxis(string portName, int slv) public bool IsSameAxis(ConfigMoveAxis axis)
{ {
if (DeviceName.Equals(portName) && slv.Equals(GetAxisValue())) if (DeviceName.Equals(axis.DeviceName) && axis.GetAxisValue().Equals(GetAxisValue()))
{ {
return true; return true;
} }
......
source/LoadCVSLibrary/storeConfig/config/BaseConfig.cs
...@@ -34,8 +34,6 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -34,8 +34,6 @@ namespace OnlineStore.LoadCSVLibrary
public BaseConfig() public BaseConfig()
{ {
SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
} }
public BaseConfig(int id, string CID, string type, string filepath) public BaseConfig(int id, string CID, string type, string filepath)
...@@ -45,11 +43,17 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -45,11 +43,17 @@ namespace OnlineStore.LoadCSVLibrary
this.Id = id; this.Id = id;
this.DType = type; this.DType = type;
this.ConfigFilePath = filepath; this.ConfigFilePath = filepath;
SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
} }
public virtual void LoadConfig(List<ConfigBase> configList) public virtual void LoadConfig(List<ConfigBase> configList)
{ {
if (SubDIList == null)
{
SubDIList = new Dictionary<int, Dictionary<string, ConfigIO>>();
}
if (SubDOList == null)
{
SubDOList = new Dictionary<int, Dictionary<string, ConfigIO>>();
}
List<string> ioTypeList = IO_Type.GetTypeList(); List<string> ioTypeList = IO_Type.GetTypeList();
StringBuilder builder = new StringBuilder("\r\n"); StringBuilder builder = new StringBuilder("\r\n");
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
...@@ -179,25 +179,25 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -179,25 +179,25 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("CompAxis_P3_Speed")] [ConfigProAttribute("CompAxis_P3_Speed")]
public int CompAxis_P3_Speed { get; set; } public int CompAxis_P3_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P101速度,UpDownAxis_P101_Speed,600 /// PRO,,L2_上下轴_P11速度,UpDownAxis_P11_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P101_Speed")] [ConfigProAttribute("UpDownAxis_P11_Speed")]
public int UpDownAxis_P101_Speed { get; set; } public int UpDownAxis_P11_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L2_上下轴_P102速度,UpDownAxis_P102_Speed,600 /// PRO,,L2_上下轴_P12速度,UpDownAxis_P12_Speed,600
/// </summary> /// </summary>
[ConfigProAttribute("UpDownAxis_P102_Speed")] [ConfigProAttribute("UpDownAxis_P12_Speed")]
public int UpDownAxis_P102_Speed { get; set; } public int UpDownAxis_P12_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L3_进出轴_P101速度,InOutAxis_P101_Speed,300 /// PRO,,L3_进出轴_P11速度,InOutAxis_P11_Speed,300
/// </summary> /// </summary>
[ConfigProAttribute("InOutAxis_P101_Speed")] [ConfigProAttribute("InOutAxis_P11_Speed")]
public int InOutAxis_P101_Speed { get; set; } public int InOutAxis_P11_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,L1_旋转轴_P101速度,MiddleAxis_P101_Speed,300 /// PRO,,L1_旋转轴_P11速度,MiddleAxis_P11_Speed,300
/// </summary> /// </summary>
[ConfigProAttribute("MiddleAxis_P101_Speed")] [ConfigProAttribute("MiddleAxis_P11_Speed")]
public int MiddleAxis_P101_Speed { get; set; } public int MiddleAxis_P11_Speed { get; set; }
/// <summary> /// <summary>
/// PRO,,温湿度端口号,Humiture_Port,COM5 /// PRO,,温湿度端口号,Humiture_Port,COM5
/// </summary> /// </summary>
......
source/LoadCVSLibrary/storeConfig/config/Store_Config.cs
...@@ -124,6 +124,126 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -124,6 +124,126 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("CameraNameList")] [ConfigProAttribute("CameraNameList")]
public string CameraNameList { get; set; } public string CameraNameList { get; set; }
/// <summary>
/// PRO,0,T1_提升轴待机点 P1,BatchAxis_P1,5000,, ,
/// </summary>
[ConfigProAttribute("BatchAxis_P1")]
public int BatchAxis_P1 { get; set; }
/// <summary>
/// PRO,0,T1_提升轴上升目标点_P2,BatchAxis_P2,4000,, ,
/// </summary>
[ConfigProAttribute("BatchAxis_P2")]
public int BatchAxis_P2 { get; set; }
/// <summary>
/// PRO,0,T1_提升轴P1速度,BatchAxis_P1Speed,4000
/// </summary>
[ConfigProAttribute("BatchAxis_P1Speed")]
public int BatchAxis_P1Speed { get; set; }
/// <summary>
/// PRO,0,T1_提升轴P2速度,BatchAxis_P2Speed,500,, ,
/// </summary>
[ConfigProAttribute("BatchAxis_P2Speed")]
public int BatchAxis_P2Speed { get; set; }
/// <summary>
/// PRO,0,T1_提升轴高度转换系数（1mm对应的脉冲）,BatchAxis_ChangeValue,11000
/// </summary>
[ConfigProAttribute("BatchAxis_ChangeValue")]
public int BatchAxis_ChangeValue { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴待机点/取放料点 P1,MiddleAxis_P1,5000
/// </summary>
[ConfigProAttribute("MiddleAxis_P1")]
public int MiddleAxis_P1 { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴左侧料仓取放料点_P2,MiddleAxis_P2,59000
/// </summary>
[ConfigProAttribute("MiddleAxis_P2")]
public int MiddleAxis_P2 { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴右侧料仓取放料点_P3,MiddleAxis_P3,59000
/// </summary>
[ConfigProAttribute("MiddleAxis_P3")]
public int MiddleAxis_P3 { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴P1速度,MiddleAxis_P1Speed,500
/// </summary>
[ConfigProAttribute("MiddleAxis_P1Speed")]
public int MiddleAxis_P1Speed { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴P2速度,MiddleAxis_P2Speed,500
/// </summary>
[ConfigProAttribute("MiddleAxis_P2Speed")]
public int MiddleAxis_P2Speed { get; set; }
/// <summary>
/// PRO,0,T2_旋转轴P3速度,MiddleAxis_P3Speed,500
/// </summary>
[ConfigProAttribute("MiddleAxis_P3Speed")]
public int MiddleAxis_P3Speed { get; set; }
/// <summary>
/// PRO,0,T3_升降轴料串取放料低点 P1,UpdownAxis_P1,5000
/// </summary>
[ConfigProAttribute("UpdownAxis_P1")]
public int UpdownAxis_P1 { get; set; }
/// <summary>
/// PRO,0,T3_升降轴料串取放料高点 P2,UpdownAxis_P2,5001
/// </summary>
[ConfigProAttribute("UpdownAxis_P2")]
public int UpdownAxis_P2 { get; set; }
/// <summary>
/// PRO,0,T3_升降轴左侧料仓取放料低点 P3,UpdownAxis_P3,5002
/// </summary>
[ConfigProAttribute("UpdownAxis_P3")]
public int UpdownAxis_P3 { get; set; }
/// <summary>
/// PRO,0,T3_升降轴左侧料仓取放料高点 P4,UpdownAxis_P4,5003
/// </summary>
[ConfigProAttribute("UpdownAxis_P4")]
public int UpdownAxis_P4 { get; set; }
/// <summary>
/// PRO,0,T3_升降轴右侧料仓取放料低点 P5,UpdownAxis_P5,5004
/// </summary>
[ConfigProAttribute("UpdownAxis_P5")]
public int UpdownAxis_P5 { get; set; }
/// <summary>
/// PRO,0,T3_升降轴右侧料仓取放料高点 P6,UpdownAxis_P6,5005
/// </summary>
[ConfigProAttribute("UpdownAxis_P6")]
public int UpdownAxis_P6 { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P1速度,UpdownAxis_P1Speed,500
/// </summary>
[ConfigProAttribute("UpdownAxis_P1Speed")]
public int UpdownAxis_P1Speed { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P2速度,UpdownAxis_P2Speed,501
/// </summary>
[ConfigProAttribute("UpdownAxis_P2Speed")]
public int UpdownAxis_P2Speed { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P3速度,UpdownAxis_P3Speed,502
/// </summary>
[ConfigProAttribute("UpdownAxis_P3Speed")]
public int UpdownAxis_P3Speed { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P4速度,UpdownAxis_P4Speed,503
/// </summary>
[ConfigProAttribute("UpdownAxis_P4Speed")]
public int UpdownAxis_P4Speed { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P5速度,UpdownAxis_P5Speed,504
/// </summary>
[ConfigProAttribute("UpdownAxis_P5Speed")]
public int UpdownAxis_P5Speed { get; set; }
/// <summary>
/// PRO,0,T2_升降轴P6速度,UpdownAxis_P6Speed,505
/// </summary>
[ConfigProAttribute("UpdownAxis_P6Speed")]
public int UpdownAxis_P6Speed { get; set; }
private List<string> CameraList = new List<string>(); private List<string> CameraList = new List<string>();
public List<string> GetCameraList() public List<string> GetCameraList()
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!