Skip to content

李娜 / SO664-AssemblyLine

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

界面调整

1 个父辈 90c6b431
内嵌 并排
正在显示 17 个修改的文件 包含 318 行增加 和 146 行删除
source/AssemblyLineClient/FrmFeedingEquip.Designer.cs
......@@ -149,7 +149,7 @@
this.groupBox1.Controls.Add(this.txtWriteTime);
this.groupBox1.Controls.Add(this.label5);
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(685, 408);
this.groupBox1.Location = new System.Drawing.Point(685, 404);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(568, 107);
this.groupBox1.TabIndex = 105;
......@@ -386,9 +386,9 @@
this.SL_TrayLocation_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_After.Location = new System.Drawing.Point(183, 339);
this.SL_TrayLocation_After.Name = "SL_TrayLocation_After";
this.SL_TrayLocation_After.Size = new System.Drawing.Size(140, 34);
this.SL_TrayLocation_After.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_After.TabIndex = 282;
this.SL_TrayLocation_After.Text = "升降盘定位气缸后退";
this.SL_TrayLocation_After.Text = "升降盘定位气缸后退<<";
this.SL_TrayLocation_After.UseVisualStyleBackColor = false;
this.SL_TrayLocation_After.Click += new System.EventHandler(this.SL_TrayLocation_After_Click);
//
......@@ -529,9 +529,9 @@
this.SL_TrayLocation_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.SL_TrayLocation_Before.Location = new System.Drawing.Point(20, 339);
this.SL_TrayLocation_Before.Name = "SL_TrayLocation_Before";
this.SL_TrayLocation_Before.Size = new System.Drawing.Size(140, 34);
this.SL_TrayLocation_Before.Size = new System.Drawing.Size(153, 34);
this.SL_TrayLocation_Before.TabIndex = 255;
this.SL_TrayLocation_Before.Text = "升降盘定位气缸前进";
this.SL_TrayLocation_Before.Text = "升降盘定位气缸前进>>";
this.SL_TrayLocation_Before.UseVisualStyleBackColor = false;
this.SL_TrayLocation_Before.Click += new System.EventHandler(this.btnTrayLocationCylinder_Click);
//
......@@ -1065,7 +1065,7 @@
this.btnBP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP3.Size = new System.Drawing.Size(163, 34);
this.btnBP3.TabIndex = 312;
this.btnBP3.Text = "上料目标位置P3";
this.btnBP3.Text = "上料目标点P3";
this.btnBP3.UseVisualStyleBackColor = true;
this.btnBP3.Click += new System.EventHandler(this.btnBP3_Click);
//
......@@ -1122,7 +1122,7 @@
this.btnBP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP1.Size = new System.Drawing.Size(163, 34);
this.btnBP1.TabIndex = 307;
this.btnBP1.Text = "上升待机位置P1：";
this.btnBP1.Text = "上升待机点P1：";
this.btnBP1.UseVisualStyleBackColor = true;
this.btnBP1.Click += new System.EventHandler(this.btnBP1_Click);
//
......@@ -1138,7 +1138,7 @@
this.btnBP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnBP2.Size = new System.Drawing.Size(163, 34);
this.btnBP2.TabIndex = 306;
this.btnBP2.Text = "下降点位置P2";
this.btnBP2.Text = "下降固定料串点P2";
this.btnBP2.UseVisualStyleBackColor = true;
this.btnBP2.Click += new System.EventHandler(this.btnBP2_Click);
//
......@@ -1207,7 +1207,7 @@
this.btnUpdownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP3.Size = new System.Drawing.Size(163, 34);
this.btnUpdownP3.TabIndex = 311;
this.btnUpdownP3.Text = "移栽升降轴取料位置P3：";
this.btnUpdownP3.Text = "升降轴取料点P3：";
this.btnUpdownP3.UseVisualStyleBackColor = true;
this.btnUpdownP3.Click += new System.EventHandler(this.btnUpdownP3_Click);
//
......@@ -1250,7 +1250,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.button3_Click);
//
......@@ -1289,7 +1289,7 @@
this.btnMoveto.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveto.Size = new System.Drawing.Size(163, 34);
this.btnMoveto.TabIndex = 306;
this.btnMoveto.Text = "托盘放料位置P2";
this.btnMoveto.Text = "托盘放料点P2";
this.btnMoveto.UseVisualStyleBackColor = true;
this.btnMoveto.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -420,7 +420,7 @@ namespace OnlineStore.AssemblyLine
int size = 0;
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtSizePosition.Text = equipBean.Config.GetUpdownP2(size).ToString();
btnMoveto.Text = size + "mm盘放料位置P2 :";
btnMoveto.Text = size + "mm盘托盘放料点P2 :";
}
private void btnMoveto_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
......@@ -733,7 +733,7 @@
this.lblMoveInfo.AutoSize = true;
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.Location = new System.Drawing.Point(16, 96);
this.lblMoveInfo.Location = new System.Drawing.Point(16, 94);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
......@@ -904,7 +904,7 @@
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(163, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "出料皮带线位置P3";
this.btnP3.Text = "接驳台放料点P3";
this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
//
......@@ -961,7 +961,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(163, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.btnMoveToP1_Click);
//
......@@ -1000,7 +1000,7 @@
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(163, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "移栽位置P2";
this.btnP2.Text = "托盘取料点P2";
this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmHYEquip.cs
......@@ -378,8 +378,8 @@ namespace OnlineStore.AssemblyLine
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtP2.Text = equipBean.Config.GetUpdownP2(size).ToString();
txtP3.Text = equipBean.Config.GetUpdownP3(size).ToString();
btnP2.Text = size + "mm盘移栽位置P2 :";
btnP3.Text = size + "mm盘出料皮带线位置P3 :";
btnP2.Text = size + "mm盘托盘取料点P2 :";
btnP3.Text = size + "mm盘接驳台放料点P3 :";
}
private void btnSave_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmIOTest.cs
......@@ -40,13 +40,13 @@ namespace OnlineStore.AssemblyLine
lblDO.Text = "";
foreach (ConfigIO ioValue in DIList)
{
lblDI.Text+= ioValue.ElectricalDefinition + "_" + ioValue.Explain +"_"+ioValue.ProName+"\r\n";
lblDI.Text+= ioValue.DisplayStr + "\r\n";
}
foreach (ConfigIO ioValue in DOList)
{
lblDO.Text += ioValue.ElectricalDefinition + "_" + ioValue.Explain + "_" + ioValue.ProName + "\r\n";
lblDO.Text += ioValue.DisplayStr + "\r\n";
}
if (LineManager.Line.HYEquipMap.ContainsKey(subType))
......
source/AssemblyLineClient/FrmLineIO.Designer.cs
......@@ -22,6 +22,7 @@
this.button1 = new System.Windows.Forms.Button();
this.txtDOIndex = new System.Windows.Forms.TextBox();
this.txtDoName = new System.Windows.Forms.TextBox();
this.btnCloseAll = new System.Windows.Forms.Button();
this.label17 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.btnWriteSingleDO = new System.Windows.Forms.Button();
......@@ -35,13 +36,15 @@
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox5 = new System.Windows.Forms.GroupBox();
this.lblTrayNum = new System.Windows.Forms.Label();
this.btnLineStop = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button();
this.btnDriveMotor_Run = new System.Windows.Forms.Button();
this.btnFrontStopDown = new System.Windows.Forms.Button();
this.btnCloseAll = new System.Windows.Forms.Button();
this.btnStopDown = new System.Windows.Forms.Button();
this.btnTopDown = new System.Windows.Forms.Button();
this.lblTrayNum = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -60,6 +63,7 @@
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Controls.Add(this.txtDOIndex);
this.groupBox1.Controls.Add(this.txtDoName);
this.groupBox1.Controls.Add(this.btnCloseAll);
this.groupBox1.Controls.Add(this.label17);
this.groupBox1.Controls.Add(this.label14);
this.groupBox1.Controls.Add(this.btnWriteSingleDO);
......@@ -69,7 +73,7 @@
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(573, 3);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(400, 120);
this.groupBox1.Size = new System.Drawing.Size(400, 127);
this.groupBox1.TabIndex = 105;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "DO写入";
......@@ -78,7 +82,7 @@
//
this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button1.Location = new System.Drawing.Point(138, 80);
this.button1.Location = new System.Drawing.Point(138, 85);
this.button1.Name = "button1";
this.button1.Size = new System.Drawing.Size(110, 34);
this.button1.TabIndex = 256;
......@@ -89,7 +93,7 @@
// txtDOIndex
//
this.txtDOIndex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDOIndex.Location = new System.Drawing.Point(191, 52);
this.txtDOIndex.Location = new System.Drawing.Point(191, 55);
this.txtDOIndex.MaxLength = 10;
this.txtDOIndex.Name = "txtDOIndex";
this.txtDOIndex.Size = new System.Drawing.Size(52, 23);
......@@ -99,19 +103,32 @@
// txtDoName
//
this.txtDoName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDoName.Location = new System.Drawing.Point(75, 52);
this.txtDoName.Location = new System.Drawing.Point(75, 55);
this.txtDoName.MaxLength = 10;
this.txtDoName.Name = "txtDoName";
this.txtDoName.Size = new System.Drawing.Size(52, 23);
this.txtDoName.TabIndex = 241;
this.txtDoName.Text = "0";
//
// btnCloseAll
//
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(257, 85);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(110, 34);
this.btnCloseAll.TabIndex = 274;
this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false;
this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
//
// label17
//
this.label17.AutoSize = true;
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label17.Location = new System.Drawing.Point(19, 55);
this.label17.Location = new System.Drawing.Point(19, 58);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(46, 17);
this.label17.TabIndex = 240;
......@@ -123,7 +140,7 @@
this.label14.AutoSize = true;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label14.Location = new System.Drawing.Point(137, 55);
this.label14.Location = new System.Drawing.Point(137, 58);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(44, 17);
this.label14.TabIndex = 239;
......@@ -134,7 +151,7 @@
//
this.btnWriteSingleDO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnWriteSingleDO.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnWriteSingleDO.Location = new System.Drawing.Point(22, 80);
this.btnWriteSingleDO.Location = new System.Drawing.Point(20, 85);
this.btnWriteSingleDO.Name = "btnWriteSingleDO";
this.btnWriteSingleDO.Size = new System.Drawing.Size(110, 34);
this.btnWriteSingleDO.TabIndex = 232;
......@@ -145,7 +162,7 @@
// txtWriteTime
//
this.txtWriteTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtWriteTime.Location = new System.Drawing.Point(323, 52);
this.txtWriteTime.Location = new System.Drawing.Point(323, 55);
this.txtWriteTime.MaxLength = 10;
this.txtWriteTime.Name = "txtWriteTime";
this.txtWriteTime.Size = new System.Drawing.Size(52, 23);
......@@ -157,7 +174,7 @@
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(253, 55);
this.label5.Location = new System.Drawing.Point(253, 58);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(60, 17);
this.label5.TabIndex = 237;
......@@ -268,9 +285,10 @@
//
this.groupBox5.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.groupBox5.Controls.Add(this.btnLineStop);
this.groupBox5.Controls.Add(this.button2);
this.groupBox5.Controls.Add(this.btnDriveMotor_Run);
this.groupBox5.Controls.Add(this.btnFrontStopDown);
this.groupBox5.Controls.Add(this.btnCloseAll);
this.groupBox5.Controls.Add(this.btnStopDown);
this.groupBox5.Controls.Add(this.btnTopDown);
this.groupBox5.Location = new System.Drawing.Point(573, 139);
......@@ -280,28 +298,39 @@
this.groupBox5.TabStop = false;
this.groupBox5.Text = "IO操作测试";
//
// lblTrayNum
//
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(571, 361);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
this.lblTrayNum.Text = "托盘编码：";
this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.BottomRight;
this.lblTrayNum.Visible = false;
// btnLineStop
//
this.btnLineStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnLineStop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnLineStop.Location = new System.Drawing.Point(191, 26);
this.btnLineStop.Name = "btnLineStop";
this.btnLineStop.Size = new System.Drawing.Size(140, 37);
this.btnLineStop.TabIndex = 278;
this.btnLineStop.Text = "驱动电机停止";
this.btnLineStop.UseVisualStyleBackColor = false;
this.btnLineStop.Click += new System.EventHandler(this.btnLineStop_Click);
//
// button2
//
this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.button2.Location = new System.Drawing.Point(191, 121);
this.button2.Name = "button2";
this.button2.Size = new System.Drawing.Size(140, 37);
this.button2.TabIndex = 277;
this.button2.Text = "T3-C1顶升下降 ↓ ";
this.button2.UseVisualStyleBackColor = true;
this.button2.Click += new System.EventHandler(this.button2_Click);
//
// btnDriveMotor_Run
//
this.btnDriveMotor_Run.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDriveMotor_Run.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDriveMotor_Run.Location = new System.Drawing.Point(194, 32);
this.btnDriveMotor_Run.Location = new System.Drawing.Point(22, 26);
this.btnDriveMotor_Run.Name = "btnDriveMotor_Run";
this.btnDriveMotor_Run.Size = new System.Drawing.Size(140, 37);
this.btnDriveMotor_Run.TabIndex = 260;
this.btnDriveMotor_Run.Text = "驱动电机正转";
this.btnDriveMotor_Run.Text = "驱动电机正转->>";
this.btnDriveMotor_Run.UseVisualStyleBackColor = false;
this.btnDriveMotor_Run.Click += new System.EventHandler(this.btnDriveMotor_Run_Click);
//
......@@ -309,36 +338,23 @@
//
this.btnFrontStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnFrontStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFrontStopDown.Location = new System.Drawing.Point(22, 32);
this.btnFrontStopDown.Location = new System.Drawing.Point(22, 78);
this.btnFrontStopDown.Name = "btnFrontStopDown";
this.btnFrontStopDown.Size = new System.Drawing.Size(140, 37);
this.btnFrontStopDown.TabIndex = 276;
this.btnFrontStopDown.Text = "T3-C1前阻挡上升";
this.btnFrontStopDown.Text = "▉ T3-C1前阻挡上升";
this.btnFrontStopDown.UseVisualStyleBackColor = true;
this.btnFrontStopDown.Click += new System.EventHandler(this.btnSw4Location_Click);
//
// btnCloseAll
//
this.btnCloseAll.BackColor = System.Drawing.Color.White;
this.btnCloseAll.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAll.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAll.Location = new System.Drawing.Point(194, 114);
this.btnCloseAll.Name = "btnCloseAll";
this.btnCloseAll.Size = new System.Drawing.Size(140, 37);
this.btnCloseAll.TabIndex = 274;
this.btnCloseAll.Text = "关闭所有DO";
this.btnCloseAll.UseVisualStyleBackColor = false;
this.btnCloseAll.Click += new System.EventHandler(this.btnCloseAll_Click);
//
// btnStopDown
//
this.btnStopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStopDown.Location = new System.Drawing.Point(22, 73);
this.btnStopDown.Location = new System.Drawing.Point(22, 119);
this.btnStopDown.Name = "btnStopDown";
this.btnStopDown.Size = new System.Drawing.Size(140, 37);
this.btnStopDown.TabIndex = 269;
this.btnStopDown.Text = "T3-C1阻挡上升";
this.btnStopDown.Text = "▉ T3-C1阻挡上升";
this.btnStopDown.UseVisualStyleBackColor = true;
this.btnStopDown.Click += new System.EventHandler(this.btn34Top_Click);
//
......@@ -346,17 +362,31 @@
//
this.btnTopDown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTopDown.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnTopDown.Location = new System.Drawing.Point(22, 114);
this.btnTopDown.Location = new System.Drawing.Point(191, 78);
this.btnTopDown.Name = "btnTopDown";
this.btnTopDown.Size = new System.Drawing.Size(140, 37);
this.btnTopDown.TabIndex = 262;
this.btnTopDown.Text = "T3-C1顶升上升";
this.btnTopDown.Text = "T3-C1顶升上升 ↑";
this.btnTopDown.UseVisualStyleBackColor = true;
this.btnTopDown.Click += new System.EventHandler(this.btnSWRun_Click);
//
// lblTrayNum
//
this.lblTrayNum.AutoSize = true;
this.lblTrayNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTrayNum.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblTrayNum.Location = new System.Drawing.Point(826, 350);
this.lblTrayNum.Name = "lblTrayNum";
this.lblTrayNum.Size = new System.Drawing.Size(68, 17);
this.lblTrayNum.TabIndex = 275;
this.lblTrayNum.Text = "托盘编码：";
this.lblTrayNum.TextAlign = System.Drawing.ContentAlignment.BottomRight;
this.lblTrayNum.Visible = false;
//
// panel1
//
this.panel1.AutoScroll = true;
this.panel1.Controls.Add(this.lblMoveInfo);
this.panel1.Controls.Add(this.lblTrayNum);
this.panel1.Controls.Add(this.groupBox4);
this.panel1.Controls.Add(this.groupBox3);
......@@ -369,6 +399,17 @@
this.panel1.Size = new System.Drawing.Size(983, 571);
this.panel1.TabIndex = 248;
//
// lblMoveInfo
//
this.lblMoveInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(579, 350);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 276;
this.lblMoveInfo.Text = "CID";
//
// FrmLineIO
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -422,6 +463,9 @@
private System.Windows.Forms.Label lblTrayNum;
private System.Windows.Forms.Button btnFrontStopDown;
private System.Windows.Forms.Button button1;
private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button btnLineStop;
private System.Windows.Forms.Label lblMoveInfo;
}
}
source/AssemblyLineClient/FrmLineIO.cs
......@@ -65,8 +65,8 @@ namespace OnlineStore.AssemblyLine
count = 19;
tableLayoutPanel2.RowStyles.Clear();
this.tableLayoutPanel2.RowCount = count;
this.tableLayoutPanel4.RowStyles.Clear();
this.tableLayoutPanel4.RowCount = count;
//this.tableLayoutPanel4.RowStyles.Clear();
//this.tableLayoutPanel4.RowCount = count;
roleindex = 0;
foreach (ConfigIO ioValue in LineManager.Config.DOList.Values)
{
......@@ -74,8 +74,8 @@ namespace OnlineStore.AssemblyLine
control.Click += Control_Click;
if (roleindex >= count)
{
this.tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
this.tableLayoutPanel4.Controls.Add(control, 0, roleindex - count);
//this.tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
//this.tableLayoutPanel4.Controls.Add(control, 0, roleindex - count);
}
else
{
......@@ -109,7 +109,7 @@ namespace OnlineStore.AssemblyLine
if ( this.Visible)
{
ReadIOList();
// lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(0);
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
}
}
......@@ -273,23 +273,12 @@ namespace OnlineStore.AssemblyLine
}
private void btnDriveMotor_Run_Click(object sender, EventArgs e)
{
if (btnDriveMotor_Run.Text.Equals("驱动电机正转"))
{
btnDriveMotor_Run.Text = "驱动电机停止";
btnDriveMotor_Run.BackColor = Color.Aqua;
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.HIGH);
}
else
{
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
btnDriveMotor_Run.Text = "驱动电机正转";
btnDriveMotor_Run.BackColor = Color.White;
}
}
private void btnSWRun_Click(object sender, EventArgs e)
{
BtnMove(btnTopDown, "T3-C1顶升上升", "T3-C1顶升下降", IO_Type.HY_TopCylinder_Down,IO_Type.HY_TopCylinder_Up );
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Down, IO_Type.HY_TopCylinder_Up);
}
......@@ -307,5 +296,16 @@ namespace OnlineStore.AssemblyLine
{
BtnMove(btnStopDown, "T3-C1前阻挡上升", "T3-C1前阻挡下降", IO_Type.HY_StopDown);
}
private void button2_Click(object sender, EventArgs e)
{
LineManager.Line.CylinderMove(null, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
}
private void btnLineStop_Click(object sender, EventArgs e)
{
LineManager.Line.WriteDrivetMotorRun(IO_VALUE.LOW);
}
}
}
source/AssemblyLineClient/FrmLineStore.Designer.cs
......@@ -46,8 +46,14 @@
this.tabPage3 = new System.Windows.Forms.TabPage();
this.panel3 = new System.Windows.Forms.Panel();
this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
this.panel4 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.lblMoveInfo = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button();
......@@ -68,6 +74,8 @@
this.cmbTray = new System.Windows.Forms.ComboBox();
this.btnUpdateTray = new System.Windows.Forms.Button();
this.listView1 = new System.Windows.Forms.ListView();
this.tabPage5 = new System.Windows.Forms.TabPage();
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.lblStatus = new System.Windows.Forms.Label();
this.lblWarnMsg = new System.Windows.Forms.Label();
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
......@@ -133,9 +141,13 @@
this.panel1.SuspendLayout();
this.tabPage3.SuspendLayout();
this.panel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout();
this.panel4.SuspendLayout();
this.tabPage4.SuspendLayout();
this.groupBox1.SuspendLayout();
this.groupBox3.SuspendLayout();
this.tabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.contextMenuStrip1.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.contextMenuStrip_control.SuspendLayout();
......@@ -150,6 +162,7 @@
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(8, 81);
this.tabControl1.Multiline = true;
......@@ -328,6 +341,7 @@
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel2.Controls.Add(this.panel4, 4, 5);
this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
this.tableLayoutPanel2.Name = "tableLayoutPanel2";
......@@ -341,9 +355,87 @@
this.tableLayoutPanel2.Size = new System.Drawing.Size(1328, 609);
this.tableLayoutPanel2.TabIndex = 11;
//
// panel4
//
this.panel4.Controls.Add(this.label9);
this.panel4.Controls.Add(this.label10);
this.panel4.Controls.Add(this.label11);
this.panel4.Controls.Add(this.label12);
this.panel4.Controls.Add(this.label13);
this.panel4.Controls.Add(this.label14);
this.panel4.Location = new System.Drawing.Point(1063, 508);
this.panel4.Name = "panel4";
this.panel4.Size = new System.Drawing.Size(262, 98);
this.panel4.TabIndex = 203;
//
// label9
//
this.label9.BackColor = System.Drawing.Color.White;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label9.Location = new System.Drawing.Point(144, 72);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(109, 18);
this.label9.TabIndex = 201;
this.label9.Text = "双击进入详情界面";
//
// label10
//
this.label10.BackColor = System.Drawing.Color.LightBlue;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label10.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label10.Location = new System.Drawing.Point(7, 4);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(109, 17);
this.label10.TabIndex = 197;
this.label10.Text = "蓝色：正常待机中";
//
// label11
//
this.label11.BackColor = System.Drawing.Color.Red;
this.label11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label11.Location = new System.Drawing.Point(7, 76);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(109, 17);
this.label11.TabIndex = 200;
this.label11.Text = "红色：严重报警";
//
// label12
//
this.label12.BackColor = System.Drawing.Color.Orange;
this.label12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label12.Location = new System.Drawing.Point(7, 40);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(109, 17);
this.label12.TabIndex = 95;
this.label12.Text = "橘色：复位中";
//
// label13
//
this.label13.BackColor = System.Drawing.Color.LightCoral;
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label13.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label13.Location = new System.Drawing.Point(7, 58);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(109, 17);
this.label13.TabIndex = 199;
this.label13.Text = "珊瑚色：信号超时报警";
//
// label14
//
this.label14.BackColor = System.Drawing.Color.LightGreen;
this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label14.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.label14.Location = new System.Drawing.Point(7, 22);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(109, 17);
this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中";
//
// tabPage4
//
this.tabPage4.Controls.Add(this.lblMoveInfo);
this.tabPage4.Controls.Add(this.groupBox1);
this.tabPage4.Controls.Add(this.groupBox3);
this.tabPage4.Controls.Add(this.listView1);
......@@ -354,17 +446,6 @@
this.tabPage4.Text = " 设备状态 ";
this.tabPage4.UseVisualStyleBackColor = true;
//
// lblMoveInfo
//
this.lblMoveInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.Location = new System.Drawing.Point(1154, 20);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(29, 17);
this.lblMoveInfo.TabIndex = 196;
this.lblMoveInfo.Text = "CID";
//
// groupBox1
//
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
......@@ -376,7 +457,7 @@
this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(406, 59);
this.groupBox1.Location = new System.Drawing.Point(417, 102);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195;
......@@ -471,7 +552,7 @@
this.groupBox3.Controls.Add(this.cmbTray);
this.groupBox3.Controls.Add(this.btnUpdateTray);
this.groupBox3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox3.Location = new System.Drawing.Point(406, 126);
this.groupBox3.Location = new System.Drawing.Point(417, 169);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(670, 61);
this.groupBox3.TabIndex = 197;
......@@ -594,6 +675,26 @@
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
//
// tabPage5
//
this.tabPage5.Controls.Add(this.pictureBox1);
this.tabPage5.Location = new System.Drawing.Point(4, 29);
this.tabPage5.Name = "tabPage5";
this.tabPage5.Size = new System.Drawing.Size(1328, 609);
this.tabPage5.TabIndex = 4;
this.tabPage5.Text = "设备位置示意图";
this.tabPage5.UseVisualStyleBackColor = true;
//
// pictureBox1
//
this.pictureBox1.Dock = System.Windows.Forms.DockStyle.Fill;
this.pictureBox1.Location = new System.Drawing.Point(0, 0);
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.Size = new System.Drawing.Size(1328, 609);
this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pictureBox1.TabIndex = 107;
this.pictureBox1.TabStop = false;
//
// lblStatus
//
this.lblStatus.AutoSize = true;
......@@ -1041,12 +1142,15 @@
this.panel1.ResumeLayout(false);
this.tabPage3.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false);
this.panel4.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.tabPage4.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
this.tabPage5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
this.contextMenuStrip1.ResumeLayout(false);
this.menuStrip1.ResumeLayout(false);
this.menuStrip1.PerformLayout();
......@@ -1078,7 +1182,6 @@
private System.Windows.Forms.Label lblPosId;
private System.Windows.Forms.Button btnUpdateStatus;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator8;
private System.Windows.Forms.Label lblMoveInfo;
private System.Windows.Forms.GroupBox groupBox3;
private System.Windows.Forms.CheckBox chbInStoNG;
private System.Windows.Forms.ComboBox cmbTrayType;
......@@ -1153,6 +1256,15 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.ToolStripMenuItem toolName;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
private System.Windows.Forms.Panel panel4;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.Label label12;
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TabPage tabPage5;
private System.Windows.Forms.PictureBox pictureBox1;
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -119,14 +119,18 @@ namespace OnlineStore.AssemblyLine
Application.Exit();
return;
}
//Task.Factory.StartNew(delegate {
LoadStoreData();
//} );
this.Opacity = 100;
this.Visible = true;
this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true;
tabControl1.TabPages.Remove(tabPage4);
tabControl1.TabPages.Remove(tabPage5);
timer1.Start();
}
......@@ -498,9 +502,6 @@ namespace OnlineStore.AssemblyLine
return;
}
string canScanCode = "";
//if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
//{
// //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
if (AgvClient.CurrCancelState)
{
......@@ -514,7 +515,6 @@ namespace OnlineStore.AssemblyLine
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time + LineManager.Line.WarnMsg + "\r\n";
lblMoveInfo.Text = LineManager.Line.GetMoveStr();
if (TrayManager.TrayErrorMsg.Equals("").Equals(false))
{
warnMsg += TrayManager.TrayErrorMsg + "\r\n";
......@@ -535,7 +535,8 @@ namespace OnlineStore.AssemblyLine
}
}
}
if (listView1.Visible)
{
lblWarnMsg.Text = warnMsg;
int i = 0;
......@@ -595,6 +596,7 @@ namespace OnlineStore.AssemblyLine
i++;
}
i++;
}
if (lineBean.runStatus > LineRunStatus.Wait)
{
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -42,9 +42,9 @@
this.StopDown2 = new System.Windows.Forms.Button();
this.StopDown1 = new System.Windows.Forms.Button();
this.ClampCylinder_Relax = new System.Windows.Forms.Button();
this.UpDownCylinder_Up = new System.Windows.Forms.Button();
this.BeforeAfterCylinder_Before = new System.Windows.Forms.Button();
this.TopCylinder_Up = new System.Windows.Forms.Button();
this.UpDownCylinder_Up = new System.Windows.Forms.Button();
this.chbDebug = new System.Windows.Forms.CheckBox();
this.lblThisSta = new System.Windows.Forms.Label();
this.lblStoreStatus = new System.Windows.Forms.Label();
......@@ -367,7 +367,7 @@
this.UpDownCylinder_Down.Name = "UpDownCylinder_Down";
this.UpDownCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Down.TabIndex = 260;
this.UpDownCylinder_Down.Text = "↓ 升降下降";
this.UpDownCylinder_Down.Text = "升降下降 ↓ ";
this.UpDownCylinder_Down.UseVisualStyleBackColor = false;
this.UpDownCylinder_Down.Click += new System.EventHandler(this.button4_Click);
//
......@@ -380,7 +380,7 @@
this.TopCylinder_Down.Name = "TopCylinder_Down";
this.TopCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Down.TabIndex = 259;
this.TopCylinder_Down.Text = "↓ 顶升下降";
this.TopCylinder_Down.Text = "顶升下降 ↓ ";
this.TopCylinder_Down.UseVisualStyleBackColor = false;
this.TopCylinder_Down.Click += new System.EventHandler(this.TopCylinder_Down_Click);
//
......@@ -423,19 +423,6 @@
this.ClampCylinder_Relax.UseVisualStyleBackColor = false;
this.ClampCylinder_Relax.Click += new System.EventHandler(this.btnClampSlack_Click);
//
// UpDownCylinder_Up
//
this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Up.Location = new System.Drawing.Point(524, 30);
this.UpDownCylinder_Up.Name = "UpDownCylinder_Up";
this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Up.TabIndex = 252;
this.UpDownCylinder_Up.Text = "↑ 升降上升";
this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
// BeforeAfterCylinder_Before
//
this.BeforeAfterCylinder_Before.BackColor = System.Drawing.Color.White;
......@@ -458,10 +445,23 @@
this.TopCylinder_Up.Name = "TopCylinder_Up";
this.TopCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Up.TabIndex = 246;
this.TopCylinder_Up.Text = "↑ 顶升上升";
this.TopCylinder_Up.Text = "顶升上升 ↑ ";
this.TopCylinder_Up.UseVisualStyleBackColor = false;
this.TopCylinder_Up.Click += new System.EventHandler(this.btnTopUp_Click);
//
// UpDownCylinder_Up
//
this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Up.Location = new System.Drawing.Point(524, 30);
this.UpDownCylinder_Up.Name = "UpDownCylinder_Up";
this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Up.TabIndex = 252;
this.UpDownCylinder_Up.Text = "升降上升 ↑ ";
this.UpDownCylinder_Up.UseVisualStyleBackColor = false;
this.UpDownCylinder_Up.Click += new System.EventHandler(this.btnUpDownUp_Click);
//
// chbDebug
//
this.chbDebug.AutoSize = true;
......@@ -481,7 +481,7 @@
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(147, 58);
this.lblThisSta.Location = new System.Drawing.Point(147, 68);
this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(511, 62);
this.lblThisSta.TabIndex = 246;
......@@ -602,9 +602,9 @@
this.lblInoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(16, 16);
this.lblInoutInfo.Location = new System.Drawing.Point(16, 19);
this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(642, 40);
this.lblInoutInfo.Size = new System.Drawing.Size(637, 40);
this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前出入库：";
//
......@@ -613,7 +613,7 @@
this.lblMoveInfo.AutoSize = true;
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.Location = new System.Drawing.Point(14, 58);
this.lblMoveInfo.Location = new System.Drawing.Point(14, 63);
this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280;
......@@ -626,9 +626,9 @@
this.lblInstoreList.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblInstoreList.ForeColor = System.Drawing.Color.Green;
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(149, 123);
this.lblInstoreList.Location = new System.Drawing.Point(149, 139);
this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(507, 139);
this.lblInstoreList.Size = new System.Drawing.Size(507, 119);
this.lblInstoreList.TabIndex = 277;
this.lblInstoreList.Click += new System.EventHandler(this.lblInstoreList_Click);
//
......@@ -794,7 +794,7 @@
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(154, 34);
this.btnP3.TabIndex = 312;
this.btnP3.Text = "料仓门口位置P3";
this.btnP3.Text = "仓门取放点P3";
this.btnP3.UseVisualStyleBackColor = true;
this.btnP3.Click += new System.EventHandler(this.btnBoxP_Click);
//
......@@ -850,7 +850,7 @@
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(154, 34);
this.btnMoveToP1.TabIndex = 307;
this.btnMoveToP1.Text = "移栽升降轴待机位置P1：";
this.btnMoveToP1.Text = "升降轴待机点P1：";
this.btnMoveToP1.UseVisualStyleBackColor = true;
this.btnMoveToP1.Click += new System.EventHandler(this.button3_Click);
//
......@@ -889,7 +889,7 @@
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(154, 34);
this.btnP2.TabIndex = 306;
this.btnP2.Text = "移栽位置P2";
this.btnP2.Text = "托盘移栽点P2";
this.btnP2.UseVisualStyleBackColor = true;
this.btnP2.Click += new System.EventHandler(this.btnMoveto_Click);
//
......
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -402,8 +402,8 @@ namespace OnlineStore.AssemblyLine
try { size = Convert.ToInt32(cmbSizeList.Text); } catch (Exception ex) { }
txtP2.Text = equipBean.Config.GetUpdownP2(size).ToString();
txtP3.Text = equipBean.Config.GetUpdownP3(size).ToString();
btnP2.Text = size + "mm盘移栽位置 :";
btnP3.Text = size + "mm盘料仓门口位置 :";
btnP2.Text = size + "mm盘托盘移栽点P2 :";
btnP3.Text = size + "mm盘仓门取放点P3 :";
// btnMoveto.Text = "尺mm" + size + "对应位置：";
}
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,0,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
......
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_10.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_12.csv
......@@ -4,9 +4,10 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/DeviceLibrary/LineConfig/HY/Config_HYEquip_17.csv
......@@ -4,9 +4,9 @@ PRO,0,是否使用伺服,UpDownUseAxis,1,,
,,,,,,
AXIS,0,移栽上下轴,UpDown_Axis,100,HC,,250,1000,1000,60,80,50,10,100,0,0
PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,,
PRO,0,移栽上下轴托盘取料位置P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料位置P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细位置P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴托盘取料点P2,UpDownP2List,0=80000;12=141200;16=130000;24=110000;32=98000;44=76000;48=73700;56=61000;8=150000,,
PRO,0,移栽上下轴接驳台放料点P3,UpDownP3List,0=90000;12=157500;16=150800;24=138200;32=116800;44=92500;48=90000;56=95000;8=160000,,
PRO,0,移栽上下轴托盘取料详细点P2,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
source/LoadCVSLibrary/FileEncoding.cs
......@@ -8,7 +8,20 @@ namespace OnlineStore.LoadCSVLibrary
{
public class FileEncoding
{
public static string[] GetFileLines(string filePath)
{
if (!File.Exists(filePath))
{
return new string[] { };
}
Encoding encoding = Encoding.UTF8;
if (!FileEncoding.GetType(filePath).Equals(Encoding.UTF8))
{
encoding = Encoding.GetEncoding("gb2312");
}
string[] lines = File.ReadAllLines(filePath, encoding);
return lines;
}
/// <summary>
/// 给定文件的路径，读取文件的二进制数据，判断文件的编码类型
/// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!