Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 d75e1381
全部展开
内嵌 并排
正在显示 8 个修改的文件 包含 44 行增加 和 10 行删除
source/AssemblyLineClient/FrmLineStore.cs
...@@ -758,7 +758,7 @@ namespace OnlineStore.AssemblyLine ...@@ -758,7 +758,7 @@ namespace OnlineStore.AssemblyLine
private void UpdateControl() private void UpdateControl()
{ {
if (tableLayoutPanel1.Visible) if (panMove.Visible)
{ {
foreach (int key in equipControls1.Keys) foreach (int key in equipControls1.Keys)
{ {
...@@ -766,7 +766,7 @@ namespace OnlineStore.AssemblyLine ...@@ -766,7 +766,7 @@ namespace OnlineStore.AssemblyLine
con.ShowData(lineBean.MoveEquipMap[key]); con.ShowData(lineBean.MoveEquipMap[key]);
} }
} }
if (tableLayoutPanel2.Visible) if (panSL.Visible)
{ {
foreach (int key in equipControls2.Keys) foreach (int key in equipControls2.Keys)
{ {
...@@ -812,7 +812,7 @@ namespace OnlineStore.AssemblyLine ...@@ -812,7 +812,7 @@ namespace OnlineStore.AssemblyLine
{ {
row = row + 1; row = row + 1;
} }
this.tableLayoutPanel1.Controls.Add(control, col, row); this.panMove.Controls.Add(control, col, row);
equipControls1.Add(equip.DeviceID, control); equipControls1.Add(equip.DeviceID, control);
num++; num++;
...@@ -829,25 +829,34 @@ namespace OnlineStore.AssemblyLine ...@@ -829,25 +829,34 @@ namespace OnlineStore.AssemblyLine
int row = num / 5; int row = num / 5;
int col = num % 5; int col = num % 5;
this.tableLayoutPanel2.Controls.Add(control, col, row); this.panSL.Controls.Add(control, col, row);
equipControls2.Add(equip.DeviceID, control); equipControls2.Add(equip.DeviceID, control);
num++; num++;
} }
List<int> hyIDList = new List<int>() { 201,203,0,208, 0,0,215,218,220,
202,204,206,209, 211,213,216,219,221,
0,205,207,210, 212,214,217,0,0 };
for (int i = 0; i < hyList.Count; i++) //for (int i = 0; i < hyList.Count; i++)
num = 0;
foreach (int i in hyIDList)
{
if (i > 0)
{ {
HYEquipBase equip = hyList[i]; int index = i - 200-1;
HYEquipBase equip = hyList[index];
EquipControl control = EquipControl.NewControl(equip); EquipControl control = EquipControl.NewControl(equip);
control.DoubleClick += Control_DoubleClick; control.DoubleClick += Control_DoubleClick;
control.ContextMenuStrip = contextMenuStrip_control; control.ContextMenuStrip = contextMenuStrip_control;
control.MouseEnter += Control_Click; control.MouseEnter += Control_Click;
int row = num / 5; int row = num / 9;
int col = num % 5; int col = num % 9;
this.tableLayoutPanel2.Controls.Add(control, col, row); this.panHY.Controls.Add(control, col, row);
equipControls2.Add(equip.DeviceID, control); equipControls2.Add(equip.DeviceID, control);
}
num++; num++;
} }
} }
......
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

61.4 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

66.3 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/AssemblyLineClient/useControl/EquipControl.Designer.cs
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
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.lblWarn = new System.Windows.Forms.Label();
this.lblUseServo = new System.Windows.Forms.Label();
this.panName.SuspendLayout(); this.panName.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -143,6 +144,7 @@ ...@@ -143,6 +144,7 @@
| 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.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);
...@@ -168,6 +170,19 @@ ...@@ -168,6 +170,19 @@
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);
...@@ -201,5 +216,6 @@ ...@@ -201,5 +216,6 @@
private System.Windows.Forms.Label lblBox; private System.Windows.Forms.Label lblBox;
private System.Windows.Forms.Panel panName; private System.Windows.Forms.Panel panName;
private System.Windows.Forms.Label lblWarn; private System.Windows.Forms.Label lblWarn;
private System.Windows.Forms.Label lblUseServo;
} }
} }
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -83,6 +83,15 @@ namespace OnlineStore.AssemblyLine ...@@ -83,6 +83,15 @@ namespace OnlineStore.AssemblyLine
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;
if (String.IsNullOrEmpty(equip.RFIDIP))
{
lblTrayNum.Visible = false;
}
else
{
lblTrayNum.Visible = true;
}
if (equip.DeviceID < 100) if (equip.DeviceID < 100)
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -18,6 +18,7 @@ namespace OnlineStore.DeviceLibrary
public string CurrShelfId = "";//当前的料架ID public string CurrShelfId = "";//当前的料架ID
public string LastOutShelfId = "";//最后一个出口 public string LastOutShelfId = "";//最后一个出口
public string RFIDIP = "";
public LineMoveInfo SecondMoveInfo = null; public LineMoveInfo SecondMoveInfo = null;
public bool IsDebug = false; public bool IsDebug = false;
public bool UseAxis = false; public bool UseAxis = false;
...@@ -611,7 +612,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -611,7 +612,6 @@ namespace OnlineStore.DeviceLibrary
} }
} }
protected string RFIDIP="";
public virtual string GetMoveStr() public virtual string GetMoveStr()
{ {
string msg = ""; string msg = "";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!