Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b890c19b 由 张东亮
选项

添加隐藏单独入库按钮

1 个父辈 fd5ac3d3
内嵌 并排
正在显示 4 个修改的文件 包含 24 行增加 和 15 行删除
ChangeConfigKey/Setting_Init.cs
...@@ -489,7 +489,8 @@ namespace OnlineStore.Common ...@@ -489,7 +489,8 @@ namespace OnlineStore.Common
public static MyConfig<bool> Enable_SingleInSingleOut = false; public static MyConfig<bool> Enable_SingleInSingleOut = false;
[MyConfigComment("是否启用手动关单料门")] [MyConfigComment("是否启用手动关单料门")]
public static MyConfig<bool> Enable_SingleDoor_ManualClose = false; public static MyConfig<bool> Enable_SingleDoor_ManualClose = false;
[MyConfigComment("启用隐藏smf单盘入库按钮")]
public static MyConfig<bool> Enable_HideSingleReelIn = false;
[MyConfigComment("压紧轴回原失败重试最大次数")] [MyConfigComment("压紧轴回原失败重试最大次数")]
...@@ -523,5 +524,6 @@ namespace OnlineStore.Common ...@@ -523,5 +524,6 @@ namespace OnlineStore.Common
public static MyConfig<int> SingleInOut_ReelWidth = 7; public static MyConfig<int> SingleInOut_ReelWidth = 7;
[MyConfigComment("单盘出入库的指定尺寸-高度")] [MyConfigComment("单盘出入库的指定尺寸-高度")]
public static MyConfig<int> SingleInOut_ReelHeight = 20; public static MyConfig<int> SingleInOut_ReelHeight = 20;
} }
} }
Common/Setting_Init.cs
...@@ -175,7 +175,8 @@ namespace OnlineStore.Common ...@@ -175,7 +175,8 @@ namespace OnlineStore.Common
public static MyConfig<bool> Enable_SingleInSingleOut = false; public static MyConfig<bool> Enable_SingleInSingleOut = false;
[MyConfigComment("是否启用手动关单料门")] [MyConfigComment("是否启用手动关单料门")]
public static MyConfig<bool> Enable_SingleDoor_ManualClose = false; public static MyConfig<bool> Enable_SingleDoor_ManualClose = false;
[MyConfigComment("启用隐藏smf单盘入库按钮")]
public static MyConfig<bool> Enable_HideSingleReelIn = false;
[MyConfigComment("压紧轴回原失败重试最大次数")] [MyConfigComment("压紧轴回原失败重试最大次数")]
......
Common/bean/Bean.cs
...@@ -291,6 +291,7 @@ namespace OnlineStore.Common ...@@ -291,6 +291,7 @@ namespace OnlineStore.Common
public static string enable = "enable"; public static string enable = "enable";
public static string disable = "disable"; public static string disable = "disable";
public static string hidden = "hidden";
public static string queueTaskCount="queueTaskCount"; public static string queueTaskCount="queueTaskCount";
/// <summary> /// <summary>
......
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
...@@ -459,18 +459,19 @@ namespace DeviceLibrary ...@@ -459,18 +459,19 @@ namespace DeviceLibrary
public Dictionary<string, string> GetBtnStatus() public Dictionary<string, string> GetBtnStatus()
{ {
Dictionary<string, string> map = new Dictionary<string, string>(); Dictionary<string, string> map = new Dictionary<string, string>
map.Add(ParamDefine.openLock, ParamDefine.disable); {
map.Add(ParamDefine.startBatchIn, ParamDefine.disable); { ParamDefine.openLock, ParamDefine.disable },
map.Add(ParamDefine.closeLock, ParamDefine.disable); { ParamDefine.startBatchIn, ParamDefine.disable },
map.Add(ParamDefine.takeOutReel, ParamDefine.disable); { ParamDefine.closeLock, ParamDefine.disable },
map.Add(ParamDefine.confirmReelOut, ParamDefine.disable); { ParamDefine.takeOutReel, ParamDefine.disable },
map.Add(ParamDefine.singleReelIn, ParamDefine.disable); { ParamDefine.confirmReelOut, ParamDefine.disable },
{ ParamDefine.singleReelIn, ParamDefine.disable },
map.Add(ParamDefine.SendEmptyShelf, ParamDefine.disable); { ParamDefine.SendEmptyShelf, ParamDefine.disable },
map.Add(ParamDefine.SendFullShelf, ParamDefine.disable); { ParamDefine.SendFullShelf, ParamDefine.disable },
map.Add(ParamDefine.NeedEmptySHelf, ParamDefine.disable); { ParamDefine.NeedEmptySHelf, ParamDefine.disable },
map.Add(ParamDefine.NeedFullShelf, ParamDefine.disable); { ParamDefine.NeedFullShelf, ParamDefine.disable }
};
if (storeStatus == StoreStatus.ResetMove if (storeStatus == StoreStatus.ResetMove
|| storeStatus == StoreStatus.SuddenStop || storeStatus == StoreStatus.SuddenStop
...@@ -501,7 +502,11 @@ namespace DeviceLibrary ...@@ -501,7 +502,11 @@ namespace DeviceLibrary
{ {
map[ParamDefine.confirmReelOut] = ParamDefine.enable; map[ParamDefine.confirmReelOut] = ParamDefine.enable;
} }
if (!Setting_Init.Disable_SingleReelIn) if (Setting_Init.Enable_HideSingleReelIn)
{
map[ParamDefine.singleReelIn] = ParamDefine.hidden;
}
else if (!Setting_Init.Disable_SingleReelIn)
{ {
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)
{ {
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!