Skip to content

孙克 / ACSquareStore

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

1

1 个父辈 dab6e9e2
内嵌 并排
正在显示 15 个修改的文件 包含 400 行增加 和 631 行删除
source/ACSquareStore/ACSquareStore.csproj
......@@ -102,12 +102,6 @@
<Compile Include="FrmAbout.Designer.cs">
<DependentUpon>FrmAbout.cs</DependentUpon>
</Compile>
<Compile Include="FrmIdConfig.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmIdConfig.Designer.cs">
<DependentUpon>FrmIdConfig.cs</DependentUpon>
</Compile>
<Compile Include="FrmPwd.cs">
<SubType>Form</SubType>
</Compile>
......@@ -147,9 +141,6 @@
<EmbeddedResource Include="FrmAbout.resx">
<DependentUpon>FrmAbout.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmIdConfig.resx">
<DependentUpon>FrmIdConfig.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmPwd.resx">
<DependentUpon>FrmPwd.cs</DependentUpon>
</EmbeddedResource>
......
source/ACSquareStore/FrmAxisDebug.cs
......@@ -127,12 +127,7 @@ namespace OnlineStore.ACSingleStore
private void btnInOutMove_MouseDown(object sender, MouseEventArgs e)
{
if (this.btnInOutMove.BackColor .Equals(System.Drawing.SystemColors.Control))
{
if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0)
{
......@@ -214,12 +209,7 @@ namespace OnlineStore.ACSingleStore
private void btnInOutMovej_MouseDown(object sender, MouseEventArgs e)
{
if (btnInOutMovej.BackColor.Equals(System.Drawing.SystemColors.Control))
{
if (StoreManager.Store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
{
int speed = FormUtil.GetIntValue(txtInOutSpeed);
if (speed <= 0)
{
......
source/ACSquareStore/FrmStoreBox.Designer.cs
......@@ -65,9 +65,6 @@
this.label49 = new System.Windows.Forms.Label();
this.richTextBox1 = new System.Windows.Forms.RichTextBox();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.label38 = new System.Windows.Forms.Label();
this.txtMiddleTarget = new System.Windows.Forms.TextBox();
this.txtInoutTarget = new System.Windows.Forms.TextBox();
......@@ -85,6 +82,8 @@
this.label43 = new System.Windows.Forms.Label();
this.label42 = new System.Windows.Forms.Label();
this.groupInout = new System.Windows.Forms.GroupBox();
this.txtInOutP3 = new System.Windows.Forms.TextBox();
this.btnInOutP3 = new System.Windows.Forms.Button();
this.lblTemp = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
this.btnSavePosition = new System.Windows.Forms.Button();
......@@ -98,7 +97,7 @@
this.txtUpDownP8 = new System.Windows.Forms.TextBox();
this.txtUpDownP1 = new System.Windows.Forms.TextBox();
this.txtUpDownP2 = new System.Windows.Forms.TextBox();
this.txtInOutP3 = new System.Windows.Forms.TextBox();
this.txtInOutP4 = new System.Windows.Forms.TextBox();
this.txtMiddleP2 = new System.Windows.Forms.TextBox();
this.txtUpDownP5 = new System.Windows.Forms.TextBox();
this.txtUpDownP6 = new System.Windows.Forms.TextBox();
......@@ -115,7 +114,7 @@
this.btnUpDownP8 = new System.Windows.Forms.Button();
this.btnUpDownP1 = new System.Windows.Forms.Button();
this.btnUpDownP2 = new System.Windows.Forms.Button();
this.btnInOutP3 = new System.Windows.Forms.Button();
this.btnInOutP4 = new System.Windows.Forms.Button();
this.btnMiddleP2 = new System.Windows.Forms.Button();
this.btnUpDownP5 = new System.Windows.Forms.Button();
this.btnUpDownP6 = new System.Windows.Forms.Button();
......@@ -164,9 +163,11 @@
this.btnIO = new System.Windows.Forms.Button();
this.tabPage6 = new System.Windows.Forms.TabPage();
this.button4 = new System.Windows.Forms.Button();
this.btnSetNum = new System.Windows.Forms.Button();
this.btnClearL = new System.Windows.Forms.Button();
this.btnLogDebug = new System.Windows.Forms.Button();
this.axis_1_Alarm = new UserFromControl.IOStatusControl();
this.axis_3_Alarm = new UserFromControl.IOStatusControl();
this.axis_2_Alarm = new UserFromControl.IOStatusControl();
this.groupAxis.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupInout.SuspendLayout();
......@@ -675,7 +676,7 @@
this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.richTextBox1.Location = new System.Drawing.Point(7, 3);
this.richTextBox1.Name = "richTextBox1";
this.richTextBox1.Size = new System.Drawing.Size(545, 543);
this.richTextBox1.Size = new System.Drawing.Size(545, 536);
this.richTextBox1.TabIndex = 256;
this.richTextBox1.Text = "";
this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
......@@ -711,36 +712,6 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "伺服状态";
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(234, 44);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(136, 44);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(331, 44);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// label38
//
this.label38.AutoSize = true;
......@@ -885,6 +856,8 @@
//
// groupInout
//
this.groupInout.Controls.Add(this.txtInOutP3);
this.groupInout.Controls.Add(this.btnInOutP3);
this.groupInout.Controls.Add(this.lblTemp);
this.groupInout.Controls.Add(this.lblMsg);
this.groupInout.Controls.Add(this.btnSavePosition);
......@@ -898,7 +871,7 @@
this.groupInout.Controls.Add(this.txtUpDownP8);
this.groupInout.Controls.Add(this.txtUpDownP1);
this.groupInout.Controls.Add(this.txtUpDownP2);
this.groupInout.Controls.Add(this.txtInOutP3);
this.groupInout.Controls.Add(this.txtInOutP4);
this.groupInout.Controls.Add(this.txtMiddleP2);
this.groupInout.Controls.Add(this.txtUpDownP5);
this.groupInout.Controls.Add(this.txtUpDownP6);
......@@ -915,7 +888,7 @@
this.groupInout.Controls.Add(this.btnUpDownP8);
this.groupInout.Controls.Add(this.btnUpDownP1);
this.groupInout.Controls.Add(this.btnUpDownP2);
this.groupInout.Controls.Add(this.btnInOutP3);
this.groupInout.Controls.Add(this.btnInOutP4);
this.groupInout.Controls.Add(this.btnMiddleP2);
this.groupInout.Controls.Add(this.btnUpDownP5);
this.groupInout.Controls.Add(this.btnUpDownP6);
......@@ -929,6 +902,39 @@
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
//
// txtInOutP3
//
this.txtInOutP3.AcceptsReturn = true;
this.txtInOutP3.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(394, 181);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 272;
this.txtInOutP3.Text = "-17000";
//
// btnInOutP3
//
this.btnInOutP3.AutoSize = true;
this.btnInOutP3.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.Location = new System.Drawing.Point(251, 176);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(146, 33);
this.btnInOutP3.TabIndex = 271;
this.btnInOutP3.Text = "X-进出轴右侧点P3:";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
//
// lblTemp
//
this.lblTemp.AutoSize = true;
......@@ -1100,20 +1106,20 @@
this.txtUpDownP2.TabIndex = 202;
this.txtUpDownP2.Text = "-836025";
//
// txtInOutP3
//
this.txtInOutP3.AcceptsReturn = true;
this.txtInOutP3.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(395, 140);
this.txtInOutP3.MaxLength = 20;
this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP3.Size = new System.Drawing.Size(89, 23);
this.txtInOutP3.TabIndex = 194;
this.txtInOutP3.Text = "-12388";
// txtInOutP4
//
this.txtInOutP4.AcceptsReturn = true;
this.txtInOutP4.BackColor = System.Drawing.SystemColors.Window;
this.txtInOutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP4.Location = new System.Drawing.Point(395, 140);
this.txtInOutP4.MaxLength = 20;
this.txtInOutP4.Name = "txtInOutP4";
this.txtInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInOutP4.Size = new System.Drawing.Size(89, 23);
this.txtInOutP4.TabIndex = 194;
this.txtInOutP4.Text = "-12388";
//
// txtMiddleP2
//
......@@ -1253,9 +1259,9 @@
this.btnInOutP2.Location = new System.Drawing.Point(10, 175);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
this.btnInOutP2.Size = new System.Drawing.Size(146, 33);
this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "X-进出轴取料点P2:";
this.btnInOutP2.Text = "X-进出轴左侧点P2:";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.UseVisualStyleBackColor = false;
this.btnInOutP2.Click += new System.EventHandler(this.btnInOutP2_Click);
......@@ -1374,23 +1380,23 @@
this.btnUpDownP2.UseVisualStyleBackColor = false;
this.btnUpDownP2.Click += new System.EventHandler(this.btnUpDownP2_Click);
//
// btnInOutP3
//
this.btnInOutP3.AutoSize = true;
this.btnInOutP3.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(251, 135);
this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
this.btnInOutP3.TabIndex = 193;
this.btnInOutP3.Text = "X-进出轴取料点P3:";
this.btnInOutP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP3.UseVisualStyleBackColor = false;
this.btnInOutP3.Click += new System.EventHandler(this.btnInOutP3_Click);
// btnInOutP4
//
this.btnInOutP4.AutoSize = true;
this.btnInOutP4.BackColor = System.Drawing.SystemColors.Control;
this.btnInOutP4.Cursor = System.Windows.Forms.Cursors.Default;
this.btnInOutP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP4.ForeColor = System.Drawing.Color.Green;
this.btnInOutP4.Location = new System.Drawing.Point(251, 135);
this.btnInOutP4.Name = "btnInOutP4";
this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP4.Size = new System.Drawing.Size(140, 33);
this.btnInOutP4.TabIndex = 193;
this.btnInOutP4.Text = "X-进出轴库位点P4:";
this.btnInOutP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP4.UseVisualStyleBackColor = false;
this.btnInOutP4.Click += new System.EventHandler(this.btnInOutP3_Click);
//
// btnMiddleP2
//
......@@ -1487,7 +1493,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearLog.Location = new System.Drawing.Point(310, 563);
this.btnClearLog.Location = new System.Drawing.Point(310, 556);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 38);
this.btnClearLog.TabIndex = 224;
......@@ -1624,7 +1630,7 @@
this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseDoor.Location = new System.Drawing.Point(146, 563);
this.btnCloseDoor.Location = new System.Drawing.Point(146, 556);
this.btnCloseDoor.Name = "btnCloseDoor";
this.btnCloseDoor.Size = new System.Drawing.Size(105, 38);
this.btnCloseDoor.TabIndex = 258;
......@@ -1637,7 +1643,7 @@
this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenDoor.Location = new System.Drawing.Point(29, 563);
this.btnOpenDoor.Location = new System.Drawing.Point(29, 556);
this.btnOpenDoor.Name = "btnOpenDoor";
this.btnOpenDoor.Size = new System.Drawing.Size(105, 38);
this.btnOpenDoor.TabIndex = 257;
......@@ -1967,7 +1973,6 @@
// tabPage6
//
this.tabPage6.Controls.Add(this.button4);
this.tabPage6.Controls.Add(this.btnSetNum);
this.tabPage6.Controls.Add(this.btnClearL);
this.tabPage6.Controls.Add(this.btnLogDebug);
this.tabPage6.Location = new System.Drawing.Point(4, 30);
......@@ -1981,7 +1986,7 @@
//
this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button4.Location = new System.Drawing.Point(410, 4);
this.button4.Location = new System.Drawing.Point(274, 4);
this.button4.Name = "button4";
this.button4.Size = new System.Drawing.Size(132, 39);
this.button4.TabIndex = 15;
......@@ -1989,18 +1994,6 @@
this.button4.UseVisualStyleBackColor = true;
this.button4.Click += new System.EventHandler(this.button4_Click);
//
// btnSetNum
//
this.btnSetNum.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSetNum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSetNum.Location = new System.Drawing.Point(274, 4);
this.btnSetNum.Name = "btnSetNum";
this.btnSetNum.Size = new System.Drawing.Size(132, 39);
this.btnSetNum.TabIndex = 13;
this.btnSetNum.Text = "料仓配置";
this.btnSetNum.UseVisualStyleBackColor = true;
this.btnSetNum.Click += new System.EventHandler(this.btnSetNum_Click);
//
// btnClearL
//
this.btnClearL.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
......@@ -2025,6 +2018,36 @@
this.btnLogDebug.UseVisualStyleBackColor = true;
this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
//
// axis_1_Alarm
//
this.axis_1_Alarm.IOName = "";
this.axis_1_Alarm.IOValue = 0;
this.axis_1_Alarm.isCanClick = false;
this.axis_1_Alarm.Location = new System.Drawing.Point(234, 44);
this.axis_1_Alarm.Name = "axis_1_Alarm";
this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_1_Alarm.TabIndex = 264;
//
// axis_3_Alarm
//
this.axis_3_Alarm.IOName = "";
this.axis_3_Alarm.IOValue = 0;
this.axis_3_Alarm.isCanClick = false;
this.axis_3_Alarm.Location = new System.Drawing.Point(136, 44);
this.axis_3_Alarm.Name = "axis_3_Alarm";
this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_3_Alarm.TabIndex = 266;
//
// axis_2_Alarm
//
this.axis_2_Alarm.IOName = "";
this.axis_2_Alarm.IOValue = 0;
this.axis_2_Alarm.isCanClick = false;
this.axis_2_Alarm.Location = new System.Drawing.Point(331, 44);
this.axis_2_Alarm.Name = "axis_2_Alarm";
this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
this.axis_2_Alarm.TabIndex = 265;
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......@@ -2099,8 +2122,8 @@
public System.Windows.Forms.TextBox txtUpDownP1;
public System.Windows.Forms.Button btnUpDownP2;
public System.Windows.Forms.TextBox txtUpDownP2;
public System.Windows.Forms.Button btnInOutP3;
public System.Windows.Forms.TextBox txtInOutP3;
public System.Windows.Forms.Button btnInOutP4;
public System.Windows.Forms.TextBox txtInOutP4;
public System.Windows.Forms.Button btnMiddleP2;
public System.Windows.Forms.TextBox txtMiddleP2;
public System.Windows.Forms.Button btnUpDownP5;
......@@ -2204,7 +2227,6 @@
private System.Windows.Forms.Button btnDebug;
private System.Windows.Forms.CheckBox chbDebug;
private System.Windows.Forms.Label lblMoveEquipInfo;
private System.Windows.Forms.Button btnSetNum;
private System.Windows.Forms.Button btnUpdown;
private System.Windows.Forms.Label label17;
private System.Windows.Forms.TextBox txtLimit2;
......@@ -2213,6 +2235,8 @@
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtServoStatue;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
public System.Windows.Forms.TextBox txtInOutP3;
public System.Windows.Forms.Button btnInOutP3;
}
}
source/ACSquareStore/FrmStoreBox.cs
......@@ -38,7 +38,7 @@ namespace OnlineStore.ACSingleStore
private void FrmTest_Load(object sender, EventArgs e)
{
string version = GetVersion(true );
string version = GetVersion(true);
LogUtil.logBox = this.richTextBox1;
LoadStore();
......@@ -46,14 +46,14 @@ namespace OnlineStore.ACSingleStore
chbDebug.Checked = store.IsDebug;
this.ShowInTaskbar = true;
this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
// this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title)+"_"+store.StoreID;
groupBox3.Text = "设备["+store.CID+"]状态";
// this.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title)+"_"+store.StoreID;
groupBox3.Text = "设备[" + store.CID + "]状态";
notifyIcon1.Text = ConfigAppSettings.GetValue(Setting_Init.App_Title);
//cmbHomeType.SelectedIndex = 1;
HideForm();
this.Opacity = 1;
txtTempPort.Text = store.Config.Humiture_Port;
LoadOk = true;
}
private void LoadStore()
......@@ -82,26 +82,28 @@ namespace OnlineStore.ACSingleStore
txtMiddleP1.Text = store.Config.MiddleAxis_P1_Position.ToString();
txtUpDownP1.Text = store.Config.UpDownAxis_DoorO_P1.ToString();
txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
txtUpDownP2.Text = store.Config.UpDownAxis_DoorI_P2.ToString();
txtUpDownP7.Text = store.Config.UpDownAxis_DoorOB_P7.ToString();
txtUpDownP8.Text = store.Config.UpDownAxis_DoorIB_P8.ToString();
//txtInOutP2.Text = store.Config.InOutAxis_Door_P2.ToString();
txtUpDownP1.Text = store.Config.UpDownAxis_DoorO_P1.ToString();
txtInOutP2.Text = store.Config.InOutAxis_P2_Position.ToString();
txtInOutP3.Text = store.Config.InOutAxis_P3_Position.ToString();
if (ktkPosition != null)
{
txtMiddleP2.Text = ktkPosition.MiddleAxis_P2.ToString();
txtUpDownP3.Text = ktkPosition.UpDownAxis_IH_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpDownAxis_IL_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OH_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OL_P6.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_P3.ToString();
txtInOutP2.Text = ktkPosition.InOutAxis_Door_P2.ToString();
}
txtUpDownP6.Text = ktkPosition.UpDownAxis_OL_P6.ToString();
txtInOutP4.Text = ktkPosition.InOutAxis_P4.ToString();
}
timer1.Enabled = true;
}
}
#endregion
......@@ -136,22 +138,22 @@ namespace OnlineStore.ACSingleStore
preOpen = isOpen;
btnOutStore.Enabled = isOpen;
btnInStore.Enabled = isOpen;
btnInStore.Enabled = isOpen;
btnStoreStart.Enabled = !isOpen;
btnSotreReset.Enabled = isOpen;
btnStoreStop.Enabled = isOpen;
}
private void timer1_Tick(object sender, EventArgs e)
{
if (!this.Visible)
{
return;
}
// button6_Click(null, null);
// timer1.Interval = 300;
// button6_Click(null, null);
// timer1.Interval = 300;
if (chbDebug.Checked.Equals(store.IsDebug).Equals(false))
{
LoadOk = false;
......@@ -159,7 +161,7 @@ namespace OnlineStore.ACSingleStore
LoadOk = true;
}
lblTemp.Text = store.currTempStr;
lblMoveEquipInfo.Text = "移栽状态："+(LineConnect.CanStartOut() ? "可出库":"不可出库" )+" "+LineConnect.LastUpdateTime.ToLongTimeString() ;
// lblMoveEquipInfo.Text = "移栽状态：" + (LineConnect.CanStartOut() ? "可出库" : "不可出库") + " " + LineConnect.LastUpdateTime.ToLongTimeString();
//忙碌状态不读取状态
if (!store.storeRunStatus.Equals(StoreRunStatus.Busy))
{
......@@ -174,7 +176,7 @@ namespace OnlineStore.ACSingleStore
}
lblThisSta.Text = store.GetRunStr();
//复位按钮状态显示
if (btnSotreReset.Enabled == false)
{
......@@ -204,13 +206,16 @@ namespace OnlineStore.ACSingleStore
}
lblWarnMsg.Text = store.WarnMsg;
//if (store.Config.IsHasDoorLimit.Equals(1))
//{
// if (IOManager.IOValue(IO_Type.Door_LimitSingle).Equals(IO_VALUE.LOW))
// {
// lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关";
// }
//}
if (IOManager.IOValue(IO_Type.DoorLimit_L).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 前门未关";
}
if (IOManager.IOValue(IO_Type.DoorLimit_B).Equals(IO_VALUE.LOW))
{
lblWarnMsg.Text = lblWarnMsg.Text + " 后门未关";
}
//如果不在出入库中，且叉子上有信号，需要提示检查叉子
if (store.storeRunStatus.Equals(StoreRunStatus.Runing) && IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
......@@ -224,19 +229,7 @@ namespace OnlineStore.ACSingleStore
{
lblWarnMsg.Text = lblWarnMsg.Text + " 温湿度报警[" + store.TempAlarmTime.ToLongTimeString() + "]";
}
if (lblWarnMsg.Text.Equals(""))
{
List<string> list = new List<string>(LineConnect.WaitInStoreList);
if (list.Count > 0)
{
string msg = "等待入库：";
foreach (string s in list)
{
msg += s + "\t";
}
lblWarnMsg.Text = msg;
}
}
if (store.autoNext)
{
string msg = store.autoMsg;
......@@ -271,7 +264,7 @@ namespace OnlineStore.ACSingleStore
lblThisSta.Text = "等待启动";
lblWarnMsg.Text = "";
btnStartAuTo.Text = "开始自动出入库";
}
}
}
private void ReadPosistion()
......@@ -281,7 +274,7 @@ namespace OnlineStore.ACSingleStore
//判断私服是否打开、
if (ACServerManager.ServerOnStatus(portName, SlvAddr))
{
txtServoStatue.Text = "✔";
txtServoStatue.Text = "✔";
}
else
{
......@@ -289,10 +282,10 @@ namespace OnlineStore.ACSingleStore
}
ReadA(store.Config.Middle_Axis, lblActual1, lblTargetP1, txtMiddleTarget, axis_1_Alarm);
ReadA(store.Config.UpDown_Axis, lblActual2, lblTargetP2, txtUpdownTarget, axis_2_Alarm);
ReadA(store.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
ReadA(store.Config.InOut_Axis, lblActual3, lblTargetP3, txtInoutTarget, axis_3_Alarm);
}
private void ReadA(ConfigMoveAxis axis,TextBox lblActual, TextBox lblTarget,TextBox lblT, IOStatusControl sta)
private void ReadA(ConfigMoveAxis axis, TextBox lblActual, TextBox lblTarget, TextBox lblT, IOStatusControl sta)
{
string portName = GetPortName();
int SlvAddr = GetSlaveAddr();
......@@ -350,7 +343,7 @@ namespace OnlineStore.ACSingleStore
{
string selectPositionNum = cmbPosition.Text;
LineMoveP ktk = LoadPostion();
store.StartOutStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
store.StartOutStoreMove(new InOutParam(new InOutPosInfo("", selectPositionNum), ktk));
}
else
{
......@@ -364,7 +357,7 @@ namespace OnlineStore.ACSingleStore
{
string selectPositionNum = cmbPosition.Text;
LineMoveP ktk = LoadPostion();
store.StartInStoreMove(new InOutParam(new InOutPosInfo( "", selectPositionNum), ktk));
store.StartInStoreMove(new InOutParam(new InOutPosInfo("", selectPositionNum), ktk));
}
else
{
......@@ -374,10 +367,10 @@ namespace OnlineStore.ACSingleStore
private LineMoveP LoadPostion()
{
LineMoveP ktk = new LineMoveP();
LineMoveP ktk = new LineMoveP();
ktk.InOut_P1 = FormUtil.GetIntValue(txtInOutP1);
ktk.InOut_P2 = FormUtil.GetIntValue(txtInOutP2);
ktk.InOut_P3 = FormUtil.GetIntValue(txtInOutP3);
ktk.InOut_P4 = FormUtil.GetIntValue(txtInOutP4);
ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1);
ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
......@@ -414,9 +407,8 @@ namespace OnlineStore.ACSingleStore
txtUpDownP3.Text = ktkPosition.UpDownAxis_IH_P3.ToString();
txtUpDownP4.Text = ktkPosition.UpDownAxis_IL_P4.ToString();
txtUpDownP5.Text = ktkPosition.UpDownAxis_OH_P5.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OL_P6.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_P3.ToString();
txtInOutP2.Text = ktkPosition.InOutAxis_Door_P2.ToString();
txtUpDownP6.Text = ktkPosition.UpDownAxis_OL_P6.ToString();
txtInOutP3.Text = ktkPosition.InOutAxis_P4.ToString();
}
}
}
......@@ -441,7 +433,7 @@ namespace OnlineStore.ACSingleStore
{
color = Color.Green;
}
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color;
......@@ -462,25 +454,15 @@ namespace OnlineStore.ACSingleStore
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
//if (axisC.PositionIsHasLimit() && (axisC.PositionMin > position || axisC.PositionMax < position))
//{
// MessageBox.Show("位置超出" + axisC.Explain + "上下限（" + axisC.PositionMin + "-" + axisC.PositionMax + "）");
// return;
//}
if ( store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if ( store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
return;
}
}
LogUtil.info("点击【绝对运动】，端口号【"+ portName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(portName, SlvAddr, position, speed );
LogUtil.info("点击【绝对运动】，端口号【" + portName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(portName, SlvAddr, position, speed);
}
private void btnAxisVMove_Click(object sender, EventArgs e)
{
......@@ -488,12 +470,7 @@ namespace OnlineStore.ACSingleStore
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int speed = FormUtil.GetIntValue(txtASpeed);
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -501,7 +478,7 @@ namespace OnlineStore.ACSingleStore
}
}
LogUtil.info("点击【匀速运动】，端口号【" + portName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.SpeedMove(portName, SlvAddr, speed);
ACServerManager.SpeedMove(portName, SlvAddr, speed);
}
private void btnAxisRMove_Click(object sender, EventArgs e)
......@@ -511,20 +488,8 @@ namespace OnlineStore.ACSingleStore
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
//int currPositon = ACServerManager.GetActualtPosition(portName, SlvAddr);
// int newPosition = position + currPositon;
// if (axisC.PositionIsHasLimit() && (axisC.PositionMin > newPosition || axisC.PositionMax < newPosition))
//{
// MessageBox.Show("位置超出"+axisC.Explain+"上下限（" + axisC.PositionMin + "-" + axisC.PositionMax + "）");
// return;
//}
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -535,7 +500,7 @@ namespace OnlineStore.ACSingleStore
ACServerManager.RelMove(portName, SlvAddr, position, speed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
......@@ -572,10 +537,10 @@ namespace OnlineStore.ACSingleStore
ktkPosition.UpDownAxis_IL_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.UpDownAxis_IL_P4 = FormUtil.GetIntValue(txtUpDownP4);
ktkPosition.InOutAxis_P3 = FormUtil.GetIntValue(txtInOutP3);
ktkPosition.InOutAxis_P4 = FormUtil.GetIntValue(txtInOutP4);
ktkPosition.UpDownAxis_OH_P5 = FormUtil.GetIntValue(txtUpDownP5);
ktkPosition.UpDownAxis_OL_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.InOutAxis_Door_P2 = FormUtil.GetIntValue(txtInOutP2);
ktkPosition.UpDownAxis_OL_P6 = FormUtil.GetIntValue(txtUpDownP6);
ktkPosition.InOutAxis_P4 = FormUtil.GetIntValue(txtInOutP3);
}
//位置配置
string appPath = Application.StartupPath;
......@@ -609,7 +574,7 @@ namespace OnlineStore.ACSingleStore
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorI_P2 != FormUtil.GetIntValue(txtUpDownP2))
{
store.Config.UpDownAxis_DoorI_P2 = FormUtil.GetIntValue(txtUpDownP2);
......@@ -625,11 +590,16 @@ namespace OnlineStore.ACSingleStore
store.Config.UpDownAxis_DoorIB_P8 = FormUtil.GetIntValue(txtUpDownP8);
needUpdate = true;
}
//if (store.Config.InOutAxis_Door_P2 != FormUtil.GetIntValue(txtInOutP2))
//{
// store.Config.InOutAxis_Door_P2 = FormUtil.GetIntValue(txtInOutP2);
// needUpdate = true;
//}
if (store.Config.InOutAxis_P2_Position != FormUtil.GetIntValue(txtInOutP2))
{
store.Config.InOutAxis_P2_Position = FormUtil.GetIntValue(txtInOutP2);
needUpdate = true;
}
if (store.Config.InOutAxis_P3_Position != FormUtil.GetIntValue(txtInOutP3))
{
store.Config.InOutAxis_P3_Position = FormUtil.GetIntValue(txtInOutP3);
needUpdate = true;
}
if (store.Config.UpDownAxis_DoorO_P1 != FormUtil.GetIntValue(txtUpDownP1))
{
store.Config.UpDownAxis_DoorO_P1 = FormUtil.GetIntValue(txtUpDownP1);
......@@ -660,13 +630,13 @@ namespace OnlineStore.ACSingleStore
/// </summary>
private bool InOutIsIsP1()
{
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
int currValue = ACServerManager.GetActualtPosition(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
int InOutDefaultPosition = ConfigAppSettings.GetIntValue(Setting_Init.InOutDefaultPosition);
int currValue = ACServerManager.GetActualtPosition(store.Config.InOut_Axis.DeviceName, store.Config.InOut_Axis.GetAxisValue());
if (currValue <= InOutDefaultPosition)
{
return true;
}
MessageBox.Show("叉子不在待机位，请先将叉子退回待机位("+InOutDefaultPosition+")", "警告（叉子在待机位时，才能移动升降轴和前后轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
MessageBox.Show("叉子不在待机位，请先将叉子退回待机位(" + InOutDefaultPosition + ")", "警告（叉子在待机位时，才能移动升降轴和前后轴） ", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);
return false;
}
private void btnCloseAxis_Click(object sender, EventArgs e)
......@@ -678,13 +648,13 @@ namespace OnlineStore.ACSingleStore
}
private void AxisABSMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{
moveAxis.TargetPosition = targetPosition;
moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
}
private void btnUpDownP1_Click(object sender, EventArgs e)
{
if (InOutIsIsP1())
{
{
int value = FormUtil.GetIntValue(txtUpDownP1);
AxisABSMove(store.Config.UpDown_Axis, value, store.Config.UpDownAxis_P1_Speed);
}
......@@ -772,38 +742,23 @@ namespace OnlineStore.ACSingleStore
private void btnInOutP1_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int value = FormUtil.GetIntValue(txtInOutP1);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P1_Speed);
}
private void btnInOutP3_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int value = FormUtil.GetIntValue(txtInOutP3);
int value = FormUtil.GetIntValue(txtInOutP4);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P3_Speed);
}
private void btnInOutP2_Click(object sender, EventArgs e)
{
if (store.InOutAxisCanMove().Equals(false))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
int value = FormUtil.GetIntValue(txtInOutP2);
AxisABSMove(store.Config.InOut_Axis, value, store.Config.InOutAxis_P2_Speed);
}
int xWidth = SystemInformation.PrimaryMonitorSize.Width;//获取显示器屏幕宽度
int yHeight = SystemInformation.PrimaryMonitorSize.Height;//高度
......@@ -848,7 +803,7 @@ namespace OnlineStore.ACSingleStore
{
MessageBox.Show("请先启动料仓！");
}
}
}
private void 轴卡点动ToolStripMenuItem_Click(object sender, EventArgs e)
{
button1_Click(null, null);
......@@ -872,7 +827,7 @@ namespace OnlineStore.ACSingleStore
private void 复位ToolStripMenuItem_Click(object sender, EventArgs e)
{
this.store.Reset();
btnSotreReset.Enabled = false;
btnSotreReset.Enabled = false;
}
private void 查看IOToolStripMenuItem_Click(object sender, EventArgs e)
......@@ -887,12 +842,12 @@ namespace OnlineStore.ACSingleStore
private void 开启DEBUGToolStripMenuItem_Click(object sender, EventArgs e)
{
if (LogUtil.debug_opened == false)
{
{
btnLogDebug.Text = "关闭DEBUG";
LogUtil.debug_opened = true;
}
else
{
{
btnLogDebug.Text = "开启DEBUG";
LogUtil.debug_opened = false;
}
......@@ -907,13 +862,13 @@ namespace OnlineStore.ACSingleStore
private void 料仓运转ONToolStripMenuItem_Click(object sender, EventArgs e)
{
this.Enabled = false;
store.RunAxis(false );
store.RunAxis(false);
this.Enabled = true;
LogUtil.info("料仓运转ON完成");
}
private void 打开舱门ToolStripMenuItem_Click(object sender, EventArgs e)
{
{
StoreManager.Store.OpenDoor(false);
}
......@@ -924,7 +879,7 @@ namespace OnlineStore.ACSingleStore
}
private void 关闭仓门ToolStripMenuItem_Click(object sender, EventArgs e)
{
{
StoreManager.Store.CloseDoor(false);
}
......@@ -946,9 +901,9 @@ namespace OnlineStore.ACSingleStore
MessageBox.Show("请先启动料仓！");
}
}
private void FrmStoreBox_Shown(object sender, EventArgs e)
{
{
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
......@@ -959,18 +914,18 @@ namespace OnlineStore.ACSingleStore
this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
//this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
//this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP4.ForeColor = System.Drawing.Color.Green;
this.btnMiddleP1.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 int GetSlaveAddr()
{
return FormUtil.GetShortValue(txtAxisValue);
......@@ -984,12 +939,7 @@ namespace OnlineStore.ACSingleStore
{
string portName = txtAxisDeviceName.Text;
short SlvAddr = FormUtil.GetShortValue(txtAxisValue);
if (store.Config.InOut_Axis.IsSameAxis(portName, SlvAddr) && (store.InOutAxisCanMove().Equals(false)))
{
MessageBox.Show("定位气缸不在下降端，不能移动进出轴", "警告", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return;
}
else if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
if (store.Config.Middle_Axis.IsSameAxis(portName, SlvAddr) || store.Config.UpDown_Axis.IsSameAxis(portName, SlvAddr))
{
if (!InOutIsIsP1())
{
......@@ -1055,9 +1005,9 @@ namespace OnlineStore.ACSingleStore
this.ShowInTaskbar = true;
DebugStatus(false);
}
catch(Exception ex)
catch (Exception ex)
{
LogUtil.error("显示界面出错："+ex.ToString());
LogUtil.error("显示界面出错：" + ex.ToString());
}
}
private void ExitApp()
......@@ -1078,7 +1028,7 @@ namespace OnlineStore.ACSingleStore
IOManager.instance.CloseAllConnection();
ACServerManager.CloseAllPort();
// KNDAIManager.CloseAllConnection();
// KNDAIManager.CloseAllConnection();
//WCFControl.CloseWCF();
System.Environment.Exit(System.Environment.ExitCode);
}
......@@ -1090,7 +1040,7 @@ namespace OnlineStore.ACSingleStore
}
private void toolStripMenuItem1_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("是否确定退出？", "提示", MessageBoxButtons.YesNo,MessageBoxIcon.Question);
DialogResult result = MessageBox.Show("是否确定退出？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result.Equals(DialogResult.Yes))
{
ExitApp();
......@@ -1114,12 +1064,12 @@ namespace OnlineStore.ACSingleStore
private void 退出ToolStripMenuItem_Click(object sender, EventArgs e)
{
DialogResult result = MessageBox.Show("是否确定退出？", "提示", MessageBoxButtons.YesNo,MessageBoxIcon.Question);
DialogResult result = MessageBox.Show("是否确定退出？", "提示", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
if (result.Equals(DialogResult.Yes))
{
ExitApp();
}
}
}
private void btnTempInit_Click(object sender, EventArgs e)
{
string port = txtTempPort.Text.ToString();
......@@ -1148,7 +1098,7 @@ namespace OnlineStore.ACSingleStore
//IOManager.IOMove(IO_Type.Door_Down, IO_VALUE.LOW);
StoreManager.Store.OpenDoor(false);
}
private void btnClearL_Click(object sender, EventArgs e)
{
LogUtil.ClearLog();
......@@ -1186,7 +1136,7 @@ namespace OnlineStore.ACSingleStore
}
}
private void btnCloseDoor_Click(object sender, EventArgs e)
{
//IOManager.IOMove(IO_Type.Door_Up, IO_VALUE.LOW);
......@@ -1194,42 +1144,9 @@ namespace OnlineStore.ACSingleStore
StoreManager.Store.CloseDoor(false);
}
private void button3_Click(object sender, EventArgs e)
{
LineConnect.StartConnect();
}
private void button5_Click(object sender, EventArgs e)
{
LineConnect.StopConnect();
}
private void button6_Click(object sender, EventArgs e)
{
if (LineConnect.IsConnect())
{
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
StoreStatus ss = StoreStatus.StoreOnline;
if (store.IsDebug)
{
ss = StoreStatus.Debugging;
}
StoreSendBean bean = new StoreSendBean(StoreManager.Config.Id, StoreManager.Config.CID, (int)ss, (int)StoreRunStatus.Runing, hasTray, (int)StoreAlarmType.None);
//bean.data.Add(ParamDefine.posId, cmbPosition.Text);
//bean.data.Add(ParamDefine.plateH, "8");
//bean.data.Add(ParamDefine.plateW, "7");
//bean.data.Add(ParamDefine.cutReel, false.ToString());
//bean.data.Add(ParamDefine.smallReel, true.ToString());
//bean.data.Add(ParamDefine.urgentReel, false.ToString());
//bean.data.Add(ParamDefine.rfid, "E99");
//bean.data.Add(ParamDefine.rfidLoc, 72.ToString());
//bean.data.Add(ParamDefine.barcode, "code");
LineConnect.SendHeart(bean);
}
}
private void chbDebug_CheckedChanged(object sender, EventArgs e)
{
{
if (!LoadOk)
{
return;
......@@ -1255,34 +1172,13 @@ namespace OnlineStore.ACSingleStore
DialogResult result = MessageBox.Show("是否切换到正常工作状态？", "是否确认切换", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button1);
if (result.Equals(DialogResult.Yes))
{
store.IsDebug = false ;
store.IsDebug = false;
ConfigAppSettings.SaveValue(Setting_Init.IsInDebug, 0);
LogUtil.info("用户切换到正常工作状态 ");
}
}
}
}
private void btnSetNum_Click(object sender, EventArgs e)
{
try
{
FrmPwd fw = new FrmPwd(10);
DialogResult result = fw.ShowDialog();
if (!result.Equals(DialogResult.OK))
{
LogUtil.info("切换界面显示时，没有正确输入密码");
return;
}
FrmIdConfig frm = new FrmIdConfig(store.StoreID);
frm.ShowDialog();
}
catch (Exception ex)
{
LogUtil.error("显示界面出错：" + ex.ToString());
}
}
}
private void btnUpdown_Click(object sender, EventArgs e)
{
string PortName = store.Config.UpDown_Axis.DeviceName;
......
source/DeviceLibrary/DeviceLibrary.csproj
......@@ -66,7 +66,6 @@
<Compile Include="IO\IOManager.cs" />
<Compile Include="IO\KangNaiDe\KNDManager.cs" />
<Compile Include="IO\KangNaiDe\MasterTcpClient.cs" />
<Compile Include="lineConnect\LineConnect.cs" />
<Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACServerManager.cs" />
<Compile Include="PanasonicServo\ACServerManager_Partial.cs" />
......
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -37,16 +37,17 @@ DO,温湿度喷气电磁阀,StartOrStopBlow,12,PRO_AOI_IP_1,0,温湿度喷气电磁阀,Y2-5,B14,
,,,14,PRO_AOI_IP_1,0,,Y2-7,B16,,
,,,15,PRO_AOI_IP_1,0,,Y2-8,B17,,
AXIS,（Y轴-前后轴） ,Middle_Axis,1,COM3,0,,,,,
AXIS,(Z轴-升降轴）,UpDown_Axis,2,COM3,0,,,,,
AXIS,( X轴-进出轴）,InOut_Axis,3,COM3,0,,,,,
AXIS,（轴四）压紧轴,Comp_Axis,4,COM3,0,,,,,
AXIS,（Z轴-升降轴）,UpDown_Axis,2,COM3,0,,,,,
AXIS,（X轴-进出轴）,InOut_Axis,3,COM3,0,,,,,
,,,,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorO_P1,301400,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,,
PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,,
PRO,（Y轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,,
PRO,( X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,,
PRO,压紧轴（轴4）P1待机原位点,CompressAxis_P1_Position,318000,,,,,,,
PRO,（ X轴-进出轴）P1待机原位点,InOutAxis_P1_Position,7900,,,,,,,
PRO,（ X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
PRO,（ X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,7900,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,1,,,,,,,
PRO,是否使用压紧轴（1=使用）,IsHasCompress_Axis,1,,,,, ,,
......@@ -83,25 +84,26 @@ PRO,（Y轴-前后轴）P7速度,UpDownAxis_P7_Speed,600,,,,,, ,
PRO,（Y轴-前后轴）P8速度,UpDownAxis_P8_Speed,600,,,,,,,
PRO,（Y轴-前后轴）P1速度,MiddleAxis_P1_Speed,500,,,,,,,
PRO,（Y轴-前后轴）P2速度,MiddleAxis_P2_Speed,500,,,,,,,
PRO,( X轴-进出轴）P1速度,InOutAxis_P1_Speed,600,,,,,,,
PRO,( X轴-进出轴）P2速度,InOutAxis_P2_Speed,600,,,,,,,
PRO,( X轴-进出轴）P3速度,InOutAxis_P3_Speed,600,,,,,,,
PRO,（X轴-进出轴）P1速度,InOutAxis_P1_Speed,600,,,,,,,
PRO,（X轴-进出轴）P2速度,InOutAxis_P2_Speed,600,,,,,,,
PRO,（X轴-进出轴）P3速度,InOutAxis_P3_Speed,600,,,,,,,
PRO,（X轴-进出轴）P4速度,InOutAxis_P4_Speed,600,,,,,,,
PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最小值,MiddleAxis_ErrorCountMin,10,,,,,,,
PRO,(Z轴-升降轴）停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
PRO,( X轴-进出轴）停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,
PRO,（Z轴-升降轴）停止时可误差的脉冲数的最小值,UpdownAxis_ErrorCountMin,10,,,,,, ,
PRO,（X轴-进出轴）停止时可误差的脉冲数的最小值,InoutAxis_ErrorCountMin,10,,,,,,,
PRO,（Y轴-前后轴） 停止时可误差的脉冲数的最大值,MiddleAxis_ErrorCountMax,1000,,,,,,,
PRO,(Z轴-升降轴）停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,( X轴-进出轴）停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,（Z轴-升降轴）停止时可误差的脉冲数的最大值,UpdownAxis_ErrorCountMax,1000,,,,,,,
PRO,（X轴-进出轴）停止时可误差的脉冲数的最大值,InoutAxis_ErrorCountMax,1000,,,,,,,
PRO,出入库多少次，会自动重置前后轴,Box_ResetMCount,1000,,,,,,,
PRO,出入库多少次，会自动重置所有轴操作,Box_ResetACount,100,,,,,,,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,是否使用料盘检测信号,IsUse_Tray_Check,0,,,,,, ,
PRO,（Y轴-前后轴） 最小限位,MiddleAxis_PositionMin,0,,,,,,,
PRO,(Z轴-升降轴）最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,( X轴-进出轴）最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,（Z轴-升降轴）最小限位,UpdownAxis_PositionMin,0,,,,,,,
PRO,（X轴-进出轴）最小限位,InoutAxis_PositionMin,0,,,,,,,
PRO,（Y轴-前后轴） 最大限位,MiddleAxis_PositionMax,0,,,,,,,
PRO,(Z轴-升降轴）最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,( X轴-进出轴）最大限位,InoutAxis_PositionMax,0,,,,,,,
PRO,（Z轴-升降轴）最大限位,UpdownAxis_PositionMax,0,,,,,,,
PRO,（X轴-进出轴）最大限位,InoutAxis_PositionMax,0,,,,,,,
PRO,需要吹气的温度(温度标准),Max_Temperature,0,,,,,,,
PRO,需要吹气的湿度(湿度标准),Max_Humidity,10,,,,,,,
PRO,每次吹气的时间（分钟）,BlowAir_Time,10,,,,,,,
......
source/DeviceLibrary/StoreConfig/linePositions.csv
位置,优先级,高度,宽度,料仓ID,前后轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位点取料点P3,压紧轴压紧点P2,压紧轴压紧前点P3,进出轴进料口取料点P2
4D07010101,2104,8,7,7,325100,1600,8600,8600,1600,124500,409500,318000,124100
4D07010102,2103,8,7,7,325074,17555,24555,24555,17555,124500,409500,318000,124100
4D07010103,2102,8,7,7,325048,33991,40991,40991,33991,124500,409500,318000,124100
4D07010104,2101,8,7,7,325022,50967,57967,57967,50967,124500,409500,318000,124100
4D07010105,2100,8,7,7,324996,66526,73526,73526,66526,124500,409500,318000,124100
4D07010106,2099,8,7,7,324970,83181,90181,90181,83181,124500,409500,318000,124100
4D07010107,2098,8,7,7,324944,99432,106432,106432,99432,124500,409500,318000,124100
4D07010108,2097,8,7,7,324918,115296,122296,122296,115296,124500,409500,318000,124100
4D07010109,2096,8,7,7,324892,132584,139584,139584,132584,124500,409500,318000,124100
4D07010110,2095,8,7,7,324866,149033,156033,156033,149033,124500,409500,318000,124100
4D07010111,2094,8,7,7,324840,165316,172316,172316,165316,124500,409500,318000,124100
4D07010112,2093,8,7,7,324814,181769,188769,188769,181769,124500,409500,318000,124100
4D07010113,2092,8,7,7,324788,198321,205321,205321,198321,124500,409500,318000,124100
4D07010114,2091,8,7,7,324762,214871,221871,221871,214871,124500,409500,318000,124100
4D07010115,2090,8,7,7,324736,231278,238278,238278,231278,124500,409500,318000,124100
4D07010116,2089,8,7,7,324700,248039,255039,255039,248039,124500,409500,318000,124100
4D07010201,2088,8,7,7,324500,659002,666002,666002,659002,124500,409500,318000,124100
4D07010202,2087,8,7,7,324437,675300,682300,682300,675300,124500,409500,318000,124100
4D07010203,2086,8,7,7,324374,691483,698483,698483,691483,124500,409500,318000,124100
4D07010204,2085,8,7,7,324311,707884,714884,714884,707884,124500,409500,318000,124100
4D07010205,2084,8,7,7,324248,724805,731805,731805,724805,124500,409500,318000,124100
4D07010206,2083,8,7,7,324185,741505,748505,748505,741505,124500,409500,318000,124100
4D07010207,2082,8,7,7,324122,757336,764336,764336,757336,124500,409500,318000,124100
4D07010208,2081,8,7,7,324059,773616,780616,780616,773616,124500,409500,318000,124100
4D07010209,2080,8,7,7,323996,790182,797182,797182,790182,124500,409500,318000,124100
4D07010210,2079,8,7,7,323933,806469,813469,813469,806469,124500,409500,318000,124100
4D07010211,2078,8,7,7,323870,824010,831010,831010,824010,124500,409500,318000,124100
4D07010212,2077,8,7,7,323807,839496,846496,846496,839496,124500,409500,318000,124100
4D07010213,2076,8,7,7,323744,855921,862921,862921,855921,124500,409500,318000,124100
4D07010214,2075,8,7,7,323681,872364,879364,879364,872364,124500,409500,318000,124100
4D07010215,2074,8,7,7,323618,889025,896025,896025,889025,124500,409500,318000,124100
4D07010216,2073,8,7,7,323555,905315,912315,912315,905315,124500,409500,318000,124100
4D07010301,2072,8,7,7,323500,921195,928195,928195,921195,124500,409500,318000,124100
4D07010302,2071,8,7,7,323462,937384,944384,944384,937384,124500,409500,318000,124100
4D07010303,2070,8,7,7,323424,953913,960913,960913,953913,124500,409500,318000,124100
4D07010304,2069,8,7,7,323386,970076,977076,977076,970076,124500,409500,318000,124100
4D07010305,2068,8,7,7,323348,986778,993778,993778,986778,124500,409500,318000,124100
4D07010306,2067,8,7,7,323310,1002812,1009812,1009812,1002812,124500,409500,318000,124100
4D07010307,2066,8,7,7,323272,1019406,1026406,1026406,1019406,124500,409500,318000,124100
4D07010308,2065,8,7,7,323234,1035569,1042569,1042569,1035569,124500,409500,318000,124100
4D07010309,2064,8,7,7,323196,1052159,1059159,1059159,1052159,124500,409500,318000,124100
4D07010310,2063,8,7,7,323158,1068703,1075703,1075703,1068703,124500,409500,318000,124100
4D07010311,2062,8,7,7,323120,1085683,1092683,1092683,1085683,124500,409500,318000,124100
4D07010312,2061,8,7,7,323082,1101660,1108660,1108660,1101660,124500,409500,318000,124100
4D07010313,2060,8,7,7,323044,1118110,1125110,1125110,1118110,124500,409500,318000,124100
4D07010314,2059,8,7,7,323006,1134193,1141193,1141193,1134193,124500,409500,318000,124100
4D07010315,2058,8,7,7,322968,1150744,1157744,1157744,1150744,124500,409500,318000,124100
4D07010316,2057,8,7,7,322930,1167820,1174820,1174820,1167820,124500,409500,318000,124100
4D07010317,2056,8,7,7,322892,1183679,1190679,1190679,1183679,124500,409500,318000,124100
4D07010318,2055,8,7,7,322854,1200340,1207340,1207340,1200340,124500,409500,318000,124100
4D07010319,2054,8,7,7,322816,1216684,1223684,1223684,1216684,124500,409500,318000,124100
4D07010320,2053,8,7,7,322778,1233035,1240035,1240035,1233035,124500,409500,318000,124100
4D07010321,2052,8,7,7,322740,1249387,1256387,1256387,1249387,124500,409500,318000,124100
4D07010322,2051,8,7,7,322702,1265668,1272668,1272668,1265668,124500,409500,318000,124100
4D07010323,2050,8,7,7,322664,1282385,1289385,1289385,1282385,124500,409500,318000,124100
4D07010324,2049,8,7,7,322626,1298829,1305829,1305829,1298829,124500,409500,318000,124100
4D07010325,2048,8,7,7,322588,1315069,1322069,1322069,1315069,124500,409500,318000,124100
4D07010326,2047,8,7,7,322550,1331785,1338785,1338785,1331785,124500,409500,318000,124100
4D07010327,2046,8,7,7,322512,1348856,1355856,1355856,1348856,124500,409500,318000,124100
4D07010328,2045,8,7,7,322474,1364466,1371466,1371466,1364466,124500,409500,318000,124100
4D07010401,2044,8,7,7,322436,1381388,1388388,1388388,1381388,124500,409500,318000,124100
4D07010402,2043,8,7,7,322398,1397778,1404778,1404778,1397778,124500,409500,318000,124100
4D07010403,2042,8,7,7,322360,1414237,1421237,1421237,1414237,124500,409500,318000,124100
4D07010404,2041,8,7,7,322322,1430518,1437518,1437518,1430518,124500,409500,318000,124100
4D07010405,2040,8,7,7,322284,1447384,1454384,1454384,1447384,124500,409500,318000,124100
4D07010406,2039,8,7,7,322246,1463574,1470574,1470574,1463574,124500,409500,318000,124100
4D07010407,2038,8,7,7,322208,1479807,1486807,1486807,1479807,124500,409500,318000,124100
4D07010408,2037,8,7,7,322170,1496102,1503102,1503102,1496102,124500,409500,318000,124100
4D07010409,2036,8,7,7,322132,1512919,1519919,1519919,1512919,124500,409500,318000,124100
4D07010410,2035,8,7,7,322094,1529107,1536107,1536107,1529107,124500,409500,318000,124100
4D07010411,2034,8,7,7,322056,1545399,1552399,1552399,1545399,124500,409500,318000,124100
4D07010412,2033,8,7,7,322018,1562050,1569050,1569050,1562050,124500,409500,318000,124100
4D07010413,2032,8,7,7,321980,1578721,1585721,1585721,1578721,124500,409500,318000,124100
4D07010414,2031,8,7,7,321942,1595309,1602309,1602309,1595309,124500,409500,318000,124100
4D07010415,2030,8,7,7,321904,1611620,1618620,1618620,1611620,124500,409500,318000,124100
4D07010416,2029,8,7,7,321866,1628063,1635063,1635063,1628063,124500,409500,318000,124100
4D07010417,2028,8,7,7,321828,1644248,1651248,1651248,1644248,124500,409500,318000,124100
4D07010418,2027,8,7,7,321790,1661153,1668153,1668153,1661153,124500,409500,318000,124100
4D07010419,2026,8,7,7,321752,1677765,1684765,1684765,1677765,124500,409500,318000,124100
4D07010420,2025,8,7,7,321714,1693906,1700906,1700906,1693906,124500,409500,318000,124100
4D07010421,2024,8,7,7,321676,1710349,1717349,1717349,1710349,124500,409500,318000,124100
4D07010422,2023,8,7,7,321638,1726596,1733596,1733596,1726596,124500,409500,318000,124100
4D07010423,2022,8,7,7,321600,1742931,1749931,1749931,1742931,124500,409500,318000,124100
4D07010424,2021,8,7,7,321562,1759903,1766903,1766903,1759903,124500,409500,318000,124100
4D07010425,2020,8,7,7,321524,1775831,1782831,1782831,1775831,124500,409500,318000,124100
4D07010426,2019,8,7,7,321486,1792245,1799245,1799245,1792245,124500,409500,318000,124100
4D07010427,2018,8,7,7,321448,1808469,1815469,1815469,1808469,124500,409500,318000,124100
4D07010428,2017,8,7,7,321400,1825026,1832026,1832026,1825026,124500,409500,318000,124100
4D07020101,2016,8,7,7,374500,2143,9143,9143,2143,124500,409500,318000,124100
4D07020102,2015,8,7,7,374470,17190,24190,24190,17190,124500,409500,318000,124100
4D07020103,2014,8,7,7,374440,33907,40907,40907,33907,124500,409500,318000,124100
4D07020104,2013,8,7,7,374410,50034,57034,57034,50034,124500,409500,318000,124100
4D07020105,2012,8,7,7,374380,66743,73743,73743,66743,124500,409500,318000,124100
4D07020106,2011,8,7,7,374350,83406,90406,90406,83406,124500,409500,318000,124100
4D07020107,2010,8,7,7,374320,99699,106699,106699,99699,124500,409500,318000,124100
4D07020108,2009,8,7,7,374290,115935,122935,122935,115935,124500,409500,318000,124100
4D07020109,2008,8,7,7,374260,132589,139589,139589,132589,124500,409500,318000,124100
4D07020110,2007,8,7,7,374230,148890,155890,155890,148890,124500,409500,318000,124100
4D07020111,2006,8,7,7,374200,165548,172548,172548,165548,124500,409500,318000,124100
4D07020112,2005,8,7,7,374170,181890,188890,188890,181890,124500,409500,318000,124100
4D07020113,2004,8,7,7,374140,198597,205597,205597,198597,124500,409500,318000,124100
4D07020114,2003,8,7,7,374110,214629,221629,221629,214629,124500,409500,318000,124100
4D07020115,2002,8,7,7,374080,231228,238228,238228,231228,124500,409500,318000,124100
4D07020116,2001,8,7,7,374050,247582,254582,254582,247582,124500,409500,318000,124100
4D07020117,2000,8,7,7,374020,263983,270983,270983,263983,124500,409500,318000,124100
4D07020118,1999,8,7,7,373990,280627,287627,287627,280627,124500,409500,318000,124100
4D07020119,1998,8,7,7,373960,296970,303970,303970,296970,124500,409500,318000,124100
4D07020120,1997,8,7,7,373930,313373,320373,320373,313373,124500,409500,318000,124100
4D07020121,1996,8,7,7,373900,329453,336453,336453,329453,124500,409500,318000,124100
4D07020122,1995,8,7,7,373870,345853,352853,352853,345853,124500,409500,318000,124100
4D07020123,1994,8,7,7,373840,362617,369617,369617,362617,124500,409500,318000,124100
4D07020124,1993,8,7,7,373810,378955,385955,385955,378955,124500,409500,318000,124100
4D07020125,1992,8,7,7,373780,395304,402304,402304,395304,124500,409500,318000,124100
4D07020126,1991,8,7,7,373750,411866,418866,418866,411866,124500,409500,318000,124100
4D07020127,1990,8,7,7,373720,428405,435405,435405,428405,124500,409500,318000,124100
4D07020128,1989,8,7,7,373690,444966,451966,451966,444966,124500,409500,318000,124100
4D07020201,1988,8,7,7,373660,461404,468404,468404,461404,124500,409500,318000,124100
4D07020202,1987,8,7,7,373630,477713,484713,484713,477713,124500,409500,318000,124100
4D07020203,1986,8,7,7,373600,494146,501146,501146,494146,124500,409500,318000,124100
4D07020204,1985,8,7,7,373570,510552,517552,517552,510552,124500,409500,318000,124100
位置,优先级,高度,宽度,料仓ID,前后轴位置P2,升降轴库位出料前点P5,升降轴库位出料缓冲点P6,升降轴库位入料前点P3,升降轴库位入料缓冲点P4,进出轴库位取料点P4
4D07010101,2104,8,7,7,325100,1600,8600,8600,1600,124500
4D07010102,2103,8,7,7,325074,17555,24555,24555,17555,124500
4D07010103,2102,8,7,7,325048,33991,40991,40991,33991,124500
4D07010104,2101,8,7,7,325022,50967,57967,57967,50967,124500
4D07010105,2100,8,7,7,324996,66526,73526,73526,66526,124500
4D07010106,2099,8,7,7,324970,83181,90181,90181,83181,124500
4D07010107,2098,8,7,7,324944,99432,106432,106432,99432,124500
4D07010108,2097,8,7,7,324918,115296,122296,122296,115296,124500
4D07010109,2096,8,7,7,324892,132584,139584,139584,132584,124500
4D07010110,2095,8,7,7,324866,149033,156033,156033,149033,124500
4D07010111,2094,8,7,7,324840,165316,172316,172316,165316,124500
4D07010112,2093,8,7,7,324814,181769,188769,188769,181769,124500
4D07010306,2067,8,7,7,323310,1002812,1009812,1009812,1002812,124500
4D07010307,2066,8,7,7,323272,1019406,1026406,1026406,1019406,124500
4D07010308,2065,8,7,7,323234,1035569,1042569,1042569,1035569,124500
4D07010309,2064,8,7,7,323196,1052159,1059159,1059159,1052159,124500
4D07010310,2063,8,7,7,323158,1068703,1075703,1075703,1068703,124500
4D07010311,2062,8,7,7,323120,1085683,1092683,1092683,1085683,124500
4D07010312,2061,8,7,7,323082,1101660,1108660,1108660,1101660,124500
4D07010313,2060,8,7,7,323044,1118110,1125110,1125110,1118110,124500
4D07010314,2059,8,7,7,323006,1134193,1141193,1141193,1134193,124500
4D07010315,2058,8,7,7,322968,1150744,1157744,1157744,1150744,124500
\ No newline at end of file
source/DeviceLibrary/acSquareStore/Square_BoxBean.cs
......@@ -163,7 +163,7 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.ResetMove;
//启动温湿度服务器
HumitureController.Init(Config.Humiture_Port);
LineConnect.StartConnect();
//LineConnect.StartConnect();
ReturnHome();
StartTime = DateTime.Now;
......@@ -592,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - StartTime;
IsRun = false;
LineConnect.StopConnect();
//LineConnect.StopConnect();
IOManager.instance.CloseAllDO();
LogUtil.info(LOGGER, StoreName + ",停止运行，总运行时间：" + span.ToString());
......@@ -965,7 +965,7 @@ namespace OnlineStore.DeviceLibrary
{
try
{
bool noInStore = LineConnect.WaitInStoreList.Count <= 0;
bool noInStore = waitOutStoreList.Count <= 0;
if (CurrInOutACount >= this.Config.Box_ResetACount &&noInStore)
{
if (storeRunStatus < StoreRunStatus.Runing || StoreMove.MoveType == StoreMoveType.InStore || StoreMove.MoveType == StoreMoveType.OutStore)
......@@ -989,7 +989,8 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + "已经累计出入库" + CurrInOutCount + "次，需要复位一下前后轴");
}
}
else if (LineConnect.CanStartOut() || IsDebug)
// else if (LineConnect.CanStartOut() || IsDebug)
else
{
InOutPosInfo currInOutFixture = null;
lock (waitOutListLock)
......@@ -1208,19 +1209,19 @@ namespace OnlineStore.DeviceLibrary
public void ReviceLineInStoreCMD(string posId, string plateH, string plateW, string message)
{
string logName = "流水线入库命令【 " + message + "】【" + posId + "】：";
if (!LineConnect.WaitInStoreList.Contains(posId))
{
LogUtil.error(logName + "库位未验证通过，重新验证库位");
bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message);
if (!result)
{
return;
}
}
else
{
LineConnect.WaitInStoreList.Remove(posId);
}
//if (!LineConnect.WaitInStoreList.Contains(posId))
//{
// LogUtil.error(logName + "库位未验证通过，重新验证库位");
// bool result = ReviceLineCheckInStoreCMD(posId, plateH, plateW, message);
// if (!result)
// {
// return;
// }
//}
//else
//{
// LineConnect.WaitInStoreList.Remove(posId);
//}
//根据发送的posId获取位置列表
ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId);
if (position == null)
......@@ -1491,11 +1492,11 @@ namespace OnlineStore.DeviceLibrary
//如果在空闲中，且有入库未完成，直接发送入库执行中
if (boxStatus.status.Equals((int)StoreStatus.StoreOnline))
{
List<string> list = new List<string>(LineConnect.WaitInStoreList);
if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false)))
{
boxStatus.status = (int)StoreStatus.InStoreExecute;
}
//List<string> list = new List<string>(LineConnect.WaitInStoreList);
//if (list.Count > 0 && (LineConnect.CanStartOut().Equals(false)))
//{
// boxStatus.status = (int)StoreStatus.InStoreExecute;
//}
}
......@@ -1593,17 +1594,17 @@ namespace OnlineStore.DeviceLibrary
string[] plateWArray = data[ParamDefine.plateW].Split(splitChar);
string[] plateHArray = data[ParamDefine.plateH].Split(splitChar);
bool urgentReel =FormUtil. GetBoolData( data,ParamDefine.urgentReel);
bool cutReel= FormUtil.GetBoolData(data, ParamDefine.cutReel);
bool smallReel = FormUtil.GetBoolData(data, ParamDefine.smallReel);
string rfid = data.ContainsKey(ParamDefine.rfid) ? data[ParamDefine.rfid] : "";
int rfidLoc = FormUtil.GetIntData(data, ParamDefine.rfidLoc);
//bool urgentReel =FormUtil. GetBoolData( data,ParamDefine.urgentReel);
//bool cutReel= FormUtil.GetBoolData(data, ParamDefine.cutReel);
//bool smallReel = FormUtil.GetBoolData(data, ParamDefine.smallReel);
//string rfid = data.ContainsKey(ParamDefine.rfid) ? data[ParamDefine.rfid] : "";
//int rfidLoc = FormUtil.GetIntData(data, ParamDefine.rfidLoc);
string barcode = data.ContainsKey(ParamDefine.barcode) ? data[ParamDefine.barcode] : "";
//urgentReel: true 表示紧急料,需要出到料串上
//cutReel: true 表示分盘料,需要出到料串上
//smallReel: true 小料(7x8),放置到小料架上
//rfid: 分配的料架RFID
//rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 70,71,72时只能分配到3 / 4号皮带线; 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3 / 4号皮带线
////urgentReel: true 表示紧急料,需要出到料串上
////cutReel: true 表示分盘料,需要出到料串上
////smallReel: true 小料(7x8),放置到小料架上
////rfid: 分配的料架RFID
////rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线, 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线, 70,71,72时只能分配到3 / 4号皮带线; 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3 / 4号皮带线
string dataStr = JsonHelper.SerializeObject(data);
LogUtil.info(LOGGER, "收到服务器出库消息：【" + dataStr+"】");
......@@ -1614,7 +1615,7 @@ namespace OnlineStore.DeviceLibrary
index++;
string plateW = plateWArray[index];
string plateH = plateHArray[index];
InOutPosInfo intouInfo = new InOutPosInfo(barcode, posId, plateW, plateH, urgentReel, cutReel, smallReel, rfid, rfidLoc);
InOutPosInfo intouInfo = new InOutPosInfo(barcode, posId, plateW, plateH );
//根据发送的posId获取位置列表
ACSquareSPosition position = CSVPositionReader<ACSquareSPosition>.GetPositon(posId);
......@@ -1651,7 +1652,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error("验证出库【" + intouInfo.ToStr() + "】是否重复出错：" + ex.ToString());
}
if (CanStarInOut() && (LineConnect.CanStartOut() || IsDebug))
if (CanStarInOut() || IsDebug )
{
bool result = StartOutStoreMove(new InOutParam(intouInfo));
if (!result)
......
source/DeviceLibrary/acSquareStore/Square_BoxBean_Partial.cs
......@@ -56,15 +56,22 @@ namespace OnlineStore.DeviceLibrary
p.InOut_P1 = Config.InOutAxis_P1_Position;
p.Middle_P1 = Config.MiddleAxis_P1_Position;
p.InOut_P2 = position.InOutAxis_Door_P2;
if (param.PosInfo.ShelfType.Equals(1))
{
p.InOut_P2 = Config.InOutAxis_P2_Position;
}
else
{
p.InOut_P2 = Config.InOutAxis_P3_Position;
}
p.UpDown_P1 = Config.UpDownAxis_DoorO_P1;
p.UpDown_P8 = Config.UpDownAxis_DoorIB_P8;
p.UpDown_P2 = Config.UpDownAxis_DoorI_P2;
p.UpDown_P7 = Config.UpDownAxis_DoorOB_P7;
p.ComPress_P2 = position.CompressAxis_P2;
p.ComPress_P3 = position.CompressAxis_C_P3;
p.InOut_P3 = position.InOutAxis_P3;
//p.ComPress_P2 = position.CompressAxis_P2;
//p.ComPress_P3 = position.CompressAxis_C_P3;
p.InOut_P4 = position.InOutAxis_P4;
p.Middle_P2 = position.MiddleAxis_P2;
p.UpDown_P3 = position.UpDownAxis_IH_P3;
p.UpDown_P4 = position.UpDownAxis_IL_P4;
......@@ -181,11 +188,11 @@ namespace OnlineStore.DeviceLibrary
isOk = false;
break;
}
else if ((!wait.IsEnd) && StoreMove.MoveStep.Equals(StoreMoveStep.SO_14_WaitTake) && LineConnect.CanReSend())
{
//判断是否需要重发入库结束命令
SendOutStoreEnd(StoreMove);
}
//else if ((!wait.IsEnd) && StoreMove.MoveStep.Equals(StoreMoveStep.SO_14_WaitTake) && LineConnect.CanReSend())
//{
// //判断是否需要重发入库结束命令
// SendOutStoreEnd(StoreMove);
//}
TimeSpan rwSpan = DateTime.Now - preRWTime;
if (!wait.IsEnd && rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6)
......@@ -214,14 +221,7 @@ namespace OnlineStore.DeviceLibrary
{
wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
}
else if (wait.WaitType == 7)
{
//wait.IsEnd = (wait.HeightValue.Equals(GetHeight()));
//if (wait.IsEnd)
//{
// LogUtil.debug("等待height=" + wait.HeightValue + "完成");
//}
}
if (wait.IsEnd)
{
if (StoreMove.OneWaitCanEndStep)
......@@ -287,7 +287,15 @@ namespace OnlineStore.DeviceLibrary
//料盘检测
InStoreLog(" 入库：SI_00 检测料盘信号");
StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
if (param.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.HIGH));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.HIGH));
}
}
else
{
......@@ -417,7 +425,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_10_LocationCylinder_Down)
......@@ -425,7 +433,7 @@ namespace OnlineStore.DeviceLibrary
//IOManager.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
InStoreLog("入库：SI_11 叉子进入库位中，进出轴至P3(库位取放料点) ");
StoreMove.NextMoveStep(StoreMoveStep.SI_11_DeviceToBag);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SI_11_DeviceToBag)
......@@ -549,7 +557,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_04_DeviceToBag);
OutStoreLog("出库：SO_04 叉子进入库位中， 进出轴至P3(库位取放料点) ");
ACAxisMove(Config.InOut_Axis, moveP.InOut_P3, Config.InOutAxis_P3_Speed);
ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_04_DeviceToBag)
{
......@@ -599,7 +607,15 @@ namespace OnlineStore.DeviceLibrary
//SO_10_DeviceToDoorPro();
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor();
......@@ -610,7 +626,15 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor();
......@@ -640,7 +664,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoor();
//发送消息给流水线
SendOutStoreEnd(StoreMove);
//SendOutStoreEnd(StoreMove);
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_GoBack)
{
......@@ -653,7 +677,15 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_14_WaitTake);
OutStoreLog("出库：SO_14_WaitTake 等待拿走物品，最多等待" + OutStoreWaitSeconds + "秒");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(ms));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.LOW));
}
else
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.LOW));
}
// StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
// StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
StoreMove.OneWaitCanEndStep = true;
}
......@@ -674,28 +706,7 @@ namespace OnlineStore.DeviceLibrary
}
}
private void SendOutStoreEnd(StoreMoveInfo storeMove)
{
int hasTray = (int)IOManager.IOValue(IO_Type.TrayCheck_Door);
int ss = (int)storeStatus;
if (IsDebug)
{
ss = (int)StoreStatus.Debugging;
}
StoreSendBean store = new StoreSendBean(Config.Id, Config.CID, (int)storeStatus, (int)storeRunStatus, hasTray, (int)alarmType);
store.data.Add(ParamDefine.posId, StoreMove.MoveParam.PosInfo.PosId);
store.data.Add(ParamDefine.plateH, StoreMove.MoveParam.PosInfo.PlateH);
store.data.Add(ParamDefine.plateW, StoreMove.MoveParam.PosInfo.PlateW);
store.data.Add(ParamDefine.cutReel, StoreMove.MoveParam.PosInfo.cutReel.ToString());
store.data.Add(ParamDefine.smallReel, StoreMove.MoveParam.PosInfo.smallReel.ToString());
store.data.Add(ParamDefine.urgentReel, StoreMove.MoveParam.PosInfo.urgentReel.ToString());
store.data.Add(ParamDefine.rfid, StoreMove.MoveParam.PosInfo.rfid);
store.data.Add(ParamDefine.rfidLoc, StoreMove.MoveParam.PosInfo.rfidLoc.ToString());
store.data.Add(ParamDefine.barcode, StoreMove.MoveParam.PosInfo.barcode);
LineConnect.OutStoreEnd(store);
}
private void SO_10_DeviceToDoorPro()
{
if (DoorIsOpen())
......@@ -715,16 +726,7 @@ namespace OnlineStore.DeviceLibrary
}
}
public bool InOutAxisCanMove()
{
if (StoreManager.Store.Config.IsHasLocationCylinder.Equals(0))
{
return true;
}
return false;
}
#endregion
public List<InOutPosInfo> waitOutStoreList = new List<InOutPosInfo>();
......
source/DeviceLibrary/store/InOutParam.cs
......@@ -56,17 +56,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public class InOutPosInfo
{
public InOutPosInfo(string barcode, string posId, string platew = "", string plateh = "", bool urgentReel = false , bool cutReel = false, bool smallReel = false, string rfid = "", int rfidLoc = 0)
public InOutPosInfo(string barcode, string posId, string platew = "", string plateh = "", int shelftype=1)
{
this.barcode = barcode;
this.PosId = posId;
this.PlateW = platew;
this.PlateH = plateh;
this.urgentReel = urgentReel;
this.cutReel = cutReel;
this.smallReel = smallReel;
this.rfid = rfid;
this.rfidLoc = rfidLoc;
}
/// <summary>
......@@ -86,34 +82,15 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public string PlateH { get; set; }
/// <summary>
/// urgentReel: true 表示紧急料,需要出到料串上
/// </summary>
public bool urgentReel { get; set; }
/// <summary>
/// cutReel: true 表示分盘料,需要出到料串上
/// </summary>
public bool cutReel { get; set; }
/// <summary>
/// smallReel: true 小料(7x8),放置到小料架上
/// </summary>
public bool smallReel { get; set; }
/// <summary>
/// rfid: 分配的料架RFID
/// </summary>
public string rfid { get; set; }
/// <summary>
/// rfidLoc: 料架的架位,值为 - 1时,可以自由分配皮带线,
/// 小料时,架位为1 - 46优先走1 / 2号皮带线,47 - 92优先走3 / 4号皮带线,
/// 70,71,72时只能分配到3 / 4号皮带线;
/// 大料时,架位1 - 6优先走1 / 2号皮带线, 7 - 12优先走3/ 4号皮带线
/// 使用左侧托架=1,还是右侧托架=2
/// </summary>
public int rfidLoc { get; set; }
public int ShelfType = 1;
public string ToStr()
{
return " barcode[" + barcode + "],PosId [" + PosId + "],plateW [" + PlateW + "],plateH [" + PlateH + "],urgentReel [" + urgentReel
+ "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
return " barcode[" + barcode + "],PosId [" + PosId + "],plateW [" + PlateW + "],plateH [" + PlateH + "],ShelfLR [" + ShelfType + "]";
}
}
......
source/DeviceLibrary/store/KTK_Store.cs
......@@ -117,19 +117,7 @@ namespace OnlineStore.DeviceLibrary
{
return new TimeSpan(0);
}
}
protected void AddAxisMoveTime(ConfigMoveAxis axis)
{
//int axisNo = axis.GetAxisValue();
//if (AxisLastStartTime.ContainsKey(axisNo))
//{
// AxisLastStartTime.Remove(axisNo);
//}
//AxisLastStartTime.Add(axisNo, DateTime.Now);
}
}
/// <summary>
/// 运动处理
/// </summary>
......@@ -250,8 +238,7 @@ namespace OnlineStore.DeviceLibrary
{
moveAxis.TargetPosition = 0;
LogUtil.info(LOGGER, moveAxis.DisplayStr + "speed[" + moveAxis.TargetSpeed + "]开始原点返回");
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
AddAxisMoveTime(moveAxis);
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, true));
ACServerManager.HomeMove(moveAxis.DeviceName, (short)moveAxis.GetAxisValue(), moveAxis.HomeHighSpeed);
}
......@@ -261,8 +248,7 @@ namespace OnlineStore.DeviceLibrary
protected void ACAxisMove(ConfigMoveAxis moveAxis, int targetPosition, int targetSpeed)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitAxis(moveAxis, targetPosition, targetSpeed));
moveAxis.TargetPosition = targetPosition;
AddAxisMoveTime(moveAxis);
moveAxis.TargetPosition = targetPosition;
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
}
......
source/DeviceLibrary/store/LineMoveP.cs
......@@ -65,19 +65,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 轴3进出轴 库位点取料点P3
/// </summary>
public int InOut_P3 { get; set; }
/// <summary>
/// 轴4（ 压紧轴）待机原位点P1
/// </summary>
public int ComPress_P1 { get; set; }
/// <summary>
/// 轴4（ 压紧轴）压紧点 P2
/// </summary>
public int ComPress_P2 { get; set; }
/// <summary>
/// 轴4（ 压紧轴） 压紧前点P3
/// </summary>
public int ComPress_P3{ get; set; }
public int InOut_P4 { get; set; }
}
}
source/LoadCVSLibrary/position/ACSquareSPosition.cs
......@@ -42,27 +42,27 @@ namespace OnlineStore.LoadCSVLibrary
public int UpDownAxis_IL_P4 { get; set; }
/// <summary>
/// 进出轴（库位点取料点）P3
/// 进出轴库位取料点P4
/// </summary>
[CSVAttribute("进出轴库位点取料点P3")]
public int InOutAxis_P3 { get; set; }
[CSVAttribute("进出轴库位取料点P4")]
public int InOutAxis_P4 { get; set; }
/// <summary>
/// 压紧轴（压紧点）P2
/// </summary>
[CSVAttribute("压紧轴压紧点P2")]
public int CompressAxis_P2 { get; set; }
/// <summary>
/// 压紧轴（压紧前点）P3
/// </summary>
[CSVAttribute("压紧轴压紧前点P3")]
public int CompressAxis_C_P3 { get; set; }
///// <summary>
///// 压紧轴（压紧点）P2
///// </summary>
//[CSVAttribute("压紧轴压紧点P2")]
//public int CompressAxis_P2 { get; set; }
///// <summary>
///// 压紧轴（压紧前点）P3
///// </summary>
//[CSVAttribute("压紧轴压紧前点P3")]
//public int CompressAxis_C_P3 { get; set; }
/// <summary>
/// 轴3(进出轴） 进料口取料点P2
/// </summary>
[CSVAttribute("进出轴进料口取料点P2")]
public int InOutAxis_Door_P2 { get; set; }
///// <summary>
///// 轴3(进出轴） 进料口取料点P2
///// </summary>
//[CSVAttribute("进出轴进料口取料点P2")]
//public int InOutAxis_Door_P2 { get; set; }
public static bool CheckPosition(ACSquareSPosition position, Box_Config Config)
{
......@@ -82,12 +82,8 @@ namespace OnlineStore.LoadCSVLibrary
{
int iMin = Config.InOut_Axis.PositionMin;
int iMax = Config.InOut_Axis.PositionMax;
if (iMin > position.InOutAxis_Door_P2 || iMax < position.InOutAxis_Door_P2)
{
LogUtil.error(position.PositionNum + " InOutAxis_Door_P2位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
}
if (iMin > position.InOutAxis_P3 || iMax < position.InOutAxis_P3)
if (iMin > position.InOutAxis_P4 || iMax < position.InOutAxis_P4)
{
LogUtil.error(position.PositionNum + " InOutAxis_P3位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
......
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
......@@ -404,10 +404,25 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
[ConfigProAttribute("Humiture_Port", true )]
public string Humiture_Port { get; set; }
/// <summary>
/// PRO,(X轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P2_Position", true)]
public int InOutAxis_P2_Position { get; set; }
/// <summary>
/// PRO,(X轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,7900,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P3_Position", true)]
public int InOutAxis_P3_Position { get; set; }
/// <summary>
/// PRO,(X轴-进出轴）P4速度,InOutAxis_P4_Speed,600,,,,,,,
/// </summary>
[ConfigProAttribute("InOutAxis_P4_Speed", true)]
public int InOutAxis_P4_Speed { get; set; }
/// <summary>
/// PRO IO模块对应的DI数量 IO_DILength 192.168.200.10#16;192.168.200.11#4
/// </summary>
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -129,7 +129,7 @@ namespace OnlineStore.LoadCSVLibrary
/// DO, 温湿度喷气电磁阀, StartOrStopBlow,12, 温湿度喷气电磁阀, Y2-5, B14
/// </summary>
public static string StartOrStopBlow = "StartOrStopBlow";
public static string TrayCheck_Door;
// public static string TrayCheck_Door;
}
public enum IO_VALUE
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!