Skip to content

李娜 / SO827-AssemblyLine

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

界面调整

1 个父辈 709fde5a
内嵌 并排
正在显示 4 个修改的文件 包含 24 行增加 和 27 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
...@@ -613,9 +613,9 @@ ...@@ -613,9 +613,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(406, 14); this.lblThisSta.Location = new System.Drawing.Point(406, 85);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(526, 330); this.lblThisSta.Size = new System.Drawing.Size(526, 259);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -688,11 +688,11 @@ ...@@ -688,11 +688,11 @@
// lblwidth // lblwidth
// //
this.lblwidth.AutoSize = true; this.lblwidth.AutoSize = true;
this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblwidth.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblwidth.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblwidth.Location = new System.Drawing.Point(21, 47); this.lblwidth.Location = new System.Drawing.Point(6, 19);
this.lblwidth.Name = "lblwidth"; this.lblwidth.Name = "lblwidth";
this.lblwidth.Size = new System.Drawing.Size(92, 17); this.lblwidth.Size = new System.Drawing.Size(122, 21);
this.lblwidth.TabIndex = 279; this.lblwidth.TabIndex = 279;
this.lblwidth.Text = "当前料盘宽度："; this.lblwidth.Text = "当前料盘宽度：";
// //
...@@ -701,7 +701,7 @@ ...@@ -701,7 +701,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(21, 73); this.lblMoveInfo.Location = new System.Drawing.Point(6, 73);
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 = 278; this.lblMoveInfo.TabIndex = 278;
...@@ -712,7 +712,7 @@ ...@@ -712,7 +712,7 @@
this.lblAgvInfo.AutoSize = true; this.lblAgvInfo.AutoSize = true;
this.lblAgvInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); 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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblAgvInfo.Location = new System.Drawing.Point(21, 21); this.lblAgvInfo.Location = new System.Drawing.Point(6, 48);
this.lblAgvInfo.Name = "lblAgvInfo"; this.lblAgvInfo.Name = "lblAgvInfo";
this.lblAgvInfo.Size = new System.Drawing.Size(61, 17); this.lblAgvInfo.Size = new System.Drawing.Size(61, 17);
this.lblAgvInfo.TabIndex = 276; this.lblAgvInfo.TabIndex = 276;
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -123,10 +123,7 @@ namespace OnlineStore.AssemblyLine ...@@ -123,10 +123,7 @@ namespace OnlineStore.AssemblyLine
FormStatus(false); FormStatus(false);
} }
} }
//if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck))
//{
// chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
//}
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() + lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + ""; "\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块"; string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO); this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(414, 179); this.groupBox1.Location = new System.Drawing.Point(414, 187);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(269, 148); this.groupBox1.Size = new System.Drawing.Size(269, 148);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
...@@ -297,9 +297,9 @@ ...@@ -297,9 +297,9 @@
this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox4.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)));
this.groupBox4.Controls.Add(this.tableLayoutPanel2); this.groupBox4.Controls.Add(this.tableLayoutPanel2);
this.groupBox4.Location = new System.Drawing.Point(210, 178); this.groupBox4.Location = new System.Drawing.Point(210, 187);
this.groupBox4.Name = "groupBox4"; this.groupBox4.Name = "groupBox4";
this.groupBox4.Size = new System.Drawing.Size(200, 337); this.groupBox4.Size = new System.Drawing.Size(200, 328);
this.groupBox4.TabIndex = 104; this.groupBox4.TabIndex = 104;
this.groupBox4.TabStop = false; this.groupBox4.TabStop = false;
this.groupBox4.Text = "DO列表"; this.groupBox4.Text = "DO列表";
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
this.tableLayoutPanel2.RowCount = 2; this.tableLayoutPanel2.RowCount = 2;
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel2.Size = new System.Drawing.Size(189, 317); this.tableLayoutPanel2.Size = new System.Drawing.Size(189, 308);
this.tableLayoutPanel2.TabIndex = 103; this.tableLayoutPanel2.TabIndex = 103;
// //
// groupBox3 // groupBox3
...@@ -325,9 +325,9 @@ ...@@ -325,9 +325,9 @@
this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) this.groupBox3.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)));
this.groupBox3.Controls.Add(this.tableLayoutPanel1); this.groupBox3.Controls.Add(this.tableLayoutPanel1);
this.groupBox3.Location = new System.Drawing.Point(6, 178); this.groupBox3.Location = new System.Drawing.Point(6, 187);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(200, 337); this.groupBox3.Size = new System.Drawing.Size(200, 328);
this.groupBox3.TabIndex = 103; this.groupBox3.TabIndex = 103;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "DI列表"; this.groupBox3.Text = "DI列表";
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowCount = 2;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(189, 317); this.tableLayoutPanel1.Size = new System.Drawing.Size(189, 308);
this.tableLayoutPanel1.TabIndex = 102; this.tableLayoutPanel1.TabIndex = 102;
// //
// groupDO // groupDO
...@@ -360,7 +360,7 @@ ...@@ -360,7 +360,7 @@
this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before); this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
this.groupDO.Controls.Add(this.TopCylinder_Up); this.groupDO.Controls.Add(this.TopCylinder_Up);
this.groupDO.Controls.Add(this.UpDownCylinder_Up); this.groupDO.Controls.Add(this.UpDownCylinder_Up);
this.groupDO.Location = new System.Drawing.Point(414, 330); this.groupDO.Location = new System.Drawing.Point(414, 338);
this.groupDO.Name = "groupDO"; this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(556, 111); this.groupDO.Size = new System.Drawing.Size(556, 111);
this.groupDO.TabIndex = 255; this.groupDO.TabIndex = 255;
...@@ -478,7 +478,7 @@ ...@@ -478,7 +478,7 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(244, 129); this.lblThisSta.Location = new System.Drawing.Point(244, 140);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(724, 28); this.lblThisSta.Size = new System.Drawing.Size(724, 28);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
...@@ -522,7 +522,7 @@ ...@@ -522,7 +522,7 @@
this.groupBox5.Controls.Add(this.label7); this.groupBox5.Controls.Add(this.label7);
this.groupBox5.Controls.Add(this.txtPosId); this.groupBox5.Controls.Add(this.txtPosId);
this.groupBox5.Controls.Add(this.btnClear); this.groupBox5.Controls.Add(this.btnClear);
this.groupBox5.Location = new System.Drawing.Point(414, 446); this.groupBox5.Location = new System.Drawing.Point(414, 451);
this.groupBox5.Name = "groupBox5"; this.groupBox5.Name = "groupBox5";
this.groupBox5.Size = new System.Drawing.Size(407, 61); this.groupBox5.Size = new System.Drawing.Size(407, 61);
this.groupBox5.TabIndex = 280; this.groupBox5.TabIndex = 280;
...@@ -559,7 +559,7 @@ ...@@ -559,7 +559,7 @@
// //
// clampJawControl1 // clampJawControl1
// //
this.clampJawControl1.Location = new System.Drawing.Point(686, 174); this.clampJawControl1.Location = new System.Drawing.Point(686, 182);
this.clampJawControl1.Name = "clampJawControl1"; this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(291, 157); this.clampJawControl1.Size = new System.Drawing.Size(291, 157);
this.clampJawControl1.TabIndex = 279; this.clampJawControl1.TabIndex = 279;
...@@ -576,7 +576,7 @@ ...@@ -576,7 +576,7 @@
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(6, 6); this.groupBox6.Location = new System.Drawing.Point(6, 6);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(973, 166); this.groupBox6.Size = new System.Drawing.Size(973, 176);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "当前状态"; this.groupBox6.Text = "当前状态";
...@@ -585,7 +585,7 @@ ...@@ -585,7 +585,7 @@
// //
this.btnHlhasReel.BackColor = System.Drawing.Color.White; this.btnHlhasReel.BackColor = System.Drawing.Color.White;
this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnHlhasReel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnHlhasReel.Location = new System.Drawing.Point(843, 14); this.btnHlhasReel.Location = new System.Drawing.Point(843, 15);
this.btnHlhasReel.Name = "btnHlhasReel"; this.btnHlhasReel.Name = "btnHlhasReel";
this.btnHlhasReel.Size = new System.Drawing.Size(121, 35); this.btnHlhasReel.Size = new System.Drawing.Size(121, 35);
this.btnHlhasReel.TabIndex = 287; this.btnHlhasReel.TabIndex = 287;
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green; this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(2, 16); this.lblInoutInfo.Location = new System.Drawing.Point(2, 21);
this.lblInoutInfo.Name = "lblInoutInfo"; this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(965, 23); this.lblInoutInfo.Size = new System.Drawing.Size(965, 23);
this.lblInoutInfo.TabIndex = 281; this.lblInoutInfo.TabIndex = 281;
...@@ -625,7 +625,7 @@ ...@@ -625,7 +625,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(244, 57); this.lblInstoreList.Location = new System.Drawing.Point(244, 57);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(724, 66); this.lblInstoreList.Size = new System.Drawing.Size(724, 74);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage2 // tabPage2
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -1163,7 +1163,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1163,7 +1163,7 @@ namespace OnlineStore.DeviceLibrary
} }
public string GetLastTrayInfo() public string GetLastTrayInfo()
{ {
return "" + LastWidth + "X" + LastHeight + "=" + lastcode + "["+((LastPosParam!=null) ?LastPosParam.PosId:"")+"]"; return "" + LastWidth + "X" + LastHeight + "=" + lastcode +( (LastPosParam!=null) ?("[" + LastPosParam.PosId + "]"): "")+(LastPosParam.IsNG?("入库NG:"+LastPosParam.NgMsg):"");
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!