Skip to content

李娜 / SO827-AssemblyLine

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

出料机构提示文字修改

1 个父辈 d4dcd359
内嵌 并排
正在显示 6 个修改的文件 包含 29 行增加 和 24 行删除
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
......@@ -7,17 +7,17 @@ PRO,0,是否是用来出料,IsCanOut,0,,,,,,,,,,,,
PRO,0,上料流水线入口AGV小车站号名称,AgvInName,T1_1,,,,,,,,,,,,
PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,T1_2,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
AXIS,0,轴一提升上料轴,Batch_Axis,5,HC,,50000,10000,10000,4000,20000,10000,10,100,0,0
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,499471,,,,,,,,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-50,,,,,,,,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,447600,,,,,,,,,,,,
AXIS,0,轴一提升上料轴,Batch_Axis,5,HC,,30000,10000,10000,500,4000,10000,10,100,0,0
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,490700,,,,,,,,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-11100,,,,,,,,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,436200,,,,,,,,,,,,
PRO,0,提升上料轴P1速度,BatchAxis_P1Speed,20000,,,,,,,,,,,,
PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,20000,,,,,,,,,,,,
PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,8000,,,,,,,,,,,,
PRO,0,提升上料轴P4速度/料盘拿走后提升轴下降速度,BatchAxis_P4Speed,10000,,,,,,,,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,1000,,,,,,,,,,,,
PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,804,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
AXIS,0,轴二移栽上下轴,UpDown_Axis,6,HC,,50000,10000,10000,4000,20000,10000,10,100,0,0
AXIS,0,轴二移栽上下轴,UpDown_Axis,6,HC,,40000,50000,50000,500,4000,10000,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,,,,,,,,,,,
PRO,0,移栽上下轴P2移栽机构下降位置,UpDownP2List,0=11000;8=245500;12=242400;28=215600;36=205200;48=203800,,,,,,,,,,,,
PRO,0,移栽上下轴P3取料位置,UpDownAxisP3,75000,,,,,,,,,,,,
......
source/DeviceLibrary/LineConfig/TrayList.data
{"TrayNum":101,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:01:45.6853967+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":101,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":102,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:02:36.2332879+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":102,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":103,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:04:55.0772293+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":103,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":106,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:05:31.2682993+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":106,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":107,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:09:47.1249335+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":107,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":108,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T09:22:14.8718857+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":108,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":110,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:00:38.0075257+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":110,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":112,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T11:08:27.8623999+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":112,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":101,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T14:41:07.0921861+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":101,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":104,"IsFull":true,"InOrOutStore":1,"ShowMsg":"找到多个有效的条码","LastUpdateTime":"2021-03-27T14:41:26.724309+08:00","InoutPar":{"WareCode":"=7x12=640262*33330032*7FDAO0264G*3000*8976##=7x12=985022*36000619*10-16*2500*0A162319##","PosId":"","TrayNumber":104,"PlateH":12,"PlateW":7,"IsNG":true,"NgMsg":"找到多个有效的条码","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"B102","rfidLoc":0}}
{"TrayNum":107,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T14:40:03.607555+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":107,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
{"TrayNum":111,"IsFull":false,"InOrOutStore":0,"ShowMsg":"","LastUpdateTime":"2021-03-27T14:42:00.4012352+08:00","InoutPar":{"WareCode":"","PosId":"","TrayNumber":111,"PlateH":0,"PlateW":0,"IsNG":false,"NgMsg":"","urgentReel":false,"cutReel":false,"smallReel":false,"rfid":"","rfidLoc":0}}
source/DeviceLibrary/assemblyLine/EquipBase.cs
......@@ -671,6 +671,10 @@ namespace OnlineStore.DeviceLibrary
}
protected void InLog(string msg )
{
if (OnlyProOutTray)
{
msg = msg.Replace("入库", "移栽");
}
string posId = MoveInfo.MoveParam != null ? "[" + currTrayNum + "][" + MoveInfo.MoveParam.PosId + "][" + MoveInfo.MoveParam.WareCode + "]" : "";
//baseConfig.DType.Equals(DeviceType.HYEquip)
if (baseConfig.DType.Equals(DeviceType.MoveEquip))
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -1046,8 +1046,8 @@ namespace OnlineStore.DeviceLibrary
string buchongStr = "";
if (isLast)
{
buchongStr = "(最后一盘料已补充5)";
height += 5;
buchongStr = "(最后一盘料已补充1)";
height += 1;
}
////如果检测出<=15,都按照8计算
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -675,15 +675,20 @@ namespace OnlineStore.DeviceLibrary
{
if (!LineServer.IsInStorePro(DeviceID, MoveInfo.MoveParam.PosId))
{
string msg = "料仓开始入库";
if (OnlyProOutTray)
{
msg = "出料机构取料";
}
MoveInfo.NextMoveStep(LineMoveStep.MI_15_SendPosToStore);
InLog("入库 " + MoveInfo.SLog + "，再次通知BOX开始入库，等待3000");
InLog("入库 " + MoveInfo.SLog + "，再次通知"+ msg + "，等待3000");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
LineServer.StartInStore(DeviceID, MoveInfo.MoveParam);
sendCount++;
if (sendCount >= 3)
{
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + " 等待BOX开始入库超时 已发送" + sendCount + "次";
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + " 等待"+ msg + "超时 已发送" + sendCount + "次";
LogUtil.error(WarnMsg );
Alarm(LineAlarmType.IoSingleTimeOut);
}
......
source/DeviceLibrary/server/LineServer.cs
......@@ -131,12 +131,12 @@ namespace OnlineStore.DeviceLibrary
/// <returns></returns>
public static bool BoxCanReviceTray(int id, out string NotOkMsg)
{
string str = "可以入库";
string str = "料仓"+id+"可以入库";
if (id.Equals(7))
{
str = "取料";
str = "出料机构可取料";
}
NotOkMsg = $" [料仓{id}{str}：离线] ";
NotOkMsg = $" [{str}：离线] ";
BoxInfo box = GetBoxInfo(id);
if (box != null)
{
......@@ -144,17 +144,17 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - box.LastMsgTime;
if (span.TotalSeconds > ClientKeepSecond)
{
NotOkMsg = $" [料仓{id}{str}：离线] ";
NotOkMsg = $" [{str}：离线] ";
return false;
}
else if (!box.HasTray.Equals(0))
{
NotOkMsg = $" [料仓{id}{str}：仓门口有料] ";
NotOkMsg = $" [{str}：仓门口有料] ";
return false;
}
else if (!box.SAlarmType.Equals(LineAlarmType.None))
{
NotOkMsg = $" [料仓{id}{str}：报警中] ";
NotOkMsg = $" [{str}：报警中] ";
return false;
}
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!