Skip to content

孙克 / ACSingleStore

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

增加出库完成状态

1 个父辈 d14242b5
内嵌 并排
正在显示 6 个修改的文件 包含 35 行增加 和 17 行删除
source/ACSingleStore/resource/language.resource
...@@ -311,4 +311,5 @@ OutStoreFailed,出库失败,Providing failed ...@@ -311,4 +311,5 @@ OutStoreFailed,出库失败,Providing failed
WaitSingle,等待信号,Wait signal WaitSingle,等待信号,Wait signal
TimeOut,超时,Time out TimeOut,超时,Time out
Run,运行中,Runing Run,运行中,Runing
Runing,运行中,Runing
\ No newline at end of file \ No newline at end of file
Runing,运行中,Runing
OutStorEnd,出库完成,OutStorEnd
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/ResourceControl.cs
...@@ -389,5 +389,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -389,5 +389,9 @@ namespace OnlineStore.DeviceLibrary
/// 批量轴已满，请取出料盘 /// 批量轴已满，请取出料盘
/// </summary> /// </summary>
public static string OutFull = "OutFull"; public static string OutFull = "OutFull";
/// <summary>
/// 出库完成
/// </summary>
public static string OutStorEnd = "OutStorEnd";
} }
} }
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1352,7 +1352,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1352,7 +1352,10 @@ namespace OnlineStore.DeviceLibrary
if (isInSuddenDown || isNoAirCheck || if (isInSuddenDown || isNoAirCheck ||
(!storeRunStatus.Equals(StoreRunStatus.Runing)) (!storeRunStatus.Equals(StoreRunStatus.Runing))
|| storeStatus.Equals(StoreStatus.InStoreExecute) || storeStatus.Equals(StoreStatus.OutStoreExecute) || storeStatus.Equals(StoreStatus.InStoreExecute) || storeStatus.Equals(StoreStatus.OutStoreExecute)
|| storeStatus.Equals(StoreStatus.InStoreEnd) || storeStatus.Equals(StoreStatus.OutStoreBoxEnd)) || storeStatus.Equals(StoreStatus.InStoreEnd)
|| storeStatus.Equals(StoreStatus.OutStoreBoxEnd)
|| storeStatus.Equals(StoreStatus.OutStorEnd)
)
{ {
return false; return false;
} }
...@@ -1906,7 +1909,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -1906,7 +1909,8 @@ namespace OnlineStore.DeviceLibrary
{ {
boxStatus.status = (int)StoreStatus.Debugging; boxStatus.status = (int)StoreStatus.Debugging;
} }
else if (storeStatus.Equals(StoreStatus.OutStoreBoxEnd) || storeStatus.Equals(StoreStatus.InStoreEnd)) else if (storeStatus.Equals(StoreStatus.OutStoreBoxEnd) || storeStatus.Equals(StoreStatus.InStoreEnd)
|| storeStatus.Equals(StoreStatus.OutStorEnd))
{ {
boxStatus.data.Add(ParamDefine.posId, lastPosId); boxStatus.data.Add(ParamDefine.posId, lastPosId);
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -710,10 +710,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -710,10 +710,8 @@ namespace OnlineStore.DeviceLibrary
{ {
if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack);
OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门"); SO_14_GoBack();
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoorAndWait();
} }
else else
{ {
...@@ -724,10 +722,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -724,10 +722,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray) else if (StoreMove.MoveStep == StoreMoveStep.SO_13_CheckTray)
{ {
StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack); SO_14_GoBack();
OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoorAndWait();
} }
else if (StoreMove.MoveStep == StoreMoveStep.SO_14_GoBack) else if (StoreMove.MoveStep == StoreMoveStep.SO_14_GoBack)
{ {
...@@ -761,6 +756,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -761,6 +756,20 @@ namespace OnlineStore.DeviceLibrary
} }
} }
private void SO_14_GoBack()
{
StoreMove.NextMoveStep(StoreMoveStep.SO_14_GoBack);
OutStoreLog("出库：SO_13 升降轴返回，轴2至P1(待机点) ,关闭舱门,更改状态为出库完成");
ACAxisMove(Config.UpDown_Axis, StoreMove.MoveParam.MoveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
CloseDoorAndWait();
//改为出库完成
string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PositionNum : "";
lastPosId = posId;
lastPosIdStatus = StoreStatus.OutStorEnd;
storeStatus = StoreStatus.OutStorEnd;
}
private void SO_10_DeviceToDoorPro() private void SO_10_DeviceToDoorPro()
{ {
LineMoveP moveP = StoreMove.MoveParam.MoveP; LineMoveP moveP = StoreMove.MoveParam.MoveP;
......
source/DeviceLibrary/store/KTK_DeviceBase.cs
...@@ -161,8 +161,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -161,8 +161,8 @@ namespace OnlineStore.DeviceLibrary
case StoreStatus.InStoreFaild: case StoreStatus.InStoreFaild:
aa = ResourceControl.GetString(ResourceControl.InStoreFailed, "入库失败") + "（" + WarnObj.WarnMsg + "）"; aa = ResourceControl.GetString(ResourceControl.InStoreFailed, "入库失败") + "（" + WarnObj.WarnMsg + "）";
break; break;
case StoreStatus.OutStoreFaild: case StoreStatus.OutStorEnd:
aa = ResourceControl.GetString(ResourceControl.OutStoreFailed, "出库失败") + "（" + WarnObj.WarnMsg + "）"; aa = ResourceControl.GetString(ResourceControl.OutStorEnd, "出库完成") + "（" + WarnObj.WarnMsg + "）";
break; break;
} }
if (!String.IsNullOrEmpty(aa)) if (!String.IsNullOrEmpty(aa))
......
source/DeviceLibrary/store/StoreStep.cs
...@@ -93,13 +93,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -93,13 +93,13 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
OutStoreBoxEnd = 10, OutStoreBoxEnd = 10,
/// <summary> /// <summary>
/// 12=移栽出库移栽过程中（移栽完成后变成OnLine） ///11=出库完成
/// </summary> /// </summary>
OutMoveExecute = 12, OutStorEnd = 11,
/// <summary> /// <summary>
///11=出库失败 /// 12=移栽出库移栽过程中（移栽完成后变成OnLine）
/// </summary> /// </summary>
OutStoreFaild = 11, OutMoveExecute = 12,
/// <summary> /// <summary>
/// 重置中（原点返回和重置都发此状态） /// 重置中（原点返回和重置都发此状态）
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!