Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 4f4fa737
全部展开
内嵌 并排
正在显示 4 个修改的文件 包含 30 行增加 和 30 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -121,7 +121,6 @@ namespace OnlineStore.AssemblyLine ...@@ -121,7 +121,6 @@ namespace OnlineStore.AssemblyLine
string opStr = "双击进入详情界面"; string opStr = "双击进入详情界面";
lblOpText.Text = opStr; lblOpText.Text = opStr;
lblOpText2.Text = opStr;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
......
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components);
this.lblBox = new System.Windows.Forms.Label(); this.lblBox = new System.Windows.Forms.Label();
this.panName = new System.Windows.Forms.Panel(); this.panName = new System.Windows.Forms.Panel();
this.lblWarn = new System.Windows.Forms.Label();
this.lblUseServo = new System.Windows.Forms.Label(); this.lblUseServo = new System.Windows.Forms.Label();
this.lblWarn = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ForeColor = System.Drawing.Color.Black; this.lblTrayNum.ForeColor = System.Drawing.Color.Black;
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblTrayNum.Location = new System.Drawing.Point(185, 35); this.lblTrayNum.Location = new System.Drawing.Point(180, 29);
this.lblTrayNum.Name = "lblTrayNum"; this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(56, 17); this.lblTrayNum.Size = new System.Drawing.Size(56, 17);
this.lblTrayNum.TabIndex = 0; this.lblTrayNum.TabIndex = 0;
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblName.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblName.Location = new System.Drawing.Point(3, 2); this.lblName.Location = new System.Drawing.Point(-2, 2);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(99, 22); this.lblName.Size = new System.Drawing.Size(99, 22);
this.lblName.TabIndex = 1; this.lblName.TabIndex = 1;
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
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.ForeColor = System.Drawing.Color.Black; this.lblMoveInfo.ForeColor = System.Drawing.Color.Black;
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblMoveInfo.Location = new System.Drawing.Point(3, 50); this.lblMoveInfo.Location = new System.Drawing.Point(3, 53);
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 = 3; this.lblMoveInfo.TabIndex = 3;
...@@ -113,12 +113,12 @@ ...@@ -113,12 +113,12 @@
this.lblDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblDebug.AutoSize = true; this.lblDebug.AutoSize = true;
this.lblDebug.BackColor = System.Drawing.Color.Transparent; this.lblDebug.BackColor = System.Drawing.Color.Transparent;
this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblDebug.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDebug.Location = new System.Drawing.Point(183, 3); this.lblDebug.Location = new System.Drawing.Point(198, 4);
this.lblDebug.Name = "lblDebug"; this.lblDebug.Name = "lblDebug";
this.lblDebug.Size = new System.Drawing.Size(51, 20); this.lblDebug.Size = new System.Drawing.Size(48, 17);
this.lblDebug.TabIndex = 5; this.lblDebug.TabIndex = 5;
this.lblDebug.Text = "启用："; this.lblDebug.Text = "启用✔";
this.lblDebug.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick); this.lblDebug.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblDebug.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter); this.lblDebug.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
// //
...@@ -130,9 +130,9 @@ ...@@ -130,9 +130,9 @@
this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblBox.ForeColor = System.Drawing.Color.Black; this.lblBox.ForeColor = System.Drawing.Color.Black;
this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblBox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.lblBox.Location = new System.Drawing.Point(2, 94); this.lblBox.Location = new System.Drawing.Point(1, 94);
this.lblBox.Name = "lblBox"; this.lblBox.Name = "lblBox";
this.lblBox.Size = new System.Drawing.Size(245, 24); this.lblBox.Size = new System.Drawing.Size(248, 24);
this.lblBox.TabIndex = 6; this.lblBox.TabIndex = 6;
this.lblBox.Text = "BOX状态："; this.lblBox.Text = "BOX状态：";
this.lblBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblBox.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -144,16 +144,29 @@ ...@@ -144,16 +144,29 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.panName.BackColor = System.Drawing.Color.Transparent; this.panName.BackColor = System.Drawing.Color.Transparent;
this.panName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.panName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.panName.Controls.Add(this.lblUseServo);
this.panName.Controls.Add(this.lblDebug); this.panName.Controls.Add(this.lblDebug);
this.panName.Controls.Add(this.lblUseServo);
this.panName.Controls.Add(this.lblName); this.panName.Controls.Add(this.lblName);
this.panName.Location = new System.Drawing.Point(1, 1); this.panName.Location = new System.Drawing.Point(1, 1);
this.panName.Name = "panName"; this.panName.Name = "panName";
this.panName.Size = new System.Drawing.Size(246, 28); this.panName.Size = new System.Drawing.Size(248, 28);
this.panName.TabIndex = 7; this.panName.TabIndex = 7;
this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick); this.panName.DoubleClick += new System.EventHandler(this.panName_DoubleClick);
this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter); this.panName.MouseEnter += new System.EventHandler(this.panName_MouseEnter);
// //
// lblUseServo
//
this.lblUseServo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblUseServo.AutoSize = true;
this.lblUseServo.BackColor = System.Drawing.Color.Transparent;
this.lblUseServo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblUseServo.Location = new System.Drawing.Point(153, 4);
this.lblUseServo.Name = "lblUseServo";
this.lblUseServo.Size = new System.Drawing.Size(48, 17);
this.lblUseServo.TabIndex = 6;
this.lblUseServo.Text = "伺服✔";
this.lblUseServo.Visible = false;
//
// lblWarn // lblWarn
// //
this.lblWarn.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.lblWarn.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
...@@ -162,27 +175,14 @@ ...@@ -162,27 +175,14 @@
this.lblWarn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWarn.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblWarn.ForeColor = System.Drawing.Color.White; this.lblWarn.ForeColor = System.Drawing.Color.White;
this.lblWarn.ImageAlign = System.Drawing.ContentAlignment.TopLeft; this.lblWarn.ImageAlign = System.Drawing.ContentAlignment.TopLeft;
this.lblWarn.Location = new System.Drawing.Point(3, 72); this.lblWarn.Location = new System.Drawing.Point(3, 77);
this.lblWarn.Name = "lblWarn"; this.lblWarn.Name = "lblWarn";
this.lblWarn.Size = new System.Drawing.Size(242, 45); this.lblWarn.Size = new System.Drawing.Size(242, 42);
this.lblWarn.TabIndex = 8; this.lblWarn.TabIndex = 8;
this.lblWarn.Text = "暂无报警"; this.lblWarn.Text = "暂无报警";
this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick); this.lblWarn.DoubleClick += new System.EventHandler(this.lblStatus_DoubleClick);
this.lblWarn.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter); this.lblWarn.MouseEnter += new System.EventHandler(this.lblStatus_MouseEnter);
// //
// lblUseServo
//
this.lblUseServo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblUseServo.AutoSize = true;
this.lblUseServo.BackColor = System.Drawing.Color.Transparent;
this.lblUseServo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblUseServo.Location = new System.Drawing.Point(127, 3);
this.lblUseServo.Name = "lblUseServo";
this.lblUseServo.Size = new System.Drawing.Size(56, 20);
this.lblUseServo.TabIndex = 6;
this.lblUseServo.Text = "伺服✔";
this.lblUseServo.Visible = false;
//
// EquipControl // EquipControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F); this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -81,9 +81,9 @@ namespace OnlineStore.AssemblyLine ...@@ -81,9 +81,9 @@ namespace OnlineStore.AssemblyLine
lblTrayNum.Text ="托盘："+equip.currTrayNum; lblTrayNum.Text ="托盘："+equip.currTrayNum;
lblStatus.Text = equip.GetRunStr(); lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔"); lblDebug.Text = "启用" + (equip.IsDebug ? "✘" : "✔");
lblWarn.Text = equip.WarnMsg; lblWarn.Text = equip.WarnMsg;
lblUseServo.Visible = equip.UseAxis; lblUseServo.Visible = false;
if (String.IsNullOrEmpty(equip.RFIDIP)) if (String.IsNullOrEmpty(equip.RFIDIP))
{ {
lblTrayNum.Visible = false; lblTrayNum.Visible = false;
...@@ -94,6 +94,7 @@ namespace OnlineStore.AssemblyLine ...@@ -94,6 +94,7 @@ namespace OnlineStore.AssemblyLine
} }
if (equip.DeviceID < 100) if (equip.DeviceID < 100)
{ {
lblUseServo.Visible = equip.UseAxis;
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{ {
lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode; lblMoveInfo.Text = "入库中：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!