Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1991b45f 由 刘韬
选项

添加禁止单盘入库的选项 

DisableSingleReelIn
1 个父辈 48d5cb2d
内嵌 并排
正在显示 7 个修改的文件 包含 20 行增加 和 15 行删除
Common/Setting_Init.cs
...@@ -70,5 +70,9 @@ namespace OnlineStore.Common ...@@ -70,5 +70,9 @@ namespace OnlineStore.Common
public static MyConfig<int> OutstoreHeightCheckUpperDeviation = 3; public static MyConfig<int> OutstoreHeightCheckUpperDeviation = 3;
[MyConfigComment("出库料盘定位信号对射触发位置高度偏差")] [MyConfigComment("出库料盘定位信号对射触发位置高度偏差")]
public static MyConfig<int> ReelCheckTriggerDeviation = 5; public static MyConfig<int> ReelCheckTriggerDeviation = 5;
[MyConfigComment("是否禁止单盘入库")]
public static MyConfig<bool> DisableSingleReelIn = false;
} }
} }
DLL/AGVLib.dll 0 → 100644
此文件类型无法预览
DLL/ConfigHelper.dll
此文件类型无法预览
DLL/ConfigHelper.xml
...@@ -57,6 +57,17 @@ ...@@ -57,6 +57,17 @@
the contents of this method with the code editor. the contents of this method with the code editor.
</summary> </summary>
</member> </member>
<member name="P:ConfigHelper.CheckedListBoxEx.DataSource">
<summary>
绑定数据源
</summary>
<param name="data"></param>
</member>
<member name="T:ConfigHelper.CheckItem">
<summary>
Represents an item in the checklistbox
</summary>
</member>
<member name="T:ConfigHelper.Config"> <member name="T:ConfigHelper.Config">
<summary> <summary>
自定义配置存取 自定义配置存取
...@@ -250,16 +261,5 @@ ...@@ -250,16 +261,5 @@
</summary> </summary>
<param name="comment"></param> <param name="comment"></param>
</member> </member>
<member name="P:ConfigHelper.CheckedListBoxEx.DataSource">
<summary>
绑定数据源
</summary>
<param name="data"></param>
</member>
<member name="T:ConfigHelper.CheckItem">
<summary>
Represents an item in the checklistbox
</summary>
</member>
</members> </members>
</doc> </doc>
DLL/ConfigHelper.zip 0 → 100644
此文件类型无法预览
DeviceLibrary/DeviceLibrary.csproj
...@@ -32,9 +32,8 @@ ...@@ -32,9 +32,8 @@
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="AGVLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="AGVLib">
<SpecificVersion>False</SpecificVersion> <HintPath>..\DLL\AGVLib.dll</HintPath>
<HintPath>..\..\..\DLL\AGVLib\AGVLib\bin\Debug\AGVLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="CodeLibrary, Version=1.0.8384.25672, Culture=neutral, processorArchitecture=MSIL"> <Reference Include="CodeLibrary, Version=1.0.8384.25672, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
......
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
...@@ -477,11 +477,13 @@ namespace DeviceLibrary ...@@ -477,11 +477,13 @@ namespace DeviceLibrary
{ {
map[ParamDefine.confirmReelOut] = ParamDefine.enable; map[ParamDefine.confirmReelOut] = ParamDefine.enable;
} }
if (!Setting_Init.DisableSingleReelIn)
{
if (RobotManage.mainMachine.StringType == MainMachine.StringTypeE.Out || RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait) if (RobotManage.mainMachine.StringType == MainMachine.StringTypeE.Out || RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait)
{ {
map[ParamDefine.singleReelIn] = ParamDefine.enable; map[ParamDefine.singleReelIn] = ParamDefine.enable;
} }
}
map[ParamDefine.SendEmptyShelf]= ParamDefine.disable; map[ParamDefine.SendEmptyShelf]= ParamDefine.disable;
map[ParamDefine.SendFullShelf] =ParamDefine.disable; map[ParamDefine.SendFullShelf] =ParamDefine.disable;
map[ParamDefine.NeedEmptySHelf]= ParamDefine.disable; map[ParamDefine.NeedEmptySHelf]= ParamDefine.disable;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!