Skip to content

孙克 / RC30-AutoInOutStore

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

修复任务重复, 翻译文字错误

1 个父辈 86674fa8
内嵌 并排
正在显示 4 个修改的文件 包含 47 行增加 和 6 行删除
source/ACSingleStore/Properties/Resource.en-US.resx
...@@ -1210,6 +1210,6 @@ ...@@ -1210,6 +1210,6 @@
<value> debug mode </value> <value> debug mode </value>
</data> </data>
<data name="InstoreInfo" xml:space="preserve"> <data name="InstoreInfo" xml:space="preserve">
<value> batch storage and retrieval info: sorage: </value> <value> batch storage and retrieval info: storage: </value>
</data> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -1326,6 +1326,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1326,6 +1326,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + " 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败，重新加入等待队列"); LogUtil.info(LOGGER, StoreName + " 执行排队中的出库【" + currInOutFixture.ToStr() + "】失败，重新加入等待队列");
AddWaitOutInfo(currInOutFixture); AddWaitOutInfo(currInOutFixture);
} }
else
{
TestADelWaitOutInfo(currInOutFixture);
}
} }
} }
} }
...@@ -2027,6 +2031,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -2027,6 +2031,10 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列"); LogUtil.info(LOGGER, StoreName + " 执行出库【" + currInOutFixture.ToStr() + "】失败，加入等待队列");
AddWaitOutInfo(currInOutFixture); AddWaitOutInfo(currInOutFixture);
} }
else
{
TestADelWaitOutInfo(currInOutFixture);
}
if (autoNext) if (autoNext)
{ {
autoMsg = ResourceControl.GetString("自动出库", "自动出库") + "：" + posId; autoMsg = ResourceControl.GetString("自动出库", "自动出库") + "：" + posId;
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -923,7 +923,7 @@ namespace OnlineStore.DeviceLibrary
return; return;
} }
} }
OutStoreLog("出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)"); OutStoreLog($"出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点:{StoreMove.MoveParam.MoveP.Middle_P2}),升降轴至P5(库位出库前点:{StoreMove.MoveParam.MoveP.UpDown_P5})");
ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed); ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
ACAxisMove(Config.Middle_Axis, StoreMove.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed); ACAxisMove(Config.Middle_Axis, StoreMove.MoveParam.MoveP.Middle_P2, Config.MiddleAxis_P2_Speed);
...@@ -1078,8 +1078,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1078,8 +1078,10 @@ namespace OnlineStore.DeviceLibrary
storeStatus = StoreStatus.StoreOnline; storeStatus = StoreStatus.StoreOnline;
LogUtil.info(LOGGER, "【" + posId + "】出库结束，耗时【" + FormUtil.GetSpanStr(InOutWatch.Elapsed) + "】累积出库： " + AutomaticBaiting.BatchOutStoreCount + "盘共" + AutomaticBaiting.BatchOutStoreHeight + "mm"); LogUtil.info(LOGGER, "【" + posId + "】出库结束，耗时【" + FormUtil.GetSpanStr(InOutWatch.Elapsed) + "】累积出库： " + AutomaticBaiting.BatchOutStoreCount + "盘共" + AutomaticBaiting.BatchOutStoreHeight + "mm");
StoreMove.EndMove(); StoreMove.EndMove();
preProTime = DateTime.Now;
storeRunStatus = StoreRunStatus.Runing; storeRunStatus = StoreRunStatus.Runing;
InOutEndProcess(StoreMoveType.OutStore); InOutEndProcess(StoreMoveType.OutStore);
} }
else else
{ {
...@@ -1231,8 +1233,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -1231,8 +1233,21 @@ namespace OnlineStore.DeviceLibrary
public void AddWaitOutInfo(FixtureCodeInfo code) public void AddWaitOutInfo(FixtureCodeInfo code)
{ {
lock (waitOutListLock)
{//判断已经有此库位号的出库信息，直接抛弃不处理 if (StoreMove.MoveParam != null)
{
if (StoreMove.MoveParam.PositionNum == code.PosId)
{
LogUtil.info("【" + code.PosId + "】 该任务已经在执行,直接抛弃");
return;
}
}
lock (waitOutListLock)
{
//判断已经有此库位号的出库信息，直接抛弃不处理
List<FixtureCodeInfo> list = (from m in waitOutStoreList where m.PosId.Equals(code.PosId) select m).ToList<FixtureCodeInfo>(); List<FixtureCodeInfo> list = (from m in waitOutStoreList where m.PosId.Equals(code.PosId) select m).ToList<FixtureCodeInfo>();
if (list.Count > 0) if (list.Count > 0)
{ {
...@@ -1244,7 +1259,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -1244,7 +1259,20 @@ namespace OnlineStore.DeviceLibrary
} }
} }
} }
public void TestADelWaitOutInfo(FixtureCodeInfo code)
{
lock (waitOutListLock)
{
//判断已经有此库位号的出库信息，直接抛弃不处理
List<FixtureCodeInfo> list = (from m in waitOutStoreList where m.PosId.Equals(code.PosId) select m).ToList<FixtureCodeInfo>();
if (list.Count > 0)
{
LogUtil.info($"当前队列任务数:{waitOutStoreList.Count} 【" + code.ToStr() + "】 【" + code.PosId + "】发现出库队列有重复任务，删除该队列任务");
waitOutStoreList.Remove(list[0]);
LogUtil.info($"waitOutStoreList:{waitOutStoreList.Count}");
}
}
}
#region 自动出入库循环代码 #region 自动出入库循环代码
public string GetAutoPosid(bool isNext) public string GetAutoPosid(bool isNext)
{ {
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -450,6 +450,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -450,6 +450,7 @@ namespace OnlineStore.DeviceLibrary
LastWidth = StoreManager.Config.Default_TrayWidth; LastWidth = StoreManager.Config.Default_TrayWidth;
if (LastWidth.Equals(0)) if (LastWidth.Equals(0))
{ {
InStoreLog($" 尺寸传感器状态 13:{IOManager.IOValue(IO_Type.WidthCheck2)},7:{IOManager.IOValue(IO_Type.WidthCheck1)}");
//料盘检测2亮为13寸盘，其他都认为是7寸盘 //料盘检测2亮为13寸盘，其他都认为是7寸盘
if (IOManager.IOValue(IO_Type.WidthCheck2).Equals(IO_VALUE.HIGH)) if (IOManager.IOValue(IO_Type.WidthCheck2).Equals(IO_VALUE.HIGH))
{ {
...@@ -461,7 +462,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -461,7 +462,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
LastWidth = 13; LastWidth = 100;
} }
} }
LastHeight = GetHeight(); LastHeight = GetHeight();
...@@ -473,6 +474,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -473,6 +474,10 @@ namespace OnlineStore.DeviceLibrary
InStoreLog(" 未扫到二维码尺寸：【" + LastWidth + "*" + LastHeight + "】，将料盘送出，等待料盘拿走"); InStoreLog(" 未扫到二维码尺寸：【" + LastWidth + "*" + LastHeight + "】，将料盘送出，等待料盘拿走");
SendTrayOut(); SendTrayOut();
} }
//else if (LastWidth == 0) {
// InStoreLog(" 未检测到料盘宽度：【" + LastWidth + "*" + LastHeight + "】，将料盘送出，等待料盘拿走");
// SendTrayOut();
//}
else else
{ {
StoreMove.NextMoveStep(StoreMoveStep.AUTO_I08_GetPosId); StoreMove.NextMoveStep(StoreMoveStep.AUTO_I08_GetPosId);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!