Skip to content

李娜 / SO664-AssemblyLine

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

进仓升降轴P3增加详细配置

1 个父辈 f373b0d5
内嵌 并排
正在显示 17 个修改的文件 包含 365 行增加 和 72 行删除
dll/libdmtx.dll
此文件类型无法预览
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -56,6 +56,16 @@ ...@@ -56,6 +56,16 @@
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label(); this.lblInstoreList = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage(); this.tabPage2 = new System.Windows.Forms.TabPage();
this.groupBox7 = new System.Windows.Forms.GroupBox();
this.btnP3Save = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.txtlP3 = new System.Windows.Forms.TextBox();
this.listP3 = new System.Windows.Forms.ListBox();
this.cmbP3Height = new System.Windows.Forms.ComboBox();
this.label8 = new System.Windows.Forms.Label();
this.cmbP3Width = new System.Windows.Forms.ComboBox();
this.label9 = new System.Windows.Forms.Label();
this.lblP3Str = new System.Windows.Forms.Label();
this.groupDetial = new System.Windows.Forms.GroupBox(); this.groupDetial = new System.Windows.Forms.GroupBox();
this.btnDSave = new System.Windows.Forms.Button(); this.btnDSave = new System.Windows.Forms.Button();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
...@@ -65,10 +75,9 @@ ...@@ -65,10 +75,9 @@
this.label2 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label();
this.cmbDSize = new System.Windows.Forms.ComboBox(); this.cmbDSize = new System.Windows.Forms.ComboBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.lblP2Str = new System.Windows.Forms.Label();
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.groupBox2 = new System.Windows.Forms.GroupBox(); this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblP3List = new System.Windows.Forms.Label();
this.lblP2 = new System.Windows.Forms.Label();
this.btnP3 = new System.Windows.Forms.Button(); this.btnP3 = new System.Windows.Forms.Button();
this.txtP3 = new System.Windows.Forms.TextBox(); this.txtP3 = new System.Windows.Forms.TextBox();
this.btnSave = new System.Windows.Forms.Button(); this.btnSave = new System.Windows.Forms.Button();
...@@ -88,6 +97,7 @@ ...@@ -88,6 +97,7 @@
this.groupBox5.SuspendLayout(); this.groupBox5.SuspendLayout();
this.groupBox6.SuspendLayout(); this.groupBox6.SuspendLayout();
this.tabPage2.SuspendLayout(); this.tabPage2.SuspendLayout();
this.groupBox7.SuspendLayout();
this.groupDetial.SuspendLayout(); this.groupDetial.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
...@@ -617,7 +627,10 @@ ...@@ -617,7 +627,10 @@
// //
// tabPage2 // tabPage2
// //
this.tabPage2.Controls.Add(this.groupBox7);
this.tabPage2.Controls.Add(this.lblP3Str);
this.tabPage2.Controls.Add(this.groupDetial); this.tabPage2.Controls.Add(this.groupDetial);
this.tabPage2.Controls.Add(this.lblP2Str);
this.tabPage2.Controls.Add(this.axisMoveControl1); this.tabPage2.Controls.Add(this.axisMoveControl1);
this.tabPage2.Controls.Add(this.groupBox2); this.tabPage2.Controls.Add(this.groupBox2);
this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Location = new System.Drawing.Point(4, 26);
...@@ -628,6 +641,128 @@ ...@@ -628,6 +641,128 @@
this.tabPage2.Text = " 伺服信息 "; this.tabPage2.Text = " 伺服信息 ";
this.tabPage2.UseVisualStyleBackColor = true; this.tabPage2.UseVisualStyleBackColor = true;
// //
// groupBox7
//
this.groupBox7.Controls.Add(this.btnP3Save);
this.groupBox7.Controls.Add(this.label6);
this.groupBox7.Controls.Add(this.txtlP3);
this.groupBox7.Controls.Add(this.listP3);
this.groupBox7.Controls.Add(this.cmbP3Height);
this.groupBox7.Controls.Add(this.label8);
this.groupBox7.Controls.Add(this.cmbP3Width);
this.groupBox7.Controls.Add(this.label9);
this.groupBox7.Location = new System.Drawing.Point(871, 145);
this.groupBox7.Name = "groupBox7";
this.groupBox7.Size = new System.Drawing.Size(280, 366);
this.groupBox7.TabIndex = 323;
this.groupBox7.TabStop = false;
this.groupBox7.Text = "升降轴仓门取放点P3详细配置";
//
// btnP3Save
//
this.btnP3Save.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3Save.ForeColor = System.Drawing.Color.Blue;
this.btnP3Save.Location = new System.Drawing.Point(171, 65);
this.btnP3Save.Name = "btnP3Save";
this.btnP3Save.Size = new System.Drawing.Size(94, 34);
this.btnP3Save.TabIndex = 322;
this.btnP3Save.Text = "保存";
this.btnP3Save.UseVisualStyleBackColor = true;
this.btnP3Save.Click += new System.EventHandler(this.btnP3Save_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label6.Location = new System.Drawing.Point(13, 74);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(49, 17);
this.label6.TabIndex = 321;
this.label6.Text = "P3位置:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtlP3
//
this.txtlP3.BackColor = System.Drawing.SystemColors.Window;
this.txtlP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtlP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtlP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtlP3.Location = new System.Drawing.Point(68, 69);
this.txtlP3.MaxLength = 12;
this.txtlP3.Name = "txtlP3";
this.txtlP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtlP3.Size = new System.Drawing.Size(90, 26);
this.txtlP3.TabIndex = 320;
this.txtlP3.Text = "-1";
//
// listP3
//
this.listP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listP3.FormattingEnabled = true;
this.listP3.ItemHeight = 20;
this.listP3.Location = new System.Drawing.Point(13, 110);
this.listP3.Name = "listP3";
this.listP3.Size = new System.Drawing.Size(253, 244);
this.listP3.TabIndex = 319;
//
// cmbP3Height
//
this.cmbP3Height.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbP3Height.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbP3Height.FormattingEnabled = true;
this.cmbP3Height.Location = new System.Drawing.Point(201, 25);
this.cmbP3Height.Name = "cmbP3Height";
this.cmbP3Height.Size = new System.Drawing.Size(65, 28);
this.cmbP3Height.TabIndex = 318;
this.cmbP3Height.SelectedIndexChanged += new System.EventHandler(this.cmbP3Width_SelectedIndexChanged);
//
// label8
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label8.Location = new System.Drawing.Point(160, 31);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(35, 17);
this.label8.TabIndex = 317;
this.label8.Text = "高度:";
this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// cmbP3Width
//
this.cmbP3Width.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbP3Width.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbP3Width.FormattingEnabled = true;
this.cmbP3Width.Location = new System.Drawing.Point(68, 25);
this.cmbP3Width.Name = "cmbP3Width";
this.cmbP3Width.Size = new System.Drawing.Size(65, 28);
this.cmbP3Width.TabIndex = 316;
this.cmbP3Width.SelectedIndexChanged += new System.EventHandler(this.cmbP3Width_SelectedIndexChanged);
//
// label9
//
this.label9.AutoSize = true;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label9.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label9.Location = new System.Drawing.Point(27, 31);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(35, 17);
this.label9.TabIndex = 315;
this.label9.Text = "宽度:";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblP3Str
//
this.lblP3Str.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3Str.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3Str.Location = new System.Drawing.Point(10, 459);
this.lblP3Str.Name = "lblP3Str";
this.lblP3Str.Size = new System.Drawing.Size(552, 40);
this.lblP3Str.TabIndex = 314;
this.lblP3Str.Text = "P3列表：";
this.lblP3Str.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// groupDetial // groupDetial
// //
this.groupDetial.Controls.Add(this.btnDSave); this.groupDetial.Controls.Add(this.btnDSave);
...@@ -638,18 +773,18 @@ ...@@ -638,18 +773,18 @@
this.groupDetial.Controls.Add(this.label2); this.groupDetial.Controls.Add(this.label2);
this.groupDetial.Controls.Add(this.cmbDSize); this.groupDetial.Controls.Add(this.cmbDSize);
this.groupDetial.Controls.Add(this.label1); this.groupDetial.Controls.Add(this.label1);
this.groupDetial.Location = new System.Drawing.Point(577, 254); this.groupDetial.Location = new System.Drawing.Point(577, 145);
this.groupDetial.Name = "groupDetial"; this.groupDetial.Name = "groupDetial";
this.groupDetial.Size = new System.Drawing.Size(581, 195); this.groupDetial.Size = new System.Drawing.Size(280, 366);
this.groupDetial.TabIndex = 317; this.groupDetial.TabIndex = 317;
this.groupDetial.TabStop = false; this.groupDetial.TabStop = false;
this.groupDetial.Text = "移栽位置P2详细配置"; this.groupDetial.Text = "升降轴托盘移栽点P2详细配置";
// //
// btnDSave // btnDSave
// //
this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDSave.ForeColor = System.Drawing.Color.Blue; this.btnDSave.ForeColor = System.Drawing.Color.Blue;
this.btnDSave.Location = new System.Drawing.Point(108, 145); this.btnDSave.Location = new System.Drawing.Point(171, 65);
this.btnDSave.Name = "btnDSave"; this.btnDSave.Name = "btnDSave";
this.btnDSave.Size = new System.Drawing.Size(94, 34); this.btnDSave.Size = new System.Drawing.Size(94, 34);
this.btnDSave.TabIndex = 322; this.btnDSave.TabIndex = 322;
...@@ -662,11 +797,11 @@ ...@@ -662,11 +797,11 @@
this.label3.AutoSize = true; this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(9, 106); this.label3.Location = new System.Drawing.Point(13, 74);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(94, 17); this.label3.Size = new System.Drawing.Size(49, 17);
this.label3.TabIndex = 321; this.label3.TabIndex = 321;
this.label3.Text = "升降轴P2位置："; this.label3.Text = "P2位置:";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// txtDP2 // txtDP2
...@@ -675,7 +810,7 @@ ...@@ -675,7 +810,7 @@
this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtDP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtDP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtDP2.Location = new System.Drawing.Point(108, 100); this.txtDP2.Location = new System.Drawing.Point(68, 69);
this.txtDP2.MaxLength = 12; this.txtDP2.MaxLength = 12;
this.txtDP2.Name = "txtDP2"; this.txtDP2.Name = "txtDP2";
this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtDP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -688,9 +823,9 @@ ...@@ -688,9 +823,9 @@
this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.listDetitalP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listDetitalP2.FormattingEnabled = true; this.listDetitalP2.FormattingEnabled = true;
this.listDetitalP2.ItemHeight = 20; this.listDetitalP2.ItemHeight = 20;
this.listDetitalP2.Location = new System.Drawing.Point(231, 22); this.listDetitalP2.Location = new System.Drawing.Point(13, 110);
this.listDetitalP2.Name = "listDetitalP2"; this.listDetitalP2.Name = "listDetitalP2";
this.listDetitalP2.Size = new System.Drawing.Size(270, 164); this.listDetitalP2.Size = new System.Drawing.Size(253, 244);
this.listDetitalP2.TabIndex = 319; this.listDetitalP2.TabIndex = 319;
this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged); this.listDetitalP2.SelectedIndexChanged += new System.EventHandler(this.listDetitalP2_SelectedIndexChanged);
// //
...@@ -699,9 +834,9 @@ ...@@ -699,9 +834,9 @@
this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDHeight.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDHeight.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDHeight.FormattingEnabled = true; this.cmbDHeight.FormattingEnabled = true;
this.cmbDHeight.Location = new System.Drawing.Point(108, 62); this.cmbDHeight.Location = new System.Drawing.Point(201, 25);
this.cmbDHeight.Name = "cmbDHeight"; this.cmbDHeight.Name = "cmbDHeight";
this.cmbDHeight.Size = new System.Drawing.Size(90, 28); this.cmbDHeight.Size = new System.Drawing.Size(65, 28);
this.cmbDHeight.TabIndex = 318; this.cmbDHeight.TabIndex = 318;
this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDHeight.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -710,11 +845,11 @@ ...@@ -710,11 +845,11 @@
this.label2.AutoSize = true; this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(9, 68); this.label2.Location = new System.Drawing.Point(160, 31);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(68, 17); this.label2.Size = new System.Drawing.Size(35, 17);
this.label2.TabIndex = 317; this.label2.TabIndex = 317;
this.label2.Text = "料盘高度："; this.label2.Text = "高度:";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// cmbDSize // cmbDSize
...@@ -722,9 +857,9 @@ ...@@ -722,9 +857,9 @@
this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbDSize.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbDSize.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbDSize.FormattingEnabled = true; this.cmbDSize.FormattingEnabled = true;
this.cmbDSize.Location = new System.Drawing.Point(108, 24); this.cmbDSize.Location = new System.Drawing.Point(68, 25);
this.cmbDSize.Name = "cmbDSize"; this.cmbDSize.Name = "cmbDSize";
this.cmbDSize.Size = new System.Drawing.Size(90, 28); this.cmbDSize.Size = new System.Drawing.Size(65, 28);
this.cmbDSize.TabIndex = 316; this.cmbDSize.TabIndex = 316;
this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged); this.cmbDSize.SelectedIndexChanged += new System.EventHandler(this.cmbDHeight_SelectedIndexChanged);
// //
...@@ -733,24 +868,33 @@ ...@@ -733,24 +868,33 @@
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(9, 30); this.label1.Location = new System.Drawing.Point(27, 31);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17); this.label1.Size = new System.Drawing.Size(35, 17);
this.label1.TabIndex = 315; this.label1.TabIndex = 315;
this.label1.Text = "料盘尺寸："; this.label1.Text = "宽度:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// lblP2Str
//
this.lblP2Str.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2Str.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2Str.Location = new System.Drawing.Point(10, 414);
this.lblP2Str.Name = "lblP2Str";
this.lblP2Str.Size = new System.Drawing.Size(552, 40);
this.lblP2Str.TabIndex = 313;
this.lblP2Str.Text = "P2列表：";
this.lblP2Str.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// axisMoveControl1 // axisMoveControl1
// //
this.axisMoveControl1.Location = new System.Drawing.Point(3, 7); this.axisMoveControl1.Location = new System.Drawing.Point(2, 4);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(567, 424); this.axisMoveControl1.Size = new System.Drawing.Size(567, 404);
this.axisMoveControl1.TabIndex = 219; this.axisMoveControl1.TabIndex = 219;
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.lblP3List);
this.groupBox2.Controls.Add(this.lblP2);
this.groupBox2.Controls.Add(this.btnP3); this.groupBox2.Controls.Add(this.btnP3);
this.groupBox2.Controls.Add(this.txtP3); this.groupBox2.Controls.Add(this.txtP3);
this.groupBox2.Controls.Add(this.btnSave); this.groupBox2.Controls.Add(this.btnSave);
...@@ -762,33 +906,11 @@ ...@@ -762,33 +906,11 @@
this.groupBox2.Controls.Add(this.txtP2); this.groupBox2.Controls.Add(this.txtP2);
this.groupBox2.Location = new System.Drawing.Point(577, 4); this.groupBox2.Location = new System.Drawing.Point(577, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(581, 241); this.groupBox2.Size = new System.Drawing.Size(574, 139);
this.groupBox2.TabIndex = 218; this.groupBox2.TabIndex = 218;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "升降轴位置配置"; this.groupBox2.Text = "升降轴位置配置";
// //
// lblP3List
//
this.lblP3List.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP3List.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP3List.Location = new System.Drawing.Point(10, 193);
this.lblP3List.Name = "lblP3List";
this.lblP3List.Size = new System.Drawing.Size(560, 40);
this.lblP3List.TabIndex = 314;
this.lblP3List.Text = "P3列表：";
this.lblP3List.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblP2
//
this.lblP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblP2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblP2.Location = new System.Drawing.Point(10, 148);
this.lblP2.Name = "lblP2";
this.lblP2.Size = new System.Drawing.Size(560, 40);
this.lblP2.TabIndex = 313;
this.lblP2.Text = "P2列表：";
this.lblP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// btnP3 // btnP3
// //
this.btnP3.BackColor = System.Drawing.SystemColors.Control; this.btnP3.BackColor = System.Drawing.SystemColors.Control;
...@@ -796,7 +918,7 @@ ...@@ -796,7 +918,7 @@
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.Color.Blue; this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(275, 63); this.btnP3.Location = new System.Drawing.Point(275, 56);
this.btnP3.Name = "btnP3"; this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP3.Size = new System.Drawing.Size(154, 34); this.btnP3.Size = new System.Drawing.Size(154, 34);
...@@ -811,7 +933,7 @@ ...@@ -811,7 +933,7 @@
this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP3.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP3.Location = new System.Drawing.Point(441, 67); this.txtP3.Location = new System.Drawing.Point(441, 60);
this.txtP3.MaxLength = 12; this.txtP3.MaxLength = 12;
this.txtP3.Name = "txtP3"; this.txtP3.Name = "txtP3";
this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -823,7 +945,7 @@ ...@@ -823,7 +945,7 @@
// //
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue; this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(275, 106); this.btnSave.Location = new System.Drawing.Point(275, 96);
this.btnSave.Name = "btnSave"; this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(154, 34); this.btnSave.Size = new System.Drawing.Size(154, 34);
this.btnSave.TabIndex = 310; this.btnSave.TabIndex = 310;
...@@ -837,7 +959,7 @@ ...@@ -837,7 +959,7 @@
this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP1.Location = new System.Drawing.Point(441, 26); this.txtP1.Location = new System.Drawing.Point(441, 21);
this.txtP1.MaxLength = 12; this.txtP1.MaxLength = 12;
this.txtP1.Name = "txtP1"; this.txtP1.Name = "txtP1";
this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -852,7 +974,7 @@ ...@@ -852,7 +974,7 @@
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue; this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(275, 22); this.btnMoveToP1.Location = new System.Drawing.Point(275, 17);
this.btnMoveToP1.Name = "btnMoveToP1"; this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMoveToP1.Size = new System.Drawing.Size(154, 34); this.btnMoveToP1.Size = new System.Drawing.Size(154, 34);
...@@ -866,7 +988,7 @@ ...@@ -866,7 +988,7 @@
this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbSizeList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbSizeList.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbSizeList.FormattingEnabled = true; this.cmbSizeList.FormattingEnabled = true;
this.cmbSizeList.Location = new System.Drawing.Point(101, 25); this.cmbSizeList.Location = new System.Drawing.Point(101, 20);
this.cmbSizeList.Name = "cmbSizeList"; this.cmbSizeList.Name = "cmbSizeList";
this.cmbSizeList.Size = new System.Drawing.Size(152, 28); this.cmbSizeList.Size = new System.Drawing.Size(152, 28);
this.cmbSizeList.TabIndex = 303; this.cmbSizeList.TabIndex = 303;
...@@ -877,7 +999,7 @@ ...@@ -877,7 +999,7 @@
this.label4.AutoSize = true; this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(27, 32); this.label4.Location = new System.Drawing.Point(27, 27);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17); this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 302; this.label4.TabIndex = 302;
...@@ -891,7 +1013,7 @@ ...@@ -891,7 +1013,7 @@
this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.Color.Blue; this.btnP2.ForeColor = System.Drawing.Color.Blue;
this.btnP2.Location = new System.Drawing.Point(13, 63); this.btnP2.Location = new System.Drawing.Point(13, 56);
this.btnP2.Name = "btnP2"; this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnP2.Size = new System.Drawing.Size(154, 34); this.btnP2.Size = new System.Drawing.Size(154, 34);
...@@ -906,7 +1028,7 @@ ...@@ -906,7 +1028,7 @@
this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtP2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtP2.Location = new System.Drawing.Point(179, 67); this.txtP2.Location = new System.Drawing.Point(179, 60);
this.txtP2.MaxLength = 12; this.txtP2.MaxLength = 12;
this.txtP2.Name = "txtP2"; this.txtP2.Name = "txtP2";
this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -944,6 +1066,8 @@ ...@@ -944,6 +1066,8 @@
this.groupBox6.ResumeLayout(false); this.groupBox6.ResumeLayout(false);
this.groupBox6.PerformLayout(); this.groupBox6.PerformLayout();
this.tabPage2.ResumeLayout(false); this.tabPage2.ResumeLayout(false);
this.groupBox7.ResumeLayout(false);
this.groupBox7.PerformLayout();
this.groupDetial.ResumeLayout(false); this.groupDetial.ResumeLayout(false);
this.groupDetial.PerformLayout(); this.groupDetial.PerformLayout();
this.groupBox2.ResumeLayout(false); this.groupBox2.ResumeLayout(false);
...@@ -1007,14 +1131,23 @@ ...@@ -1007,14 +1131,23 @@
private System.Windows.Forms.Button BeforeAfterCylinder_After; private System.Windows.Forms.Button BeforeAfterCylinder_After;
private System.Windows.Forms.Button UpDownCylinder_Down; private System.Windows.Forms.Button UpDownCylinder_Down;
private System.Windows.Forms.Button TopCylinder_Down; private System.Windows.Forms.Button TopCylinder_Down;
private System.Windows.Forms.Label lblP2; private System.Windows.Forms.Label lblP2Str;
private System.Windows.Forms.Label lblP3List; private System.Windows.Forms.Label lblP3Str;
private System.Windows.Forms.TextBox txtDOIndex; private System.Windows.Forms.TextBox txtDOIndex;
private System.Windows.Forms.TextBox txtDoName; private System.Windows.Forms.TextBox txtDoName;
private System.Windows.Forms.GroupBox groupBox5; private System.Windows.Forms.GroupBox groupBox5;
private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtPosId; private System.Windows.Forms.TextBox txtPosId;
private System.Windows.Forms.Button btnClear; private System.Windows.Forms.Button btnClear;
private System.Windows.Forms.GroupBox groupBox7;
private System.Windows.Forms.Button btnP3Save;
private System.Windows.Forms.Label label6;
internal System.Windows.Forms.TextBox txtlP3;
private System.Windows.Forms.ListBox listP3;
private System.Windows.Forms.ComboBox cmbP3Height;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.ComboBox cmbP3Width;
private System.Windows.Forms.Label label9;
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -60,6 +60,7 @@ namespace OnlineStore.AssemblyLine ...@@ -60,6 +60,7 @@ namespace OnlineStore.AssemblyLine
lblName.Text = equipBean.Name; lblName.Text = equipBean.Name;
this.Text = equipBean.Name; this.Text = equipBean.Name;
LoadDP2(); LoadDP2();
LoadDP3();
LoadDOBtn(groupDO); LoadDOBtn(groupDO);
IsLoad = true; IsLoad = true;
} }
...@@ -461,8 +462,8 @@ namespace OnlineStore.AssemblyLine ...@@ -461,8 +462,8 @@ namespace OnlineStore.AssemblyLine
equipBean.Config.UpdateUpdownP3(size, sizeBoxP); equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
LineManager.SaveMoveEquipConfig(equipBean.Config); LineManager.SaveMoveEquipConfig(equipBean.Config);
lblP2.Text = "P2列表：" + equipBean.Config.UpDownP2List; lblP2Str.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List; lblP3Str.Text = "P3列表：" + equipBean.Config.UpDownP3List;
MessageBox.Show("保存成功！"); MessageBox.Show("保存成功！");
} }
...@@ -499,11 +500,30 @@ namespace OnlineStore.AssemblyLine ...@@ -499,11 +500,30 @@ namespace OnlineStore.AssemblyLine
listDetitalP2.Items.Add(key + "=" + DP2Map[key]); listDetitalP2.Items.Add(key + "=" + DP2Map[key]);
} }
txtDP2.Text = txtP2.Text; txtDP2.Text = txtP2.Text;
lblP2.Text = "P2列表：" + equipBean.Config.UpDownP2List; lblP2Str.Text = "P2列表：" + equipBean.Config.UpDownP2List;
lblP3List.Text = "P3列表：" + equipBean.Config.UpDownP3List; lblP3Str.Text = "P3列表：" + equipBean.Config.UpDownP3List;
} }
private void LoadDP3()
{
cmbP3Height.Items.Clear();
foreach (int heigth in LineManager.GetTrayList())
{
cmbP3Height.Items.Add(heigth);
}
cmbP3Width.Items.Clear();
cmbP3Width.Items.AddRange(new object[] { 7, 11, 13, 15 });
cmbP3Width.SelectedIndex = 0;
cmbP3Height.SelectedIndex = 0;
listP3.Items.Clear();
Dictionary<string, int> DP3Map = equipBean.Config.LoadP3DetialMap();
foreach (string key in DP3Map.Keys)
{
listP3.Items.Add(key + "=" + DP3Map[key]);
}
txtlP3.Text = txtP3.Text;
}
private void btnDSave_Click(object sender, EventArgs e) private void btnDSave_Click(object sender, EventArgs e)
{ {
int size = Convert.ToInt32(cmbDSize.Text); int size = Convert.ToInt32(cmbDSize.Text);
...@@ -697,6 +717,46 @@ namespace OnlineStore.AssemblyLine ...@@ -697,6 +717,46 @@ namespace OnlineStore.AssemblyLine
txtPosId.Clear(); txtPosId.Clear();
} }
} }
private void cmbP3Width_SelectedIndexChanged(object sender, EventArgs e)
{
if (!IsLoad)
{
return;
}
if (cmbP3Width.SelectedIndex < 0 || cmbP3Height.SelectedIndex < 0)
{
return;
}
int size = Convert.ToInt32(cmbP3Width.Text);
int height = Convert.ToInt32(cmbP3Height.Text);
int position = equipBean.Config.GetUpdownP3Detial(height, size);
txtlP3.Text = position.ToString();
}
private void btnP3Save_Click(object sender, EventArgs e)
{
int size = Convert.ToInt32(cmbP3Width.Text);
int height = Convert.ToInt32(cmbP3Height.Text);
int position = FormUtil.GetIntValue(txtlP3);
DialogResult result = MessageBox.Show("保存后只能修改不能删除，是否确定保存？", "确定保存", MessageBoxButtons.OKCancel);
if (result.Equals(DialogResult.OK))
{
equipBean.Config.UpdateUpdownP3Detial(size, height, position);
LineManager.SaveMoveEquipConfig(equipBean.Config);
LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P3值：" + position + "，保存成功");
MessageBox.Show("保存成功！");
listP3 .Items.Clear();
Dictionary<string, int> DP3Map = equipBean.Config.LoadP3DetialMap();
foreach (string key in DP3Map.Keys)
{
listP3.Items.Add(key + "=" + DP3Map[key]);
}
}
}
} }
} }
......
source/AssemblyLineClient/记录.txt
20200203 20200303
三楼环形线更新文件：20210303-AssemblyLine-更新，修改内容：
1.入料线阻挡下降1.5秒。
2.T3,T4 料架送出时，若出口有料架，出料线转动5秒
3.料仓离线改为3秒
4.进仓升降轴P3增加详细配置
20200203
修改内容： 修改内容：
1.阻挡1下降2秒自动上升。 1.阻挡1下降2秒自动上升。
2.入料放料盘到托盘，夹爪放松完成，升降轴上升时再更新托盘有料。 2.入料放料盘到托盘，夹爪放松完成，升降轴上升时再更新托盘有料。
......
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,-11000,, ...@@ -8,6 +8,7 @@ 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,移栽上下轴流水线上方位置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,移栽上下轴料仓门口位置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,UpDownP2DetialList,0X0=8000;,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,400,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,300,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,300,,
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_09.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=9856;12=9162;16=8943;8=9856,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=9856;12=9162;16=8943;8=9856,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10110;12=9325;16=9175;8=10110,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10110;12=9325;16=9175;8=10110,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9856;7X16=8943;7X12=9162,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9856;7X16=8943;7X12=9162,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_10.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=9938;12=8883;16=8848;8=9938,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=9938;12=8883;16=8848;8=9938,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10153;12=9513;16=9150;8=10153,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10153;12=9513;16=9150;8=10153,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9938;7X12=8883;7X16=8848,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=9938;7X12=8883;7X16=8848,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_13.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8321;12=8321;16=7883;24=7173;32=5868;44=5300;56=3222;8=8321,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8321;12=8321;16=7883;24=7173;32=5868;44=5300;56=3222;8=8321,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=11010;12=11010;16=10687;24=9575;32=8714;44=7997;56=5719;8=11010,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=11010;12=11010;16=10687;24=9575;32=8714;44=7997;56=5719;8=11010,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3222;13X16=7883;13X44=5300;15X32=5868;13X24=7173;13X32=6387;13X12=8321;15X44=4574;11X12=8859,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3222;13X16=7883;13X44=5300;15X32=5868;13X24=7173;13X32=6387;13X12=8321;15X44=4574;11X12=8859,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_14.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8440;12=8440;16=7567;24=6941;32=6047;44=4626;56=3019;8=8440,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8440;12=8440;16=7567;24=6941;32=6047;44=4626;56=3019;8=8440,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10186;12=10186;16=9507;24=9041;32=8136;44=7024;48=90000;56=5442;8=10186,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10186;12=10186;16=9507;24=9041;32=8136;44=7024;48=90000;56=5442;8=10186,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3019;15X44=4318;15X32=5600;13X44=4626;13X32=6047;13X24=6941;13X16=7567;13X12=8019;11X12=8440,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3019;15X44=4318;15X32=5600;13X44=4626;13X32=6047;13X24=6941;13X16=7567;13X12=8019;11X12=8440,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_15.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9078;16=8104;24=7426;32=6564;44=5480;48=73700;56=3630;8=150000,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=80000;12=9078;16=8104;24=7426;32=6564;44=5480;48=73700;56=3630;8=150000,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=10281;16=9431;24=8746;32=7967;44=6836;48=90000;56=5259;8=160000,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=90000;12=10281;16=9431;24=8746;32=7967;44=6836;48=90000;56=5259;8=160000,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3630;15X44=4992;15X32=5797;13X44=5480;13X32=6564;13X24=7426;13X16=8104;13X12=8244;11X12=9078,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3630;15X44=4992;15X32=5797;13X44=5480;13X32=6564;13X24=7426;13X16=8104;13X12=8244;11X12=9078,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_16.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8484;12=8484;16=7557;24=6830;32=5969;44=5009;56=3078;8=8484,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8484;12=8484;16=7557;24=6830;32=5969;44=5009;56=3078;8=8484,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=9984;12=9984;16=9479;24=8868;32=7932;44=6875;56=5125;8=9984,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=9984;12=9984;16=9479;24=8868;32=7932;44=6875;56=5125;8=9984,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3078;13X32=5969;15X44=4395;15X32=5636;13X44=5009;13X24=6830;13X16=7557;13X12=8109;11X12=8484,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=3078;13X32=5969;15X44=4395;15X32=5636;13X44=5009;13X24=6830;13X16=7557;13X12=8109;11X12=8484,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_18.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=7570;12=7570;16=7052;24=6360;32=4926;44=3635;48=73700;56=2318;8=7570,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=7570;12=7570;16=7052;24=6360;32=4926;44=3635;48=73700;56=2318;8=7570,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=8926;12=8926;16=8563;24=7875;32=7150;44=5249;48=90000;56=4831;8=8926,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=8926;12=8926;16=8563;24=7875;32=7150;44=5249;48=90000;56=4831;8=8926,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=2318;15X44=3635;11X12=7953;15X32=4926;13X44=4449;13X32=5444;13X24=6360;13X16=7052;13X12=7570,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,15X56=2318;15X44=3635;11X12=7953;15X32=4926;13X44=4449;13X32=5444;13X24=6360;13X16=7052;13X12=7570,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_23.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8652;12=8652;16=7327;24=6642;32=5383;44=4736;56=2931;8=8652,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=8652;12=8652;16=7327;24=6642;32=5383;44=4736;56=2931;8=8652,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10635;12=10635;16=9672;24=8644;32=8215;44=6839;56=5374;8=10635,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=10635;12=10635;16=9672;24=8644;32=8215;44=6839;56=5374;8=10635,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=7327;15X32=5184;15X44=4124;15X56=2931;13X44=4736;13X32=5517;13X24=6642;13X12=7281;11X12=8652,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,13X16=7327;15X32=5184;15X44=4124;15X56=2931;13X44=4736;13X32=5517;13X24=6642;13X12=7281;11X12=8652,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_24.csv
...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,, ...@@ -8,6 +8,7 @@ PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,
PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=927;12=8494;16=7941;24=7941;32=6347;44=5347;48=73700;56=3342;8=150000,, PRO,0,移栽上下轴流水线上方位置P2,UpDownP2List,0=927;12=8494;16=7941;24=7941;32=6347;44=5347;48=73700;56=3342;8=150000,,
PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=1193;12=10732;16=10382;24=10488;32=8650;44=7402;48=90000;56=5679;8=160000,, PRO,0,移栽上下轴料仓门口位置P3,UpDownP3List,0=1193;12=10732;16=10382;24=10488;32=8650;44=7402;48=90000;56=5679;8=160000,,
PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=927;13X8=927;13X12=8494;13X16=7941;15X32=5509;15X44=4483;11X12=8850;15X56=3342;13X44=5342;13X32=6046;13X24=6998,, PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,7X8=927;13X8=927;13X12=8494;13X16=7941;15X32=5509;15X44=4483;11X12=8850;15X56=3342;13X44=5342;13X32=6046;13X24=6998,,
PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,, PRO,0,移栽上下轴P1速度,UpdownAxis_P1Speed,20000,,
PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,, PRO,0,移栽上下轴P2速度,UpdownAxis_P2Speed,20000,,
PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,, PRO,0,移栽上下轴P3速度,UpdownAxis_P3Speed,20000,,
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/assemblyLine/MoveEquip.cs
...@@ -347,12 +347,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -347,12 +347,12 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down); CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
} }
} }
private void UpdownDownP3Move(int trayHeight) private void UpdownDownP3Move(int trayHeight,int traySize)
{ {
if (UseAxis) if (UseAxis)
{ {
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
int position = Config.GetUpdownP3(trayHeight); int position = Config.GetUpdownP3Detial(trayHeight,traySize);
UpdownAxis.AbsMove(MoveInfo, position, Config.UpdownAxis_P3Speed); UpdownAxis.AbsMove(MoveInfo, position, Config.UpdownAxis_P3Speed);
} }
else else
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -84,7 +84,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.MO_52_CylinderDown); MoveInfo.NextMoveStep(LineMoveStep.MO_52_CylinderDown);
OutLog("出库 " + MoveInfo.SLog + ": 上下气缸下降 "); OutLog("出库 " + MoveInfo.SLog + ": 上下气缸下降 ");
UpdownDownP3Move(MoveInfo.MoveParam.PlateH); UpdownDownP3Move(MoveInfo.MoveParam.PlateH,MoveInfo.MoveParam.PlateW);
// CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down); // CylinderMove(MoveInfo, IO_Type.UpDownCylinder_Up, IO_Type.UpDownCylinder_Down);
} }
else else
...@@ -122,7 +122,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -122,7 +122,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.MO_52_CylinderDown); MoveInfo.NextMoveStep(LineMoveStep.MO_52_CylinderDown);
OutLog("出库 " + MoveInfo.SLog + ": 上下气缸下降 "); OutLog("出库 " + MoveInfo.SLog + ": 上下气缸下降 ");
UpdownDownP3Move(MoveInfo.MoveParam.PlateH); UpdownDownP3Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
} }
else if (MoveInfo.IsStep(LineMoveStep.MO_55_CylinderUp)) else if (MoveInfo.IsStep(LineMoveStep.MO_55_CylinderUp))
{ {
...@@ -394,7 +394,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -394,7 +394,7 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(LineMoveStep.MI_11_CylinderDown); MoveInfo.NextMoveStep(LineMoveStep.MI_11_CylinderDown);
InLog("入库 " + MoveInfo.SLog + " ，上下气缸下降"); InLog("入库 " + MoveInfo.SLog + " ，上下气缸下降");
UpdownDownP3Move(MoveInfo.MoveParam.PlateH); UpdownDownP3Move(MoveInfo.MoveParam.PlateH, MoveInfo.MoveParam.PlateW);
} }
else else
{ {
......
source/LoadCVSLibrary/storeConfig/config/MoveEquip_Config.cs
...@@ -83,6 +83,14 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -83,6 +83,14 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("UpDownP2DetialList", false)] [ConfigProAttribute("UpDownP2DetialList", false)]
public string UpDownP2DetialList { get; set; } public string UpDownP2DetialList { get; set; }
/// <summary>
/// PRO,0,移栽上下轴仓门口取放点P3详细位置,UpDownP3DetialList,0X0=0;,,
/// </summary>
[ConfigProAttribute("UpDownP3DetialList", false)]
public string UpDownP3DetialList { get; set; }
#region P2
private Dictionary<string, int> UpdownP2DetialMap = null; private Dictionary<string, int> UpdownP2DetialMap = null;
public Dictionary<string, int> LoadP2DetialMap() public Dictionary<string, int> LoadP2DetialMap()
...@@ -116,7 +124,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -116,7 +124,7 @@ namespace OnlineStore.LoadCSVLibrary
return UpdownP2DetialMap; return UpdownP2DetialMap;
} }
public int GetUpdownP2Detial( int trayHeight, int traySize=8) public int GetUpdownP2Detial(int trayHeight, int traySize = 8)
{ {
LoadP2DetialMap(); LoadP2DetialMap();
string fkey = traySize + "X" + trayHeight; string fkey = traySize + "X" + trayHeight;
...@@ -132,7 +140,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -132,7 +140,7 @@ namespace OnlineStore.LoadCSVLibrary
} }
public void UpdateUpdownP2Detial(int size,int height, int sizePosition) public void UpdateUpdownP2Detial(int size, int height, int sizePosition)
{ {
string fkey = size + "X" + height; string fkey = size + "X" + height;
string newPositionStr = ""; string newPositionStr = "";
...@@ -153,7 +161,81 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -153,7 +161,81 @@ namespace OnlineStore.LoadCSVLibrary
UpDownP2DetialList = newPositionStr; UpDownP2DetialList = newPositionStr;
} }
#endregion
#region P3
private Dictionary<string, int> UpdownP3DetialMap = null;
public Dictionary<string, int> LoadP3DetialMap()
{
try
{
if (UpdownP3DetialMap == null)
{
UpdownP3DetialMap = new Dictionary<string, int>();
string[] arrayList = UpDownP3DetialList.Split(';');
foreach (string str in arrayList)
{
string[] arrStr = str.Split('=');
if (arrStr.Length == 2)
{
string key = arrStr[0].Trim().ToUpper();
if (key.Equals("0X0"))
{
continue;
}
int length = Convert.ToInt32(arrStr[1].Trim());
UpdownP3DetialMap.Add(key, length);
}
}
}
}
catch (Exception ex)
{
}
return UpdownP3DetialMap;
}
public int GetUpdownP3Detial(int trayHeight, int traySize = 8)
{
LoadP3DetialMap();
string fkey = traySize + "X" + trayHeight;
if (UpdownP3DetialMap.ContainsKey(fkey))
{
return UpdownP3DetialMap[fkey];
}
else
{
return GetUpdownP3(trayHeight);
}
return -1;
}
public void UpdateUpdownP3Detial(int size, int height, int sizePosition)
{
string fkey = size + "X" + height;
string newPositionStr = "";
if (UpdownP3DetialMap.ContainsKey(fkey))
{
UpdownP3DetialMap[fkey] = sizePosition;
}
else
{
UpdownP3DetialMap.Add(fkey, sizePosition);
}
foreach (string key in UpdownP3DetialMap.Keys)
{
newPositionStr += key + "=" + UpdownP3DetialMap[key] + ";";
}
newPositionStr = newPositionStr.Substring(0, newPositionStr.Length - 1);
UpDownP3DetialList = newPositionStr;
}
#endregion
///// <summary>s ///// <summary>s
///// PRO,0,移栽上下轴下降速度,UpdownAxis_DownSpeed,500,,,,, ///// PRO,0,移栽上下轴下降速度,UpdownAxis_DownSpeed,500,,,,,
///// </summary> ///// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!