Commit ef6a969c 张东亮

运行版

1 个父辈 00577443
......@@ -292,7 +292,8 @@ namespace OnlineStore.DeviceLibrary
//如果Feeder1出口无料架,放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch1, 1000))
{
IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
StopIOMove(IO_Type.L1_OutStopDown, StopDownMS);
Thread.Sleep(1000);
LogUtil.info(" Feeder1线体出口无料架,下降 [" + IO_Type.L1_StopDown + "] [" + StopDownMS + "] 秒");
ol_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L1_StopDown, StopDownMS);
......@@ -304,13 +305,14 @@ namespace OnlineStore.DeviceLibrary
ol_noshelfWatch1.Stop();
IOManager.CIOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
}
}
private Task TranverseTask = new Task(new Action(TranverseProcess));
private Task TranverseTask;
private static void TranverseProcess()
{
LogUtil.info(" TranverseProcess");
LogUtil.info(" TranverseProcess Run");
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
IOManager.CIOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.LOW);
......@@ -330,19 +332,21 @@ namespace OnlineStore.DeviceLibrary
while (IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.HIGH);
if (stopwatch.Elapsed.TotalMinutes >= 1)
if (stopwatch.Elapsed.TotalMinutes >= 2)
{
stopwatch.Stop();
IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW);
//stopwatch.Stop();
//IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW);
// IOManager.CIOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
//IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
//Thread.Sleep(1000);
//IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
//Thread.Sleep(1000);
LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] [" + stopwatch.Elapsed.TotalMinutes + "] 秒");
break;
LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] [" + stopwatch.Elapsed.TotalSeconds + "秒]");
//break;
}
}
stopwatch.Stop();
Thread.Sleep(5000);
IOManager.CIOMove(IO_Type.Tranverse_Run, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 横移电机停止");
......@@ -351,6 +355,7 @@ namespace OnlineStore.DeviceLibrary
IOManager.CIOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
Thread.Sleep(1000);
LogUtil.info(" 横移机构下降");
LogUtil.info(" TranverseProcess Finish");
}
private Stopwatch ol_tranverseShelfWatch = new Stopwatch();
private void TranverseTimerProcess()
......@@ -362,14 +367,14 @@ namespace OnlineStore.DeviceLibrary
{
if (LineManager.checkWatch(ol_tranverseShelfWatch, 2000))
{
if (TranverseTask.Status.Equals(TaskStatus.Created))
if (TranverseTask ==null)
{
TranverseTask.Start();
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess));
il_lastCallAgvTime = DateTime.Now;
}
else if (TranverseTask.IsCompleted)
{
TranverseTask.Start();
TranverseTask = Task.Factory.StartNew(new Action(TranverseProcess));
il_lastCallAgvTime = DateTime.Now;
}
}
......
......@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
//return "进料线出口" + Config.L2_AgvName + ":" + AgvClient.GetAction(Config.L2_AgvName) + ",料架: " + LastInShelfId + "\r\n" +
// "出料线进口" + Config.L1_AgvName + ":" + AgvClient.GetAction(Config.L1_AgvName) + ",料架: " + LastOutShelfId + "\r\n";
return "Feeder1线入料口" + Config.L1_AgvName + ":" +agvClient.Feeder_In_Msg+ "\r\n" + //"料架: " + LastInShelfId + AgvClient.GetAction(Config.L1_AgvName)
"Feeder2线出料口" + Config.L2_AgvName + ":" + "料架: " + LastOutShelfId +"\r\n"+ agvClient.Feeder_Out_Msg + "\r\n";//+ "料架: " + LastOutShelfId + AgvClient.GetAction(Config.L2_AgvName) +
"Feeder2线出料口" + Config.L2_AgvName + ":" + "料架: " + LastOutShelfId +" "+ agvClient.Feeder_Out_Msg + "\r\n";//+ "料架: " + LastOutShelfId + AgvClient.GetAction(Config.L2_AgvName) +
}
#endregion
......
......@@ -283,7 +283,7 @@
this.btnInLOutStopDown.Name = "btnInLOutStopDown";
this.btnInLOutStopDown.Size = new System.Drawing.Size(140, 39);
this.btnInLOutStopDown.TabIndex = 279;
this.btnInLOutStopDown.Text = "Feeder1线体出口阻挡下降";
this.btnInLOutStopDown.Text = "Feeder1出口缓冲打开";
this.btnInLOutStopDown.UseVisualStyleBackColor = true;
this.btnInLOutStopDown.Click += new System.EventHandler(this.btnInLOutStopDown_Click);
//
......
......@@ -342,7 +342,7 @@ namespace OnlineStore.FeederLineClient
private void btnInLOutStopDown_Click(object sender, EventArgs e)
{
BtnMove(btnInLOutStopDown, "Feeder1线体出口阻挡下降", "Feeder1线体出口阻挡上升", IO_Type.L1_OutStopDown);
BtnMove(btnInLOutStopDown, "Feeder1出口缓冲打开", "Feeder1出口缓冲关闭", IO_Type.L1_OutStopDown);
}
private void btnOLInStopDown_Click(object sender, EventArgs e)
......@@ -431,10 +431,21 @@ namespace OnlineStore.FeederLineClient
private void btnTranverse_Click(object sender, EventArgs e)
{
if (btnTranverse.Text.Equals("横移机构上升"))
BtnMove(btnTranverse, "横移机构上升", "横移机构下降", IO_Type.Tranverse_Up_SOL);
{
IOManager.CIOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.LOW);
Thread.Sleep(500);
IOManager.IOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.HIGH);
Thread.Sleep(500);
btnTranverse.Text = "横移机构下降";
}
else
BtnMove(btnTranverse, "横移机构下降", "横移机构上升", IO_Type.Tranverse_Down_SOL);
btnTranverse.BackColor = Color.White;
{
IOManager.CIOMove(IO_Type.Tranverse_Up_SOL, IO_VALUE.LOW);
Thread.Sleep(500);
IOManager.IOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
Thread.Sleep(500);
btnTranverse.Text = "横移机构上升";
}
}
private void btnTranverseRun_Click(object sender, EventArgs e)
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!