Skip to content

李娜 / SO827-AssemblyLine

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

bug修改

1 个父辈 10de6088
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 15 行增加 和 47 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -124,8 +124,8 @@ namespace OnlineStore.AssemblyLine ...@@ -124,8 +124,8 @@ namespace OnlineStore.AssemblyLine
} }
} }
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() + //lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + ""; // "\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块"; string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus) + "(" + canOut + ")"; lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus) + "(" + canOut + ")";
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -358,7 +358,7 @@ namespace OnlineStore.AssemblyLine ...@@ -358,7 +358,7 @@ namespace OnlineStore.AssemblyLine
停止所有料仓TToolStripMenuItem_Click(null, null); 停止所有料仓TToolStripMenuItem_Click(null, null);
} }
AgvClient.Dispose(); //AgvClient.Dispose();
if (IOManager.instance != null) if (IOManager.instance != null)
{ {
IOManager.instance.CloseAllDO(); IOManager.instance.CloseAllDO();
...@@ -438,14 +438,7 @@ namespace OnlineStore.AssemblyLine ...@@ -438,14 +438,7 @@ namespace OnlineStore.AssemblyLine
string canScanCode = ""; string canScanCode = "";
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
lblStatus.Text = lineBean.GetRunStr() + canScanCode; lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string warnMsg = ""; string warnMsg = "";
if (LineManager.Line.runStatus > LineRunStatus.Wait) if (LineManager.Line.runStatus > LineRunStatus.Wait)
...@@ -742,30 +735,7 @@ namespace OnlineStore.AssemblyLine ...@@ -742,30 +735,7 @@ namespace OnlineStore.AssemblyLine
} }
LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text); LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text);
} }
private void aGVCancelStateToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !aGVCancelStateToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(AgvClient.CurrCancelState))
{
return;
}
AgvClient.SetCancelState(result);
//robot.XrayBean.OpenXLine = result;
if (result)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
LogUtil.info(Name + " 点击：" + aGVCancelStateToolStripMenuItem.Text);
}
#region 按钮界面 #region 按钮界面
......
source/DeviceLibrary/DeviceLibrary.csproj
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="agvClient\AgvClient.cs" />
<Compile Include="assemblyLine\HY\HYEquipBase.cs" /> <Compile Include="assemblyLine\HY\HYEquipBase.cs" />
<Compile Include="assemblyLine\HY\HY_C1_SLStation.cs" /> <Compile Include="assemblyLine\HY\HY_C1_SLStation.cs" />
<Compile Include="assemblymanager\ALineManager.cs" /> <Compile Include="assemblymanager\ALineManager.cs" />
...@@ -82,7 +81,6 @@ ...@@ -82,7 +81,6 @@
<Compile Include="assemblyLine\FeedingEquip.cs" /> <Compile Include="assemblyLine\FeedingEquip.cs" />
<Compile Include="assemblymanager\RFIDManagercs.cs" /> <Compile Include="assemblymanager\RFIDManagercs.cs" />
<Compile Include="assemblymanager\SServerManager.cs" /> <Compile Include="assemblymanager\SServerManager.cs" />
<Compile Include="assemblymanager\EDataManager.cs" />
<Compile Include="assemblymanager\TrayManager.cs" /> <Compile Include="assemblymanager\TrayManager.cs" />
<Compile Include="baan\AxisBean.cs" /> <Compile Include="baan\AxisBean.cs" />
<Compile Include="baan\ClampJawBean.cs" /> <Compile Include="baan\ClampJawBean.cs" />
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -683,7 +683,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -683,7 +683,7 @@ namespace OnlineStore.DeviceLibrary
MoveEndS(); MoveEndS();
LastOutShelfId = CurrShelfId; LastOutShelfId = CurrShelfId;
InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId); InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId);
AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, ClientLevel.Low); //AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, ClientLevel.Low);
} }
} }
else if (MoveInfo.IsStep(LineMoveStep.FI_62_OutLineRun)) else if (MoveInfo.IsStep(LineMoveStep.FI_62_OutLineRun))
...@@ -693,7 +693,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -693,7 +693,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
//IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW); //IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId); InLog("上料完成，料架到达出口处, 通知AGV取空料架, 入料流程结束，更新LastOutShelfId=" + LastOutShelfId);
AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, ClientLevel.Low); //AgvClient.NeedLeave(Config.AgvOutName, LastOutShelfId, ClientLevel.Low);
} }
#endregion #endregion
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -68,8 +68,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -68,8 +68,8 @@ namespace OnlineStore.DeviceLibrary
ConfigClampJaw jawconfig = Line_Config.ClampJawMap[config.Id]; ConfigClampJaw jawconfig = Line_Config.ClampJawMap[config.Id];
FeedingEquip equip = new FeedingEquip(lineConfig.CID, config,jawconfig); FeedingEquip equip = new FeedingEquip(lineConfig.CID, config,jawconfig);
//增加AGV小车客户端 //增加AGV小车客户端
AgvClient.NodeList.Add(config.AgvInName); //AgvClient.NodeList.Add(config.AgvInName);
AgvClient.NodeList.Add(config.AgvOutName); //AgvClient.NodeList.Add(config.AgvOutName);
AddDeviceName(ioList, config.IOIPList); AddDeviceName(ioList, config.IOIPList);
FeedingEquipMap.Add(config.Id, equip); FeedingEquipMap.Add(config.Id, equip);
...@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Enabled = true; mainTimer.Enabled = true;
IoCheckTimer.Enabled = true; IoCheckTimer.Enabled = true;
AgvClient.Init(); //AgvClient.Init();
canStart = true; canStart = true;
}); });
...@@ -368,7 +368,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -368,7 +368,7 @@ namespace OnlineStore.DeviceLibrary
IoCheckTimer.Enabled = false; IoCheckTimer.Enabled = false;
mainTimer.Enabled = false; mainTimer.Enabled = false;
serverConTimer.Enabled = false ; serverConTimer.Enabled = false ;
AgvClient.SetCancelState(true); //AgvClient.SetCancelState(true);
RFIDManager.Close(); RFIDManager.Close();
//停止运行时，把阻挡气缸上升 //停止运行时，把阻挡气缸上升
//StopMove(); //StopMove();
...@@ -903,7 +903,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -903,7 +903,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.EndMove(); MoveInfo.EndMove();
mainTimer.Interval = 300; mainTimer.Interval = 300;
maxSeconds = 3; maxSeconds = 3;
AgvClient.SetCancelState(AgvClient.CurrCancelState); //AgvClient.SetCancelState(AgvClient.CurrCancelState);
LogUtil.info(Name + "所有移栽模块复位完成，打开流水线，开始运转，定时器改为300，耗时 [" + FormUtil.GetSpanStr(span) + "]"); LogUtil.info(Name + "所有移栽模块复位完成，打开流水线，开始运转，定时器改为300，耗时 [" + FormUtil.GetSpanStr(span) + "]");
} }
else if (span.TotalSeconds > 120) else if (span.TotalSeconds > 120)
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -316,7 +316,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -316,7 +316,7 @@ namespace OnlineStore.DeviceLibrary
OutLog("出库 " + MoveInfo.SLog + ": 夹料气缸夹紧，更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【MOVING】【" + DeviceID + "】"); OutLog("出库 " + MoveInfo.SLog + ": 夹料气缸夹紧，更新料盘位置【" + MoveInfo.MoveParam.WareCode + "】【MOVING】【" + DeviceID + "】");
//更新料盘位置 //更新料盘位置
SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.MOVING, DeviceID.ToString()); SServerManager.UpdateTrayLoc(Name, MoveInfo.MoveParam.WareCode, LocStatus.MOVING, DeviceID.ToString());
EDataManager.UpdateParam(DeviceID, 2, MoveInfo.MoveParam); //EDataManager.UpdateParam(DeviceID, 2, MoveInfo.MoveParam);
} }
else else
{ {
...@@ -449,7 +449,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -449,7 +449,7 @@ namespace OnlineStore.DeviceLibrary
//CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax); //CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
ClampJwa.Relax(MoveInfo, MoveInfo.MoveParam.WareCode); ClampJwa.Relax(MoveInfo, MoveInfo.MoveParam.WareCode);
EDataManager.UpdateParam(DeviceID); //EDataManager.UpdateParam(DeviceID);
} }
else if (MoveInfo.IsStep(LineMoveStep.MO_61_CylinderRelax)) else if (MoveInfo.IsStep(LineMoveStep.MO_61_CylinderRelax))
{ {
...@@ -578,7 +578,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -578,7 +578,7 @@ namespace OnlineStore.DeviceLibrary
InLog("入库 " + MoveInfo.SLog + ": 夹料气缸夹紧"); InLog("入库 " + MoveInfo.SLog + ": 夹料气缸夹紧");
ClampEmptyMove = false; ClampEmptyMove = false;
ClampJwa.Push(MoveInfo, true, MoveInfo.MoveParam.WareCode); ClampJwa.Push(MoveInfo, true, MoveInfo.MoveParam.WareCode);
EDataManager.UpdateParam(DeviceID, 1, MoveInfo.MoveParam); //EDataManager.UpdateParam(DeviceID, 1, MoveInfo.MoveParam);
} }
else if (MoveInfo.IsStep(LineMoveStep.MI_05_CylinderOpen)) else if (MoveInfo.IsStep(LineMoveStep.MI_05_CylinderOpen))
{ {
...@@ -641,7 +641,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -641,7 +641,7 @@ namespace OnlineStore.DeviceLibrary
InLog("入库 " + MoveInfo.SLog + "，夹料气缸放松"); InLog("入库 " + MoveInfo.SLog + "，夹料气缸放松");
//CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax); //CylinderMove(MoveInfo, IO_Type.ClampCylinder_Work, IO_Type.ClampCylinder_Relax);
ClampJwa.Relax(MoveInfo, MoveInfo.MoveParam.WareCode); ClampJwa.Relax(MoveInfo, MoveInfo.MoveParam.WareCode);
EDataManager.UpdateParam(DeviceID); //EDataManager.UpdateParam(DeviceID);
} }
else if (MoveInfo.IsStep(LineMoveStep.MI_12_CylinderRelax)) else if (MoveInfo.IsStep(LineMoveStep.MI_12_CylinderRelax))
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!