Commit 958879e7 刘韬

优化部分提示

1 个父辈 16cdd782
......@@ -40,9 +40,9 @@ namespace OnlineStore.Common
}
}
public static decimal GetNumValue(string key)
public static decimal GetNumValue(string key, decimal defaultvalue=0)
{
decimal a = 0;
decimal a = defaultvalue;
System.Configuration.Configuration config = ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.None);
if (config.AppSettings.Settings[key] == null)
{
......
......@@ -251,6 +251,9 @@
<WCFMetadata Include="Connected Services\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
<PostBuildEvent>start $(TargetDir)</PostBuildEvent>
</PropertyGroup>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
......
......@@ -42,8 +42,9 @@
<Reference Include="Agv.Client">
<HintPath>..\..\..\775-AGVClientTest\Agv.Client.dll</HintPath>
</Reference>
<Reference Include="Asa.Camera.VisionLib">
<HintPath>..\..\..\camera\Asa.Camera.VisionLib.dll</HintPath>
<Reference Include="Asa.Camera.VisionLib, Version=1.3.7927.28975, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\Camera\CameraVisionLib\bin\Debug\Asa.Camera.VisionLib.dll</HintPath>
</Reference>
<Reference Include="Asa.RFID.HiStation">
<HintPath>..\..\..\..\work\RFID\Asa.RFID.HiStation.dll</HintPath>
......
......@@ -39,7 +39,7 @@ namespace OnlineStore.DeviceLibrary
}
var m = Regex.Match(configtxt, "name\".*?\"(.+)\"", RegexOptions.IgnoreCase);
CameraDeviceName = m.Groups[1].Value;
camera = new VisionLib(path, "HIK.IPCamera");
camera = new VisionLib(path,true, "HIK.IPCamera");
}
catch (Exception e)
{
......
......@@ -393,6 +393,9 @@ namespace OnlineStore.DeviceLibrary
)
{
LogUtil.error(Name + " 启动出库【" + param.ToStr() + "】失败,忙碌或报警中 ,storeStatus:" + runStatus + ",MoveType:" + MoveInfo.MoveType + ",isInSuddenDown:" + isInSuddenDown + ",isNoAirCheck:" + isNoAirCheck+ ",IO_Type.InDoor_Check;"+ IOValue(IO_Type.InDoor_Check));
if (IOValue(IO_Type.InDoor_Check).Equals(IO_VALUE.HIGH))
SetWarnMsg($"舱门{ID}口有料盘, 请取走");
return false;
}
......@@ -704,6 +707,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.SO_05_InoutBack);
InOutStoreLog(outType + "进出轴返回P1 [" + moveP.InOut_P1 + "] ");
InOutBackToP1(moveP.InOut_P1);
OutDoorReelType = 2;
}
#endregion
......@@ -756,7 +760,8 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.SO_26_InoutToP1);
InOutStoreLog(outType + "进出轴返回待机点P1 [" + moveP.InOut_P1 + "] ");
InOutBackToP1(moveP.InOut_P1);
OutDoorReelType = 1;
if (OutDoorReelType==0)
OutDoorReelType = 1;
CylinderMove(MoveInfo, IO_Type.OutDoor_Down, IO_Type.OutDoor_Up);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.OutDoor_Check, IO_VALUE.LOW));
}
......
......@@ -36,7 +36,8 @@ namespace OnlineStore.DeviceLibrary
//if (plateW > 7)
try
{
axis.Push(Force, 4.5f, 15);
var f= (float)ConfigAppSettings.GetNumValue("ClampOpen", 5);
axis.Push(Force, f, 15);
}
catch(Exception e) {
LogUtil.info(e.ToString());
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!