Skip to content

李娜 / SO827-AssemblyLine

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

界面调整，1024X768

1 个父辈 087b7734
全部展开
内嵌 并排
正在显示 19 个修改的文件 包含 87 行增加 和 99 行删除
source/AssemblyLineClient/App.config
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<add key="Feed_LastShelfID_104" value="B7" /> <add key="Feed_LastShelfID_104" value="B7" />
<add key="SaveErrorImageToFile" value="1" /> <add key="SaveErrorImageToFile" value="1" />
<add key="UseHCBoard" value="1" /> <add key="UseHCBoard" value="1" />
<add key="ShowIOForm" value="1" /> <add key="ShowIOForm" value="0" />
<add key="RfidServer_Port" value="12001" /> <add key="RfidServer_Port" value="12001" />
</appSettings> </appSettings>
<log4net> <log4net>
......
source/AssemblyLineClient/FrmAbout.Designer.cs
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top; this.btnNext.Anchor = System.Windows.Forms.AnchorStyles.Top;
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnNext.Font = new System.Drawing.Font("微软雅黑", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(210, 140); this.btnNext.Location = new System.Drawing.Point(200, 174);
this.btnNext.Name = "btnNext"; this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(120, 45); this.btnNext.Size = new System.Drawing.Size(104, 45);
this.btnNext.TabIndex = 275; this.btnNext.TabIndex = 275;
this.btnNext.Text = "确定"; this.btnNext.Text = "确定";
this.btnNext.UseVisualStyleBackColor = false; this.btnNext.UseVisualStyleBackColor = false;
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.lblVersion.Location = new System.Drawing.Point(12, 36); this.lblVersion.Location = new System.Drawing.Point(12, 36);
this.lblVersion.Name = "lblVersion"; this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(529, 23); this.lblVersion.Size = new System.Drawing.Size(503, 23);
this.lblVersion.TabIndex = 276; this.lblVersion.TabIndex = 276;
this.lblVersion.Text = "版本号：1.1.0000.0000"; this.lblVersion.Text = "版本号：1.1.0000.0000";
this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblVersion.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -64,9 +64,9 @@ ...@@ -64,9 +64,9 @@
// //
this.lblTime.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblTime.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.lblTime.Location = new System.Drawing.Point(81, 66); this.lblTime.Location = new System.Drawing.Point(81, 79);
this.lblTime.Name = "lblTime"; this.lblTime.Name = "lblTime";
this.lblTime.Size = new System.Drawing.Size(379, 23); this.lblTime.Size = new System.Drawing.Size(353, 23);
this.lblTime.TabIndex = 277; this.lblTime.TabIndex = 277;
this.lblTime.Text = "更新时间：0000-00-00 00:00:00"; this.lblTime.Text = "更新时间：0000-00-00 00:00:00";
this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblTime.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -75,18 +75,18 @@ ...@@ -75,18 +75,18 @@
// //
this.lblCodeName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.lblCodeName.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.lblCodeName.Location = new System.Drawing.Point(12, 100); this.lblCodeName.Location = new System.Drawing.Point(12, 122);
this.lblCodeName.Name = "lblCodeName"; this.lblCodeName.Name = "lblCodeName";
this.lblCodeName.Size = new System.Drawing.Size(529, 23); this.lblCodeName.Size = new System.Drawing.Size(503, 23);
this.lblCodeName.TabIndex = 278; this.lblCodeName.TabIndex = 278;
this.lblCodeName.Text = "软件编号：？？？"; this.lblCodeName.Text = "软件编号：？？？";
this.lblCodeName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblCodeName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// btnCopy // btnCopy
// //
this.btnCopy.Location = new System.Drawing.Point(466, 64); this.btnCopy.Location = new System.Drawing.Point(451, 77);
this.btnCopy.Name = "btnCopy"; this.btnCopy.Name = "btnCopy";
this.btnCopy.Size = new System.Drawing.Size(75, 25); this.btnCopy.Size = new System.Drawing.Size(74, 25);
this.btnCopy.TabIndex = 279; this.btnCopy.TabIndex = 279;
this.btnCopy.Text = "复制编号"; this.btnCopy.Text = "复制编号";
this.btnCopy.UseVisualStyleBackColor = true; this.btnCopy.UseVisualStyleBackColor = true;
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(553, 222); this.ClientSize = new System.Drawing.Size(543, 248);
this.Controls.Add(this.btnCopy); this.Controls.Add(this.btnCopy);
this.Controls.Add(this.lblCodeName); this.Controls.Add(this.lblCodeName);
this.Controls.Add(this.lblTime); this.Controls.Add(this.lblTime);
......
source/AssemblyLineClient/FrmEquipBase.Designer.cs
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
private void InitializeComponent() private void InitializeComponent()
{ {
this.panBase = new System.Windows.Forms.Panel(); this.panBase = new System.Windows.Forms.Panel();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.btnExit = new System.Windows.Forms.Button(); this.btnExit = new System.Windows.Forms.Button();
this.lblName = new System.Windows.Forms.Label(); this.lblName = new System.Windows.Forms.Label();
this.chbDebug = new System.Windows.Forms.CheckBox(); this.chbDebug = new System.Windows.Forms.CheckBox();
...@@ -37,7 +38,6 @@ ...@@ -37,7 +38,6 @@
this.btnStart = new System.Windows.Forms.Button(); this.btnStart = new System.Windows.Forms.Button();
this.btnInStore = new System.Windows.Forms.Button(); this.btnInStore = new System.Windows.Forms.Button();
this.btnStop = new System.Windows.Forms.Button(); this.btnStop = new System.Windows.Forms.Button();
this.chbMoveStop = new System.Windows.Forms.CheckBox();
this.panBase.SuspendLayout(); this.panBase.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -57,18 +57,29 @@ ...@@ -57,18 +57,29 @@
this.panBase.Controls.Add(this.btnStop); this.panBase.Controls.Add(this.btnStop);
this.panBase.Location = new System.Drawing.Point(3, 3); this.panBase.Location = new System.Drawing.Point(3, 3);
this.panBase.Name = "panBase"; this.panBase.Name = "panBase";
this.panBase.Size = new System.Drawing.Size(1177, 50); this.panBase.Size = new System.Drawing.Size(997, 50);
this.panBase.TabIndex = 259; this.panBase.TabIndex = 259;
// //
// chbMoveStop
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(657, 12);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
//
// btnExit // btnExit
// //
this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.btnExit.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnExit.BackColor = System.Drawing.Color.White; this.btnExit.BackColor = System.Drawing.Color.White;
this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnExit.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnExit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnExit.Location = new System.Drawing.Point(1062, 4); this.btnExit.Location = new System.Drawing.Point(887, 4);
this.btnExit.Name = "btnExit"; this.btnExit.Name = "btnExit";
this.btnExit.Size = new System.Drawing.Size(110, 40); this.btnExit.Size = new System.Drawing.Size(105, 40);
this.btnExit.TabIndex = 260; this.btnExit.TabIndex = 260;
this.btnExit.Text = "退出"; this.btnExit.Text = "退出";
this.btnExit.UseVisualStyleBackColor = false; this.btnExit.UseVisualStyleBackColor = false;
...@@ -80,7 +91,7 @@ ...@@ -80,7 +91,7 @@
this.lblName.ForeColor = System.Drawing.Color.Black; this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 4); this.lblName.Location = new System.Drawing.Point(5, 4);
this.lblName.Name = "lblName"; this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40); this.lblName.Size = new System.Drawing.Size(120, 40);
this.lblName.TabIndex = 250; this.lblName.TabIndex = 250;
this.lblName.Text = "进仓移栽"; this.lblName.Text = "进仓移栽";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -89,7 +100,7 @@ ...@@ -89,7 +100,7 @@
// //
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(666, 12); this.chbDebug.Location = new System.Drawing.Point(568, 12);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24); this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247; this.chbDebug.TabIndex = 247;
...@@ -102,7 +113,7 @@ ...@@ -102,7 +113,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green; this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(862, 14); this.lblStoreStatus.Location = new System.Drawing.Point(746, 14);
this.lblStoreStatus.Name = "lblStoreStatus"; this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20); this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245; this.lblStoreStatus.TabIndex = 245;
...@@ -114,9 +125,9 @@ ...@@ -114,9 +125,9 @@
this.btnOutStore.BackColor = System.Drawing.Color.White; this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(414, 4); this.btnOutStore.Location = new System.Drawing.Point(347, 4);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 40); this.btnOutStore.Size = new System.Drawing.Size(105, 40);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试"; this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false; this.btnOutStore.UseVisualStyleBackColor = false;
...@@ -126,9 +137,9 @@ ...@@ -126,9 +137,9 @@
this.btnStart.BackColor = System.Drawing.Color.White; this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(188, 4); this.btnStart.Location = new System.Drawing.Point(129, 4);
this.btnStart.Name = "btnStart"; this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 40); this.btnStart.Size = new System.Drawing.Size(105, 40);
this.btnStart.TabIndex = 86; this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试"; this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false; this.btnStart.UseVisualStyleBackColor = false;
...@@ -138,9 +149,9 @@ ...@@ -138,9 +149,9 @@
this.btnInStore.BackColor = System.Drawing.Color.White; this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(527, 4); this.btnInStore.Location = new System.Drawing.Point(456, 4);
this.btnInStore.Name = "btnInStore"; this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(110, 40); this.btnInStore.Size = new System.Drawing.Size(105, 40);
this.btnInStore.TabIndex = 102; this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试"; this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false; this.btnInStore.UseVisualStyleBackColor = false;
...@@ -150,29 +161,18 @@ ...@@ -150,29 +161,18 @@
this.btnStop.BackColor = System.Drawing.Color.White; this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(301, 4); this.btnStop.Location = new System.Drawing.Point(238, 4);
this.btnStop.Name = "btnStop"; this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 40); this.btnStop.Size = new System.Drawing.Size(105, 40);
this.btnStop.TabIndex = 87; this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止"; this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false; this.btnStop.UseVisualStyleBackColor = false;
// //
// chbMoveStop
//
this.chbMoveStop.AutoSize = true;
this.chbMoveStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbMoveStop.Location = new System.Drawing.Point(764, 12);
this.chbMoveStop.Name = "chbMoveStop";
this.chbMoveStop.Size = new System.Drawing.Size(84, 24);
this.chbMoveStop.TabIndex = 262;
this.chbMoveStop.Text = "暂停运动";
this.chbMoveStop.UseVisualStyleBackColor = true;
//
// FrmEquipBase // FrmEquipBase
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1184, 611); this.ClientSize = new System.Drawing.Size(1004, 711);
this.Controls.Add(this.panBase); this.Controls.Add(this.panBase);
this.Name = "FrmEquipBase"; this.Name = "FrmEquipBase";
this.Text = "FrmEquipBase"; this.Text = "FrmEquipBase";
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -39,18 +39,18 @@ namespace OnlineStore.AssemblyLine ...@@ -39,18 +39,18 @@ namespace OnlineStore.AssemblyLine
int roleindex = 0; int roleindex = 0;
this.tableLayoutPanel1.RowStyles.Clear(); this.tableLayoutPanel1.RowStyles.Clear();
this.tableLayoutPanel1.RowCount = maxCount; this.tableLayoutPanel1.RowCount = maxCount;
this.tableLayoutPanel3.RowStyles.Clear(); //this.tableLayoutPanel3.RowStyles.Clear();
this.tableLayoutPanel3.RowCount = maxCount; //this.tableLayoutPanel3.RowCount = maxCount;
int i = 0; int i = 0;
foreach (ConfigIO ioValue in equipBean.Config.DIList.Values) foreach (ConfigIO ioValue in equipBean.Config.DIList.Values)
{ {
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName); IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
if (i >= maxCount) //if (i >= maxCount)
{ //{
this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); // this.tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - maxCount); // this.tableLayoutPanel3.Controls.Add(control, 0, roleindex - maxCount);
} //}
else //else
{ {
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28)); this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex); this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
...@@ -122,10 +122,10 @@ namespace OnlineStore.AssemblyLine ...@@ -122,10 +122,10 @@ namespace OnlineStore.AssemblyLine
FormStatus(false); FormStatus(false);
} }
} }
if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck)) //if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck))
{ //{
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut; // 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) ? "紧急出料模块" : "入料模块";
...@@ -219,6 +219,7 @@ namespace OnlineStore.AssemblyLine ...@@ -219,6 +219,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString(); txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP; txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString(); txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; } if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue; newControl.BackColor = Color.SkyBlue;
...@@ -256,9 +257,9 @@ namespace OnlineStore.AssemblyLine ...@@ -256,9 +257,9 @@ namespace OnlineStore.AssemblyLine
txtBP3.Text = equipBean.Config.BatchAxisP3.ToString(); txtBP3.Text = equipBean.Config.BatchAxisP3.ToString();
lblName.Text = equipBean.Name; lblName.Text = equipBean.Name;
this.Text = equipBean.Name; this.Text = equipBean.Name;
chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1); //chbBoxSendShelf.Visible = equipBean.Config.IsCanOut.Equals(1);
//chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
btnScan.Visible = equipBean.Config.IsCanOut.Equals(0); btnScan.Visible = equipBean.Config.IsCanOut.Equals(0);
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
btnOutStore.Visible = equipBean.Config.IsCanOut.Equals(1); btnOutStore.Visible = equipBean.Config.IsCanOut.Equals(1);
lblTargetP3.Text = "目标P3：" + equipBean.Config.BatchAxisP3 ; lblTargetP3.Text = "目标P3：" + equipBean.Config.BatchAxisP3 ;
lblTestMsg.Text = ""; lblTestMsg.Text = "";
...@@ -569,10 +570,10 @@ namespace OnlineStore.AssemblyLine ...@@ -569,10 +570,10 @@ namespace OnlineStore.AssemblyLine
} }
private void chbBoxSendShelf_CheckedChanged(object sender, EventArgs e) private void chbBoxSendShelf_CheckedChanged(object sender, EventArgs e)
{ {
IsInCheck = true; //IsInCheck = true;
LogUtil.info(equipBean.Name + "界面点击：出库完成送出料架=" + chbBoxSendShelf.Checked); //LogUtil.info(equipBean.Name + "界面点击：出库完成送出料架=" + chbBoxSendShelf.Checked);
equipBean.OutEndSendShelfOut = chbBoxSendShelf.Checked; //equipBean.OutEndSendShelfOut = chbBoxSendShelf.Checked;
IsInCheck = false; //IsInCheck = false;
} }
private void btnOutStopDown_Click(object sender, EventArgs e) private void btnOutStopDown_Click(object sender, EventArgs e)
{ {
......
source/AssemblyLineClient/FrmHYEquip.cs
...@@ -202,6 +202,7 @@ namespace OnlineStore.AssemblyLine ...@@ -202,6 +202,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString(); txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP; txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString(); txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; } if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue; newControl.BackColor = Color.SkyBlue;
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -54,7 +54,7 @@ namespace OnlineStore.AssemblyLine ...@@ -54,7 +54,7 @@ namespace OnlineStore.AssemblyLine
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
this.Cursor = Cursors.Default; this.Cursor = Cursors.Default;
tabControl1.TabPages.Remove(tabPage5); //tabControl1.TabPages.Remove(tabPage5);
timer1.Start(); timer1.Start();
} }
...@@ -120,8 +120,8 @@ namespace OnlineStore.AssemblyLine ...@@ -120,8 +120,8 @@ namespace OnlineStore.AssemblyLine
cmbBoxIndex.SelectedIndex = 0; cmbBoxIndex.SelectedIndex = 0;
} }
string opStr = "双击进入详情界面"; //string opStr = "双击进入详情界面";
lblOpText.Text = opStr; //lblOpText.Text = opStr;
LogUtil.logBox = this.logBox; LogUtil.logBox = this.logBox;
lastLogTime = DateTime.Now.AddMinutes(-10); lastLogTime = DateTime.Now.AddMinutes(-10);
...@@ -825,12 +825,12 @@ namespace OnlineStore.AssemblyLine ...@@ -825,12 +825,12 @@ namespace OnlineStore.AssemblyLine
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 / 6; int row = num / 4;
int col = num % 6; int col = num % 4;
if (row > 1) //if (row > 1)
{ //{
row = row + 1; // row = row + 1;
} //}
this.panMove.Controls.Add(control, col, row); this.panMove.Controls.Add(control, col, row);
equipControls1.Add(equip.DeviceID, control); equipControls1.Add(equip.DeviceID, control);
...@@ -1124,5 +1124,10 @@ namespace OnlineStore.AssemblyLine ...@@ -1124,5 +1124,10 @@ namespace OnlineStore.AssemblyLine
LineManager.DisGetWare = chbDisGetWare.Checked; LineManager.DisGetWare = chbDisGetWare.Checked;
LogUtil.info("界面点击勾选：" + chbDisGetWare.Text + "=" + LineManager.DisGetWare); LogUtil.info("界面点击勾选：" + chbDisGetWare.Text + "=" + LineManager.DisGetWare);
} }
private void menuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -266,6 +266,7 @@ namespace OnlineStore.AssemblyLine ...@@ -266,6 +266,7 @@ namespace OnlineStore.AssemblyLine
txtDOIndex.Text = io.GetIOAddr().ToString(); txtDOIndex.Text = io.GetIOAddr().ToString();
txtDoName.Text = io.IO_IP; txtDoName.Text = io.IO_IP;
txtSlaveId.Text = io.SlaveID.ToString(); txtSlaveId.Text = io.SlaveID.ToString();
lblAddr.Text = txtDoName.Text + "_" + txtDOIndex.Text;
IOTextControl newControl = DOControlList[io.ProName]; IOTextControl newControl = DOControlList[io.ProName];
if (selectControl != null) { selectControl.BackColor = Color.White; } if (selectControl != null) { selectControl.BackColor = Color.White; }
newControl.BackColor = Color.SkyBlue; newControl.BackColor = Color.SkyBlue;
......
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png

