Skip to content

孙克 / RC1250-ACPackingStore

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

尺寸分为7寸和15寸

1 个父辈 c4fb65b7
内嵌 并排
正在显示 5 个修改的文件 包含 21 行增加 和 61 行删除
source/ACPackingStore/FrmStore.cs
......@@ -182,6 +182,7 @@ namespace OnlineStore.ACPackingStore
LogUtil.info(LOGGER, "开始启动");
startTimer.Interval = 1;
startTimer.Elapsed += timer_Elapsed;
startTimer.AutoReset = false;
startTimer.Enabled = true;
}
private delegate void ShowFormDelegate();
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs
......@@ -134,7 +134,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
LogInfo("开始启动，启动时间：" + StartTime.ToString());
if (IsDebug)
if (!IsDebug)
{
//连接AGV调度
if (!AgvClient.ISConnected())
......@@ -885,14 +885,14 @@ namespace OnlineStore.DeviceLibrary
boxStatus.msg = CodeMsg;
lineOperation.msg = CodeMsg;
}
if (CodeMsg.Equals(""))
{
if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
{
boxStatus.msg = "叉子料盘检测有料，请检查";
lineOperation.msg = "叉子料盘检测有料，请检查";
}
}
//if (CodeMsg.Equals(""))
//{
// if (storeRunStatus.Equals(StoreRunStatus.Runing) && IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
// {
// boxStatus.msg = "叉子料盘检测有料，请检查";
// lineOperation.msg = "叉子料盘检测有料，请检查";
// }
//}
CodeMsg = "";
//WarnMsg = "";
//状态
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
......@@ -410,7 +410,7 @@ namespace OnlineStore.DeviceLibrary
{
if (IOValue(IO_Type.TrayCheck_3).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.TrayCheck_4).Equals(IO_VALUE.HIGH))
{
LastWidth = 13;
LastWidth = 15;
}
else if (IOValue(IO_Type.TrayCheck_1).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.TrayCheck_2).Equals(IO_VALUE.HIGH))
{
......@@ -418,6 +418,7 @@ namespace OnlineStore.DeviceLibrary
}
else
{
LastWidth = 7;
LogUtil.info("未检测到识别区料盘检测信号， 默认高度为7");
}
......
source/DeviceLibrary/ACPackingStore/PackingStoreBean.cs
......@@ -161,7 +161,7 @@ namespace OnlineStore.DeviceLibrary
foreach (AC_BOX_Bean box in this.BoxMap.Values)
{
if (!box.IsDebug)
// if (!box.IsDebug)
{
box.StartRun();
}
......@@ -192,7 +192,7 @@ namespace OnlineStore.DeviceLibrary
foreach (AC_BOX_Bean equip in BoxMap.Values)
{
//调试状态不再重置
if (!equip.IsDebug)
// if (!equip.IsDebug)
{
if (!equip.alarmType.Equals(StoreAlarmType.None))
{
......@@ -391,7 +391,7 @@ namespace OnlineStore.DeviceLibrary
foreach (AC_BOX_Bean equip in this.BoxMap.Values)
{
if (!equip.IsDebug)
// if (!equip.IsDebug)
{
equip.StopMove();
}
......@@ -407,8 +407,9 @@ namespace OnlineStore.DeviceLibrary
foreach (AC_BOX_Bean box in this.BoxMap.Values)
{
if ((box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset)) && box.IsDebug.Equals(false))
{
if ((box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset)) )
//if ((box.storeRunStatus.Equals(StoreRunStatus.HomeMoving) || box.storeRunStatus.Equals(StoreRunStatus.Reset)) && box.IsDebug.Equals(false))
{
if (box.alarmType.Equals(StoreAlarmType.None))
{
isOk = false;
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -149,14 +149,7 @@ namespace OnlineStore.LoadCSVLibrary
/// DO L侧相机光源ON Camera_Led 2 Y23 DO-23
/// </summary>
public static string Camera_Led = "Camera_Led";
///// <summary>
///// DO L侧入料口移门关闭 EntranceDoor_Close 3 Y24 DO-24
///// </summary>
//public static string EntranceDoor_Close = "EntranceDoor_Close";
///// <summary>
///// DO L侧入料口移门打开 EntranceDoor_Open 4 Y25 DO-25
///// </summary>
//public static string EntranceDoor_Open = "EntranceDoor_Open";
/// <summary>
/// DO L侧线体正转 Line_Run 5 Y26 DO-26
/// </summary>
......@@ -169,46 +162,10 @@ namespace OnlineStore.LoadCSVLibrary
/// DO L侧料仓吹气SOL StartOrStopBlow 7 Y28 DO-28
/// </summary>
public static string StartOrStopBlow = "StartOrStopBlow";
///// <summary>
///// DO L侧NG料口升降门上升SOL NGDoowCylinder_Up 8 Y29 DO-29
///// </summary>
//public static string NGDoowCylinder_Up = "NGDoowCylinder_Up";
///// <summary>
///// DO L侧NG料口升降门下降SOL NGDoorCylinder_Down 9 Y30 DO-30
///// </summary>
//public static string NGDoorCylinder_Down = "NGDoorCylinder_Down";
///// <summary>
///// DO L侧顶升装置上升SOL TopCylinder_Up 10 Y31 DO-31
///// </summary>
//public static string TopCylinder_Up = "TopCylinder_Up";
// /// <summary>
// /// DO L侧顶升装置下降SOL TopCylinder_Down 11 Y32 DO-32
// /// </summary>
//public static string TopCylinder_Down = "TopCylinder_Down";
///// <summary>
///// DO L侧定位装置上升SOL LocationCylinder_Up 12 Y33 DO-33
///// </summary>
//public static string LocationCylinder_Up = "LocationCylinder_Up";
///// <summary>
///// DO L侧定位装置下降SOL LocationCylinder_Down 13 Y34 DO-34
///// </summary>
//public static string LocationCylinder_Down = "LocationCylinder_Down";
///// <summary>
///// 进出料口门上升端 Door_Up
///// </summary>
//public static string Door_Up = "Door_Up";
///// <summary>
///// 进出料口门下降端 Door_Down
///// </summary>
//public static string Door_Down = "Door_Down";
//public static string DoorLimit = "DoorLimit";
public static string TrayCheck_Door = "TrayCheck_Door";
public static string TrayCheck_Fixture = "TrayCheck_Fixture";
// public static string TrayCheck_Fixture = "TrayCheck_Fixture";
}
public enum IO_VALUE
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!