Skip to content

李娜 / AutoCountMachine

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

右侧入口的料盘全部放到XRay

1 个父辈 f6a3f44e
内嵌 并排
正在显示 7 个修改的文件 包含 43 行增加 和 21 行删除
RC1266-AutoCountMachine/source/AutoCountClient/App.config
......@@ -7,14 +7,14 @@
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="1" />
<add key="App_Title" value="自动点料机" />
<add key="ServerAddr" value="http://10.85.17.233"/>
<add key="ConfigPath_Robot" value="\RobotConfig\Config_Robot.csv" />
<add key="ConfigPath_XRay" value="\RobotConfig\Config_XRay.csv" />
<add key="ConfigPath_InputEquip" value="\RobotConfig\Config_InputEquip.csv" />
<add key="ConfigPath_OutputEquip" value="\RobotConfig\Config_OutputEquip.csv" />
<add key="ConfigPath_OutputEquip" value="\RobotConfig\Config_OutputEquip.csv" />
<!--二维码类型列表配置，用#分割，一维码=Barcode 二维码： QR Code#Data Matrix ECC 200#Micro QR Code-->
<add key="CodeType" value="Data Matrix ECC 200#QR Code" />
<!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
......@@ -22,7 +22,7 @@
<!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\CodeParam\" />
<add key="Config_Pwd" value="123456" />
<add key="UseAIOBOX" value="1" />
<!--流水线监听端口-->
<add key="TCPServerPort" value="5246" />
......@@ -32,8 +32,8 @@
<add key="DIMS" value="60" />
<add key="DOMS" value="300" />
<add key="LineRunTest" value="1" />
<add key="DefaultPWD" value="123456" />
<add key="DefaultPWD" value="123456" />
<add key="Server_Log_Open" value="0" />
<add key="CodeCount" value="3" />
<add key="NeedScanCode" value="1" />
......@@ -50,7 +50,7 @@
<!--XRay射线最后一次使用时间-->
<add key ="XRay_Data" value =""/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
<file value="logs/autoCount.log" />
......@@ -63,7 +63,7 @@
</layout>
</appender>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID-line.log" />
<file value="logs/TheRFID.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
......@@ -82,6 +82,7 @@
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<logger name="RollingLogFileAppender">
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
......@@ -94,6 +95,7 @@
<level value="Info" />
<appender-ref ref="XRay" />
</logger>
<!--<root>
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
......
RC1266-AutoCountMachine/source/AutoCountClient/记录.txt
......@@ -54,3 +54,7 @@ Stop
软件退出时调用Close
20200601
设备启动时提示急停未开：改为未初始化完成
\ No newline at end of file
RC1266-AutoCountMachine/source/DeviceLibrary/bean/InputEquip_InStore.cs
......@@ -177,13 +177,13 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StepEnum.IW10_SaveSize);
MoveInfo.MoveParam.PlateH = moveBean.LastHeight;
MoveInfo.MoveParam.PlateW = GetWidth();
WorkLog("测高结束， 记录尺寸【"+ MoveInfo.MoveParam.PlateW + "X"+ MoveInfo.MoveParam.PlateH + "】，开始下一盘预扫码");
WorkLog("测高结束， 记录尺寸【" + MoveInfo.MoveParam.PlateW + "X" + MoveInfo.MoveParam.PlateH + "】，开始下一盘预扫码");
}
else if (MoveInfo.IsTimeOut(60))
{
WarnMsg =Name+ "等待" + moveBean.Name + "测高结束超时[" + MoveInfo.TimeOutSeconds + "]秒";
LogUtil.error( WarnMsg, MoveInfo.ErrorLogType);
WarnMsg = Name + "等待" + moveBean.Name + "测高结束超时[" + MoveInfo.TimeOutSeconds + "]秒";
LogUtil.error(WarnMsg, MoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
}
......@@ -198,6 +198,11 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.MoveParam.TargetPosType = 1;
WorkLog(" 无有效条码，从XRay放到NG箱：" + MoveInfo.MoveParam.ToStr());
}
else if (MoveInfo.MoveParam.InPosType.Equals(2))
{
MoveInfo.MoveParam.TargetPosType = 1;
WorkLog(" 右侧入口入料，直接放到XRay：" + MoveInfo.MoveParam.ToStr());
}
else if (SServerManager.CanConnect())
{
Task task = Task.Factory.StartNew(delegate
......@@ -243,7 +248,7 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.IsTimeOut(120))
{
WarnMsg = Name + "等待" + MoveInfo.MoveParam.WareCode + "验证是否测值 超时[" + MoveInfo.TimeOutSeconds + "]秒";
LogUtil.error( WarnMsg,MoveInfo.ErrorLogType);
LogUtil.error(WarnMsg, MoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
return;
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Partial.cs
......@@ -157,7 +157,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsTimeOut(120))
{
WarnMsg = MoveInfo.Name + "等待贴标模块空闲 超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "]" + "等待贴标模块空闲 超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg, MoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
......@@ -221,7 +221,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsTimeOut(120))
{
WarnMsg = MoveInfo.Name + "等待出料料串准备完成（OS_18_ShelfReady）超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "]" + "等待出料料串准备完成（OS_18_ShelfReady）超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg, MoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
......@@ -238,7 +238,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (MoveInfo.IsTimeOut(60))
{
WarnMsg = MoveInfo.Name + "等待出料料串可放料（OS_22_WaitTray）超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
WarnMsg = MoveInfo.Name + "[" + MoveInfo.MoveStep + "]" + "等待出料料串可放料（OS_22_WaitTray）超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg, MoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
......@@ -465,7 +465,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (SecMoveInfo.IsTimeOut(120))
{
WarnMsg = SecMoveInfo.Name + "等待 料盘可贴标(OS_25_WaitLabel) 超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
WarnMsg = SecMoveInfo.Name + "[" + SecMoveInfo.MoveStep + "]" + "等待 料盘可贴标(OS_25_WaitLabel) 超时[" + FormUtil.GetSpanStr(SecMoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg,SecMoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip_Shelf.cs
......@@ -257,7 +257,7 @@ namespace OnlineStore.DeviceLibrary
}
else if (SecMoveInfo.IsTimeOut(120))
{
WarnMsg = SecMoveInfo.Name + "等待 贴标结束 超时[" + FormUtil.GetSpanStr(MoveInfo.StepSpan()) + "]";
WarnMsg = SecMoveInfo.Name + "[" + SecMoveInfo.MoveStep + "]" + "等待 贴标结束 超时[" + FormUtil.GetSpanStr(SecMoveInfo.StepSpan()) + "]";
LogUtil.error(WarnMsg, SecMoveInfo.ErrorLogType);
Alarm(AlarmType.IoSingleTimeOut);
}
......
RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs
......@@ -117,7 +117,7 @@ namespace OnlineStore.LoadCSVLibrary
}
if (DIList.ContainsKey(io.ProName))
{
LogUtil.error("配置DI：[" + io.ToString() + "] ProName重复 ");
LogUtil.debug("配置DI：[" + io.ToString() + "] ProName重复 ");
}
else
{
......@@ -131,7 +131,7 @@ namespace OnlineStore.LoadCSVLibrary
}
if (SubDIList[io.SubType].ContainsKey(io.ProName))
{
LogUtil.error("配置DI：[" + io.ToString() + "] ProName重复 ");
LogUtil.debug("配置DI：[" + io.ToString() + "] ProName重复 ");
}
else
{
......
RC1266-AutoCountMachine/source/LoadCVSLibrary/storeConfig/config/XRay_Config.cs
......@@ -43,5 +43,16 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("XRay_Voltage")]
public string XRay_Voltage { get; set; }
/// <summary>
/// PRO,0,XRay图片窗宽,WindowWidth,567,,,,,
/// </summary>
[ConfigProAttribute("WindowWidth")]
public int WindowWidth { get; set; }
/// <summary>
/// PRO,0,XRay图片窗位,WindowLevel,567,,,,,
/// </summary>
[ConfigProAttribute("WindowLevel")]
public int WindowLevel { get; set; }
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!