Commit ad40a6a7 LN

日志打印修改。点料时间加长。如果未找到区域时不写文件area.txt

1 个父辈 d345b915
......@@ -65,7 +65,7 @@
</layout>
</appender>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID.log" />
<file value="logs/rfid/TheRFID.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
......@@ -75,7 +75,27 @@
</layout>
</appender>
<appender name="XRay" type="log4net.Appender.RollingFileAppender">
<file value="logs/XRay.log" />
<file value="logs/xray/XRay.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="Count" type="log4net.Appender.RollingFileAppender">
<file value="logs/Count.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
<datePattern value="yyyy-MM-dd" />
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX.log" />
<param name="Encoding" value="UTF-8" />
<appendToFile value="true" />
<rollingStyle value="Date" />
......@@ -97,6 +117,14 @@
<level value="Info" />
<appender-ref ref="XRay" />
</logger>
<logger name="Count">
<level value="Info" />
<appender-ref ref="Count" />
</logger>
<logger name="AIOBOX">
<level value="Info" />
<appender-ref ref="AIOBOX" />
</logger>
<!--<root>
<level value="Info" />
......
......@@ -66,7 +66,7 @@ namespace OnlineStore.DeviceLibrary
{
try
{
countImage = new CountImage("XRay");
countImage = new CountImage("Count");
countImage.SetDirectory(path1_tif, path2_out, path3_area);
LogUtil.info(Name + "CountImage path1【" + path1_tif + "】");
LogUtil.info(Name + "CountImage path2【" + path2_out + "】");
......
......@@ -331,22 +331,23 @@ namespace OnlineStore.DeviceLibrary
return;
}
MoveInfo.NextMoveStep(StepEnum.XW15_GetResult);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(15000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(180000));
if (xRay.IsRayOpen)
{
xRay.Stop();
}
int count = 99999;
countImage.GetCount(lastTh, out count);
InXWork = false;
WorkLog("点料:获取点料结果["+ lastTh + "]=【" + count + "】,保存并上传结果");
WorkLog("点料:开始调用 countImage.GetCount ");
bool result = countImage.GetCount(lastTh, out count);
WorkLog("点料:获取点料结果[" + lastTh + "]=【" + count + "】,result=" + result + ",保存并上传结果");
if (Work_ReelInfo.WareCount <= 0)
{
MoveInfo.MoveParam.WareCount = count;
Work_ReelInfo.WareCount = count;
}
string outF = path2_out + @"\" + lastFileName;
string outF = path2_out + lastFileName;
try
{
if (System.IO.File.Exists(outF))
......@@ -364,6 +365,7 @@ namespace OnlineStore.DeviceLibrary
{
LogUtil.error("读取结果图片【" + outF + "】出错:" + ex.ToString());
}
InXWork = false;
Task.Factory.StartNew(delegate
{
// string msg = "暂不上传";
......@@ -442,18 +444,20 @@ namespace OnlineStore.DeviceLibrary
{
lastTh = ThresholdValue;
string[] codeArray = codeStr.Split(';');
string fileValue = "";
string area = "";
if (codeArray.Length.Equals(2))
{
string pn = codeArray[0];
if (countParamMap.ContainsKey(pn))
{
string area = countParamMap[pn].AreaValue;
string fileValue = lastFileName + " " + area;
area = countParamMap[pn].AreaValue;
fileValue = lastFileName + " " + area;
lastTh = countParamMap[pn].Threshold;
LogUtil.info("【" + codeStr + "】使用参数【" + lastTh + "】【" + area + "】,文件名【" + lastFileName + "】");
File.WriteAllText(path3_area, fileValue);
}
}
LogUtil.info("【" + codeStr + "】使用参数【" + lastTh + "】【" + area + "】,文件名【" + lastFileName + "】内容【"+fileValue+"】");
File.WriteAllText(path3_area, fileValue);
}
private void ClearFilePath()
{
......
......@@ -71,7 +71,7 @@ namespace OnlineStore.DeviceLibrary
string logName = "IO模块[" + ioIp + "] DI[" + DILength + "] DO[" + DOLength + "] ";
try
{
aioBox = new AIOBOX();
aioBox = new AIOBOX("AIOBOX");
aioBox.SetType(Asa.IOModule.Box_Type.DI, DILength, Asa.IOModule.Box_Type.DO, DOLength);
aioBox.IP = ioIp;
aioBox.Upload = true;
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!