Commit b1103d34 张东亮

1

1 个父辈 edfe343b
...@@ -587,6 +587,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -587,6 +587,7 @@ namespace OnlineStore.LoadCSVLibrary
return comp2; return comp2;
} }
} }
LogUtil.LOGGER.Warn($"{DeviceID} 未查询到指定高度={plateh}的脉冲,使用P4压紧点+压紧确认信号收到之后下降的位置");
return new ComP2Info(plateh, CompAxis_P4_Position, CompAxis_P4_Position+CompAxis_Down_Position); return new ComP2Info(plateh, CompAxis_P4_Position, CompAxis_P4_Position+CompAxis_Down_Position);
} }
public ComP2Info GetComP3(int plateh) public ComP2Info GetComP3(int plateh)
...@@ -607,7 +608,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -607,7 +608,7 @@ namespace OnlineStore.LoadCSVLibrary
return comp2; return comp2;
} }
} }
LogUtil.LOGGER.Warn($"未查询到指定高度={plateh}的脉冲,使用P3最大压紧前点"); LogUtil.LOGGER.Warn($"{DeviceID} 未查询到指定高度={plateh}的脉冲,使用P3最大压紧前点");
return new ComP2Info(plateh, CompAxis_Max_P3, CompAxis_Max_P3); return new ComP2Info(plateh, CompAxis_Max_P3, CompAxis_Max_P3);
} }
public List<int> GetComP2AllHeights() public List<int> GetComP2AllHeights()
...@@ -783,7 +784,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -783,7 +784,7 @@ namespace OnlineStore.LoadCSVLibrary
if (minP > CompAxis_P1_Position && maxP > CompAxis_P1_Position) if (minP > CompAxis_P1_Position && maxP > CompAxis_P1_Position)
{ {
ComP3List.Add(new ComP2Info(plateH, minP, maxP)); ComP3List.Add(new ComP2Info(plateH, minP, maxP));
LOGGER.Info($"添加库位P3前点参数{plateH}={maxP}"); LOGGER.Info($"{DeviceID} 添加库位P3前点参数{plateH}={maxP}");
} }
else else
{ {
......
using log4net; using log4net;
using OnlineStore.Common;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
...@@ -12,7 +13,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -12,7 +13,7 @@ namespace OnlineStore.LoadCSVLibrary
public static Dictionary<string, string> ProIOIpMap = null; public static Dictionary<string, string> ProIOIpMap = null;
public const string IOIP_Str = "PRO_AOI_IP"; public const string IOIP_Str = "PRO_AOI_IP";
public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); public static readonly ILog LOGGER = LogUtil.LOGGER;
/// <summary> /// <summary>
/// ID /// ID
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!