Skip to content

李娜 / AutoCountMachine

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

日志修改

1 个父辈 8c2f9388
内嵌 并排
正在显示 7 个修改的文件 包含 52 行增加 和 42 行删除
RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.cs
......@@ -747,7 +747,7 @@ namespace OnlineStore.AutoCountClient
return;
}
LogUtil.error("点击：打印标签 StartPrintLabel");
LogUtil.error("点击：PrintLabel 打印标签 StartPrintLabel");
string code = txtPrintCode.Text;
string num = txtPringNum.Text;
equipBean.StartPrintLabel(code, num);
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/BatchMoveBean.cs
......@@ -381,7 +381,7 @@ namespace OnlineStore.DeviceLibrary
NotOkMsg = " [" + IOManager.GetIO(wait.IoType, Robot.DeviceID).DisplayStr + "=" + wait.IoValue + "]";
wait.IsEnd = Robot.IOValue(wait.IoType).Equals(wait.IoValue);
if (!wait.IsEnd)
if (!wait.IsEnd && (!moveInfo.IsStep(StepEnum.IB23_ShelfOut)))
{
TimeSpan rwSpan = DateTime.Now - preRWTime;
//一分钟还未检测到
......@@ -390,7 +390,7 @@ namespace OnlineStore.DeviceLibrary
ConfigIO io = Robot.Config.getWaitIO(wait.IoType);
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] 等待" + NotOkMsg + " 超时 " + Math.Round(span.TotalSeconds, 1) + "秒";
LogUtil.error( WarnMsg, moveInfo.ErrorLogType);
LogUtil.error(WarnMsg, moveInfo.ErrorLogType);
if (alarmType.Equals(AlarmType.None))
{
Alarm(AlarmType.IoSingleTimeOut);
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/EquipBase.cs
......@@ -460,24 +460,28 @@ namespace OnlineStore.DeviceLibrary
}
if (level.Equals(1))
{
LogUtil.info(MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + msg);
LogUtil.info(MoveInfo.Name + "[" + code + "]" + "[" + MoveInfo.MoveStep + "] " + msg);
}
else
{
LogUtil.debug(MoveInfo.Name + "[" + MoveInfo.MoveStep + "] " + msg);
LogUtil.debug(MoveInfo.Name + "[" + code + "]" + "[" + MoveInfo.MoveStep + "] " + msg);
}
}
protected void SecWorkLog(string msg)
protected void SecWorkLog(string msg,int level=-1)
{
if (level < 0)
{
level = SecWorkLogLevel;
}
string code = SecMoveInfo.MoveParam != null ? SecMoveInfo.MoveParam.WareCode : "";
if (SecWorkLogLevel.Equals(1))
if (level.Equals(1))
{
LogUtil.info(SecMoveInfo.Name +" "+ code + " " + "[" + SecMoveInfo.MoveStep + "] " + msg);
LogUtil.info(SecMoveInfo.Name +"["+ code + "]" + "[" + SecMoveInfo.MoveStep + "] " + msg);
}
else
{
LogUtil.debug(SecMoveInfo.Name + " " + code + " " + "[" + SecMoveInfo.MoveStep + "] " + msg);
LogUtil.debug(SecMoveInfo.Name + "[" + code + "]" + "[" + SecMoveInfo.MoveStep + "] " + msg);
}
}
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/InputEquip_InStore.cs
......@@ -73,19 +73,19 @@ namespace OnlineStore.DeviceLibrary
private void IW02_UpdownToP1()
{
MoveInfo.NextMoveStep(StepEnum.IW02_UpdownToP1);
WorkLog("取料： 升降轴到待机点P1");
WorkLog("取料： 升降轴到待机点P1",0);
UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P1, Config.UpdownAxis_P1Speed);
}
private void IW03_MiddleToP2()
{
MoveInfo.NextMoveStep(StepEnum.IW03_MiddleToP2);
WorkLog("取料： 旋转轴到取料位置P2");
WorkLog("取料： 旋转轴到取料位置P2",0);
MiddleAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.Get_Middle_P2(Config), Config.MiddleAxis_P2Speed);
}
private void IW04_InoutToP2()
{
MoveInfo.NextMoveStep(StepEnum.IW04_InoutToP2);
WorkLog("取料： 进出轴前进到P2");
WorkLog("取料： 进出轴前进到P2",0);
InOutAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.Get_Inout_P2(Config), Config.InoutAxis_P2Speed);
}
protected override void WorkingProcess()
......@@ -115,14 +115,14 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.IW04_InoutToP2))
{
MoveInfo.NextMoveStep(StepEnum.IW05_UpdownToP2);
WorkLog("取料： 升降轴下降到P2");
WorkLog("取料： 升降轴下降到P2",0);
UpdownAxis.AbsMove(MoveInfo, MoveInfo.MoveParam.Get_Updown_P2(Config), Config.UpdownAxis_P2Speed);
}
else if (MoveInfo.IsStep(StepEnum.IW05_UpdownToP2))
{
MoveInfo.NextMoveStep(StepEnum.IW06_Clamping_Work);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
WorkLog("取料： 夹料气缸夹紧");
WorkLog("取料： 夹料气缸夹紧",0);
CylinderMove(MoveInfo, IO_Type.Clamping_Relax, IO_Type.Clamping_Work);
}
else if (MoveInfo.IsStep(StepEnum.IW06_Clamping_Work))
......@@ -130,14 +130,14 @@ namespace OnlineStore.DeviceLibrary
if (CylinderIsOk(IO_Type.Clamping_Relax, IO_Type.Clamping_Work))
{
MoveInfo.NextMoveStep(StepEnum.IW07_UpdownToP1);
WorkLog("取料： 升降轴到待机点P1");
WorkLog("取料： 升降轴到待机点P1",0);
UpdownAxis.AbsMove(MoveInfo, Config.UpdownAxis_P1, Config.UpdownAxis_P1Speed);
}
else
{
MoveInfo.NextMoveStep(StepEnum.IW06_Clamping_Work);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
WorkLog("取料： 夹料气缸夹紧");
WorkLog("取料： 夹料气缸夹紧",0);
CylinderMove(MoveInfo, IO_Type.Clamping_Relax, IO_Type.Clamping_Work);
}
}
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs
......@@ -41,8 +41,8 @@ namespace OnlineStore.DeviceLibrary
Init();
ledProcessTimer.Elapsed += LedProcess;
IoCheckTimer.Elapsed += IoCheckTimerProcess;
MoveInfo = new RobotMoveInfo(" 出料-取放料 ");
SecMoveInfo = new RobotMoveInfo( " 出料-贴标 ");
MoveInfo = new RobotMoveInfo(" 出料_取放料 ");
SecMoveInfo = new RobotMoveInfo( " 出料_贴标 ");
ShelfMoveInfo = new RobotMoveInfo(" 出料-ShelfMove ");
MoveZAxis = new AxisBean(RobotManager.Config.Move_Z_Axis, Name);
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs
......@@ -115,13 +115,13 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsStep(StepEnum.OT01_WaitCheck))
{
MoveInfo.NextMoveStep(StepEnum.OT02_MoveZToP1);
WorkLog("取料：取料Z轴到P1 ");
WorkLog("取料：取料Z轴到P1 ",0);
MoveZAxis.AbsMove(MoveInfo, Config.MoveZ_P1, Config.MoveZ_P1Speed);
}
else if (MoveInfo.IsStep(StepEnum.OT02_MoveZToP1))
{
MoveInfo.NextMoveStep(StepEnum.OT03_MoveXToP2);
WorkLog("取料：取料X轴到P2 ");
WorkLog("取料：取料X轴到P2 ",0);
MoveXAxis.AbsMove(MoveInfo, Config.GetMoveXP2(MoveInfo.MoveParam.PlateW), Config.MoveX_P2Speed);
}
else if (MoveInfo.IsStep(StepEnum.OT03_MoveXToP2))
......@@ -131,7 +131,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveParam.IsNgReel)
{
MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
WorkLog("取料：取料Z轴到P2 ");
WorkLog("取料：取料Z轴到P2 ",0);
MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
}
else
......@@ -166,19 +166,19 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.OT06_MoveXToP2))
{
MoveInfo.NextMoveStep(StepEnum.OT07_MoveZToP2);
WorkLog("取料：取料Z轴到P2 ");
WorkLog("取料：取料Z轴到P2 ",0);
MoveZAxis.AbsMove(MoveInfo, Config.GetMoveZP2(MoveInfo.MoveParam.PlateH), Config.MoveZ_P2Speed);
}
else if (MoveInfo.IsStep(StepEnum.OT07_MoveZToP2))
{
MoveInfo.NextMoveStep(StepEnum.OT08_Clamping_Work);
WorkLog("取料：取料气缸夹紧 ");
WorkLog("取料：取料气缸夹紧 ",0);
CylinderMove(MoveInfo, IO_Type.TakeT_Clamping_Relax, IO_Type.TakeT_Clamping_Work);
}
else if (MoveInfo.IsStep(StepEnum.OT08_Clamping_Work))
{
MoveInfo.NextMoveStep(StepEnum.OT09_MoveZToP1);
WorkLog("取料：取料Z轴返回P1 ");
WorkLog("取料：取料Z轴返回P1 ",0);
MoveZAxis.AbsMove(MoveInfo, Config.MoveZ_P1, Config.MoveZ_P1Speed);
}
......@@ -187,7 +187,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveParam.IsNgReel)
{
MoveInfo.NextMoveStep(StepEnum.OT21_NG_MoveXToP1);
WorkLog("NG料：取料X轴到P1 ");
WorkLog("NG料：取料X轴到P1 ",0);
MoveXAxis.AbsMove(MoveInfo, Config.MoveX_P1, Config.MoveX_P1Speed);
}
else
......@@ -247,14 +247,14 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.OT13_MoveZToP3))
{
MoveInfo.NextMoveStep(StepEnum.OT14_Clamping_Relax);
WorkLog("放料：取料气缸放松 ");
WorkLog("放料：取料气缸放松 ",0);
CylinderMove(MoveInfo, IO_Type.TakeT_Clamping_Work, IO_Type.TakeT_Clamping_Relax);
}
else if (MoveInfo.IsStep(StepEnum.OT14_Clamping_Relax))
{
bool shelfOk = ShelfMoveInfo.MoveType.Equals(RobotMoveType.ShelfPro) && ShelfMoveInfo.IsStep(StepEnum.OS_22_WaitTray);
MoveInfo.NextMoveStep(StepEnum.OT15_MoveZToP1);
WorkLog("放料：取料Z轴回到P1 ");
WorkLog("放料：取料Z轴回到P1 ",0);
MoveZAxis.AbsMove(MoveInfo, Config.MoveZ_P1, Config.MoveZ_P1Speed);
if (shelfOk)
{
......@@ -267,7 +267,7 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(StepEnum.OT15_MoveZToP1))
{
MoveInfo.NextMoveStep(StepEnum.OT16_MoveXToP2);
WorkLog("放料：取料X轴回到P2 ");
WorkLog("放料：取料X轴回到P2 ",0);
MoveXAxis.AbsMove(MoveInfo, Config.GetMoveXP2(MoveInfo.MoveParam.PlateW), Config.MoveX_P2Speed);
}
else if (MoveInfo.IsStep(StepEnum.OT16_MoveXToP2))
......@@ -356,7 +356,7 @@ namespace OnlineStore.DeviceLibrary
SecMoveInfo.NextMoveStep(StepEnum.OL03_PrintLabel);
RobotManager.LastPrintStatus = Asa.PrintLabel.PrinterStatus.Unknown;
NeedPrint = ConfigAppSettings.GetIntValue(Setting_Init.NeedPrintLabel).Equals(1);
SecWorkLog("贴标: 重置状态=Unknown，开始打印标签[" + NeedPrint + "] ，贴标XYR轴到取标签点P2, 等待1s");
SecWorkLog("贴标: 重置PrintLabel状态=Unknown，开始打印标签[" + NeedPrint + "] ，贴标XYR轴到取标签点P2, 等待1s");
SecMoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
if (NeedPrint)
{
......@@ -432,7 +432,7 @@ namespace OnlineStore.DeviceLibrary
if (canLabel && ShelfMoveInfo.IsStep(StepEnum.OS_25_WaitLabel))
{
SecMoveInfo.NextMoveStep(StepEnum.OL11_XYToP3);
SecWorkLog("贴标: XY轴移动到P3点");
SecWorkLog("贴标: XY轴移动到P3点",0);
LabelXAxis.AbsMove(SecMoveInfo, Config.LabelX_P3, Config.LabelX_P3Speed);
LabelYAxis.AbsMove(SecMoveInfo, Config.LabelY_P3, Config.LabelY_P3Speed);
......@@ -448,13 +448,13 @@ namespace OnlineStore.DeviceLibrary
else if (SecMoveInfo.IsStep(StepEnum.OL11_XYToP3))
{
SecMoveInfo.NextMoveStep(StepEnum.OL12_ZToP4);
SecWorkLog("贴标: Z轴先走到旋转点P4");
SecWorkLog("贴标: Z轴先走到旋转点P4",0);
LabelZAxis.AbsMove(SecMoveInfo, Config.LabelZ_P4, Config.LabelZ_P4Speed);
}
else if (SecMoveInfo.IsStep(StepEnum.OL12_ZToP4))
{
SecMoveInfo.NextMoveStep(StepEnum.OL13_RToP3);
SecWorkLog("贴标: R轴到P3点");
SecWorkLog("贴标: R轴到P3点",0);
LabelRAxis.AbsMove(SecMoveInfo, Config.LabelR_P3, Config.LabelR_P3Speed);
}
else if (SecMoveInfo.IsStep(StepEnum.OL13_RToP3))
......@@ -475,7 +475,7 @@ namespace OnlineStore.DeviceLibrary
else if (SecMoveInfo.IsStep(StepEnum.OL14_PasteForward))
{
SecMoveInfo.NextMoveStep(StepEnum.OL15_ZToP3);
SecWorkLog("贴标: Z轴到P3点");
SecWorkLog("贴标: Z轴到P3点",0);
LabelZAxis.AbsMove(SecMoveInfo, Config.LabelZ_P3, Config.LabelZ_P3Speed);
}
......@@ -489,13 +489,13 @@ namespace OnlineStore.DeviceLibrary
else if (SecMoveInfo.IsStep(StepEnum.OL16_Nozzle_Stop))
{
SecMoveInfo.NextMoveStep(StepEnum.OL17_ZToP1);
SecWorkLog("贴标: Z轴返回P1");
SecWorkLog("贴标: Z轴返回P1",0);
LabelZAxis.AbsMove(SecMoveInfo, Config.LabelZ_P1, Config.LabelZ_P1Speed);
}
else if (SecMoveInfo.IsStep(StepEnum.OL17_ZToP1))
{
SecMoveInfo.NextMoveStep(StepEnum.OL18_LableBack);
SecWorkLog("贴标: 贴标气缸后退");
SecWorkLog("贴标: 贴标气缸后退",0);
CylinderMove(SecMoveInfo, IO_Type.LablePaste_Forward, IO_Type.PasteCode_Back);
bool canLabel = ShelfMoveInfo.MoveType.Equals(RobotMoveType.ShelfPro) && ShelfMoveInfo.IsStep(StepEnum.OS_25_WaitLabel);
......@@ -526,15 +526,17 @@ namespace OnlineStore.DeviceLibrary
{
try
{
LogUtil.info("调用 打印标签 StartPrintLabel ,[" + wareCode + "] [" + wareCount + "] ");
LogUtil.info("调用 PrintLabel 打印标签 StartPrintLabel ,[" + wareCode + "] [" + wareCount + "] 开始");
Dictionary<string, string> text = new Dictionary<string, string>();
text.Add("aa", wareCode);
text.Add("bb", wareCount );
text.Add("cc", DateTime.Now.ToLongTimeString());
RobotManager.PrintBean.Print(text);
LogUtil.info(" PrintLabel 打印标签 StartPrintLabel 结束 ");
}
catch (Exception ex)
{
LogUtil.error("打印标签 StartPrintLabel 错误：" + ex.ToString());
LogUtil.error("PrintLabel 打印标签 StartPrintLabel 错误：" + ex.ToString());
}
}
#endregion
......
RC1266-AutoCountMachine/source/DeviceLibrary/manager/RobotManager.cs
......@@ -214,24 +214,28 @@ namespace OnlineStore.DeviceLibrary
PrintBean.LoadLabel(labelName);
PrintBean.Printer(PrintName, false);
LogUtil.info("打印机初始化完成【" + labelName + "】【" + PrintName + "】");
LogUtil.info("PrintLabel 打印机初始化完成【" + labelName + "】【" + PrintName + "】");
System.Drawing.Printing.PrintDocument print = new System.Drawing.Printing.PrintDocument();
string sDefault = print.PrinterSettings.PrinterName;//默认打印机名
LogUtil.info("本机默认打印机：" + sDefault);
LogUtil.info("PrintLabel 本机默认打印机：" + sDefault);
int index = 1;
foreach (string sPrint in System.Drawing.Printing.PrinterSettings.InstalledPrinters)//获取所有打印机名称
{
LogUtil.info("打印机_"+index+"_名称：" + sPrint);
LogUtil.info("PrintLabel 打印机_" + index+"_名称：" + sPrint);
index++;
}
}
public static Asa.PrintLabel.PrinterStatus LastPrintStatus = Asa.PrintLabel.PrinterStatus.Unknown;
private static void Print_PrintStatusChanged(Asa.PrintLabel.PrinterStatus sta)
private static void Print_PrintStatusChanged(Asa.PrintLabel.PrinterStatus sta,string msg)
{
if (sta.Equals(LastPrintStatus).Equals(false))
{
LogUtil.info("收到打印机新状态：" + sta + "，之前状态【" + LastPrintStatus + "】更新并保存状态");
LogUtil.info("PrintLabel 收到打印机新状态：【" + sta + "】【"+msg+"】，替换原来的状态【" + LastPrintStatus + "】 ");
}
else
{
LogUtil.info(" PrintLabel 收到打印机新状态：【" + sta + "】【" + msg + "】，与之前状态一样 ");
}
LastPrintStatus = sta;
// MessageBox.Show(sta.ToString());
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!