Skip to content

张东亮 / SO1057-XLRStore

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

设备恢复正常后清理异常消息显示

1 个父辈 ac395c8a
内嵌 并排
正在显示 4 个修改的文件 包含 25 行增加 和 21 行删除
source/DeviceLibrary/storeBean/EquipBase.cs
...@@ -99,7 +99,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -99,7 +99,10 @@ namespace OnlineStore.DeviceLibrary
{ {
OutstoreProcess(); OutstoreProcess();
} }
if (MoveInfo.MoveType.Equals(MoveType.None))
{
WarnMsg = "";
}
} }
private DateTime lastProTimer = DateTime.Now; private DateTime lastProTimer = DateTime.Now;
......
source/DeviceLibrary/storeBean/inputBean/BatchMoveBean.cs
...@@ -75,6 +75,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -75,6 +75,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (MoveInfo.MoveType.Equals(MoveType.None)) if (MoveInfo.MoveType.Equals(MoveType.None))
{ {
WarnMsg = "";
if (Robot.MoveInfo.MoveType.Equals(MoveType.Reset) || Robot.MoveInfo.MoveType.Equals(MoveType.RHome)) if (Robot.MoveInfo.MoveType.Equals(MoveType.Reset) || Robot.MoveInfo.MoveType.Equals(MoveType.RHome))
{ {
} }
......
source/DeviceLibrary/storeBean/inputBean/InputEquip.cs
...@@ -550,7 +550,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -550,7 +550,7 @@ namespace OnlineStore.DeviceLibrary
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial??""; var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial??"";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial) if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{ {
LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库的 hSerial:{posInfo.hSerial} 不符"); LogInfo($"{posType}的料 hSerial:{posInfo.hSerial}，与{moveBean.Name}的 hSerial:{curhSerial} 不符");
moveBean.ShelfNeedLeave = true; moveBean.ShelfNeedLeave = true;
} }
else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv) else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv)
...@@ -613,7 +613,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -613,7 +613,7 @@ namespace OnlineStore.DeviceLibrary
var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? ""; var curhSerial = moveBean.MoveInfo.MoveParam?.PosInfo?.hSerial ?? "";
if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial) if (!string.IsNullOrEmpty(curhSerial) && curhSerial != posInfo.hSerial)
{ {
LogInfo($"{posType}当前料串的 hSerial:{curhSerial}，与准备出库到料串 hSerial:{posInfo.hSerial} 不符"); LogInfo($"{posType}的料 hSerial:{posInfo.hSerial}，与{moveBean.Name}的料串 hSerial:{curhSerial} 不符");
moveBean.ShelfNeedLeave = true; moveBean.ShelfNeedLeave = true;
} }
else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv) else if (moveBean.MoveInfo.MoveType == MoveType.InStore && moveBean.MoveInfo.MoveStep == StepEnum.IS23_WaitAgv)
......
source/XLRStoreClient/FrmXLRStore.Designer.cs
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
this.tabPage2.Controls.Add(this.panel1); this.tabPage2.Controls.Add(this.panel1);
this.tabPage2.Location = new System.Drawing.Point(4, 32); this.tabPage2.Location = new System.Drawing.Point(4, 32);
this.tabPage2.Name = "tabPage2"; this.tabPage2.Name = "tabPage2";
this.tabPage2.Size = new System.Drawing.Size(192, 64); this.tabPage2.Size = new System.Drawing.Size(992, 607);
this.tabPage2.TabIndex = 1; this.tabPage2.TabIndex = 1;
this.tabPage2.Text = " 设备状态 "; this.tabPage2.Text = " 设备状态 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
...@@ -165,7 +165,7 @@ ...@@ -165,7 +165,7 @@
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(192, 64); this.panel1.Size = new System.Drawing.Size(992, 607);
this.panel1.TabIndex = 1; this.panel1.TabIndex = 1;
// //
// tableLayoutPanel1 // tableLayoutPanel1
...@@ -190,7 +190,7 @@ ...@@ -190,7 +190,7 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 14.28571F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.04762F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(192, 64); this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 607);
this.tableLayoutPanel1.TabIndex = 0; this.tableLayoutPanel1.TabIndex = 0;
// //
// InputControl // InputControl
...@@ -201,11 +201,11 @@ ...@@ -201,11 +201,11 @@
this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2); this.tableLayoutPanel1.SetColumnSpan(this.InputControl, 2);
this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill; this.InputControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.InputControl.EquipText = "上料机构"; this.InputControl.EquipText = "上料机构";
this.InputControl.Location = new System.Drawing.Point(4, 43); this.InputControl.Location = new System.Drawing.Point(4, 378);
this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.InputControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.InputControl.MoveInfo = "暂无出入库"; this.InputControl.MoveInfo = "暂无出入库";
this.InputControl.Name = "InputControl"; this.InputControl.Name = "InputControl";
this.InputControl.Size = new System.Drawing.Size(184, 4); this.InputControl.Size = new System.Drawing.Size(984, 107);
this.InputControl.TabIndex = 5; this.InputControl.TabIndex = 5;
this.InputControl.WorkStatus = "暂未启动"; this.InputControl.WorkStatus = "暂未启动";
// //
...@@ -215,11 +215,11 @@ ...@@ -215,11 +215,11 @@
this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA1.ColorStatus = System.Drawing.Color.White; this.ReelControlA1.ColorStatus = System.Drawing.Color.White;
this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA1.Location = new System.Drawing.Point(4, 25); this.ReelControlA1.Location = new System.Drawing.Point(4, 206);
this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA1.Name = "ReelControlA1"; this.ReelControlA1.Name = "ReelControlA1";
this.ReelControlA1.ReelText = "暂存区物料"; this.ReelControlA1.ReelText = "暂存区物料";
this.ReelControlA1.Size = new System.Drawing.Size(88, 1); this.ReelControlA1.Size = new System.Drawing.Size(488, 78);
this.ReelControlA1.TabIndex = 0; this.ReelControlA1.TabIndex = 0;
// //
// ReelControlA2 // ReelControlA2
...@@ -228,11 +228,11 @@ ...@@ -228,11 +228,11 @@
this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlA2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlA2.ColorStatus = System.Drawing.Color.White; this.ReelControlA2.ColorStatus = System.Drawing.Color.White;
this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlA2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlA2.Location = new System.Drawing.Point(4, 34); this.ReelControlA2.Location = new System.Drawing.Point(4, 292);
this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlA2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlA2.Name = "ReelControlA2"; this.ReelControlA2.Name = "ReelControlA2";
this.ReelControlA2.ReelText = "暂存区物料"; this.ReelControlA2.ReelText = "暂存区物料";
this.ReelControlA2.Size = new System.Drawing.Size(88, 1); this.ReelControlA2.Size = new System.Drawing.Size(488, 78);
this.ReelControlA2.TabIndex = 1; this.ReelControlA2.TabIndex = 1;
// //
// ReelControlB1 // ReelControlB1
...@@ -241,11 +241,11 @@ ...@@ -241,11 +241,11 @@
this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB1.ColorStatus = System.Drawing.Color.White; this.ReelControlB1.ColorStatus = System.Drawing.Color.White;
this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB1.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB1.Location = new System.Drawing.Point(100, 25); this.ReelControlB1.Location = new System.Drawing.Point(500, 206);
this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB1.Name = "ReelControlB1"; this.ReelControlB1.Name = "ReelControlB1";
this.ReelControlB1.ReelText = "暂存区物料"; this.ReelControlB1.ReelText = "暂存区物料";
this.ReelControlB1.Size = new System.Drawing.Size(88, 1); this.ReelControlB1.Size = new System.Drawing.Size(488, 78);
this.ReelControlB1.TabIndex = 2; this.ReelControlB1.TabIndex = 2;
// //
// ReelControlB2 // ReelControlB2
...@@ -254,11 +254,11 @@ ...@@ -254,11 +254,11 @@
this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.ReelControlB2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.ReelControlB2.ColorStatus = System.Drawing.Color.White; this.ReelControlB2.ColorStatus = System.Drawing.Color.White;
this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill; this.ReelControlB2.Dock = System.Windows.Forms.DockStyle.Fill;
this.ReelControlB2.Location = new System.Drawing.Point(100, 34); this.ReelControlB2.Location = new System.Drawing.Point(500, 292);
this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ReelControlB2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ReelControlB2.Name = "ReelControlB2"; this.ReelControlB2.Name = "ReelControlB2";
this.ReelControlB2.ReelText = "暂存区物料"; this.ReelControlB2.ReelText = "暂存区物料";
this.ReelControlB2.Size = new System.Drawing.Size(88, 1); this.ReelControlB2.Size = new System.Drawing.Size(488, 78);
this.ReelControlB2.TabIndex = 3; this.ReelControlB2.TabIndex = 3;
// //
// BoxControl // BoxControl
...@@ -273,7 +273,7 @@ ...@@ -273,7 +273,7 @@
this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.BoxControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.BoxControl.MoveInfo = "暂无出入库"; this.BoxControl.MoveInfo = "暂无出入库";
this.BoxControl.Name = "BoxControl"; this.BoxControl.Name = "BoxControl";
this.BoxControl.Size = new System.Drawing.Size(184, 13); this.BoxControl.Size = new System.Drawing.Size(984, 194);
this.BoxControl.TabIndex = 4; this.BoxControl.TabIndex = 4;
this.BoxControl.WorkStatus = "暂未启动"; this.BoxControl.WorkStatus = "暂未启动";
// //
...@@ -284,11 +284,11 @@ ...@@ -284,11 +284,11 @@
this.ShelfAControl.ColorStatus = System.Drawing.Color.White; this.ShelfAControl.ColorStatus = System.Drawing.Color.White;
this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfAControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfAControl.EquipText = "A料口"; this.ShelfAControl.EquipText = "A料口";
this.ShelfAControl.Location = new System.Drawing.Point(4, 55); this.ShelfAControl.Location = new System.Drawing.Point(4, 493);
this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfAControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfAControl.MoveInfo = "暂无出入库"; this.ShelfAControl.MoveInfo = "暂无出入库";
this.ShelfAControl.Name = "ShelfAControl"; this.ShelfAControl.Name = "ShelfAControl";
this.ShelfAControl.Size = new System.Drawing.Size(88, 5); this.ShelfAControl.Size = new System.Drawing.Size(488, 110);
this.ShelfAControl.TabIndex = 6; this.ShelfAControl.TabIndex = 6;
this.ShelfAControl.WorkStatus = "暂未启动"; this.ShelfAControl.WorkStatus = "暂未启动";
// //
...@@ -299,11 +299,11 @@ ...@@ -299,11 +299,11 @@
this.ShelfBControl.ColorStatus = System.Drawing.Color.White; this.ShelfBControl.ColorStatus = System.Drawing.Color.White;
this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill; this.ShelfBControl.Dock = System.Windows.Forms.DockStyle.Fill;
this.ShelfBControl.EquipText = "B料口"; this.ShelfBControl.EquipText = "B料口";
this.ShelfBControl.Location = new System.Drawing.Point(100, 55); this.ShelfBControl.Location = new System.Drawing.Point(500, 493);
this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.ShelfBControl.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.ShelfBControl.MoveInfo = "暂无出入库"; this.ShelfBControl.MoveInfo = "暂无出入库";
this.ShelfBControl.Name = "ShelfBControl"; this.ShelfBControl.Name = "ShelfBControl";
this.ShelfBControl.Size = new System.Drawing.Size(88, 5); this.ShelfBControl.Size = new System.Drawing.Size(488, 110);
this.ShelfBControl.TabIndex = 7; this.ShelfBControl.TabIndex = 7;
this.ShelfBControl.WorkStatus = "暂未启动"; this.ShelfBControl.WorkStatus = "暂未启动";
// //
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!