Skip to content

孙克 / RC1250-AssemblyLine

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

移栽模块出库过程中或还有出库任务，不能入库，完全出库完成再入库

1 个父辈 afb5dcce
全部展开
内嵌 并排
正在显示 6 个修改的文件 包含 32 行增加 和 32 行删除
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
this.panel1.Controls.Add(this.btnReset); this.panel1.Controls.Add(this.btnReset);
this.panel1.Location = new System.Drawing.Point(2, 1); this.panel1.Location = new System.Drawing.Point(2, 1);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1303, 56); this.panel1.Size = new System.Drawing.Size(1312, 56);
this.panel1.TabIndex = 258; this.panel1.TabIndex = 258;
// //
// btnScan // btnScan
...@@ -206,10 +206,10 @@ ...@@ -206,10 +206,10 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(5, 60); this.tabControl1.Location = new System.Drawing.Point(4, 60);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1307, 519); this.tabControl1.Size = new System.Drawing.Size(1310, 519);
this.tabControl1.TabIndex = 257; this.tabControl1.TabIndex = 257;
// //
// tabPage1 // tabPage1
...@@ -223,7 +223,7 @@ ...@@ -223,7 +223,7 @@
this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Location = new System.Drawing.Point(4, 26);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(3); this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
this.tabPage1.Size = new System.Drawing.Size(1299, 489); this.tabPage1.Size = new System.Drawing.Size(1302, 489);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " IO列表 "; this.tabPage1.Text = " IO列表 ";
this.tabPage1.UseVisualStyleBackColor = true; this.tabPage1.UseVisualStyleBackColor = true;
...@@ -236,9 +236,9 @@ ...@@ -236,9 +236,9 @@
this.groupBox2.Controls.Add(this.btnlineStop); this.groupBox2.Controls.Add(this.btnlineStop);
this.groupBox2.Controls.Add(this.cmbLineType); this.groupBox2.Controls.Add(this.cmbLineType);
this.groupBox2.Controls.Add(this.btnLine1Test); this.groupBox2.Controls.Add(this.btnLine1Test);
this.groupBox2.Location = new System.Drawing.Point(495, 157); this.groupBox2.Location = new System.Drawing.Point(491, 157);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(797, 66); this.groupBox2.Size = new System.Drawing.Size(805, 66);
this.groupBox2.TabIndex = 279; this.groupBox2.TabIndex = 279;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "皮带转动测试"; this.groupBox2.Text = "皮带转动测试";
...@@ -325,9 +325,9 @@ ...@@ -325,9 +325,9 @@
this.groupBox6.Controls.Add(this.lblTrayNum); this.groupBox6.Controls.Add(this.lblTrayNum);
this.groupBox6.Controls.Add(this.lblInstoreList); this.groupBox6.Controls.Add(this.lblInstoreList);
this.groupBox6.Controls.Add(this.lblMoveInfo); this.groupBox6.Controls.Add(this.lblMoveInfo);
this.groupBox6.Location = new System.Drawing.Point(495, 227); this.groupBox6.Location = new System.Drawing.Point(491, 227);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(797, 256); this.groupBox6.Size = new System.Drawing.Size(808, 256);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "消息"; this.groupBox6.Text = "消息";
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(271, 14); this.lblThisSta.Location = new System.Drawing.Point(271, 14);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(520, 137); this.lblThisSta.Size = new System.Drawing.Size(531, 137);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -367,7 +367,7 @@ ...@@ -367,7 +367,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(267, 228); this.lblInstoreList.Location = new System.Drawing.Point(267, 228);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(524, 53); this.lblInstoreList.Size = new System.Drawing.Size(535, 53);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// lblMoveInfo // lblMoveInfo
...@@ -413,7 +413,7 @@ ...@@ -413,7 +413,7 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.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.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(251, 6); this.groupBox4.Location = new System.Drawing.Point(248, 6);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(240, 477); this.groupBox4.Size = new System.Drawing.Size(240, 477);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
...@@ -450,7 +450,7 @@ ...@@ -450,7 +450,7 @@
this.groupBox5.Controls.Add(this.btnStop1Up); this.groupBox5.Controls.Add(this.btnStop1Up);
this.groupBox5.Location = new System.Drawing.Point(876, 6); this.groupBox5.Location = new System.Drawing.Point(876, 6);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(416, 147); this.groupBox5.Size = new System.Drawing.Size(424, 147);
this.groupBox5.TabIndex = 255; this.groupBox5.TabIndex = 255;
this.groupBox5.TabStop = false; this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试"; this.groupBox5.Text = "IO操作测试";
...@@ -573,9 +573,9 @@ ...@@ -573,9 +573,9 @@
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox1.Controls.Add(this.txtSlaveId);
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(495, 6); this.groupBox1.Location = new System.Drawing.Point(491, 6);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(374, 147); this.groupBox1.Size = new System.Drawing.Size(382, 147);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入"; this.groupBox1.Text = "DO写入";
......
source/AssemblyLineClient/记录.txt
20200324 20200324
1.入库逻辑修改：提升轴先上升后需要下降到料盘不溢出的位置，横移气缸才能动作。 1.入库逻辑修改：提升轴先上升后需要下降到料盘不溢出的位置，横移气缸才能动作。
2.出料模块取料条件修改：随意放时需要等皮带线空闲。 2.出料模块取料条件修改：随意放时需要等皮带线空闲。
3.移栽模块出库过程中或还有出库任务，不能入库，完全出库完成再入库
20200323 20200323
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -620,20 +620,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -620,20 +620,9 @@ namespace OnlineStore.DeviceLibrary
msg += "LastTP：" + TrayLine1.LastTrayPosition + " " + TrayLine2.LastTrayPosition + " " + Line3LastTrayP + " " + "\n"; msg += "LastTP：" + TrayLine1.LastTrayPosition + " " + TrayLine2.LastTrayPosition + " " + Line3LastTrayP + " " + "\n";
msg += "LIsRun：" + TrayLine1.IsInTurn() + " " + TrayLine2.IsInTurn() + " " + Line3Turn.InTurn + " " + "\n"; msg += "LIsRun：" + TrayLine1.IsInTurn() + " " + TrayLine2.IsInTurn() + " " + Line3Turn.InTurn + " " + "\n";
msg += "L3CanRun：" + TrayLine1.Line3CanRun + " " + TrayLine2.Line3CanRun + " " + "\n"; msg += "L3CanRun：" + TrayLine1.Line3CanRun + " " + TrayLine2.Line3CanRun + " " + "\n";
//msg += "LastWidth：" + LastWidth+"\n";
//if (IsNewType)
//{
msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + " " + LastWidth + "=" + StationInfo_Move.CodeStr + "\n"; msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + " " + LastWidth + "=" + StationInfo_Move.CodeStr + "\n";
//} msg += "NG 位：" + StationInfo_NG.ToStr + "\n";
//else msg += "扫码位：" + StationInfo_Scan.ToStr + "\n";
//{
// msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.MoveStep + " " + LastWidth + "=" + StationInfo_Move.CodeStr + "\n";
//}
msg += "NG 工位：" + StationInfo_NG.ToStr + "\n";
msg += "扫码工位：" + StationInfo_Scan.ToStr + "\n";
//msg += "IsInScanCode：" + IsInScanCode;
// msg += "LastWidth：" + LastWidth + "\n";
return msg; return msg;
} }
public override bool StartInStoreMove(InOutParam param) public override bool StartInStoreMove(InOutParam param)
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -460,6 +460,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -460,6 +460,17 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
//如果正在出库执行中，不能拦截入库托盘
if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
return false;
}
else if (waitOutStoreList.Count > 0)
{
return false;
}
bool isfull = TrayManager.TrayIsFull(currTrayNum); bool isfull = TrayManager.TrayIsFull(currTrayNum);
//LogInfo("***************入库*****验证入库编号，托盘号【" + currTrayNum + "】,isfull【" + isfull + "】"); //LogInfo("***************入库*****验证入库编号，托盘号【" + currTrayNum + "】,isfull【" + isfull + "】");
//FixtureCodeInfo code = GetBox().currInOutFixture; //FixtureCodeInfo code = GetBox().currInOutFixture;
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -660,10 +660,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -660,10 +660,10 @@ namespace OnlineStore.DeviceLibrary
/// 料盘移栽：记录高度尺寸 /// 料盘移栽：记录高度尺寸
/// </summary> /// </summary>
FI_20_SaveSize , FI_20_SaveSize ,
/// <summary> ///// <summary>
/// 提升轴下降到料盘不溢出的位置 ///// 提升轴下降到料盘不溢出的位置
/// </summary> ///// </summary>
FI_21_BatchAxisDown, //FI_21_BatchAxisDown,
/// <summary> /// <summary>
/// 料盘移栽： 上料横移气缸放料SOL /// 料盘移栽： 上料横移气缸放料SOL
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!