Skip to content

李娜 / AutoCountMachine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit b54bda76 由 LN
选项

bug修改

1 个父辈 0ee07d01
内嵌 并排
正在显示 3 个修改的文件 包含 19 行增加 和 2 行删除
RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.Designer.cs
...@@ -145,6 +145,7 @@ ...@@ -145,6 +145,7 @@
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.chbMoveStop = new System.Windows.Forms.CheckBox(); this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.lblAgvInfo = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout(); this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -782,6 +783,7 @@ ...@@ -782,6 +783,7 @@
this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox6.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.groupBox6.Controls.Add(this.lblAgvInfo);
this.groupBox6.Controls.Add(this.chbPrint); this.groupBox6.Controls.Add(this.chbPrint);
this.groupBox6.Controls.Add(this.btnPrint); this.groupBox6.Controls.Add(this.btnPrint);
this.groupBox6.Controls.Add(this.label6); this.groupBox6.Controls.Add(this.label6);
...@@ -925,7 +927,7 @@ ...@@ -925,7 +927,7 @@
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(18, 29); this.lblMoveInfo.Location = new System.Drawing.Point(18, 52);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17); this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280; this.lblMoveInfo.TabIndex = 280;
...@@ -1971,6 +1973,17 @@ ...@@ -1971,6 +1973,17 @@
this.chbMoveStop.UseVisualStyleBackColor = true; this.chbMoveStop.UseVisualStyleBackColor = true;
this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged); this.chbMoveStop.CheckedChanged += new System.EventHandler(this.chbMoveStop_CheckedChanged);
// //
// lblAgvInfo
//
this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblAgvInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(18, 25);
this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 300;
this.lblAgvInfo.Text = "AGV 状态";
//
// FrmOutputEquip // FrmOutputEquip
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -2140,6 +2153,7 @@ ...@@ -2140,6 +2153,7 @@
private System.Windows.Forms.CheckBox chbPrint; private System.Windows.Forms.CheckBox chbPrint;
internal System.Windows.Forms.Button btnZP4; internal System.Windows.Forms.Button btnZP4;
internal System.Windows.Forms.TextBox txtZP4; internal System.Windows.Forms.TextBox txtZP4;
private System.Windows.Forms.Label lblAgvInfo;
} }
} }
RC1266-AutoCountMachine/source/AutoCountClient/FrmOutputEquip.cs
...@@ -189,6 +189,9 @@ namespace OnlineStore.AutoCountClient ...@@ -189,6 +189,9 @@ namespace OnlineStore.AutoCountClient
FormStatus(false); FormStatus(false);
} }
} }
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
lblMoveInfo.Text = equipBean.GetMoveStr(); lblMoveInfo.Text = equipBean.GetMoveStr();
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ; // string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = RobotBase.GetRunStr(equipBean.runStatus); lblStoreStatus.Text = RobotBase.GetRunStr(equipBean.runStatus);
......
RC1266-AutoCountMachine/source/DeviceLibrary/bean/OutputEquip.cs
...@@ -458,7 +458,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -458,7 +458,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (RobotManager.checkWatch(needLeaveWatch, 3000)) if (RobotManager.checkWatch(needLeaveWatch, 3000))
{ {
AgvClient.NeedEnter(Config.AgvOutName, "", Asa.ClientLevel.High); AgvClient.NeedLeave(Config.AgvOutName, "", Asa.ClientLevel.High);
} }
} }
else else
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!