Skip to content

李娜 / SO664-AssemblyLine

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

取消入库任务修改。hy12增加延迟。

1 个父辈 c009eb68
内嵌 并排
正在显示 8 个修改的文件 包含 38 行增加 和 13 行删除
source/AssemblyLineClient/记录.txt
20200310 20210511
1.扫码算法更新。
2.HY12顶升之后增加延迟。
3.取消入库任务增加参数。
20200310
1.T5增加固定气缸下降DI 1.T5增加固定气缸下降DI
X93 T5固定气缸1下降端 X93 T5固定气缸1下降端
X94 T5固定气缸2下降端 X94 T5固定气缸2下降端
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -1046,7 +1046,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1046,7 +1046,7 @@ namespace OnlineStore.DeviceLibrary
//如果分配了库位，需要调用取消 //如果分配了库位，需要调用取消
if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != ""&&trayInfo.InOrOutStore.Equals(1)) if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != ""&&trayInfo.InOrOutStore.Equals(1))
{ {
SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode); SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode,false );
} }
MoveInfo.MoveParam = param; MoveInfo.MoveParam = param;
return true ; return true ;
......
source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs
...@@ -257,19 +257,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -257,19 +257,31 @@ namespace OnlineStore.DeviceLibrary
} }
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_11_TopDown)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_11_TopDown))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
if (IsNgPro()) if (IsNgPro())
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：，等待托盘检测无信号"); CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：，等待托盘检测无信号");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
} }
else else
{ {
//SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
//CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：线体转动 ，等待托盘检测无信号");
//LineRun(SecondMoveInfo);
//SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTime);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：顶升上升后等待500ms再转动皮带");
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
}
}
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTime))
{
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_12_WaitTrayLeave);
CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：线体转动 ，等待托盘检测无信号"); CheckLog(" 托盘放行" + SecondMoveInfo.SLog + "：线体转动 ，等待托盘检测无信号");
LineRun(SecondMoveInfo); LineRun(SecondMoveInfo);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
} }
}
else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave)) else if (SecondMoveInfo.IsStep(LineMoveStep.JHY_12_WaitTrayLeave))
{ {
SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave); SecondMoveInfo.NextMoveStep(LineMoveStep.JHY_13_TrayLeave);
...@@ -428,7 +440,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -428,7 +440,7 @@ namespace OnlineStore.DeviceLibrary
//如果分配了库位，需要调用取消 //如果分配了库位，需要调用取消
if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "") if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
{ {
SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode); SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode,false );
} }
SecondMoveInfo.MoveParam = inoup; SecondMoveInfo.MoveParam = inoup;
//MoveInfo.MoveParam = inoup; //MoveInfo.MoveParam = inoup;
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -640,7 +640,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -640,7 +640,7 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务"); LogUtil.error(Name + "托盘号【" + currTrayNum + "】入库信息【" + currCode.ToStr() + "】料仓未验证成功，更新为入库NG料，从waitInStoreList中删除" + reIndex + "，取消入库任务");
TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败"); TrayManager.UpdateInStoreNG(currTrayNum, true, "Box验证入库失败");
waitInStoreList.RemoveAt(reIndex); waitInStoreList.RemoveAt(reIndex);
SServerManager.cancelPutInTask(Name, currCode.WareCode); SServerManager.cancelPutInTask(Name, currCode.WareCode, true);
return false; return false;
} }
} }
...@@ -649,7 +649,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -649,7 +649,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务"); LogUtil.error(Name + "托盘信息 " + tray.ToStr() + " 与入库任务 " + currCode.ToStr() + " 不一致，从waitInStoreList中删除" + reIndex + "，取消入库任务");
waitInStoreList.RemoveAt(reIndex); waitInStoreList.RemoveAt(reIndex);
SServerManager.cancelPutInTask(Name, currCode.WareCode); SServerManager.cancelPutInTask(Name, currCode.WareCode,true);
return false; return false;
} }
} }
......
source/DeviceLibrary/assemblymanager/SServerManager.cs
...@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -363,7 +363,7 @@ namespace OnlineStore.DeviceLibrary
// 取消任务地址: /cancelPutInTask //参数: barcode // 取消任务地址: /cancelPutInTask //参数: barcode
private static string Addr_cancelPutInTask = "/rest/api/qisda/device/cancelPutInTask"; private static string Addr_cancelPutInTask = "/rest/api/qisda/device/cancelPutInTask";
public static string cancelPutInTask(string deviceName, string barcode) public static string cancelPutInTask(string deviceName, string barcode,bool disablePos)
{ {
string msg = ""; string msg = "";
try try
...@@ -376,6 +376,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -376,6 +376,7 @@ namespace OnlineStore.DeviceLibrary
Dictionary<string, string> paramMap = new Dictionary<string, string>(); Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add("barcode", barcode); paramMap.Add("barcode", barcode);
paramMap.Add("disablePos", disablePos.ToString());
string server = GetAddr(Addr_cancelPutInTask, paramMap); string server = GetAddr(Addr_cancelPutInTask, paramMap);
DateTime startTime = DateTime.Now; DateTime startTime = DateTime.Now;
...@@ -386,11 +387,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -386,11 +387,11 @@ namespace OnlineStore.DeviceLibrary
if (data == null) if (data == null)
{ {
return msg = deviceName + " cancelPutInTask【 " + barcode + "】 没有收到服务器反馈"; return msg = deviceName + " cancelPutInTask【 " + barcode + "," + disablePos + "】 没有收到服务器反馈";
} }
else if (data.code.Equals(0).Equals(false)) else if (data.code.Equals(0).Equals(false))
{ {
return msg = deviceName + " cancelPutInTask【 " + barcode + "】 ：" + data.msg; return msg = deviceName + " cancelPutInTask【 " + barcode + "," + disablePos + "】 ：" + data.msg;
} }
return ""; return "";
...@@ -455,7 +456,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -455,7 +456,7 @@ namespace OnlineStore.DeviceLibrary
if (serverResult == null) if (serverResult == null)
{ {
result.Msg = deviceName + " 【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask "; result.Msg = deviceName + " 【" + codeStr + "】结果：没有收到服务器反馈，调用 cancelPutInTask ";
cancelPutInTask(deviceName, codeStr); cancelPutInTask(deviceName, codeStr,false );
result.Param = new InOutParam(0, codeStr, "", height, width, true); result.Param = new InOutParam(0, codeStr, "", height, width, true);
result.Param.rfid = rfid; result.Param.rfid = rfid;
result.Param.IsNG = true; result.Param.IsNG = true;
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -227,6 +227,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -227,6 +227,8 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveEquip moveEquip = LineManager.Line.MoveEquipMap[storeId]; MoveEquip moveEquip = LineManager.Line.MoveEquipMap[storeId];
moveEquip.RemoveInStore(tray.InoutPar, "手动清空托盘"); moveEquip.RemoveInStore(tray.InoutPar, "手动清空托盘");
//手动清空托盘时直接取消入库任务
SServerManager.cancelPutInTask("手动清空托盘", tray.InoutPar.WareCode, false);
} }
} }
} }
......
source/DeviceLibrary/deviceLibrary/halcon/CodeManager.cs
...@@ -138,7 +138,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -138,7 +138,7 @@ namespace OnlineStore.DeviceLibrary
string r = ""; string r = "";
List<CodeInfo> tlci = EyemDecode.ModelDecoder(ref bmp); List<CodeInfo> tlci = EyemDecode.Decoder(ref bmp);
bool eyemNoCode = false; bool eyemNoCode = false;
foreach (CodeInfo code in tlci) foreach (CodeInfo code in tlci)
{ {
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -1279,7 +1279,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -1279,7 +1279,12 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降 /// 托盘放行： 阻挡上升，定位气缸下降，顶升气缸下降
/// </summary> /// </summary>
JHY_11_TopDown =5511, JHY_11_TopDown =5521,
/// <summary>
/// 托盘放行： HY12顶升气缸上升后等待500ms
/// </summary>
JHY_12_WaitTime,
/// <summary> /// <summary>
/// 托盘放行： 等待托盘检测无信号 /// 托盘放行： 等待托盘检测无信号
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!