21.1 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png

51.8 KB | 宽: | 高:

source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
source/AssemblyLineClient/image/line.png
  • 两方对比
  • 交换覆盖
  • 透明覆盖
source/AssemblyLineClient/useControl/AxisMoveControl.cs
...@@ -51,14 +51,12 @@ namespace OnlineStore.AssemblyLine ...@@ -51,14 +51,12 @@ namespace OnlineStore.AssemblyLine
btnDelMove.BackColor = Color.White; btnDelMove.BackColor = Color.White;
this.IsHuiChuan = AxisManager.instance is HCAxisManager; this.IsHuiChuan = AxisManager.instance is HCAxisManager;
if (IsHuiChuan) if (IsHuiChuan)
{ {
groupBox1.Visible = false;
groupBox2.Visible = true; groupBox2.Visible = true;
timer1.Start(); timer1.Start();
} }
else else
{ {
groupBox1.Visible = true;
groupBox2.Visible = false; groupBox2.Visible = false;
} }
} }
...@@ -132,19 +130,7 @@ namespace OnlineStore.AssemblyLine ...@@ -132,19 +130,7 @@ namespace OnlineStore.AssemblyLine
AxisManager.instance.HomeMove(PortName, SlvAddr, speed,currSelAxis.HomeLowSpeed,currSelAxis.HomeAddSpeed); AxisManager.instance.HomeMove(PortName, SlvAddr, speed,currSelAxis.HomeLowSpeed,currSelAxis.HomeAddSpeed);
} }
} }
private void btnGetAlarm_Click(object sender, EventArgs e)
{
this.txtAlarmStatus.Text = AxisManager.instance.GetAlarmStatus(PortName, SlvAddr).ToString();
this.txtBusyStatus.Text = AxisManager.instance.GetBusyStatus(PortName, SlvAddr).ToString();
this.txtHomeStatus.Text = AxisManager.instance.GetHomeEndStatus(PortName, SlvAddr).ToString();
this.txtHomeSingle.Text = AxisManager.instance.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = AxisManager.instance.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = AxisManager.instance.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
txtServoStatue.Text = AxisManager.instance.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
}
private void btnReadPosition_Click(object sender, EventArgs e) private void btnReadPosition_Click(object sender, EventArgs e)
{ {
txtAxisPosition.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString(); txtAxisPosition.Text = AxisManager.instance.GetActualtPosition(PortName, SlvAddr).ToString();
...@@ -182,22 +168,11 @@ namespace OnlineStore.AssemblyLine ...@@ -182,22 +168,11 @@ namespace OnlineStore.AssemblyLine
btnCloseAxis.ForeColor = color; btnCloseAxis.ForeColor = color;
btnAxisAMove.ForeColor = color; btnAxisAMove.ForeColor = color;
btnAxisRMove.ForeColor = color; btnAxisRMove.ForeColor = color;
btnAxisVMove.ForeColor = color;
btnAxisReturnHome.ForeColor = color; btnAxisReturnHome.ForeColor = color;
btnAxisStop.ForeColor = color; btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
btnAddMove.ForeColor = color; btnAddMove.ForeColor = color;
btnDelMove.ForeColor = color; btnDelMove.ForeColor = color;
this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = "";
this.txtLimit1.Text = "";
this.txtLimit2.Text = "";
txtServoStatue.Text = "";
} }
} }
private void AxisMove( int speed) private void AxisMove( int speed)
......
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -114,6 +114,11 @@ namespace OnlineStore.AssemblyLine ...@@ -114,6 +114,11 @@ namespace OnlineStore.AssemblyLine
BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID); BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID);
string online = "✘"; string online = "✘";
string str = "BOX";
if (equip.DeviceID.Equals(7))
{
str = "出料机构";
}
if (box != null) if (box != null)
{ {
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond) if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
...@@ -122,7 +127,7 @@ namespace OnlineStore.AssemblyLine ...@@ -122,7 +127,7 @@ namespace OnlineStore.AssemblyLine
if (box.SAlarmType.Equals(LineAlarmType.None)) if (box.SAlarmType.Equals(LineAlarmType.None))
{ {
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr(); lblBox.Text = str+"[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
if (box.SRunStatus.Equals((int)LineRunStatus.Busy)) if (box.SRunStatus.Equals((int)LineRunStatus.Busy))
{ {
lblBox.BackColor = Color.LightGreen; lblBox.BackColor = Color.LightGreen;
...@@ -134,20 +139,20 @@ namespace OnlineStore.AssemblyLine ...@@ -134,20 +139,20 @@ namespace OnlineStore.AssemblyLine
} }
else else
{ {
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " "+box.SAlarmType+" " + box.ToShowStr(); lblBox.Text = str + "[" + box.CId.ToString() + "]：" + online + " "+box.SAlarmType+" " + box.ToShowStr();
lblBox.BackColor = Color.Red; lblBox.BackColor = Color.Red;
} }
} }
else else
{ {
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr(); lblBox.Text = str + "[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.BackColor = Color.Gray; lblBox.BackColor = Color.Gray;
} }
} }
else else
{ {
lblBox.Text = "BOX状态：" + online; lblBox.Text = str + "状态：" + online;
lblBox.BackColor = Color.Gray; lblBox.BackColor = Color.Gray;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!