Skip to content

孙克 / ACSingleStore

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

改出库逻辑为舱门口判断是否有盘

1 个父辈 aef9ef72
全部展开
内嵌 并排
正在显示 5 个修改的文件 包含 33 行增加 和 20 行删除
source/ACSingleStore/ResourceCulture.cs
...@@ -42,7 +42,7 @@ namespace OnlineStore ...@@ -42,7 +42,7 @@ namespace OnlineStore
LoadData(); LoadData();
} }
} }
private static char spilt = ','; private static char spilt = '#';
private static void LoadData() private static void LoadData()
{ {
ResourceControl.GetChinaStringEvent += GetChinaString; ResourceControl.GetChinaStringEvent += GetChinaString;
......
source/DeviceLibrary/ResourceControl.cs
...@@ -393,5 +393,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -393,5 +393,9 @@ namespace OnlineStore.DeviceLibrary
/// 出库完成 /// 出库完成
/// </summary> /// </summary>
public static string OutStorEnd = "OutStorEnd"; public static string OutStorEnd = "OutStorEnd";
public static string take_out_reel_failure = "take_out_reel_failure";
public static string safety_grating_covered = "safety_grating_covered";
} }
} }
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -658,13 +658,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -658,13 +658,13 @@ namespace OnlineStore.DeviceLibrary
else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack) else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
{ {
//if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW)) //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
if(Config.IsUse_Tray_Check.Equals(1)) //if(Config.IsUse_Tray_Check.Equals(1))
{ //{
StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray); // StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray);
OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High "); // OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High ");
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH)); // StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
} //}
else //else
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_08_ToDoorPosition); StoreMove.NextMoveStep(StoreMoveStep.SO_08_ToDoorPosition);
OutStoreLog("出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点), "); OutStoreLog("出库：SO_08 走到料门口，旋转轴至P1(待机点)升降轴至P2(进料口出料前点), ");
...@@ -725,17 +725,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -725,17 +725,29 @@ namespace OnlineStore.DeviceLibrary
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_12_DeviceOutFromDoor) else if (StoreMove.MoveStep == StoreMoveStep.SO_12_DeviceOutFromDoor)
{ {
if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW)) //改为出库完成
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = posId;
lastPosIdStatus = StoreStatus.OutStorEnd;
storeStatus = StoreStatus.OutStorEnd;
SendLineStatus();
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_13_CheckTray);
SO_14_GoBack(); OutStoreLog($"出库：检测到料盘 SO_13 等待TrayCheck_Fixture= LOW && TrayCheck_Door=high");
} }
else else
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_13_CheckTray); StoreMove.NextMoveStep(StoreMoveStep.SO_TakeReelFaile);
OutStoreLog("出库：SO_13 等待TrayCheck_Fixture= LOW "); SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.LOW)); OutStoreLog($"料叉没有成功取出料盘,请检查库位[{posId}]");
} }
//改为出库完成
}
else if (StoreMove.MoveStep == StoreMoveStep.SO_TakeReelFaile)
{
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
SetWarnMsg(ResourceControl.take_out_reel_failure, posId);
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray)
{ {
...@@ -822,11 +834,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -822,11 +834,7 @@ namespace OnlineStore.DeviceLibrary
} }
private void SO_14_GoBack() private void SO_14_GoBack()
{ {
//改为出库完成
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = posId;
lastPosIdStatus = StoreStatus.OutStorEnd;
storeStatus = StoreStatus.OutStorEnd;
StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack); StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack);
OutStoreLog("出库：SO_14 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成"); OutStoreLog("出库：SO_14 升降轴返回，轴2至P1(待机点) ,关闭仓门,更改状态为出库完成");
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -257,6 +257,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -257,6 +257,7 @@ namespace OnlineStore.DeviceLibrary
/// 料仓出库。。。等待200毫秒再次验证料盘是否拿走 /// 料仓出库。。。等待200毫秒再次验证料盘是否拿走
/// </summary> /// </summary>
SO_16_CheckIsTake=116, SO_16_CheckIsTake=116,
SO_TakeReelFaile,
#endregion #endregion
...@@ -264,7 +265,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -264,7 +265,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 入库检测 /// 入库检测
/// </summary> /// </summary>
SI_00_TrayCheck=200, SI_00_TrayCheck =200,
/// <summary> /// <summary>
/// 入库，。定位气缸下降 /// 入库，。定位气缸下降
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!