Commit 42a0eb1f LN

增加暂停抓料复选框

1 个父辈 038c4e47
...@@ -33,6 +33,7 @@ ...@@ -33,6 +33,7 @@
this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabControl1 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage(); this.tabPage1 = new System.Windows.Forms.TabPage();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.chbDisGetWare = new System.Windows.Forms.CheckBox();
this.chbTrayTest = new System.Windows.Forms.CheckBox(); this.chbTrayTest = new System.Windows.Forms.CheckBox();
this.chbDisMove = new System.Windows.Forms.CheckBox(); this.chbDisMove = new System.Windows.Forms.CheckBox();
this.lblCardMsg = new System.Windows.Forms.Label(); this.lblCardMsg = new System.Windows.Forms.Label();
...@@ -219,6 +220,7 @@ ...@@ -219,6 +220,7 @@
// //
this.groupBox2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox2.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.groupBox2.Controls.Add(this.chbDisGetWare);
this.groupBox2.Controls.Add(this.chbTrayTest); this.groupBox2.Controls.Add(this.chbTrayTest);
this.groupBox2.Controls.Add(this.chbDisMove); this.groupBox2.Controls.Add(this.chbDisMove);
this.groupBox2.Controls.Add(this.lblCardMsg); this.groupBox2.Controls.Add(this.lblCardMsg);
...@@ -227,27 +229,40 @@ ...@@ -227,27 +229,40 @@
this.groupBox2.Controls.Add(this.chbLeftDis); this.groupBox2.Controls.Add(this.chbLeftDis);
this.groupBox2.Controls.Add(this.chbDisSL); this.groupBox2.Controls.Add(this.chbDisSL);
this.groupBox2.Controls.Add(this.chbRightDis); this.groupBox2.Controls.Add(this.chbRightDis);
this.groupBox2.Location = new System.Drawing.Point(10, 3); this.groupBox2.Location = new System.Drawing.Point(5, 3);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(302, 630); this.groupBox2.Size = new System.Drawing.Size(310, 630);
this.groupBox2.TabIndex = 200; this.groupBox2.TabIndex = 200;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
// //
// chbDisGetWare
//
this.chbDisGetWare.AutoSize = true;
this.chbDisGetWare.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDisGetWare.Location = new System.Drawing.Point(11, 24);
this.chbDisGetWare.Name = "chbDisGetWare";
this.chbDisGetWare.Size = new System.Drawing.Size(173, 25);
this.chbDisGetWare.TabIndex = 204;
this.chbDisGetWare.Text = "暂停抓料,准备更新";
this.chbDisGetWare.UseVisualStyleBackColor = true;
this.chbDisGetWare.CheckedChanged += new System.EventHandler(this.chbDisGetWare_CheckedChanged);
//
// chbTrayTest // chbTrayTest
// //
this.chbTrayTest.AutoSize = true; this.chbTrayTest.AutoSize = true;
this.chbTrayTest.Location = new System.Drawing.Point(9, 22); this.chbTrayTest.Location = new System.Drawing.Point(11, 60);
this.chbTrayTest.Name = "chbTrayTest"; this.chbTrayTest.Name = "chbTrayTest";
this.chbTrayTest.Size = new System.Drawing.Size(168, 24); this.chbTrayTest.Size = new System.Drawing.Size(168, 24);
this.chbTrayTest.TabIndex = 203; this.chbTrayTest.TabIndex = 203;
this.chbTrayTest.Text = "托盘横移到出料线测试"; this.chbTrayTest.Text = "托盘横移到出料线测试";
this.chbTrayTest.UseVisualStyleBackColor = true; this.chbTrayTest.UseVisualStyleBackColor = true;
this.chbTrayTest.Visible = false;
this.chbTrayTest.CheckedChanged += new System.EventHandler(this.chbTrayTest_CheckedChanged); this.chbTrayTest.CheckedChanged += new System.EventHandler(this.chbTrayTest_CheckedChanged);
// //
// chbDisMove // chbDisMove
// //
this.chbDisMove.AutoSize = true; this.chbDisMove.AutoSize = true;
this.chbDisMove.Location = new System.Drawing.Point(9, 222); this.chbDisMove.Location = new System.Drawing.Point(11, 240);
this.chbDisMove.Name = "chbDisMove"; this.chbDisMove.Name = "chbDisMove";
this.chbDisMove.Size = new System.Drawing.Size(144, 24); this.chbDisMove.Size = new System.Drawing.Size(144, 24);
this.chbDisMove.TabIndex = 202; this.chbDisMove.TabIndex = 202;
...@@ -265,7 +280,7 @@ ...@@ -265,7 +280,7 @@
// chbDisHy // chbDisHy
// //
this.chbDisHy.AutoSize = true; this.chbDisHy.AutoSize = true;
this.chbDisHy.Location = new System.Drawing.Point(9, 187); this.chbDisHy.Location = new System.Drawing.Point(11, 205);
this.chbDisHy.Name = "chbDisHy"; this.chbDisHy.Name = "chbDisHy";
this.chbDisHy.Size = new System.Drawing.Size(194, 24); this.chbDisHy.Size = new System.Drawing.Size(194, 24);
this.chbDisHy.TabIndex = 201; this.chbDisHy.TabIndex = 201;
...@@ -287,7 +302,7 @@ ...@@ -287,7 +302,7 @@
// chbLeftDis // chbLeftDis
// //
this.chbLeftDis.AutoSize = true; this.chbLeftDis.AutoSize = true;
this.chbLeftDis.Location = new System.Drawing.Point(9, 67); this.chbLeftDis.Location = new System.Drawing.Point(11, 93);
this.chbLeftDis.Name = "chbLeftDis"; this.chbLeftDis.Name = "chbLeftDis";
this.chbLeftDis.Size = new System.Drawing.Size(277, 24); this.chbLeftDis.Size = new System.Drawing.Size(277, 24);
this.chbLeftDis.TabIndex = 196; this.chbLeftDis.TabIndex = 196;
...@@ -298,7 +313,7 @@ ...@@ -298,7 +313,7 @@
// chbDisSL // chbDisSL
// //
this.chbDisSL.AutoSize = true; this.chbDisSL.AutoSize = true;
this.chbDisSL.Location = new System.Drawing.Point(9, 152); this.chbDisSL.Location = new System.Drawing.Point(11, 170);
this.chbDisSL.Name = "chbDisSL"; this.chbDisSL.Name = "chbDisSL";
this.chbDisSL.Size = new System.Drawing.Size(192, 24); this.chbDisSL.Size = new System.Drawing.Size(192, 24);
this.chbDisSL.TabIndex = 199; this.chbDisSL.TabIndex = 199;
...@@ -309,7 +324,7 @@ ...@@ -309,7 +324,7 @@
// chbRightDis // chbRightDis
// //
this.chbRightDis.AutoSize = true; this.chbRightDis.AutoSize = true;
this.chbRightDis.Location = new System.Drawing.Point(9, 101); this.chbRightDis.Location = new System.Drawing.Point(11, 126);
this.chbRightDis.Name = "chbRightDis"; this.chbRightDis.Name = "chbRightDis";
this.chbRightDis.Size = new System.Drawing.Size(293, 24); this.chbRightDis.Size = new System.Drawing.Size(293, 24);
this.chbRightDis.TabIndex = 197; this.chbRightDis.TabIndex = 197;
...@@ -1120,38 +1135,38 @@ ...@@ -1120,38 +1135,38 @@
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator6.Visible = false; this.toolStripSeparator6.Visible = false;
// //
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.二维码学习ToolStripMenuItem.Text = "二维码学习"; this.二维码学习ToolStripMenuItem.Text = "二维码学习";
this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click); this.二维码学习ToolStripMenuItem.Click += new System.EventHandler(this.二维码学习ToolStripMenuItem_Click);
// //
// toolStripSeparator7 // toolStripSeparator7
// //
this.toolStripSeparator7.Name = "toolStripSeparator7"; this.toolStripSeparator7.Name = "toolStripSeparator7";
this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(173, 6);
// //
// 托盘初始化ToolStripMenuItem // 托盘初始化ToolStripMenuItem
// //
this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem"; this.托盘初始化ToolStripMenuItem.Name = "托盘初始化ToolStripMenuItem";
this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.托盘初始化ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.托盘初始化ToolStripMenuItem.Text = "托盘编码"; this.托盘初始化ToolStripMenuItem.Text = "托盘编码";
this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click); this.托盘初始化ToolStripMenuItem.Click += new System.EventHandler(this.托盘初始化ToolStripMenuItem_Click);
// //
// toolStripSeparator9 // toolStripSeparator9
// //
this.toolStripSeparator9.Name = "toolStripSeparator9"; this.toolStripSeparator9.Name = "toolStripSeparator9";
this.toolStripSeparator9.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator9.Size = new System.Drawing.Size(173, 6);
this.toolStripSeparator9.Visible = false; this.toolStripSeparator9.Visible = false;
// //
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(176, 26);
this.toolStripMenuItem2.Text = "AGV调试"; this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Visible = false; this.toolStripMenuItem2.Visible = false;
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
...@@ -1159,36 +1174,36 @@ ...@@ -1159,36 +1174,36 @@
// toolStripSeparator13 // toolStripSeparator13
// //
this.toolStripSeparator13.Name = "toolStripSeparator13"; this.toolStripSeparator13.Name = "toolStripSeparator13";
this.toolStripSeparator13.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator13.Size = new System.Drawing.Size(173, 6);
// //
// iO模块状态ToolStripMenuItem // iO模块状态ToolStripMenuItem
// //
this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem"; this.iO模块状态ToolStripMenuItem.Name = "iO模块状态ToolStripMenuItem";
this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.iO模块状态ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态"; this.iO模块状态ToolStripMenuItem.Text = "查看料仓状态";
this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click); this.iO模块状态ToolStripMenuItem.Click += new System.EventHandler(this.iO模块状态ToolStripMenuItem_Click);
// //
// toolStripSeparator14 // toolStripSeparator14
// //
this.toolStripSeparator14.Name = "toolStripSeparator14"; this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator14.Size = new System.Drawing.Size(173, 6);
// //
// 查看托盘信息ToolStripMenuItem // 查看托盘信息ToolStripMenuItem
// //
this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem"; this.查看托盘信息ToolStripMenuItem.Name = "查看托盘信息ToolStripMenuItem";
this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.查看托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息"; this.查看托盘信息ToolStripMenuItem.Text = "查看托盘信息";
this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click); this.查看托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.btnTrayInfo_Click);
// //
// toolStripSeparator12 // toolStripSeparator12
// //
this.toolStripSeparator12.Name = "toolStripSeparator12"; this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator12.Size = new System.Drawing.Size(173, 6);
// //
// 清空托盘信息ToolStripMenuItem // 清空托盘信息ToolStripMenuItem
// //
this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem"; this.清空托盘信息ToolStripMenuItem.Name = "清空托盘信息ToolStripMenuItem";
this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.清空托盘信息ToolStripMenuItem.Size = new System.Drawing.Size(176, 26);
this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息"; this.清空托盘信息ToolStripMenuItem.Text = "清空托盘信息";
this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click); this.清空托盘信息ToolStripMenuItem.Click += new System.EventHandler(this.清空托盘信息ToolStripMenuItem_Click);
// //
...@@ -1207,31 +1222,31 @@ ...@@ -1207,31 +1222,31 @@
// 清空日志ToolStripMenuItem // 清空日志ToolStripMenuItem
// //
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem"; this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.清空日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.清空日志ToolStripMenuItem.Text = "清空日志"; this.清空日志ToolStripMenuItem.Text = "清空日志";
this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click); this.清空日志ToolStripMenuItem.Click += new System.EventHandler(this.清空日志ToolStripMenuItem_Click);
// //
// toolStripSeparator10 // toolStripSeparator10
// //
this.toolStripSeparator10.Name = "toolStripSeparator10"; this.toolStripSeparator10.Name = "toolStripSeparator10";
this.toolStripSeparator10.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator10.Size = new System.Drawing.Size(141, 6);
// //
// 复制日志ToolStripMenuItem // 复制日志ToolStripMenuItem
// //
this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem"; this.复制日志ToolStripMenuItem.Name = "复制日志ToolStripMenuItem";
this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.复制日志ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.复制日志ToolStripMenuItem.Text = "复制日志"; this.复制日志ToolStripMenuItem.Text = "复制日志";
this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click); this.复制日志ToolStripMenuItem.Click += new System.EventHandler(this.复制日志ToolStripMenuItem_Click);
// //
// toolStripSeparator11 // toolStripSeparator11
// //
this.toolStripSeparator11.Name = "toolStripSeparator11"; this.toolStripSeparator11.Name = "toolStripSeparator11";
this.toolStripSeparator11.Size = new System.Drawing.Size(177, 6); this.toolStripSeparator11.Size = new System.Drawing.Size(141, 6);
// //
// 版本号ToolStripMenuItem // 版本号ToolStripMenuItem
// //
this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem"; this.版本号ToolStripMenuItem.Name = "版本号ToolStripMenuItem";
this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(180, 26); this.版本号ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.版本号ToolStripMenuItem.Text = "关于软件"; this.版本号ToolStripMenuItem.Text = "关于软件";
this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click); this.版本号ToolStripMenuItem.Click += new System.EventHandler(this.版本号ToolStripMenuItem_Click);
// //
...@@ -1582,6 +1597,7 @@ ...@@ -1582,6 +1597,7 @@
private System.Windows.Forms.Label label9; private System.Windows.Forms.Label label9;
private System.Windows.Forms.Panel panel13; private System.Windows.Forms.Panel panel13;
private System.Windows.Forms.Label label15; private System.Windows.Forms.Label label15;
private System.Windows.Forms.CheckBox chbDisGetWare;
} }
} }
...@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine ...@@ -1265,5 +1265,19 @@ namespace OnlineStore.AssemblyLine
LineManager.TrayToOutLineTest = chbTrayTest.Checked; LineManager.TrayToOutLineTest = chbTrayTest.Checked;
LogUtil.info("界面点击勾选:" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest); LogUtil.info("界面点击勾选:" + chbTrayTest.Text + "=" + LineManager.TrayToOutLineTest);
} }
private void chbDisGetWare_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (LineManager.DisGetWare.Equals(chbDisGetWare.Checked))
{
return;
}
LineManager.DisGetWare = chbDisGetWare.Checked;
LogUtil.info("界面点击勾选:" + chbDisGetWare.Text + "=" + LineManager.DisGetWare);
}
} }
} }
...@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -342,10 +342,18 @@ namespace OnlineStore.DeviceLibrary
if (ScanCodeTask == null || ScanCodeTask.IsCompleted) if (ScanCodeTask == null || ScanCodeTask.IsCompleted)
{ {
ClearTimeoutAlarm("扫码结束超时"); ClearTimeoutAlarm("扫码结束超时");
ClearTimeoutAlarm("扫码执行结束超时");
if (!LineManager.DisGetWare)
{
ClearTimeoutAlarm("启用抓料超时");
MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake); MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderTake);
InLog("料盘移栽" + MoveInfo.SLog + ":上料横移取料端"); InLog("料盘移栽" + MoveInfo.SLog + ":上料横移取料端");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Give, IO_Type.SL_MoveCylinder_Take);
ClearTimeoutAlarm("扫码执行结束超时"); }
else if (MoveInfo.IsTimeOut(60))
{
MoveTimeOut(MoveInfo, "启用抓料超时");
}
} }
else if (MoveInfo.IsTimeOut(60)) else if (MoveInfo.IsTimeOut(60))
{ {
......
...@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,6 +284,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if (LineManager.DisGetWare)
{
return false;
}
MoveEquip move = MoveEquipMap[id]; MoveEquip move = MoveEquipMap[id];
if (!move.NoAlarm() || move.waitInStoreList.Count > 0 || move.IsDebug || move.waitOutStoreList.Count > 0) if (!move.NoAlarm() || move.waitInStoreList.Count > 0 || move.IsDebug || move.waitOutStoreList.Count > 0)
{ {
......
...@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -536,7 +536,10 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
if(LineManager.DisGetWare)
{
return false;
}
//如果正在出库执行中,不能拦截入库托盘 //如果正在出库执行中,不能拦截入库托盘
if (MoveInfo.MoveType.Equals(LineMoveType.OutStore)) if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{ {
......
...@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,6 +22,8 @@ namespace OnlineStore.DeviceLibrary
public static bool DisAllMove = false; public static bool DisAllMove = false;
public static bool TrayToOutLineTest = false; public static bool TrayToOutLineTest = false;
public static bool DisGetWare = false;
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1); public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals(""); public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!