Skip to content

孙克 / RC1250-AssemblyLine

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

料架入库：无托盘后需要返回

1 个父辈 a866d659
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 30 行增加 和 25 行删除
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
...@@ -137,7 +137,7 @@ ...@@ -137,7 +137,7 @@
// txtBusyStatus // txtBusyStatus
// //
this.txtBusyStatus.Enabled = false; this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(133, 75); this.txtBusyStatus.Location = new System.Drawing.Point(133, 82);
this.txtBusyStatus.Name = "txtBusyStatus"; this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23); this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288; this.txtBusyStatus.TabIndex = 288;
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
// label11 // label11
// //
this.label11.AutoSize = true; this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(19, 110); this.label11.Location = new System.Drawing.Point(19, 117);
this.label11.Name = "label11"; this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(105, 17); this.label11.Size = new System.Drawing.Size(105, 17);
this.label11.TabIndex = 292; this.label11.TabIndex = 292;
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
// txtHomeStatus // txtHomeStatus
// //
this.txtHomeStatus.Enabled = false; this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(133, 107); this.txtHomeStatus.Location = new System.Drawing.Point(133, 114);
this.txtHomeStatus.Name = "txtHomeStatus"; this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23); this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291; this.txtHomeStatus.TabIndex = 291;
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
// label10 // label10
// //
this.label10.AutoSize = true; this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(58, 78); this.label10.Location = new System.Drawing.Point(58, 85);
this.label10.Name = "label10"; this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17); this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289; this.label10.TabIndex = 289;
...@@ -171,7 +171,7 @@ ...@@ -171,7 +171,7 @@
// label3 // label3
// //
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(65, 46); this.label3.Location = new System.Drawing.Point(65, 53);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17); this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286; this.label3.TabIndex = 286;
...@@ -180,7 +180,7 @@ ...@@ -180,7 +180,7 @@
// label24 // label24
// //
this.label24.AutoSize = true; this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(53, 206); this.label24.Location = new System.Drawing.Point(53, 213);
this.label24.Name = "label24"; this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17); this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.TabIndex = 316; this.label24.TabIndex = 316;
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
// txtAlarmStatus // txtAlarmStatus
// //
this.txtAlarmStatus.Enabled = false; this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(133, 43); this.txtAlarmStatus.Location = new System.Drawing.Point(133, 50);
this.txtAlarmStatus.Name = "txtAlarmStatus"; this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23); this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285; this.txtAlarmStatus.TabIndex = 285;
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
// txtLimit2 // txtLimit2
// //
this.txtLimit2.Enabled = false; this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(133, 203); this.txtLimit2.Location = new System.Drawing.Point(133, 210);
this.txtLimit2.Name = "txtLimit2"; this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23); this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313; this.txtLimit2.TabIndex = 313;
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
// label22 // label22
// //
this.label22.AutoSize = true; this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(53, 174); this.label22.Location = new System.Drawing.Point(53, 181);
this.label22.Name = "label22"; this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17); this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.TabIndex = 312; this.label22.TabIndex = 312;
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
// txtLimit1 // txtLimit1
// //
this.txtLimit1.Enabled = false; this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(133, 171); this.txtLimit1.Location = new System.Drawing.Point(133, 178);
this.txtLimit1.Name = "txtLimit1"; this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23); this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309; this.txtLimit1.TabIndex = 309;
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(65, 142); this.label6.Location = new System.Drawing.Point(65, 149);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17); this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300; this.label6.TabIndex = 300;
...@@ -261,7 +261,7 @@ ...@@ -261,7 +261,7 @@
// txtHomeSingle // txtHomeSingle
// //
this.txtHomeSingle.Enabled = false; this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(133, 139); this.txtHomeSingle.Location = new System.Drawing.Point(133, 146);
this.txtHomeSingle.Name = "txtHomeSingle"; this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23); this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297; this.txtHomeSingle.TabIndex = 297;
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -371,7 +371,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -371,7 +371,7 @@ namespace OnlineStore.DeviceLibrary
Alarm(LineAlarmType.IoSingleTimeOut); Alarm(LineAlarmType.IoSingleTimeOut);
LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID + 13); LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID + 13);
} }
else if (rwSpan.TotalSeconds > 3 && span.TotalSeconds > 3) else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6)
{ {
preRWTime = DateTime.Now; preRWTime = DateTime.Now;
string msg = moveInfo.Name + " " + NotOkMsg + "已等待 " + Math.Abs(span.TotalSeconds) + "秒，重写DO："; string msg = moveInfo.Name + " " + NotOkMsg + "已等待 " + Math.Abs(span.TotalSeconds) + "秒，重写DO：";
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -97,7 +97,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -97,7 +97,7 @@ namespace OnlineStore.DeviceLibrary
private void StartReset() private void StartReset()
{ {
BatchAxisStopCheck();
ResetClearData(); ResetClearData();
lineStatus = LineStatus.ResetMove; lineStatus = LineStatus.ResetMove;
IOMove(IO_Type.SL_HddLed, IO_VALUE.HIGH); IOMove(IO_Type.SL_HddLed, IO_VALUE.HIGH);
......
source/DeviceLibrary/deviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -156,7 +156,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -156,7 +156,8 @@ namespace OnlineStore.DeviceLibrary
public static bool IsHomeMoveEnd(string portName, int slvAddr) public static bool IsHomeMoveEnd(string portName, int slvAddr)
{ {
int status = GetHomeEndStatus(portName, slvAddr); int status = GetHomeEndStatus(portName, slvAddr);
if (status >= 1) bool isOk = ACServerManager.GetBusyStatus(portName, slvAddr).Equals(0);
if (status >= 1&&isOk)
{ {
return true; return true;
} return false; } return false;
......
source/DeviceLibrary/model/LineMoveInfo.cs
...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,7 +19,7 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public int TimeOutSeconds = 60; public int TimeOutSeconds = 60;
public string Name = ""; public string Name = "";
public bool ShelfNoTray = false;
public LineMoveInfo(int storeId,string name) public LineMoveInfo(int storeId,string name)
{ {
this.Name = name; this.Name = name;
...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
} }
public string SLog public string SLog
{ {
get { return MoveStep + ""; } get { return " "+MoveStep + " "; }
} }
public void NextMoveStep(LineMoveStep step) public void NextMoveStep(LineMoveStep step)
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -806,39 +806,43 @@ namespace OnlineStore.DeviceLibrary ...@@ -806,39 +806,43 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 出料完成，判断出料线体是否有料架 /// 出料完成，判断出料线体是否有料架
/// </summary> /// </summary>
FO_34_OutCheck = 12034, // FO_34_OutCheck = 12034,
/// <summary> /// <summary>
/// 出料完成，出口顶升气缸上升 /// 出料完成，出口顶升气缸上升
/// </summary> /// </summary>
FO_35_OutTopCylinder_Up = 12035, FO_34_OutTopCylinder_Up = 12034,
/// <summary>
///出料完成， 等待料架离开定位工位
/// </summary>
FO_35_WaitLocationNoShelf,
/// <summary> /// <summary>
///出料完成， 线体横移电机运转，等待料架到达出口 ///出料完成， 线体横移电机运转，等待料架到达出口
/// </summary> /// </summary>
FO_36_SideWayLineRun = 12036, FO_36_SideWayLineRun ,
/// <summary> /// <summary>
///出料完成， 料架到达出口，线体横移电机停止 ///出料完成， 料架到达出口，线体横移电机停止
/// </summary> /// </summary>
FO_37_LineStop = 12037, FO_37_LineStop ,
/// <summary> /// <summary>
///出料完成， 料架到达出口，出口顶升下降，定位气缸下降, ///出料完成， 料架到达出口，出口顶升下降，定位气缸下降,
/// </summary> /// </summary>
FO_38_TopCylinderDown = 12038, FO_38_TopCylinderDown ,
/// <summary> /// <summary>
///出料完成， 出口线体运转，料架到达出口处, 通知AGV取空料架 ///出料完成， 出口线体运转，料架到达出口处, 通知AGV取空料架
/// </summary> /// </summary>
FO_39_OutLineRun = 12039, FO_39_OutLineRun ,
/// <summary> /// <summary>
///出料完成， AGV到达，继续转动出口线体，送走出料料架, ///出料完成， AGV到达，继续转动出口线体，送走出料料架,
/// </summary> /// </summary>
FO_40_OutLineRun = 12040, FO_40_OutLineRun,
/// <summary> /// <summary>
///出料完成， 料架送出, ///出料完成， 料架送出,
/// </summary> /// </summary>
FO_41_OutLineRun = 12041, FO_41_OutLineRun,
#endregion #endregion
#region 出料装置移栽出料，20000开始 #region 出料装置移栽出料，20000开始
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!