Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 30029a9c
内嵌 并排
正在显示 7 个修改的文件 包含 63 行增加 和 58 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -484,7 +484,7 @@ namespace OnlineStore.AssemblyLine
private void btnBStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnBStopDown, "缓冲阻挡下降", "缓冲阻挡上升", IO_Type.SL_Buffer_StopDown);
BtnMove(btnBStopDown, "SL缓冲阻挡下降", "SL缓冲阻挡上升", IO_Type.SL_Buffer_StopDown);
}
private void btnBP1_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmIOStatus.Designer.cs
......@@ -85,7 +85,7 @@
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(926, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(404, 138);
this.groupBox1.Size = new System.Drawing.Size(404, 120);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -94,7 +94,7 @@
//
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(238, 94);
this.button1.Location = new System.Drawing.Point(238, 78);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(87, 34);
this.button1.TabIndex = 256;
......@@ -105,7 +105,7 @@
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(277, 58);
this.txtDOIndex.Location = new System.Drawing.Point(277, 50);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(52, 23);
......@@ -115,7 +115,7 @@
// txtDoName
//
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(71, 58);
this.txtDoName.Location = new System.Drawing.Point(71, 50);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(133, 23);
......@@ -127,7 +127,7 @@
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 61);
this.label17.Location = new System.Drawing.Point(19, 53);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 240;
......@@ -139,7 +139,7 @@
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(227, 61);
this.label14.Location = new System.Drawing.Point(227, 53);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17);
this.label14.TabIndex = 239;
......@@ -150,7 +150,7 @@
//
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(145, 94);
this.btnWriteSingleDO.Location = new System.Drawing.Point(145, 78);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(87, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -161,7 +161,7 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(82, 100);
this.txtWriteTime.Location = new System.Drawing.Point(82, 84);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(52, 23);
......@@ -173,7 +173,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(19, 103);
this.label5.Location = new System.Drawing.Point(19, 87);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -188,7 +188,7 @@
this.cmbWriteIO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbWriteIO.FormattingEnabled = true;
this.cmbWriteIO.ItemHeight = 22;
this.cmbWriteIO.Location = new System.Drawing.Point(11, 21);
this.cmbWriteIO.Location = new System.Drawing.Point(11, 18);
this.cmbWriteIO.Name = "cmbWriteIO";
this.cmbWriteIO.Size = new System.Drawing.Size(318, 28);
this.cmbWriteIO.TabIndex = 234;
......@@ -203,7 +203,7 @@
this.chbAutoRead.Checked = true;
this.chbAutoRead.CheckState = System.Windows.Forms.CheckState.Checked;
this.chbAutoRead.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRead.Location = new System.Drawing.Point(321, 355);
this.chbAutoRead.Location = new System.Drawing.Point(329, 192);
this.chbAutoRead.Name = "chbAutoRead";
this.chbAutoRead.Size = new System.Drawing.Size(75, 21);
this.chbAutoRead.TabIndex = 244;
......@@ -317,9 +317,9 @@
this.groupBox5.Controls.Add(this.btnNGCylinder);
this.groupBox5.Controls.Add(this.btnSW4Run);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Location = new System.Drawing.Point(926, 142);
this.groupBox5.Location = new System.Drawing.Point(926, 126);
this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(404, 406);
this.groupBox5.Size = new System.Drawing.Size(404, 422);
this.groupBox5.TabIndex = 246;
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
......@@ -328,7 +328,7 @@
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(185, 60);
this.button2.Location = new System.Drawing.Point(22, 183);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(153, 37);
this.button2.TabIndex = 287;
......@@ -340,7 +340,7 @@
//
this.btnsw2StopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnsw2StopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnsw2StopDown.Location = new System.Drawing.Point(22, 60);
this.btnsw2StopDown.Location = new System.Drawing.Point(22, 346);
this.btnsw2StopDown.Name = "btnsw2StopDown";
this.btnsw2StopDown.Size = new System.Drawing.Size(153, 37);
this.btnsw2StopDown.TabIndex = 286;
......@@ -352,7 +352,7 @@
//
this.btnSw3Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Location.Location = new System.Drawing.Point(22, 276);
this.btnSw3Location.Location = new System.Drawing.Point(185, 231);
this.btnSw3Location.Name = "btnSw3Location";
this.btnSw3Location.Size = new System.Drawing.Size(153, 37);
this.btnSw3Location.TabIndex = 285;
......@@ -364,7 +364,7 @@
//
this.btnSw3Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Top.Location = new System.Drawing.Point(22, 314);
this.btnSw3Top.Location = new System.Drawing.Point(185, 269);
this.btnSw3Top.Name = "btnSw3Top";
this.btnSw3Top.Size = new System.Drawing.Size(153, 37);
this.btnSw3Top.TabIndex = 284;
......@@ -376,7 +376,7 @@
//
this.btnSw2Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Location.Location = new System.Drawing.Point(185, 191);
this.btnSw2Location.Location = new System.Drawing.Point(22, 231);
this.btnSw2Location.Name = "btnSw2Location";
this.btnSw2Location.Size = new System.Drawing.Size(153, 37);
this.btnSw2Location.TabIndex = 283;
......@@ -388,7 +388,7 @@
//
this.btnSw2Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Top.Location = new System.Drawing.Point(185, 231);
this.btnSw2Top.Location = new System.Drawing.Point(22, 269);
this.btnSw2Top.Name = "btnSw2Top";
this.btnSw2Top.Size = new System.Drawing.Size(153, 37);
this.btnSw2Top.TabIndex = 282;
......@@ -400,7 +400,7 @@
//
this.btnSw1Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Location.Location = new System.Drawing.Point(22, 191);
this.btnSw1Location.Location = new System.Drawing.Point(185, 69);
this.btnSw1Location.Name = "btnSw1Location";
this.btnSw1Location.Size = new System.Drawing.Size(153, 37);
this.btnSw1Location.TabIndex = 281;
......@@ -412,7 +412,7 @@
//
this.btnSw4Location.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw4Location.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw4Location.Location = new System.Drawing.Point(185, 276);
this.btnSw4Location.Location = new System.Drawing.Point(22, 69);
this.btnSw4Location.Name = "btnSw4Location";
this.btnSw4Location.Size = new System.Drawing.Size(153, 37);
this.btnSw4Location.TabIndex = 276;
......@@ -424,7 +424,7 @@
//
this.btnSw4Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw4Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw4Top.Location = new System.Drawing.Point(185, 314);
this.btnSw4Top.Location = new System.Drawing.Point(22, 107);
this.btnSw4Top.Name = "btnSw4Top";
this.btnSw4Top.Size = new System.Drawing.Size(153, 37);
this.btnSw4Top.TabIndex = 269;
......@@ -436,7 +436,7 @@
//
this.btnSw1Top.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Top.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Top.Location = new System.Drawing.Point(22, 231);
this.btnSw1Top.Location = new System.Drawing.Point(185, 107);
this.btnSw1Top.Name = "btnSw1Top";
this.btnSw1Top.Size = new System.Drawing.Size(153, 37);
this.btnSw1Top.TabIndex = 280;
......@@ -448,7 +448,7 @@
//
this.btnSw3Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw3Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw3Run.Location = new System.Drawing.Point(22, 146);
this.btnSw3Run.Location = new System.Drawing.Point(185, 307);
this.btnSw3Run.Name = "btnSw3Run";
this.btnSw3Run.Size = new System.Drawing.Size(153, 37);
this.btnSw3Run.TabIndex = 279;
......@@ -460,7 +460,7 @@
//
this.btnSw2Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw2Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw2Run.Location = new System.Drawing.Point(185, 106);
this.btnSw2Run.Location = new System.Drawing.Point(22, 307);
this.btnSw2Run.Name = "btnSw2Run";
this.btnSw2Run.Size = new System.Drawing.Size(153, 37);
this.btnSw2Run.TabIndex = 278;
......@@ -472,7 +472,7 @@
//
this.btnSw1Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSw1Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSw1Run.Location = new System.Drawing.Point(22, 106);
this.btnSw1Run.Location = new System.Drawing.Point(185, 145);
this.btnSw1Run.Name = "btnSw1Run";
this.btnSw1Run.Size = new System.Drawing.Size(153, 37);
this.btnSw1Run.TabIndex = 277;
......@@ -485,7 +485,7 @@
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(191, 370);
this.lblTrayNum.Location = new System.Drawing.Point(26, 394);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
......@@ -498,7 +498,7 @@
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(22, 361);
this.btnCloseAll.Location = new System.Drawing.Point(185, 372);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(153, 37);
this.btnCloseAll.TabIndex = 274;
......@@ -522,7 +522,7 @@
//
this.btnSW4Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSW4Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSW4Run.Location = new System.Drawing.Point(185, 146);
this.btnSW4Run.Location = new System.Drawing.Point(22, 145);
this.btnSW4Run.Name = "btnSW4Run";
this.btnSW4Run.Size = new System.Drawing.Size(153, 37);
this.btnSW4Run.TabIndex = 262;
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -141,7 +141,7 @@
this.groupBox2.Controls.Add(this.btnCopyLog);
this.groupBox2.Location = new System.Drawing.Point(460, 4);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(860, 75);
this.groupBox2.Size = new System.Drawing.Size(860, 71);
this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息";
......@@ -151,7 +151,7 @@
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(445, 26);
this.btnTrayInfo.Location = new System.Drawing.Point(445, 13);
this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195;
......@@ -163,7 +163,7 @@
//
this.lblCID.AutoSize = true;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(19, 34);
this.lblCID.Location = new System.Drawing.Point(19, 25);
this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95;
......@@ -173,7 +173,7 @@
//
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(137, 32);
this.chbAutoRun.Location = new System.Drawing.Point(137, 23);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94;
......@@ -186,7 +186,7 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(781, 31);
this.chkDebug.Location = new System.Drawing.Point(781, 18);
this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194;
......@@ -198,7 +198,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(669, 26);
this.btnClearLog.Location = new System.Drawing.Point(669, 13);
this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190;
......@@ -211,7 +211,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(557, 26);
this.btnCopyLog.Location = new System.Drawing.Point(557, 13);
this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191;
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
//CylinderMove(MoveInfo, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_OutTopCylinder_Down);
//阻挡上升
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH);
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
if (Config.SidesWayNum <= 0)
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -898,10 +898,15 @@ namespace OnlineStore.DeviceLibrary
{
//此托盘是紧急出料盘，需要通过料架出库
bool debugNeed = IsDebug && runStatus >= LineRunStatus.Runing;
if (info.PosId.Equals(""))
{
param = new InOutParam(trayNum, "紧急出料测试", "1#AC1_3_2", 12, 7);
}
bool isJinji = info.EmergencyOut && info.IsFull && runStatus >= LineRunStatus.Runing;
if (debugNeed || isJinji )
{
if (checkAndMove)
{
SecondMoveInfo.MoveParam = param;
......@@ -909,11 +914,11 @@ namespace OnlineStore.DeviceLibrary
//判断是否有料架，是否可以出库
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW))
{
LogUtil.error(Name+" 【" + info.ToStr() + "】需要出库，但是无料架暂不处理",DeviceID+16);
LogUtil.error(Name+" 【" + info.ToStr() + "】需要出库，定位工位无料架，暂不处理",DeviceID+16);
}
else if (OutStoreHeight < 0)
{
LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，但是料架没准备好暂不处理", DeviceID + 17);
LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，料架未准备好，暂不处理", DeviceID + 17);
}
else
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
......@@ -87,9 +87,9 @@ namespace OnlineStore.DeviceLibrary
else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart);
OutLog("准备出库料架： " + MoveInfo.SLog + " 阻挡工位检测有料架，进料阻挡上升，缓冲阻挡下降，流水线转动 1000");
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH);//进料阻挡上升
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
OutLog("准备出库料架： " + MoveInfo.SLog + " 阻挡工位检测有料架，进料阻挡下降，缓冲阻挡上升，流水线转动 1000");
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH);//进料阻挡下降
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡上升
IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
//等待指定时间
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
......@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary
else if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart);
OutLog("准备出库料架： " + MoveInfo.SLog + " 进料口检测有料架，进料阻挡下降，缓冲阻挡上升，流水线转动 1000");
OutLog("准备出库料架： " + MoveInfo.SLog + " 进料口检测有料架，进料阻挡上升，缓冲阻挡下降，流水线转动 1000");
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);//进料阻挡上升
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH);//缓冲阻挡下降
IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
......
source/DeviceLibrary/model/StoreStep.cs
......@@ -728,20 +728,20 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
///出料检测： 工位检测信号，定位气缸上升
/// </summary>
FO_05_LocationCylinder_Up ,
FO_05_LocationCylinder_Up= 12005,
/// <summary>
/// 出料检测：提升轴下降到位P2
/// </summary>
FO_06_BatchAxisToP2 ,
FO_06_BatchAxisToP2 = 12006,
/// <summary>
/// 出料检测：升降盘定位气缸前进
/// </summary>
FO_07_TrayLocation_Before,
FO_07_TrayLocation_Before= 12007,
/// <summary>
/// 出料检测：上料轴开始慢速上升到P3点
/// </summary>
FO_08_AxisUpMove,
FO_08_AxisUpMove= 12008,
/// <summary>
/// 紧急出料移栽：上料轴下降指定的高度，同时升降轴回待机点
......@@ -751,45 +751,45 @@ namespace OnlineStore.DeviceLibrary
/// <summary>
/// 紧急出料移栽：上料横移机构取料端
/// /// </summary>
FO_212_MoveCylinder_Take,
FO_212_MoveCylinder_Take = 12212,
/// <summary>
/// 紧急出料移栽：上料横移机构下降
/// /// </summary>
FO_213_MoveCylinder_Down,
FO_213_MoveCylinder_Down = 12213,
/// <summary>
/// 紧急出料移栽：升降伺服下降到指定位置
/// /// </summary>
FO_214_UpdownAxisToP2,
FO_214_UpdownAxisToP2 = 12214,
/// <summary>
/// 紧急出料移栽：上料气缸夹紧
/// /// </summary>
FO_215_MoveCylinder_Tighten,
FO_215_MoveCylinder_Tighten = 12215,
/// <summary>
/// 紧急出料移栽：升降伺服到P1
/// /// </summary>
FO_216_UpdownAxisToP1,
FO_216_UpdownAxisToP1 = 12216,
/// <summary>
/// 紧急出料移栽：上料横移机构上升
/// /// </summary>
FO_217_MoveCylinder_Up,
FO_217_MoveCylinder_Up = 12217,
/// <summary>
/// 紧急出料移栽：上料横移机构到放料端
/// /// </summary>
FO_218_MoveCylinder_Give,
FO_218_MoveCylinder_Give = 12218,
/// <summary>
/// 料盘移栽：升降伺服到P3
/// </summary>
FO_219_UpdownAxisToP3,
FO_219_UpdownAxisToP3 = 12219,
/// <summary>
/// 料盘移栽：出料横移机构放松
/// </summary>
FO_220_MoveCylinder_Slack,
FO_220_MoveCylinder_Slack = 12220,
/// <summary>
/// 料盘移栽：升降伺服回P1
/// </summary>
FO_221_UpdownAxisToP1,
FO_221_UpdownAxisToP1 = 12221,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!