Skip to content

李娜 / SO664-AssemblyLine

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

1

1 个父辈 5f947b49
内嵌 并排
正在显示 12 个修改的文件 包含 49 行增加 和 118 行删除
source/AssemblyLineClient/App.config
......@@ -5,7 +5,7 @@
</configSections>
<appSettings>
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1" />
<add key="App_AutoRun" value="0" />
<add key="App_Title" value="流水线客户端" />
<!--Server address-->
<!--<add key="http.server" value="http://localhost/myproject/service/store/emptyPosForPutin"/>-->
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -108,7 +108,6 @@
this.开机自动启动ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
this.启用蜂鸣器ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator16 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator25 = new System.Windows.Forms.ToolStripSeparator();
this.aGVCancelStateToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator17 = new System.Windows.Forms.ToolStripSeparator();
......@@ -865,7 +864,6 @@
this.开机自动启动ToolStripMenuItem,
this.toolStripSeparator15,
this.启用蜂鸣器ToolStripMenuItem,
this.toolStripSeparator16,
this.toolStripSeparator25,
this.aGVCancelStateToolStripMenuItem,
this.toolStripSeparator17,
......@@ -894,11 +892,6 @@
this.启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
this.启用蜂鸣器ToolStripMenuItem.Click += new System.EventHandler(this.启用蜂鸣器ToolStripMenuItem_Click);
//
// toolStripSeparator16
//
this.toolStripSeparator16.Name = "toolStripSeparator16";
this.toolStripSeparator16.Size = new System.Drawing.Size(203, 6);
//
// toolStripSeparator25
//
this.toolStripSeparator25.Name = "toolStripSeparator25";
......@@ -1114,7 +1107,6 @@
private System.Windows.Forms.ToolStripMenuItem 开机自动启动ToolStripMenuItem;
private System.Windows.Forms.ToolStripMenuItem 启用蜂鸣器ToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator16;
private System.Windows.Forms.ToolStripMenuItem aGVCancelStateToolStripMenuItem;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator17;
private System.Windows.Forms.TabPage tabPage2;
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
......@@ -16,9 +16,7 @@ namespace OnlineStore.DeviceLibrary
private TaskData taskData = null;
private InOutParam LastOutParam = new InOutParam();
private bool NeedCheckShelf = true;
internal bool StartTrayOut(InOutParam outParam)
{
if (outParam == null || outParam.PosId == null || outParam.PosId.Equals(""))
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
......@@ -30,8 +30,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
mainTimer.Enabled = false;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset();
......@@ -44,8 +43,7 @@ namespace OnlineStore.DeviceLibrary
public override bool Reset()
{
StopMove();
runStatus = LineRunStatus.Reset;
SecondMoveInfo.EndMove();
runStatus = LineRunStatus.Reset;
MoveInfo.NewMove(LineMoveType.Reset);
StartReset();
return true;
......@@ -99,8 +97,7 @@ namespace OnlineStore.DeviceLibrary
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
}
}
......@@ -630,6 +627,11 @@ namespace OnlineStore.DeviceLibrary
#endregion
else
{
LogUtil.error(Name + "FixtureProcess 未找到[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]的处理");
}
}
private void HY31_IOL_TopUp()
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
......@@ -28,8 +28,7 @@ namespace OnlineStore.DeviceLibrary
}
mainTimer.Enabled = false;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset();
......@@ -46,8 +45,7 @@ namespace OnlineStore.DeviceLibrary
{
return false;
}
runStatus = LineRunStatus.Reset;
SecondMoveInfo.EndMove();
runStatus = LineRunStatus.Reset;
MoveInfo.NewMove(LineMoveType.Reset);
StartReset();
return true;
......@@ -98,8 +96,7 @@ namespace OnlineStore.DeviceLibrary
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
}
}
......@@ -530,6 +527,10 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove();
CheckLog("托盘阻挡" + MoveInfo.SLog + " 处理完成");
}
else
{
LogUtil.error(Name + "FixtureProcess 未找到[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]的处理");
}
#endregion
}
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs
......@@ -31,8 +31,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
mainTimer.Enabled = false;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset();
......@@ -50,7 +49,6 @@ namespace OnlineStore.DeviceLibrary
return false;
}
runStatus = LineRunStatus.Reset;
SecondMoveInfo.EndMove();
MoveInfo.NewMove(LineMoveType.Reset);
StartReset();
return true;
......@@ -58,6 +56,7 @@ namespace OnlineStore.DeviceLibrary
private void StartReset()
{
SecondMoveInfo.EndMove();
ResetClearData();
MoveInfo.NextMoveStep(LineMoveStep.JHY_R01_UpdownHome);
LogInfo(MoveInfo.MoveType + " " + MoveInfo.MoveStep + ": 电机停止，升降轴回原点，阻挡上升，定位气缸下降，顶升气缸下降");
......@@ -108,8 +107,7 @@ namespace OnlineStore.DeviceLibrary
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
}
else
{
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
......@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LogUtil.error(Name + "FixtureProcess 未找到[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]的处理");
LogUtil.error(Name + "FixtureProcess 未找到[" + SecondMoveInfo.MoveType + "][" + SecondMoveInfo.MoveStep + "]的处理");
}
}
......@@ -555,9 +555,10 @@ namespace OnlineStore.DeviceLibrary
MoveTimeOut(MoveInfo, "等待给服务器发送afterPutCutTask完成");
}
}
else
{
LogUtil.error(Name + "OutStoreProcess 未找到[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]的处理");
}
}
#endregion
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
......@@ -23,8 +23,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
mainTimer.Enabled = false;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
runStatus = LineRunStatus.HomeMoving;
MoveInfo.NewMove(LineMoveType.ReturnHome);
StartReset();
......@@ -37,8 +36,7 @@ namespace OnlineStore.DeviceLibrary
public override bool Reset()
{
StopMove();
runStatus = LineRunStatus.Reset;
SecondMoveInfo.EndMove();
runStatus = LineRunStatus.Reset;
MoveInfo.NewMove(LineMoveType.Reset);
StartReset();
return true;
......@@ -74,9 +72,7 @@ namespace OnlineStore.DeviceLibrary
{
LogInfo(MoveInfo.MoveType + " 完成！");
runStatus = LineRunStatus.Runing;
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
MoveInfo.EndMove();
}
}
}
......@@ -319,6 +315,10 @@ namespace OnlineStore.DeviceLibrary
CheckLog("出料线横移" + MoveInfo.SLog + " 横移结束");
MoveInfo.EndMove();
}
else
{
LogUtil.error(Name + "FixtureProcess 未找到[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]的处理");
}
#endregion
}
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -78,16 +78,14 @@ namespace OnlineStore.DeviceLibrary
}
foreach (MoveEquip_Config config in configList.Values)
{
MoveEquip equip = new MoveEquip(lineConfig.CID, config);
MoveEquip equip = new MoveEquip(lineConfig.CID, config);
AddDeviceName(ioList, config.IOIPList);
MoveEquipMap.Add(config.Id, equip);
AllEquipMap.Add(config.Id, equip);
}
foreach (HYEquip_Config config in hyConfigMap.Values)
{
HYEquipBase equip =HYEquipBase.GetHY( lineConfig.CID, config);
HYEquipBase equip =HYEquipBase.GetHY( lineConfig.CID, config);
AddDeviceName(ioList, config.IOIPList);
HYEquipMap.Add(config.Id, equip);
AllEquipMap.Add(config.Id, equip);
......@@ -273,35 +271,7 @@ namespace OnlineStore.DeviceLibrary
T3C1_Stop(MoveInfo);
T3C1_TrayNum = -1;
//横移轨道下降
//SideWayStop();
//SW23WaitTrayNum = -1;
//SW41WaitTrayNum = -1;
//CheckAndMove(IO_Type.SW2_StopDown, IO_VALUE.LOW);
//CheckAndMove(IO_Type.SW4_StopDown, IO_VALUE.LOW);
////定位下降
//CylinderMove(MoveInfo, IO_Type.SW1_LocationCylinder_Up, IO_Type.SW1_LocationCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW4_LocationCylinder_Up, IO_Type.SW4_LocationCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW2_LocationCylinder_Up, IO_Type.SW2_LocationCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW3_LocationCylinder_Up, IO_Type.SW3_LocationCylinder_Down);
////顶升下降
//CylinderMove(MoveInfo, IO_Type.SW2_TopCylinder_Up, IO_Type.SW2_TopCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW3_TopCylinder_Up, IO_Type.SW3_TopCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW1_TopCylinder_Up, IO_Type.SW1_TopCylinder_Down);
//CylinderMove(MoveInfo, IO_Type.SW4_TopCylinder_Up, IO_Type.SW4_TopCylinder_Down);
////分流模块复位
//ShuntStop();
//Shunt2Stop();
//IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.HIGH);
//CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
//CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
//CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
//CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
}
public override bool Reset()
......@@ -636,15 +606,13 @@ namespace OnlineStore.DeviceLibrary
if (isInSuddenDown.Equals(false))
{
LogUtil.error(Name + "收到急停信号，等待300后再次验证急停");
//Task.Factory.StartNew(delegate
//{
Thread.Sleep(300);
if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
{
SetWarnMsg("收到急停信号，报警急停");
Alarm(LineAlarmType.SuddenStop);
}
//});
Thread.Sleep(300);
if (IOValue(IO_Type.SuddenStop_BTN).Equals(IO_VALUE.LOW))
{
SetWarnMsg("收到急停信号，报警急停");
Alarm(LineAlarmType.SuddenStop);
}
}
}
else if (fuweiValue.Equals(IO_VALUE.HIGH) && (!fuweiValue.Equals(lastFuwei)))
......@@ -759,12 +727,7 @@ namespace OnlineStore.DeviceLibrary
default: break;
}
T3C1_TimerProcess();
//SideWayTimerProcess();
//ShuntTimerProcess();
//Shunt2TimerProcess();
T3C1_TimerProcess();
}
catch (Exception ex)
{
......@@ -850,13 +813,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove();
WriteDrivetMotorRun(IO_VALUE.LOW);
T3C1_Stop();
//IOMove(IO_Type.SW4_MotorRun, IO_VALUE.LOW);
//IOMove(IO_Type.SW4_TopCylinder_Down, IO_VALUE.LOW);
//IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
//SideWayStop();
//ShuntStop();
//Shunt2Stop();
T3C1_Stop();
}
protected override void ResetProcess()
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -336,24 +336,14 @@ namespace OnlineStore.DeviceLibrary
return false;
}
MoveEquip move = MoveEquipMap[id];
if (move.IsDebug)
//if (!move.NoErrorAlarm() || move.IsDebug || move.waitOutStoreList.Count > 0)
if (move.IsDebug)
{
return false;
}
if (runStatus > LineRunStatus.Wait && move.runStatus > LineRunStatus.Wait)
{
return true;
}
//if (runStatus.Equals(LineRunStatus.Runing) || runStatus.Equals(LineRunStatus.Busy))
//{
// if ((move.MoveInfo.MoveType.Equals(LineMoveType.None) || move.MoveInfo.MoveType.Equals(LineMoveType.InStore))
// && (move.runStatus.Equals(LineRunStatus.Runing) || move.runStatus.Equals(LineRunStatus.Busy)))
// {
// return true;
// }
//}
// LogUtil.error("runStatus【" + runStatus + "】，move.MoveInfo.MoveType【" + move.MoveInfo.MoveType + "】，move.runStatus【" + move.runStatus + "】 ");
}
return false;
}
......
source/DeviceLibrary/assemblyLine/MoveEquip.cs
......@@ -179,14 +179,8 @@ namespace OnlineStore.DeviceLibrary
{
trayCheck2LowWait.Stop();
trayCheckWait.Stop();
//如果正在出库中，需要减去托盘号
if (MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
DebugInfo("停止运动时出库执行中，减去托盘数；");
//减去需要的盘数
// TrayManager.DelNeedEmptyTrayNum();
MoveInfo.EndMove();
}
MoveInfo.EndMove();
runStatus = LineRunStatus.Busy;
SecondMoveInfo.EndMove();
......
source/DeviceLibrary/server/LineServer.cs
......@@ -174,9 +174,7 @@ namespace OnlineStore.DeviceLibrary
}
}
foreach (int id in IdList)
{
// foreach (BoxInfo box in BoxMap.Values)
//{
{
BoxInfo box = GetBoxInfo(id);
if (box != null)
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!