Skip to content

孙克 / RC1250-AssemblyLine

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

增加11-18托盘检测信号。禁用托盘时如果是入库料清除入库任务。

1 个父辈 5a5a5d00
内嵌 并排
正在显示 12 个修改的文件 包含 36 行增加 和 19 行删除
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -59,6 +59,7 @@ namespace OnlineStore.AssemblyLine
lblName.Text = equipBean.Name;
LoadDP2();
LoadDP3();
chbUseTrayCheck.Visible = equipBean.Config.DIList.ContainsKey(IO_Type.TrayCheck);
chbUseTrayCheck.Checked = LineManager.useTrayCheck.Contains(equipBean.DeviceID);
IsLoad = true;
}
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
......@@ -9,7 +9,7 @@ PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C4,,,,,
,,,,,,,,,
AXIS,0,轴二提升上料轴,Batch_Axis,3,COM2,0,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6515100,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-50100,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-53000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,5926000,,,,,
PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,4000,,,,,
PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/Config_Line.csv
......@@ -53,12 +53,12 @@ PRO,0,移栽装置15-托盘-RFID-IP,PRO_RFIP_015,192.168.210.125,,,,,
PRO,0,移栽装置16-托盘-RFID-IP,PRO_RFIP_016,192.168.210.126,,,,,
PRO,0,移栽装置17-托盘-RFID-IP,PRO_RFIP_017,192.168.210.128,,,,,
PRO,0,移栽装置18-托盘-RFID-IP,PRO_RFIP_018,192.168.210.129,,,,,
PRO,0,移栽装置19-托盘-RFID-IP,PRO_RFIP_019,192.168.210.131,,,,,
PRO,0,移栽装置20-托盘-RFID-IP,PRO_RFIP_020,192.168.210.132,,,,,
PRO,0,出料移栽1-托盘-RFID-IP,PRO_RFIP_201,192.168.210.119,,,,,
PRO,0,出料移栽2-托盘-RFID-IP,PRO_RFIP_202,192.168.210.122,,,,,
PRO,0,出料移栽3-托盘-RFID-IP,PRO_RFIP_203,192.168.210.127,,,,,
PRO,0,出料移栽4-托盘-RFID-IP,PRO_RFIP_204,192.168.210.130,,,,,
PRO,0,移栽装置19-托盘-RFID-IP,PRO_RFIP_019,192.168.210.131,,,,,
PRO,0,移栽装置20-托盘-RFID-IP,PRO_RFIP_020,192.168.210.132,,,,,
,0,入料流水线1-托盘-RFID-IP,PRO_RFIP_101,192.168.210.101,,,,,
PRO,0,入料流水线2-托盘-RFID-IP,PRO_RFIP_102,192.168.210.110,,,,,
PRO,0,入料流水线3-托盘-RFID-IP,PRO_RFIP_103,192.168.210.116,,,,,
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_03.csv
......@@ -4,7 +4,7 @@ PRO,0,是否存放的大料盘,IsBigTray,1,,,,,
,,,,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,11,COM3,0,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-5000,,,,,
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-10000,,,,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=108000;48=28680;8=126800;44=42800;16=96800;24=76800;32=64800;56=27800,,,,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=148000;48=90000;8=160000;44=83000;16=140000;24=130000;32=104000;56=70000,,,,,
PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,500,,,,,
......@@ -16,8 +16,8 @@ PRO,0,移栽上下轴原点加速度,UpdownAxis_HomeAddSpeed,200,,,,,
PRO,0,移栽上下轴走到待机点P1速度,UpdownAxis_P1Speed,400,,,,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,600,,,,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,600,,,,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=8000;,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=97200;13X44=45200;15X44=43000;15X32=65000;13X12=110200;11X12=112000;13X24=57000,,,,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,13X16=144000;15X24=122000;13X44=86000;15X44=83000;15X32=105000;13X12=150000;11X12=152000,,
,,,,,,,,,
DI,3,进仓03阻挡1托盘检测,StopCylinder_Check1,0,PRO_AOI_IP_21,0,进仓03阻挡1托盘检测,X291,X291
DI,3,进仓03阻挡2托盘检测,StopCylinder_Check2,1,PRO_AOI_IP_21,0,进仓03阻挡2托盘检测,X292,X292
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_11.csv
......@@ -45,8 +45,8 @@ DI,201,出料1前后气缸前进端,BeforeAfterCylinder_Before,9,PRO_AOI_IP_30,,出料1前后
DI,201,出料1前后气缸后退端,BeforeAfterCylinder_After,10,PRO_AOI_IP_30,,出料1前后气缸后退端,X441,X441
DI,201,出料1夹料气缸夹紧端,ClampCylinder_Slack,11,PRO_AOI_IP_30,,出料1夹料气缸夹紧端,X442,X442
DI,201,出料1夹料气缸放松端,ClampCylinder_Tighten,12,PRO_AOI_IP_30,,出料1夹料气缸放松端,X443,X443
,,,,13,PRO_AOI_IP_30,,出料1上下气缸上升端,X444,X444
,,,,14,PRO_AOI_IP_30,,出料1上下气缸下降端,X445,X445
DI,11,进仓11料盘检测,TrayCheck,13,PRO_AOI_IP_30,0,进仓11料盘检测,X444,X444
DI,12,进仓12料盘检测,TrayCheck,14,PRO_AOI_IP_30,0,进仓12料盘检测,X445,X445
,,,,15,PRO_AOI_IP_30,,,X446,X446
,,,,,,,,,
DO,11,进仓11阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_29,0,进仓11阻挡1下降SOL,Y411,Y411
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_13.csv
......@@ -45,8 +45,8 @@ DI,202,出料2前后气缸前进端,BeforeAfterCylinder_Before,9,PRO_AOI_IP_32,,出料2前后
DI,202,出料2前后气缸后退端,BeforeAfterCylinder_After,10,PRO_AOI_IP_32,,出料2前后气缸后退端,X481,X481
DI,202,出料2夹料气缸夹紧端,ClampCylinder_Slack,11,PRO_AOI_IP_32,,出料2夹料气缸夹紧端,X482,X482
DI,202,出料2夹料气缸放松端,ClampCylinder_Tighten,12,PRO_AOI_IP_32,,出料2夹料气缸放松端,X483,X483
,,,,13,PRO_AOI_IP_32,,出料2上下气缸上升端,X484,X484
,,,,14,PRO_AOI_IP_32,,出料2上下气缸下降端,X485,X485
DI,13,进仓13料盘检测,TrayCheck,13,PRO_AOI_IP_32,0,进仓13料盘检测,X484,X484
DI,14,进仓14料盘检测,TrayCheck,14,PRO_AOI_IP_32,0,进仓14料盘检测,X485,X485
,,,,15,PRO_AOI_IP_32,,,X486,X486
,,,,,,,,,
DO,13,进仓13阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_31,0,进仓13阻挡1下降SOL,Y451,Y451
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_15.csv
......@@ -45,8 +45,8 @@ DI,203,出料3前后气缸前进端,BeforeAfterCylinder_Before,9,PRO_AOI_IP_34,,出料3前后
DI,203,出料3前后气缸后退端,BeforeAfterCylinder_After,10,PRO_AOI_IP_34,,出料3前后气缸后退端,X521,X521
DI,203,出料3夹料气缸夹紧端,ClampCylinder_Slack,11,PRO_AOI_IP_34,,出料3夹料气缸夹紧端,X522,X522
DI,203,出料3夹料气缸放松端,ClampCylinder_Tighten,12,PRO_AOI_IP_34,,出料3夹料气缸放松端,X523,X523
,,,,13,PRO_AOI_IP_34,,出料3上下气缸上升端,X524,X524
,,,,14,PRO_AOI_IP_34,,出料3上下气缸下降端,X525,X525
DI,15,进仓15料盘检测,TrayCheck,13,PRO_AOI_IP_34,0,进仓15料盘检测,X524,X524
DI,16,进仓16料盘检测,TrayCheck,14,PRO_AOI_IP_34,0,进仓16料盘检测,X525,X525
,,,,15,PRO_AOI_IP_34,,,X526,X526
,,,,,,,,,
DO,15,进仓15阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_33,0,进仓15阻挡1下降SOL,Y491,Y491
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_17.csv
......@@ -45,8 +45,8 @@ DI,204,出料4前后气缸前进端,BeforeAfterCylinder_Before,9,PRO_AOI_IP_36,0,出料4前
DI,204,出料4前后气缸后退端,BeforeAfterCylinder_After,10,PRO_AOI_IP_36,0,出料4前后气缸后退端,X561,X561
DI,204,出料4夹料气缸夹紧端,ClampCylinder_Slack,11,PRO_AOI_IP_36,0,出料4夹料气缸夹紧端,X562,X562
DI,204,出料4夹料气缸放松端,ClampCylinder_Tighten,12,PRO_AOI_IP_36,0,出料4夹料气缸放松端,X563,X563
,,,,13,PRO_AOI_IP_36,0,出料4上下气缸上升端,X564,X564
,,,,14,PRO_AOI_IP_36,0,出料4上下气缸下降端,X565,X565
DI,17,进仓17料盘检测,TrayCheck,13,PRO_AOI_IP_36,0,进仓17料盘检测,X564,X564
DI,18,进仓18料盘检测,TrayCheck,14,PRO_AOI_IP_36,0,进仓18料盘检测,X565,X565
,,,,15,PRO_AOI_IP_36,0,,X566,X566
,,,,,,,,,
DO,17,进仓17阻挡1下降SOL,StopCylinder_Down1,0,PRO_AOI_IP_35,0,进仓17阻挡1下降SOL,Y531,Y531
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_20.csv
类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
,,,,,,,,,
PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,1,COM3,1,,,
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -701,7 +701,7 @@ namespace OnlineStore.DeviceLibrary
return false;
}
public bool RemoveInStore(InOutParam param, string logName = "料盘已移走")
public bool RemoveInStore(InOutParam param, string logName = "料盘已移走", bool IsCancel = false)
{
if (waitInStoreList.Count > 0)
{
......@@ -722,7 +722,11 @@ namespace OnlineStore.DeviceLibrary
if (reIndex >= 0)
{
waitInStoreList.RemoveAt(reIndex);
LogInfo("*******"+ logName + "，清理入库任务：【" + param.ToStr() + "】");
LogInfo("*******" + logName + "，清理入库任务：【" + param.ToStr() + "】");
if (IsCancel)
{
SServerManager.cancelPutInTask(Name, param.WareCode);
}
return true;
}
}
......
source/DeviceLibrary/assemblymanager/TrayDisableManager.cs
......@@ -47,7 +47,14 @@ namespace OnlineStore.DeviceLibrary
{
TrayDisableMap.TryAdd(trayNum, t);
}
LogUtil.info("增加托盘禁用：" + t.ToStr());
//如果托盘上物料是入库的，直接清理入库 任务
TrayInfo tray = TrayManager.GetTrayInfo(trayNum);
if (tray.IsFull && tray.InOrOutStore.Equals(1))
{
TrayManager.ClearInstore(tray, "禁用托盘[" + trayNum + "]");
}
LogUtil.info("增加托盘禁用：" + t.ToStr() + "");
}
public static void RemoveDisable(int trayNum)
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
......@@ -178,6 +178,11 @@ namespace OnlineStore.DeviceLibrary
{
TrayInfoMap = new ConcurrentDictionary<int, TrayInfo>();
}
/// <summary>
/// 只清空托盘的 入库任务,会取消入库任务
/// </summary>
/// <param name="tray">托盘信息</param>
/// <param name="msg">清理说明</param>
public static void ClearInstore(TrayInfo tray,string msg = "手动清空托盘")
{
if (tray == null)
......@@ -193,7 +198,7 @@ namespace OnlineStore.DeviceLibrary
if (storeId > 0 && (moveEquip != null))
{
//MoveEquip moveEquip = LineManager.Line.MoveEquipMap[storeId];
moveEquip.RemoveInStore(tray.InoutPar, msg);
moveEquip.RemoveInStore(tray.InoutPar, msg,true);
}
}
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!