Skip to content

孙克 / RC1250-AssemblyLine

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

按钮文字调整

1 个父辈 d5e6eb43
内嵌 并排
正在显示 8 个修改的文件 包含 62 行增加 和 38 行删除
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
......@@ -287,7 +287,7 @@
this.btnSRun.BackColor = System.Drawing.Color.White;
this.btnSRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSRun.Location = new System.Drawing.Point(199, 68);
this.btnSRun.Location = new System.Drawing.Point(199, 110);
this.btnSRun.Name = "btnSRun";
this.btnSRun.Size = new System.Drawing.Size(140, 34);
this.btnSRun.TabIndex = 263;
......
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -92,6 +92,7 @@
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblName = new System.Windows.Forms.Label();
this.btnScan = new System.Windows.Forms.Button();
this.btnOLine = new System.Windows.Forms.Button();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -328,6 +329,7 @@
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.groupBox5.Controls.Add(this.btnOLine);
this.groupBox5.Controls.Add(this.btnBStopDown);
this.groupBox5.Controls.Add(this.btnEStopDown);
this.groupBox5.Controls.Add(this.btnOSWRun);
......@@ -394,7 +396,7 @@
this.btnLSWRun.BackColor = System.Drawing.Color.White;
this.btnLSWRun.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLSWRun.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLSWRun.Location = new System.Drawing.Point(175, 36);
this.btnLSWRun.Location = new System.Drawing.Point(175, 87);
this.btnLSWRun.Name = "btnLSWRun";
this.btnLSWRun.Size = new System.Drawing.Size(153, 34);
this.btnLSWRun.TabIndex = 264;
......@@ -498,7 +500,7 @@
this.btnTrayLocationCylinder.BackColor = System.Drawing.Color.White;
this.btnTrayLocationCylinder.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayLocationCylinder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(175, 87);
this.btnTrayLocationCylinder.Location = new System.Drawing.Point(175, 393);
this.btnTrayLocationCylinder.Name = "btnTrayLocationCylinder";
this.btnTrayLocationCylinder.Size = new System.Drawing.Size(153, 34);
this.btnTrayLocationCylinder.TabIndex = 255;
......@@ -1122,6 +1124,19 @@
this.btnScan.UseVisualStyleBackColor = false;
this.btnScan.Click += new System.EventHandler(this.btnScan_Click);
//
// btnOLine
//
this.btnOLine.BackColor = System.Drawing.Color.White;
this.btnOLine.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOLine.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOLine.Location = new System.Drawing.Point(175, 36);
this.btnOLine.Name = "btnOLine";
this.btnOLine.Size = new System.Drawing.Size(153, 34);
this.btnOLine.TabIndex = 268;
this.btnOLine.Text = "SL出料线体运转";
this.btnOLine.UseVisualStyleBackColor = false;
this.btnOLine.Click += new System.EventHandler(this.btnOLine_Click);
//
// FrmFeedingEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -1236,6 +1251,7 @@
internal System.Windows.Forms.TextBox txtUpdownP3;
internal System.Windows.Forms.Button btnUpdownP3;
private System.Windows.Forms.CheckBox chbMoveStop;
private System.Windows.Forms.Button btnOLine;
}
}
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -567,6 +567,11 @@ namespace OnlineStore.AssemblyLine
equipBean.MoveStop = chbMoveStop.Checked;
LogUtil.info(equipBean.Name + "用户切换是否暂停： " + equipBean.MoveStop);
}
private void btnOLine_Click(object sender, EventArgs e)
{
BtnMove(btnLineRun, "SL出料线体运转", "SL出料线体停止", IO_Type.SL_Line_Run);
}
}
}
......
source/AssemblyLineClient/FrmIOStatus.Designer.cs
......@@ -486,7 +486,7 @@
this.btnNGCylinder.Name = "btnNGCylinder";
this.btnNGCylinder.Size = new System.Drawing.Size(140, 34);
this.btnNGCylinder.TabIndex = 268;
this.btnNGCylinder.Text = "NG料盘退出气缸前进";
this.btnNGCylinder.Text = "NG料盘气缸前进";
this.btnNGCylinder.UseVisualStyleBackColor = true;
this.btnNGCylinder.Click += new System.EventHandler(this.btnNGCylinder_Click);
//
......
source/AssemblyLineClient/FrmIOStatus.cs
......@@ -283,7 +283,7 @@ namespace OnlineStore.AssemblyLine
private void btnNGCylinder_Click(object sender, EventArgs e)
{
BtnMove(btnNGCylinder, "NG料盘退出气缸前进", "NG料盘退出气缸后退", IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
BtnMove(btnNGCylinder, "NG料盘气缸前进", "NG料盘气缸后退", IO_Type.NGCylinder_After, IO_Type.NGCylinder_Before);
}
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -347,7 +347,7 @@
this.btnClampSlack.Name = "btnClampSlack";
this.btnClampSlack.Size = new System.Drawing.Size(140, 34);
this.btnClampSlack.TabIndex = 255;
this.btnClampSlack.Text = "夹料气缸夹紧";
this.btnClampSlack.Text = "夹料夹紧";
this.btnClampSlack.UseVisualStyleBackColor = false;
this.btnClampSlack.Click += new System.EventHandler(this.btnClampSlack_Click);
//
......@@ -360,7 +360,7 @@
this.btnUpDownUp.Name = "btnUpDownUp";
this.btnUpDownUp.Size = new System.Drawing.Size(140, 34);
this.btnUpDownUp.TabIndex = 252;
this.btnUpDownUp.Text = "上下气缸上升";
this.btnUpDownUp.Text = "升降上升";
this.btnUpDownUp.UseVisualStyleBackColor = false;
this.btnUpDownUp.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
......@@ -386,7 +386,7 @@
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(140, 34);
this.btnTopUp.TabIndex = 246;
this.btnTopUp.Text = "顶升气缸上升";
this.btnTopUp.Text = "顶升上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
......
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
......@@ -51,6 +51,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox6 = new System.Windows.Forms.GroupBox();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTrayNum = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage();
......@@ -67,7 +68,6 @@
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -346,7 +346,7 @@
this.btnClampSlack.Name = "btnClampSlack";
this.btnClampSlack.Size = new System.Drawing.Size(140, 34);
this.btnClampSlack.TabIndex = 255;
this.btnClampSlack.Text = "夹料气缸夹紧";
this.btnClampSlack.Text = "夹料夹紧";
this.btnClampSlack.UseVisualStyleBackColor = false;
this.btnClampSlack.Click += new System.EventHandler(this.btnClampSlack_Click);
//
......@@ -359,7 +359,7 @@
this.btnUpDownUp.Name = "btnUpDownUp";
this.btnUpDownUp.Size = new System.Drawing.Size(140, 34);
this.btnUpDownUp.TabIndex = 252;
this.btnUpDownUp.Text = "上下气缸上升";
this.btnUpDownUp.Text = "升降上升";
this.btnUpDownUp.UseVisualStyleBackColor = false;
this.btnUpDownUp.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
......@@ -372,7 +372,7 @@
this.btnBeforeAfterBefore.Name = "btnBeforeAfterBefore";
this.btnBeforeAfterBefore.Size = new System.Drawing.Size(140, 34);
this.btnBeforeAfterBefore.TabIndex = 249;
this.btnBeforeAfterBefore.Text = "前后气缸前进";
this.btnBeforeAfterBefore.Text = "横移前进";
this.btnBeforeAfterBefore.UseVisualStyleBackColor = false;
this.btnBeforeAfterBefore.Click += new System.EventHandler(this.btnBeforeAfterBefore_Click);
//
......@@ -385,7 +385,7 @@
this.btnTopUp.Name = "btnTopUp";
this.btnTopUp.Size = new System.Drawing.Size(140, 34);
this.btnTopUp.TabIndex = 246;
this.btnTopUp.Text = "顶升气缸上升";
this.btnTopUp.Text = "顶升上升";
this.btnTopUp.UseVisualStyleBackColor = false;
this.btnTopUp.Click += new System.EventHandler(this.btnTopUp_Click);
//
......@@ -523,6 +523,17 @@
this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息";
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(18, 29);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息：";
//
// lblTrayNum
//
this.lblTrayNum.AutoSize = true;
......@@ -734,17 +745,6 @@
this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// lblMoveInfo
//
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(18, 29);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
this.lblMoveInfo.Text = "运动信息：";
//
// FrmProvidingEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......
source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs
......@@ -223,16 +223,8 @@ namespace OnlineStore.DeviceLibrary
#region 不需要托盘或移栽入库料盘完成
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_12_MoveOk))
{
if (Config.SidesWayNum.Equals(2))
{
//更新横移托盘已处理完成
TrayManager.UpdateSWState(Config.SidesWayNum, 1);
preTrayNum = currTrayNum;
CheckLog("托盘放行： 此处为环形线横移2，不需要下降， (托盘放行结束） ");
SecondMoveInfo.EndMove();
}
else if (Config.SidesWayNum > 0)
{
if (Config.SidesWayNum > 0)
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_13_LoactionCylinder_Down);
InStoreLog("托盘放行， " + SecondMoveInfo.MoveStep + " 托盘开始放行，环形线定位气缸下降");
......@@ -247,9 +239,20 @@ namespace OnlineStore.DeviceLibrary
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_13_LoactionCylinder_Down))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopCylinder_Down);
CheckLog("托盘放行， " + SecondMoveInfo.MoveStep + " ，环形线顶升气缸下降）");
CylinderMove(SecondMoveInfo, IO_Type.SW_TopCylinder_Up, IO_Type.SW_TopCylinder_Down);
if (Config.SidesWayNum.Equals(2))
{
//更新横移托盘已处理完成
TrayManager.UpdateSWState(Config.SidesWayNum, 1);
preTrayNum = currTrayNum;
CheckLog("托盘放行： 此处为环形线横移2，顶升气缸不需要下降， (托盘放行结束） ");
SecondMoveInfo.EndMove();
}
else
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_14_TopCylinder_Down);
CheckLog("托盘放行， " + SecondMoveInfo.MoveStep + " ，环形线顶升气缸下降）");
CylinderMove(SecondMoveInfo, IO_Type.SW_TopCylinder_Up, IO_Type.SW_TopCylinder_Down);
}
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_14_TopCylinder_Down))
{
......@@ -305,7 +308,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveCylineCanTakeOrGive())
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_202_MoveCylinder_Give);
InStoreLog("紧急出料移栽"+SecondMoveInfo.MoveStep+"：上料横移机构到放料端");
InStoreLog("紧急出料移栽" + SecondMoveInfo.MoveStep + "：上料横移机构到放料端");
CylinderMove(SecondMoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give);
}
else
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!