Skip to content

孙克 / ACSingleStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 8df519a3 由 刘韬
选项

优化报警文字提示

1 个父辈 9d8c3922
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 18 行增加 和 13 行删除
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 0818bd99307b8d6c0337a100c2c6c2f524782d02")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 9d8c3922bd46e1f1f4a849ae9b7c4946bc7c9e4d")]
[assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/DeviceLibrary/ResourceControl.cs
......@@ -350,6 +350,8 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
public static string AxisAlarm = "AxisAlarm";
public static string CustAlarm = "CustAlarm";
public static string DoorHasReel = "DoorHasReel";
public static string DoorIOError = "DoorIOError";
/// <summary>
/// 等待信号{0}={1}超时 1084
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -355,7 +355,7 @@ namespace OnlineStore.DeviceLibrary
{
if (StoreMove.IsTimeOut(out _, 20))
{
SetWarnMsg(ResourceControl.CustAlarm, "Wait TrayCheck_Door=HIGH Timeout");
SetWarnMsg(ResourceControl.DoorHasReel);
}
return;
}
......@@ -397,7 +397,8 @@ namespace OnlineStore.DeviceLibrary
{
InStoreLog("入库：SI_04_CompressWare 压紧物品(有压紧轴的才需要此步骤)，压紧轴至P3(压紧前点) 开始");
StoreMove.NextMoveStep(StoreMoveStep.SI_04_CompressWare);
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed); }
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
}
else
{
SI_05_DeviceToDoor();
......@@ -914,7 +915,7 @@ namespace OnlineStore.DeviceLibrary
else
{
OutStoreLog("出库：SO_15_WaitTake 等待拿走物品 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW, ResourceControl.GetString(ResourceControl.TakeTrayGo)));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
}
}
......@@ -932,7 +933,7 @@ namespace OnlineStore.DeviceLibrary
StoreMove.NextMoveStep(StoreMoveStep.SO_16_CheckIsTake);
OutStoreLog("出库：SO_16_CheckIsTake 再次等待物品是否已拿走 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(200));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW, ResourceControl.GetString(ResourceControl.TakeTrayGo)));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
}
else
......@@ -958,7 +959,7 @@ namespace OnlineStore.DeviceLibrary
{
StoreMove.NextMoveStep(StoreMoveStep.SO_091_WaitNoTray);
OutStoreLog("出库：SO_091 打开仓门，等待门口无料盘 ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.LOW, ResourceControl.GetString(ResourceControl.TakeTrayGo)));
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor();
}
......
source/DeviceLibrary/acSingleStore/DoorControl.cs
......@@ -46,8 +46,8 @@ namespace OnlineStore.DeviceLibrary
DoorRunMonitorEnable = true;
if (needwait)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Up, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.LOW, ResourceControl.GetString(ResourceControl.DoorIOError)));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Up, IO_VALUE.HIGH, ResourceControl.GetString(ResourceControl.DoorIOError)));
}
}
/// <summary>
......@@ -75,8 +75,8 @@ namespace OnlineStore.DeviceLibrary
DoorRunMonitorEnable = true;
if (needwait)
{
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.HIGH));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Up, IO_VALUE.LOW));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Down, IO_VALUE.HIGH, ResourceControl.GetString(ResourceControl.DoorIOError)));
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Door_Up, IO_VALUE.LOW, ResourceControl.GetString(ResourceControl.DoorIOError)));
}
}
void CheckDoorState() {
......
source/DeviceLibrary/store/KTK_Store.cs
......@@ -328,7 +328,7 @@ namespace OnlineStore.DeviceLibrary
{
//msg = StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "收到原点完成信号，当前位置[" + outCount + "]，误差过大，需要报警";
SetWarnMsgAndLog(ResourceControl.AxisHomeMoveAlarm, StoreMove.MoveStep + "", moveAxis.GetNameStr(), outCount + "");
SetWarnMsgAndLog(ResourceControl.AxisHomeMoveAlarm, StoreMove.MoveStep + "", moveAxis.GetNameStr());
msg = WarnObj.WarnMsg;
LogUtil.error(LOGGER, msg);
}
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
......@@ -156,7 +156,7 @@ namespace OnlineStore.DeviceLibrary
{
}
public static WaitResultInfo WaitIO(string ioType, IO_VALUE ioValue)
public static WaitResultInfo WaitIO(string ioType, IO_VALUE ioValue,string mimo="")
{
WaitResultInfo wait = new WaitResultInfo();
wait.CanWhileMoveCount = 0;
......@@ -164,6 +164,7 @@ namespace OnlineStore.DeviceLibrary
wait.IoType = ioType;
wait.IoValue = ioValue;
wait.IsEnd = false;
wait.Mimo = mimo;
return wait;
}
public static WaitResultInfo WaitAxis(ConfigMoveAxis axis,int targetPosition,int targetSpeed )
......@@ -266,7 +267,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (WaitType == 2)
{
return ResourceControl.GetString(ResourceControl.WaitIo, "IO信号等待") + "【" + IoType + "】=【" + IoValue + "】";
return ResourceControl.GetString(ResourceControl.WaitIo, "IO信号等待") + "【" +Mimo+ IoType+" "+ StoreManager.Config.StoreDIList[IoType].ElectricalDefinition + "】=【" + IoValue + "】";
}
else if (WaitType == 3)
{
......@@ -342,6 +343,7 @@ namespace OnlineStore.DeviceLibrary
/// 高度
/// </summary>
public int HeightValue { get; set; }
public string Mimo { get; set; }
}
public enum StoreMoveType
{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!