Skip to content

李娜 / AutoCountMachine

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

点料bug修改

1 个父辈 c2e97a9c
内嵌 并排
正在显示 8 个修改的文件 包含 58 行增加 和 86 行删除
RC1266-AutoCountMachine/source/AutoCountClient/FrmAnalyze.cs
...@@ -105,6 +105,11 @@ namespace OnlineStore.AutoCountClient ...@@ -105,6 +105,11 @@ namespace OnlineStore.AutoCountClient
index++; index++;
} }
} }
else
{
this.dataGridView1.Rows.Clear();
MessageBox.Show("未查询到点料记录");
}
}catch(Exception ex) }catch(Exception ex)
{ {
LogUtil.error("查询数据出错：" + ex.ToString()); LogUtil.error("查询数据出错：" + ex.ToString());
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.Designer.cs
...@@ -58,6 +58,7 @@ ...@@ -58,6 +58,7 @@
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.设置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.设置TToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.元器件学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.元器件学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.二维码学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.二维码学习ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripMenuItem();
...@@ -66,6 +67,8 @@ ...@@ -66,6 +67,8 @@
this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.帮助ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
this.元器件库ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.清空日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.清空日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
this.复制日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.复制日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -73,11 +76,6 @@ ...@@ -73,11 +76,6 @@
this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.版本号ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.menuStrip1 = new System.Windows.Forms.MenuStrip(); this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem4 = new System.Windows.Forms.ToolStripMenuItem();
this.工作模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.正常工作模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
this.元器件学习模式ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.开机自动启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.开机自动启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.启用X射线点料ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用X射线点料ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
...@@ -87,9 +85,6 @@ ...@@ -87,9 +85,6 @@
this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.lblXrayWork = new System.Windows.Forms.Label(); this.lblXrayWork = new System.Windows.Forms.Label();
this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog(); this.folderBrowserDialog1 = new System.Windows.Forms.FolderBrowserDialog();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
this.元器件库ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.panWork.SuspendLayout(); this.panWork.SuspendLayout();
...@@ -361,38 +356,43 @@ ...@@ -361,38 +356,43 @@
// 元器件学习ToolStripMenuItem // 元器件学习ToolStripMenuItem
// //
this.元器件学习ToolStripMenuItem.Name = "元器件学习ToolStripMenuItem"; this.元器件学习ToolStripMenuItem.Name = "元器件学习ToolStripMenuItem";
this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(234, 26); this.元器件学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 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);
// //
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(177, 6);
//
// 二维码学习ToolStripMenuItem // 二维码学习ToolStripMenuItem
// //
this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem"; this.二维码学习ToolStripMenuItem.Name = "二维码学习ToolStripMenuItem";
this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(234, 26); this.二维码学习ToolStripMenuItem.Size = new System.Drawing.Size(180, 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(231, 6); this.toolStripSeparator7.Size = new System.Drawing.Size(177, 6);
// //
// toolStripMenuItem2 // toolStripMenuItem2
// //
this.toolStripMenuItem2.Name = "toolStripMenuItem2"; this.toolStripMenuItem2.Name = "toolStripMenuItem2";
this.toolStripMenuItem2.Size = new System.Drawing.Size(234, 26); this.toolStripMenuItem2.Size = new System.Drawing.Size(180, 26);
this.toolStripMenuItem2.Text = "AGV调试"; this.toolStripMenuItem2.Text = "AGV调试";
this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click); this.toolStripMenuItem2.Click += new System.EventHandler(this.toolStripMenuItem2_Click);
// //
// toolStripSeparator6 // toolStripSeparator6
// //
this.toolStripSeparator6.Name = "toolStripSeparator6"; this.toolStripSeparator6.Name = "toolStripSeparator6";
this.toolStripSeparator6.Size = new System.Drawing.Size(231, 6); this.toolStripSeparator6.Size = new System.Drawing.Size(177, 6);
// //
// 标签编辑ToolStripMenuItem // 标签编辑ToolStripMenuItem
// //
this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem"; this.标签编辑ToolStripMenuItem.Name = "标签编辑ToolStripMenuItem";
this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(234, 26); this.标签编辑ToolStripMenuItem.Size = new System.Drawing.Size(180, 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);
// //
...@@ -424,6 +424,18 @@ ...@@ -424,6 +424,18 @@
this.toolStripSeparator5.Name = "toolStripSeparator5"; this.toolStripSeparator5.Name = "toolStripSeparator5";
this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6); this.toolStripSeparator5.Size = new System.Drawing.Size(141, 6);
// //
// 元器件库ToolStripMenuItem
//
this.元器件库ToolStripMenuItem.Name = "元器件库ToolStripMenuItem";
this.元器件库ToolStripMenuItem.Size = new System.Drawing.Size(144, 26);
this.元器件库ToolStripMenuItem.Text = "元器件库";
this.元器件库ToolStripMenuItem.Click += new System.EventHandler(this.元器件库ToolStripMenuItem_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(141, 6);
//
// 清空日志ToolStripMenuItem // 清空日志ToolStripMenuItem
// //
this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem"; this.清空日志ToolStripMenuItem.Name = "清空日志ToolStripMenuItem";
...@@ -473,8 +485,6 @@ ...@@ -473,8 +485,6 @@
// toolStripMenuItem4 // toolStripMenuItem4
// //
this.toolStripMenuItem4.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.toolStripMenuItem4.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.工作模式ToolStripMenuItem,
this.toolStripSeparator12,
this.开机自动启动ToolStripMenuItem, this.开机自动启动ToolStripMenuItem,
this.toolStripSeparator9, this.toolStripSeparator9,
this.启用X射线点料ToolStripMenuItem, this.启用X射线点料ToolStripMenuItem,
...@@ -487,41 +497,6 @@ ...@@ -487,41 +497,6 @@
this.toolStripMenuItem4.Text = "运行参数"; this.toolStripMenuItem4.Text = "运行参数";
this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click); this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
// //
// 工作模式ToolStripMenuItem
//
this.工作模式ToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.正常工作模式ToolStripMenuItem,
this.toolStripSeparator14,
this.元器件学习模式ToolStripMenuItem});
this.工作模式ToolStripMenuItem.Name = "工作模式ToolStripMenuItem";
this.工作模式ToolStripMenuItem.Size = new System.Drawing.Size(213, 26);
this.工作模式ToolStripMenuItem.Text = "工作模式";
this.工作模式ToolStripMenuItem.Visible = false;
//
// 正常工作模式ToolStripMenuItem
//
this.正常工作模式ToolStripMenuItem.Name = "正常工作模式ToolStripMenuItem";
this.正常工作模式ToolStripMenuItem.Size = new System.Drawing.Size(203, 26);
this.正常工作模式ToolStripMenuItem.Text = "✔ 正常工作模式";
this.正常工作模式ToolStripMenuItem.Click += new System.EventHandler(this.正常工作模式ToolStripMenuItem_Click);
//
// toolStripSeparator14
//
this.toolStripSeparator14.Name = "toolStripSeparator14";
this.toolStripSeparator14.Size = new System.Drawing.Size(200, 6);
//
// 元器件学习模式ToolStripMenuItem
//
this.元器件学习模式ToolStripMenuItem.Name = "元器件学习模式ToolStripMenuItem";
this.元器件学习模式ToolStripMenuItem.Size = new System.Drawing.Size(203, 26);
this.元器件学习模式ToolStripMenuItem.Text = "元器件学习模式";
this.元器件学习模式ToolStripMenuItem.Click += new System.EventHandler(this.元器件学习模式ToolStripMenuItem_Click);
//
// toolStripSeparator12
//
this.toolStripSeparator12.Name = "toolStripSeparator12";
this.toolStripSeparator12.Size = new System.Drawing.Size(210, 6);
//
// 开机自动启动ToolStripMenuItem // 开机自动启动ToolStripMenuItem
// //
this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem"; this.开机自动启动ToolStripMenuItem.Name = "开机自动启动ToolStripMenuItem";
...@@ -577,23 +552,6 @@ ...@@ -577,23 +552,6 @@
this.lblXrayWork.Text = "警告：点料过程中，请勿开门"; this.lblXrayWork.Text = "警告：点料过程中，请勿开门";
this.lblXrayWork.Visible = false; this.lblXrayWork.Visible = false;
// //
// toolStripSeparator17
//
this.toolStripSeparator17.Name = "toolStripSeparator17";
this.toolStripSeparator17.Size = new System.Drawing.Size(231, 6);
//
// 元器件库ToolStripMenuItem
//
this.元器件库ToolStripMenuItem.Name = "元器件库ToolStripMenuItem";
this.元器件库ToolStripMenuItem.Size = new System.Drawing.Size(180, 26);
this.元器件库ToolStripMenuItem.Text = "元器件库";
this.元器件库ToolStripMenuItem.Click += new System.EventHandler(this.元器件库ToolStripMenuItem_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(177, 6);
//
// FrmRobotMain // FrmRobotMain
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -678,11 +636,6 @@ ...@@ -678,11 +636,6 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.ToolStripMenuItem aGVCancelStateToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem aGVCancelStateToolStripMenuItem;
private System.Windows.Forms.Panel panWork; private System.Windows.Forms.Panel panWork;
private System.Windows.Forms.ToolStripMenuItem 工作模式ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 正常工作模式ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
private System.Windows.Forms.ToolStripMenuItem 元器件学习模式ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator12;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15; private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripMenuItem 启用蜂鸣器ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 启用蜂鸣器ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 元器件学习ToolStripMenuItem; private System.Windows.Forms.ToolStripMenuItem 元器件学习ToolStripMenuItem;
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmRobotMain.cs
...@@ -834,7 +834,7 @@ namespace OnlineStore.AutoCountClient ...@@ -834,7 +834,7 @@ namespace OnlineStore.AutoCountClient
return; return;
} }
AgvClient.SetCancelState(result); AgvClient.SetCancelState(result);
robot.XrayBean.OpenXLine = result; //robot.XrayBean.OpenXLine = result;
if (result) if (result)
{ {
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState"; aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
......
RC1266-AutoCountMachine/source/AutoCountClient/FrmXRay.Designer.cs
...@@ -72,6 +72,7 @@ ...@@ -72,6 +72,7 @@
this.btnXStart = new System.Windows.Forms.Button(); this.btnXStart = new System.Windows.Forms.Button();
this.btnXStop = new System.Windows.Forms.Button(); this.btnXStop = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblOpen = new System.Windows.Forms.Label();
this.lblXrOpen = new System.Windows.Forms.Label(); this.lblXrOpen = new System.Windows.Forms.Label();
this.lblLastS = new System.Windows.Forms.Label(); this.lblLastS = new System.Windows.Forms.Label();
this.lblData = new System.Windows.Forms.Label(); this.lblData = new System.Windows.Forms.Label();
...@@ -792,6 +793,7 @@ ...@@ -792,6 +793,7 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.lblOpen);
this.groupBox2.Controls.Add(this.lblXrOpen); this.groupBox2.Controls.Add(this.lblXrOpen);
this.groupBox2.Controls.Add(this.lblLastS); this.groupBox2.Controls.Add(this.lblLastS);
this.groupBox2.Controls.Add(this.lblData); this.groupBox2.Controls.Add(this.lblData);
...@@ -806,6 +808,18 @@ ...@@ -806,6 +808,18 @@
this.groupBox2.Text = "X光参数/状态信息"; this.groupBox2.Text = "X光参数/状态信息";
this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter); this.groupBox2.Enter += new System.EventHandler(this.groupBox2_Enter);
// //
// lblOpen
//
this.lblOpen.AutoSize = true;
this.lblOpen.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblOpen.ForeColor = System.Drawing.Color.Red;
this.lblOpen.Location = new System.Drawing.Point(12, 144);
this.lblOpen.Name = "lblOpen";
this.lblOpen.Size = new System.Drawing.Size(100, 17);
this.lblOpen.TabIndex = 6;
this.lblOpen.Text = "已禁用X射线点料";
this.lblOpen.Visible = false;
//
// lblXrOpen // lblXrOpen
// //
this.lblXrOpen.AutoSize = true; this.lblXrOpen.AutoSize = true;
...@@ -1025,6 +1039,7 @@ ...@@ -1025,6 +1039,7 @@
private System.IO.FileSystemWatcher fileSystemWatcher1; private System.IO.FileSystemWatcher fileSystemWatcher1;
private System.Windows.Forms.ComboBox cmbType; private System.Windows.Forms.ComboBox cmbType;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblOpen;
} }
} }
RC1266-AutoCountMachine/source/AutoCountClient/FrmXRay.cs
...@@ -107,6 +107,7 @@ namespace OnlineStore.AutoCountClient ...@@ -107,6 +107,7 @@ namespace OnlineStore.AutoCountClient
} }
ReadIOList(); ReadIOList();
ReadBtnDO(); ReadBtnDO();
lblOpen.Visible =(! equipBean.OpenXLine);
lblLastS.Text = equipBean.LastXRayState; lblLastS.Text = equipBean.LastXRayState;
if (equipBean.xRay.IsRayOpen) if (equipBean.xRay.IsRayOpen)
{ {
......
RC1266-AutoCountMachine/source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public class AgvClient public class AgvClient
{ {
public static bool CurrCancelState = true ; public static bool CurrCancelState = false ;
private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp); private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
private static Asa.AgvClient agvClient; private static Asa.AgvClient agvClient;
public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>(); public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
...@@ -437,11 +437,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -437,11 +437,10 @@ namespace OnlineStore.DeviceLibrary
//料串可离开 //料串可离开
AgvClient.SetStatus(Config.AgvInName, "", ClientAction.FinishEnter, ClientLevel.High, true); AgvClient.SetStatus(Config.AgvInName, "", ClientAction.FinishEnter, ClientLevel.High, true);
Task.Factory.StartNew(delegate
{ Thread.Sleep(2000);
Thread.Sleep(5000); AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
AgvClient.SetStatus(Config.AgvInName, "", ClientAction.None, ClientLevel.High, true);
});
ProcessShelfEnter = false; ProcessShelfEnter = false;
LogUtil.info(logName + " 结束"); LogUtil.info(logName + " 结束");
} }
...@@ -490,7 +489,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -490,7 +489,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
LogUtil.info(logName + " 已收到 O_WLine_OutCheck=LOW ，等待8000后停止转动 "); LogUtil.info(logName + " 已收到 O_WLine_OutCheck=LOW ，等待8000后停止转动 ");
} }
Thread.Sleep(8000); Thread.Sleep(8000);
//停止转动 ,阻挡上升 //停止转动 ,阻挡上升
IOMove(IO_Type.O_WLine_OutStop, IO_VALUE.LOW); IOMove(IO_Type.O_WLine_OutStop, IO_VALUE.LOW);
...@@ -498,11 +497,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -498,11 +497,10 @@ namespace OnlineStore.DeviceLibrary
//此处判断是否需要停止接料线体 //此处判断是否需要停止接料线体
IOMove(IO_Type.O_WLine_Run, IO_VALUE.LOW); IOMove(IO_Type.O_WLine_Run, IO_VALUE.LOW);
AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.FinishLeave, ClientLevel.High, true); AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.FinishLeave, ClientLevel.High, true);
Task.Factory.StartNew(delegate
{ Thread.Sleep(2000);
Thread.Sleep(5000); AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
AgvClient.SetStatus(Config.AgvOutName, "", ClientAction.None, ClientLevel.High, true);
});
ProcessShelfOut = false; ProcessShelfOut = false;
LogUtil.info(logName + "结束,停止转动 "); LogUtil.info(logName + "结束,停止转动 ");
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!