Skip to content

刘韬 / 1069_MIMO_PlUS

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

对接服务器料叉忽略按钮

1 个父辈 cd8238ad
内嵌 并排
正在显示 9 个修改的文件 包含 50 行增加 和 17 行删除
Common/bean/Bean.cs
......@@ -310,5 +310,9 @@ namespace OnlineStore.Common
/// 贴标机交互按钮,入口 空料串取出
/// </summary>
public static string SendEmptyShelf = "SendEmptyShelf";
/// <summary>
/// 忽略料叉报警
/// </summary>
public static string ignoreFixtureAlarm = "ignoreFixtureAlarm";
}
}
DLL/ConfigHelper.dll
此文件类型无法预览
DLL/ConfigHelper.xml
......@@ -261,6 +261,11 @@
</summary>
<param name="comment"></param>
</member>
<member name="T:CommonLib">
<summary>
程序公共类
</summary>
</member>
<member name="P:CommonLib.AppPathExe">
<summary>
程序exe全路经 如d:\app\app.exe
......@@ -305,6 +310,12 @@
<param name="enable">是否启用</param>
<param name="delaysec">延迟启动时间秒</param>
</member>
<member name="M:CommonLib.AddTaskAction(System.Action)">
<summary>
添加需要每天定时运行的任务
</summary>
<param name="action"></param>
</member>
<member name="M:CommonLib.DeleteOverDayFile(System.String,System.String,System.Int32)">
<summary>
删除超过指定天数的文件
......
DeviceLibrary/DeviceLibrary/ServerCommunication.cs
......@@ -411,31 +411,36 @@ namespace DeviceLibrary
LogUtil.info(StoreName + "收到服务器命令：openLock=doit");
result = RobotManage.mainMachine.doOpenBatchDoor();
}
else if (dataMap.ContainsKey(ParamDefine.startBatchIn) && dataMap[ParamDefine.startBatchIn].Equals(ParamDefine.doit))
if (dataMap.ContainsKey(ParamDefine.startBatchIn) && dataMap[ParamDefine.startBatchIn].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：startBatchIn=doit");
//result = AutomaticBaiting.doStartBatchIn();
}
else if (dataMap.ContainsKey(ParamDefine.takeOutReel) && dataMap[ParamDefine.takeOutReel].Equals(ParamDefine.doit))
if (dataMap.ContainsKey(ParamDefine.takeOutReel) && dataMap[ParamDefine.takeOutReel].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：takeOutReel=doit");
result = RobotManage.mainMachine.doTakeOutReel();
}
else if (dataMap.ContainsKey(ParamDefine.closeLock) && dataMap[ParamDefine.closeLock].Equals(ParamDefine.doit))
if (dataMap.ContainsKey(ParamDefine.closeLock) && dataMap[ParamDefine.closeLock].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：closeLock=doit");
result = RobotManage.mainMachine.doCloseBatchDoor();
}
else if (dataMap.ContainsKey(ParamDefine.confirmReelOut) && dataMap[ParamDefine.confirmReelOut].Equals(ParamDefine.doit))
if (dataMap.ContainsKey(ParamDefine.confirmReelOut) && dataMap[ParamDefine.confirmReelOut].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：confirmReelOut=doit");
result = RobotManage.mainMachine.doSingleInCloseNgDoor();
}
else if (dataMap.ContainsKey(ParamDefine.singleReelIn) && dataMap[ParamDefine.singleReelIn].Equals(ParamDefine.doit))
if (dataMap.ContainsKey(ParamDefine.singleReelIn) && dataMap[ParamDefine.singleReelIn].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：SingleReelIn=doit");
result = RobotManage.mainMachine.doSingleInOpenNgDoor();
}
if (dataMap.ContainsKey(ParamDefine.ignoreFixtureAlarm) && dataMap[ParamDefine.ignoreFixtureAlarm].Equals(ParamDefine.doit))
{
LogUtil.info(StoreName + "收到服务器命令：ignoreFixtureAlarm=doit");
RobotManage.mainMachine.IgnoreX09();
result = "";
}
if (!result.Equals(""))
{
......@@ -470,18 +475,21 @@ namespace DeviceLibrary
{ ParamDefine.SendEmptyShelf, ParamDefine.disable },
{ ParamDefine.SendFullShelf, ParamDefine.disable },
{ ParamDefine.NeedEmptySHelf, ParamDefine.disable },
{ ParamDefine.NeedFullShelf, ParamDefine.disable }
{ ParamDefine.NeedFullShelf, ParamDefine.disable },
{ ParamDefine.ignoreFixtureAlarm, ParamDefine.disable },
};
if (RobotManage.mainMachine == null)
return map;
map[ParamDefine.ignoreFixtureAlarm] = RobotManage.mainMachine.ShowIgnoreFixtureAlarm ? ParamDefine.enable : ParamDefine.disable;
if (storeStatus == StoreStatus.ResetMove
|| storeStatus == StoreStatus.SuddenStop
|| storeStatus == StoreStatus.Debugging
)
return map;
if (RobotManage.mainMachine == null)
return map;
if (RobotManage.mainMachine.IOValue(IO_Type.StringDoor_Close).Equals(IO_VALUE.HIGH) &&
(RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.StringOut_Released
|| RobotManage.mainMachine.StringMoveInfo.MoveStep == MoveStep.Wait))
......@@ -502,6 +510,8 @@ namespace DeviceLibrary
{
map[ParamDefine.confirmReelOut] = ParamDefine.enable;
}
if (Setting_Init.Enable_HideSingleReelIn)
{
map[ParamDefine.singleReelIn] = ParamDefine.hidden;
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -35,6 +35,7 @@ namespace DeviceLibrary
public RunStatus runStatus { get; set; } = RunStatus.Stop;
public Robot_Config Config { get; set; }
public volatile bool UserPause = false;
public volatile bool ShowIgnoreFixtureAlarm = false;
public MoveInfo ResetMoveInfo;
......@@ -413,6 +414,7 @@ namespace DeviceLibrary
case MoveStep.H01_HomeReset:
ResetMoveInfo.NextMoveStep(MoveStep.H02_HomeReset_01);
ServerCM.storeStatus = StoreStatus.ResetMove;
ShowIgnoreFixtureAlarm = false;
if (IOValue(IO_Type.StringBack_Check).Equals(IO_VALUE.LOW) && IOValue(IO_Type.StringFront_Check).Equals(IO_VALUE.LOW))
{
ResetMoveInfo.log("复位时没有料串");
......@@ -814,13 +816,16 @@ namespace DeviceLibrary
lastStringSafetyStatus = false;
StringDoorPause();
}
}
if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.LOW) && StringMoveInfo.MoveStep != MoveStep.Wait)
{
if (stringdoorSafetyProcStrategy == 0)
{
ok = false;
DeviceSuddenStop();
}
}
else if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.HIGH))
if (IOValue(IO_Type.AGV_OnPosition).Equals(IO_VALUE.HIGH))
{
if (stringdoorSafetyProcStrategy == 1)
{
......
DeviceLibrary/theMachine/MainMachine_ServerControl.cs
......@@ -81,7 +81,7 @@ namespace DeviceLibrary
StringMoveInfo.LastSetpTime = DateTime.Now;
StringMoveInfo.IsInWait = true;
StringDoorOpen(StringMoveInfo);
StringDoorOpen(null);
return crc.GetString(L.begin_open_string_door, "开始打开料串门");
//LogUtil.info($"批量料门无法打开,料仓正在出入库中:{StringMoveInfo.MoveStep}");
......@@ -104,7 +104,7 @@ namespace DeviceLibrary
//RobotManage.mainMachine.StringMoveInfo.NextMoveStep(RobotManage.mainMachine.StringMoveInfo.MoveStep);
StringMoveInfo.LastSetpTime = DateTime.Now;
StringMoveInfo.IsInWait = true;
StringDoorClose(StringMoveInfo);
StringDoorClose(null);
return crc.GetString(L.begin_close_string_door, "开始关闭料串门");
}
}
......
TheMachine/Form1.cs
......@@ -524,14 +524,17 @@ namespace TheMachine
listView1.Items.Add(lvi);
if (msg.errInfo == ErrInfo.X09_BoxNotDetect)
{
RobotManage.mainMachine.ShowIgnoreFixtureAlarm = true;
if (btn_IgnoreX09.Visible) continue;
btn_IgnoreX09.Invoke(new Action(() =>
{
btn_IgnoreX09.Visible = true;
}));
}
else if (msg.errInfo == ErrInfo.X09_Clear)
{
RobotManage.mainMachine.ShowIgnoreFixtureAlarm = false;
if (!btn_IgnoreX09.Visible) continue;
btn_IgnoreX09.Invoke(new Action(() =>
{
......
TheMachine/UC/UC_SetUserPassword.designer.cs
......@@ -60,9 +60,9 @@ namespace TheMachine
//
// button_ok
//
this.button_ok.Location = new System.Drawing.Point(201, 188);
this.button_ok.Location = new System.Drawing.Point(155, 188);
this.button_ok.Name = "button_ok";
this.button_ok.Size = new System.Drawing.Size(119, 33);
this.button_ok.Size = new System.Drawing.Size(165, 33);
this.button_ok.TabIndex = 2;
this.button_ok.Text = "确认修改";
this.button_ok.UseVisualStyleBackColor = true;
......
TheMachine/resources/en-US.lngres
......@@ -415,7 +415,7 @@ ledstate_Running 运行 Run
ledstate_SystemPause 暂停 Pause
ledstate_THoutRangeOver30m 温湿度超限30分钟 Temperature And Humidity Exceeded The Limit Over 30 min
ledstate_THoutRange 温湿度超限 Temperature And Humidity Exceeded The Limit
Res0220 状态,优先级从大到小 Status, From High To Low Priority
Res0220 状态,优先级从大到小 Status
Res0221 绿灯 Green
Res0222 黄灯 Yellow
Res0223 红灯 Red
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!