Skip to content

孙克 / RC1250-ACPackingStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 1cf23ae2 由 张东亮
选项

锁定料架扫码

1 个父辈 65166571
内嵌 并排
正在显示 7 个修改的文件 包含 371 行增加 和 183 行删除
source/ACPackingStore/FrmBox.Designer.cs
...@@ -114,6 +114,7 @@ ...@@ -114,6 +114,7 @@
this.btnUpDownP3 = new System.Windows.Forms.Button(); this.btnUpDownP3 = new System.Windows.Forms.Button();
this.btnUpDownP4 = new System.Windows.Forms.Button(); this.btnUpDownP4 = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox(); this.groupBox3 = new System.Windows.Forms.GroupBox();
this.btnClearcurState = new System.Windows.Forms.Button();
this.lblMoveInfo = new System.Windows.Forms.Label(); this.lblMoveInfo = new System.Windows.Forms.Label();
this.lblTemp = new System.Windows.Forms.Label(); this.lblTemp = new System.Windows.Forms.Label();
this.lblMoveEquipInfo = new System.Windows.Forms.Label(); this.lblMoveEquipInfo = new System.Windows.Forms.Label();
...@@ -139,7 +140,7 @@ ...@@ -139,7 +140,7 @@
this.btnTempClose = new System.Windows.Forms.Button(); this.btnTempClose = new System.Windows.Forms.Button();
this.btnTempInit = new System.Windows.Forms.Button(); this.btnTempInit = new System.Windows.Forms.Button();
this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl(); this.axisMoveControl1 = new OnlineStore.ACPackingStore.AxisMoveControl();
this.btnClearcurState = new System.Windows.Forms.Button(); this.chbLockedShelf = new System.Windows.Forms.CheckBox();
this.groupShelf.SuspendLayout(); this.groupShelf.SuspendLayout();
this.panel1.SuspendLayout(); this.panel1.SuspendLayout();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
...@@ -173,9 +174,9 @@ ...@@ -173,9 +174,9 @@
this.groupShelf.Controls.Add(this.cmbShelfPosition); this.groupShelf.Controls.Add(this.cmbShelfPosition);
this.groupShelf.Enabled = false; this.groupShelf.Enabled = false;
this.groupShelf.Location = new System.Drawing.Point(922, 16); this.groupShelf.Location = new System.Drawing.Point(922, 16);
this.groupShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupShelf.Margin = new System.Windows.Forms.Padding(4);
this.groupShelf.Name = "groupShelf"; this.groupShelf.Name = "groupShelf";
this.groupShelf.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupShelf.Padding = new System.Windows.Forms.Padding(4);
this.groupShelf.Size = new System.Drawing.Size(296, 352); this.groupShelf.Size = new System.Drawing.Size(296, 352);
this.groupShelf.TabIndex = 274; this.groupShelf.TabIndex = 274;
this.groupShelf.TabStop = false; this.groupShelf.TabStop = false;
...@@ -187,7 +188,7 @@ ...@@ -187,7 +188,7 @@
this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveShelf.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveShelf.Location = new System.Drawing.Point(148, 286); this.btnSaveShelf.Location = new System.Drawing.Point(148, 286);
this.btnSaveShelf.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSaveShelf.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveShelf.Name = "btnSaveShelf"; this.btnSaveShelf.Name = "btnSaveShelf";
this.btnSaveShelf.Size = new System.Drawing.Size(131, 48); this.btnSaveShelf.Size = new System.Drawing.Size(131, 48);
this.btnSaveShelf.TabIndex = 282; this.btnSaveShelf.TabIndex = 282;
...@@ -218,7 +219,7 @@ ...@@ -218,7 +219,7 @@
this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP101.Location = new System.Drawing.Point(168, 240); this.txtInoutP101.Location = new System.Drawing.Point(168, 240);
this.txtInoutP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInoutP101.Margin = new System.Windows.Forms.Padding(4);
this.txtInoutP101.MaxLength = 0; this.txtInoutP101.MaxLength = 0;
this.txtInoutP101.Name = "txtInoutP101"; this.txtInoutP101.Name = "txtInoutP101";
this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -235,10 +236,10 @@ ...@@ -235,10 +236,10 @@
this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInoutP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP101.ForeColor = System.Drawing.Color.Green; this.btnInoutP101.ForeColor = System.Drawing.Color.Green;
this.btnInoutP101.Location = new System.Drawing.Point(14, 234); this.btnInoutP101.Location = new System.Drawing.Point(14, 234);
this.btnInoutP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInoutP101.Margin = new System.Windows.Forms.Padding(4);
this.btnInoutP101.Name = "btnInoutP101"; this.btnInoutP101.Name = "btnInoutP101";
this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInoutP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP101.Size = new System.Drawing.Size(170, 41); this.btnInoutP101.Size = new System.Drawing.Size(150, 41);
this.btnInoutP101.TabIndex = 279; this.btnInoutP101.TabIndex = 279;
this.btnInoutP101.Text = "进出轴位置P101:"; this.btnInoutP101.Text = "进出轴位置P101:";
this.btnInoutP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInoutP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -253,7 +254,7 @@ ...@@ -253,7 +254,7 @@
this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMP101.Location = new System.Drawing.Point(168, 194); this.txtMP101.Location = new System.Drawing.Point(168, 194);
this.txtMP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMP101.Margin = new System.Windows.Forms.Padding(4);
this.txtMP101.MaxLength = 0; this.txtMP101.MaxLength = 0;
this.txtMP101.Name = "txtMP101"; this.txtMP101.Name = "txtMP101";
this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -271,10 +272,10 @@ ...@@ -271,10 +272,10 @@
this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.button5.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.button5.Location = new System.Drawing.Point(14, 188); this.button5.Location = new System.Drawing.Point(14, 188);
this.button5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.button5.Margin = new System.Windows.Forms.Padding(4);
this.button5.Name = "button5"; this.button5.Name = "button5";
this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.button5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.button5.Size = new System.Drawing.Size(170, 41); this.button5.Size = new System.Drawing.Size(150, 41);
this.button5.TabIndex = 277; this.button5.TabIndex = 277;
this.button5.Text = "旋转轴位置P101:"; this.button5.Text = "旋转轴位置P101:";
this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.button5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -289,7 +290,7 @@ ...@@ -289,7 +290,7 @@
this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP101.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP101.Location = new System.Drawing.Point(168, 99); this.txtUpdownP101.Location = new System.Drawing.Point(168, 99);
this.txtUpdownP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpdownP101.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP101.MaxLength = 0; this.txtUpdownP101.MaxLength = 0;
this.txtUpdownP101.Name = "txtUpdownP101"; this.txtUpdownP101.Name = "txtUpdownP101";
this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -305,7 +306,7 @@ ...@@ -305,7 +306,7 @@
this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP102.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP102.Location = new System.Drawing.Point(168, 146); this.txtUpdownP102.Location = new System.Drawing.Point(168, 146);
this.txtUpdownP102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpdownP102.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP102.MaxLength = 0; this.txtUpdownP102.MaxLength = 0;
this.txtUpdownP102.Name = "txtUpdownP102"; this.txtUpdownP102.Name = "txtUpdownP102";
this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -322,10 +323,10 @@ ...@@ -322,10 +323,10 @@
this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP101.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP101.ForeColor = System.Drawing.Color.Red; this.btnUpdownP101.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP101.Location = new System.Drawing.Point(14, 92); this.btnUpdownP101.Location = new System.Drawing.Point(14, 92);
this.btnUpdownP101.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpdownP101.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP101.Name = "btnUpdownP101"; this.btnUpdownP101.Name = "btnUpdownP101";
this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP101.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP101.Size = new System.Drawing.Size(170, 41); this.btnUpdownP101.Size = new System.Drawing.Size(150, 41);
this.btnUpdownP101.TabIndex = 273; this.btnUpdownP101.TabIndex = 273;
this.btnUpdownP101.Text = "升降轴低点P101:"; this.btnUpdownP101.Text = "升降轴低点P101:";
this.btnUpdownP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP101.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -341,10 +342,10 @@ ...@@ -341,10 +342,10 @@
this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpdownP102.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpdownP102.ForeColor = System.Drawing.Color.Red; this.btnUpdownP102.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP102.Location = new System.Drawing.Point(14, 140); this.btnUpdownP102.Location = new System.Drawing.Point(14, 140);
this.btnUpdownP102.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpdownP102.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP102.Name = "btnUpdownP102"; this.btnUpdownP102.Name = "btnUpdownP102";
this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP102.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP102.Size = new System.Drawing.Size(170, 41); this.btnUpdownP102.Size = new System.Drawing.Size(150, 41);
this.btnUpdownP102.TabIndex = 275; this.btnUpdownP102.TabIndex = 275;
this.btnUpdownP102.Text = "升降轴高点P102:"; this.btnUpdownP102.Text = "升降轴高点P102:";
this.btnUpdownP102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP102.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -357,7 +358,7 @@ ...@@ -357,7 +358,7 @@
this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbShelfPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbShelfPosition.FormattingEnabled = true; this.cmbShelfPosition.FormattingEnabled = true;
this.cmbShelfPosition.Location = new System.Drawing.Point(96, 34); this.cmbShelfPosition.Location = new System.Drawing.Point(96, 34);
this.cmbShelfPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cmbShelfPosition.Margin = new System.Windows.Forms.Padding(4);
this.cmbShelfPosition.Name = "cmbShelfPosition"; this.cmbShelfPosition.Name = "cmbShelfPosition";
this.cmbShelfPosition.Size = new System.Drawing.Size(182, 31); this.cmbShelfPosition.Size = new System.Drawing.Size(182, 31);
this.cmbShelfPosition.TabIndex = 272; this.cmbShelfPosition.TabIndex = 272;
...@@ -378,7 +379,7 @@ ...@@ -378,7 +379,7 @@
this.panel1.Controls.Add(this.btnStoreStop); this.panel1.Controls.Add(this.btnStoreStop);
this.panel1.Controls.Add(this.btnSotreReset); this.panel1.Controls.Add(this.btnSotreReset);
this.panel1.Location = new System.Drawing.Point(4, 2); this.panel1.Location = new System.Drawing.Point(4, 2);
this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1648, 59); this.panel1.Size = new System.Drawing.Size(1648, 59);
this.panel1.TabIndex = 273; this.panel1.TabIndex = 273;
...@@ -387,7 +388,7 @@ ...@@ -387,7 +388,7 @@
// //
this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnUpdown.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnUpdown.Location = new System.Drawing.Point(1466, 5); this.btnUpdown.Location = new System.Drawing.Point(1466, 5);
this.btnUpdown.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpdown.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdown.Name = "btnUpdown"; this.btnUpdown.Name = "btnUpdown";
this.btnUpdown.Size = new System.Drawing.Size(160, 49); this.btnUpdown.Size = new System.Drawing.Size(160, 49);
this.btnUpdown.TabIndex = 273; this.btnUpdown.TabIndex = 273;
...@@ -399,7 +400,7 @@ ...@@ -399,7 +400,7 @@
// //
this.btnScanTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnScanTest.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnScanTest.Location = new System.Drawing.Point(1304, 5); this.btnScanTest.Location = new System.Drawing.Point(1304, 5);
this.btnScanTest.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnScanTest.Margin = new System.Windows.Forms.Padding(4);
this.btnScanTest.Name = "btnScanTest"; this.btnScanTest.Name = "btnScanTest";
this.btnScanTest.Size = new System.Drawing.Size(160, 49); this.btnScanTest.Size = new System.Drawing.Size(160, 49);
this.btnScanTest.TabIndex = 272; this.btnScanTest.TabIndex = 272;
...@@ -411,7 +412,7 @@ ...@@ -411,7 +412,7 @@
// //
this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreHome.Location = new System.Drawing.Point(491, 5); this.btnStoreHome.Location = new System.Drawing.Point(491, 5);
this.btnStoreHome.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnStoreHome.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreHome.Name = "btnStoreHome"; this.btnStoreHome.Name = "btnStoreHome";
this.btnStoreHome.Size = new System.Drawing.Size(160, 49); this.btnStoreHome.Size = new System.Drawing.Size(160, 49);
this.btnStoreHome.TabIndex = 3; this.btnStoreHome.TabIndex = 3;
...@@ -423,7 +424,7 @@ ...@@ -423,7 +424,7 @@
// //
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(1141, 5); this.btnAxisOff.Location = new System.Drawing.Point(1141, 5);
this.btnAxisOff.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAxisOff.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisOff.Name = "btnAxisOff"; this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(160, 49); this.btnAxisOff.Size = new System.Drawing.Size(160, 49);
this.btnAxisOff.TabIndex = 11; this.btnAxisOff.TabIndex = 11;
...@@ -435,7 +436,7 @@ ...@@ -435,7 +436,7 @@
// //
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(979, 5); this.btnAxisOn.Location = new System.Drawing.Point(979, 5);
this.btnAxisOn.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAxisOn.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisOn.Name = "btnAxisOn"; this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(160, 49); this.btnAxisOn.Size = new System.Drawing.Size(160, 49);
this.btnAxisOn.TabIndex = 10; this.btnAxisOn.TabIndex = 10;
...@@ -447,7 +448,7 @@ ...@@ -447,7 +448,7 @@
// //
this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisP.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisP.Location = new System.Drawing.Point(816, 5); this.btnAxisP.Location = new System.Drawing.Point(816, 5);
this.btnAxisP.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnAxisP.Margin = new System.Windows.Forms.Padding(4);
this.btnAxisP.Name = "btnAxisP"; this.btnAxisP.Name = "btnAxisP";
this.btnAxisP.Size = new System.Drawing.Size(160, 49); this.btnAxisP.Size = new System.Drawing.Size(160, 49);
this.btnAxisP.TabIndex = 8; this.btnAxisP.TabIndex = 8;
...@@ -459,7 +460,7 @@ ...@@ -459,7 +460,7 @@
// //
this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnIO.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnIO.Location = new System.Drawing.Point(654, 5); this.btnIO.Location = new System.Drawing.Point(654, 5);
this.btnIO.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnIO.Margin = new System.Windows.Forms.Padding(4);
this.btnIO.Name = "btnIO"; this.btnIO.Name = "btnIO";
this.btnIO.Size = new System.Drawing.Size(160, 49); this.btnIO.Size = new System.Drawing.Size(160, 49);
this.btnIO.TabIndex = 5; this.btnIO.TabIndex = 5;
...@@ -471,7 +472,7 @@ ...@@ -471,7 +472,7 @@
// //
this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStart.Location = new System.Drawing.Point(4, 5); this.btnStoreStart.Location = new System.Drawing.Point(4, 5);
this.btnStoreStart.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnStoreStart.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreStart.Name = "btnStoreStart"; this.btnStoreStart.Name = "btnStoreStart";
this.btnStoreStart.Size = new System.Drawing.Size(160, 49); this.btnStoreStart.Size = new System.Drawing.Size(160, 49);
this.btnStoreStart.TabIndex = 0; this.btnStoreStart.TabIndex = 0;
...@@ -483,7 +484,7 @@ ...@@ -483,7 +484,7 @@
// //
this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStoreStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStoreStop.Location = new System.Drawing.Point(166, 5); this.btnStoreStop.Location = new System.Drawing.Point(166, 5);
this.btnStoreStop.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnStoreStop.Margin = new System.Windows.Forms.Padding(4);
this.btnStoreStop.Name = "btnStoreStop"; this.btnStoreStop.Name = "btnStoreStop";
this.btnStoreStop.Size = new System.Drawing.Size(160, 49); this.btnStoreStop.Size = new System.Drawing.Size(160, 49);
this.btnStoreStop.TabIndex = 1; this.btnStoreStop.TabIndex = 1;
...@@ -495,7 +496,7 @@ ...@@ -495,7 +496,7 @@
// //
this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSotreReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSotreReset.Location = new System.Drawing.Point(329, 5); this.btnSotreReset.Location = new System.Drawing.Point(329, 5);
this.btnSotreReset.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSotreReset.Margin = new System.Windows.Forms.Padding(4);
this.btnSotreReset.Name = "btnSotreReset"; this.btnSotreReset.Name = "btnSotreReset";
this.btnSotreReset.Size = new System.Drawing.Size(160, 49); this.btnSotreReset.Size = new System.Drawing.Size(160, 49);
this.btnSotreReset.TabIndex = 2; this.btnSotreReset.TabIndex = 2;
...@@ -511,7 +512,7 @@ ...@@ -511,7 +512,7 @@
this.tabControl1.Controls.Add(this.tabPage4); this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Location = new System.Drawing.Point(8, 65); this.tabControl1.Location = new System.Drawing.Point(8, 65);
this.tabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabControl1.Margin = new System.Windows.Forms.Padding(4);
this.tabControl1.Name = "tabControl1"; this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0; this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(1649, 714); this.tabControl1.Size = new System.Drawing.Size(1649, 714);
...@@ -522,7 +523,7 @@ ...@@ -522,7 +523,7 @@
this.tabPage4.Controls.Add(this.groupInout); this.tabPage4.Controls.Add(this.groupInout);
this.tabPage4.Controls.Add(this.groupBox3); this.tabPage4.Controls.Add(this.groupBox3);
this.tabPage4.Location = new System.Drawing.Point(4, 32); this.tabPage4.Location = new System.Drawing.Point(4, 32);
this.tabPage4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage4.Margin = new System.Windows.Forms.Padding(4);
this.tabPage4.Name = "tabPage4"; this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(1641, 678); this.tabPage4.Size = new System.Drawing.Size(1641, 678);
this.tabPage4.TabIndex = 3; this.tabPage4.TabIndex = 3;
...@@ -580,9 +581,9 @@ ...@@ -580,9 +581,9 @@
this.groupInout.Controls.Add(this.btnUpDownP4); this.groupInout.Controls.Add(this.btnUpDownP4);
this.groupInout.Enabled = false; this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(4, 205); this.groupInout.Location = new System.Drawing.Point(4, 205);
this.groupInout.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupInout.Margin = new System.Windows.Forms.Padding(4);
this.groupInout.Name = "groupInout"; this.groupInout.Name = "groupInout";
this.groupInout.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupInout.Padding = new System.Windows.Forms.Padding(4);
this.groupInout.Size = new System.Drawing.Size(1630, 452); this.groupInout.Size = new System.Drawing.Size(1630, 452);
this.groupInout.TabIndex = 100; this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false; this.groupInout.TabStop = false;
...@@ -607,7 +608,7 @@ ...@@ -607,7 +608,7 @@
this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP11.Location = new System.Drawing.Point(801, 391); this.txtUpdownP11.Location = new System.Drawing.Point(801, 391);
this.txtUpdownP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpdownP11.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP11.MaxLength = 0; this.txtUpdownP11.MaxLength = 0;
this.txtUpdownP11.Name = "txtUpdownP11"; this.txtUpdownP11.Name = "txtUpdownP11";
this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -636,9 +637,9 @@ ...@@ -636,9 +637,9 @@
this.groupBox1.Enabled = false; this.groupBox1.Enabled = false;
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(1232, 16); this.groupBox1.Location = new System.Drawing.Point(1232, 16);
this.groupBox1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Margin = new System.Windows.Forms.Padding(4);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox1.Padding = new System.Windows.Forms.Padding(4);
this.groupBox1.Size = new System.Drawing.Size(374, 419); this.groupBox1.Size = new System.Drawing.Size(374, 419);
this.groupBox1.TabIndex = 1; this.groupBox1.TabIndex = 1;
this.groupBox1.TabStop = false; this.groupBox1.TabStop = false;
...@@ -667,7 +668,7 @@ ...@@ -667,7 +668,7 @@
this.txtCom7_P3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCom7_P3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCom7_P3_P2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtCom7_P3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtCom7_P3_P2.Location = new System.Drawing.Point(251, 172); this.txtCom7_P3_P2.Location = new System.Drawing.Point(251, 172);
this.txtCom7_P3_P2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtCom7_P3_P2.Margin = new System.Windows.Forms.Padding(4);
this.txtCom7_P3_P2.MaxLength = 0; this.txtCom7_P3_P2.MaxLength = 0;
this.txtCom7_P3_P2.Name = "txtCom7_P3_P2"; this.txtCom7_P3_P2.Name = "txtCom7_P3_P2";
this.txtCom7_P3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtCom7_P3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -698,7 +699,7 @@ ...@@ -698,7 +699,7 @@
this.txtComP3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3_P2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3_P2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3_P2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3_P2.Location = new System.Drawing.Point(251, 130); this.txtComP3_P2.Location = new System.Drawing.Point(251, 130);
this.txtComP3_P2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComP3_P2.Margin = new System.Windows.Forms.Padding(4);
this.txtComP3_P2.MaxLength = 0; this.txtComP3_P2.MaxLength = 0;
this.txtComP3_P2.Name = "txtComP3_P2"; this.txtComP3_P2.Name = "txtComP3_P2";
this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3_P2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -715,7 +716,7 @@ ...@@ -715,7 +716,7 @@
this.btnComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP4.ForeColor = System.Drawing.Color.Purple; this.btnComP4.ForeColor = System.Drawing.Color.Purple;
this.btnComP4.Location = new System.Drawing.Point(21, 28); this.btnComP4.Location = new System.Drawing.Point(21, 28);
this.btnComP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnComP4.Margin = new System.Windows.Forms.Padding(4);
this.btnComP4.Name = "btnComP4"; this.btnComP4.Name = "btnComP4";
this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP4.Size = new System.Drawing.Size(204, 40); this.btnComP4.Size = new System.Drawing.Size(204, 40);
...@@ -734,7 +735,7 @@ ...@@ -734,7 +735,7 @@
this.btnMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMaxP3.ForeColor = System.Drawing.Color.Purple; this.btnMaxP3.ForeColor = System.Drawing.Color.Purple;
this.btnMaxP3.Location = new System.Drawing.Point(16, 79); this.btnMaxP3.Location = new System.Drawing.Point(16, 79);
this.btnMaxP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMaxP3.Margin = new System.Windows.Forms.Padding(4);
this.btnMaxP3.Name = "btnMaxP3"; this.btnMaxP3.Name = "btnMaxP3";
this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMaxP3.Size = new System.Drawing.Size(222, 40); this.btnMaxP3.Size = new System.Drawing.Size(222, 40);
...@@ -752,7 +753,7 @@ ...@@ -752,7 +753,7 @@
this.txtComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP4.Location = new System.Drawing.Point(229, 34); this.txtComP4.Location = new System.Drawing.Point(229, 34);
this.txtComP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComP4.Margin = new System.Windows.Forms.Padding(4);
this.txtComP4.MaxLength = 0; this.txtComP4.MaxLength = 0;
this.txtComP4.Name = "txtComP4"; this.txtComP4.Name = "txtComP4";
this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -768,7 +769,7 @@ ...@@ -768,7 +769,7 @@
this.txtComMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMaxP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMaxP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMaxP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMaxP3.Location = new System.Drawing.Point(229, 81); this.txtComMaxP3.Location = new System.Drawing.Point(229, 81);
this.txtComMaxP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComMaxP3.Margin = new System.Windows.Forms.Padding(4);
this.txtComMaxP3.MaxLength = 0; this.txtComMaxP3.MaxLength = 0;
this.txtComMaxP3.Name = "txtComMaxP3"; this.txtComMaxP3.Name = "txtComMaxP3";
this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMaxP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -782,7 +783,7 @@ ...@@ -782,7 +783,7 @@
this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveCom.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveCom.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCom.Location = new System.Drawing.Point(99, 361); this.btnSaveCom.Location = new System.Drawing.Point(99, 361);
this.btnSaveCom.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSaveCom.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveCom.Name = "btnSaveCom"; this.btnSaveCom.Name = "btnSaveCom";
this.btnSaveCom.Size = new System.Drawing.Size(131, 48); this.btnSaveCom.Size = new System.Drawing.Size(131, 48);
this.btnSaveCom.TabIndex = 256; this.btnSaveCom.TabIndex = 256;
...@@ -798,7 +799,7 @@ ...@@ -798,7 +799,7 @@
this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMax.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMax.Location = new System.Drawing.Point(242, 274); this.txtComMax.Location = new System.Drawing.Point(242, 274);
this.txtComMax.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComMax.Margin = new System.Windows.Forms.Padding(4);
this.txtComMax.MaxLength = 12; this.txtComMax.MaxLength = 12;
this.txtComMax.Name = "txtComMax"; this.txtComMax.Name = "txtComMax";
this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMax.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -828,7 +829,7 @@ ...@@ -828,7 +829,7 @@
this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComMin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComMin.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComMin.Location = new System.Drawing.Point(119, 274); this.txtComMin.Location = new System.Drawing.Point(119, 274);
this.txtComMin.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComMin.Margin = new System.Windows.Forms.Padding(4);
this.txtComMin.MaxLength = 12; this.txtComMin.MaxLength = 12;
this.txtComMin.Name = "txtComMin"; this.txtComMin.Name = "txtComMin";
this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComMin.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -861,7 +862,7 @@ ...@@ -861,7 +862,7 @@
this.btnCMove.ForeColor = System.Drawing.Color.Purple; this.btnCMove.ForeColor = System.Drawing.Color.Purple;
this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnCMove.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnCMove.Location = new System.Drawing.Point(99, 312); this.btnCMove.Location = new System.Drawing.Point(99, 312);
this.btnCMove.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnCMove.Margin = new System.Windows.Forms.Padding(4);
this.btnCMove.Name = "btnCMove"; this.btnCMove.Name = "btnCMove";
this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnCMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCMove.Size = new System.Drawing.Size(246, 41); this.btnCMove.Size = new System.Drawing.Size(246, 41);
...@@ -877,7 +878,7 @@ ...@@ -877,7 +878,7 @@
this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPlateH.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPlateH.FormattingEnabled = true; this.cmbPlateH.FormattingEnabled = true;
this.cmbPlateH.Location = new System.Drawing.Point(100, 225); this.cmbPlateH.Location = new System.Drawing.Point(100, 225);
this.cmbPlateH.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cmbPlateH.Margin = new System.Windows.Forms.Padding(4);
this.cmbPlateH.Name = "cmbPlateH"; this.cmbPlateH.Name = "cmbPlateH";
this.cmbPlateH.Size = new System.Drawing.Size(245, 31); this.cmbPlateH.Size = new System.Drawing.Size(245, 31);
this.cmbPlateH.TabIndex = 176; this.cmbPlateH.TabIndex = 176;
...@@ -906,7 +907,7 @@ ...@@ -906,7 +907,7 @@
this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpdownP12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpdownP12.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpdownP12.Location = new System.Drawing.Point(1108, 391); this.txtUpdownP12.Location = new System.Drawing.Point(1108, 391);
this.txtUpdownP12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpdownP12.Margin = new System.Windows.Forms.Padding(4);
this.txtUpdownP12.MaxLength = 0; this.txtUpdownP12.MaxLength = 0;
this.txtUpdownP12.Name = "txtUpdownP12"; this.txtUpdownP12.Name = "txtUpdownP12";
this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -922,7 +923,7 @@ ...@@ -922,7 +923,7 @@
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(494, 390); this.txtInoutP11.Location = new System.Drawing.Point(494, 390);
this.txtInoutP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInoutP11.Margin = new System.Windows.Forms.Padding(4);
this.txtInoutP11.MaxLength = 0; this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11"; this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -940,7 +941,7 @@ ...@@ -940,7 +941,7 @@
this.btnInoutP11.ForeColor = System.Drawing.Color.Green; this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(315, 384); this.btnInoutP11.Location = new System.Drawing.Point(315, 384);
this.btnInoutP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInoutP11.Margin = new System.Windows.Forms.Padding(4);
this.btnInoutP11.Name = "btnInoutP11"; this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(175, 41); this.btnInoutP11.Size = new System.Drawing.Size(175, 41);
...@@ -959,10 +960,10 @@ ...@@ -959,10 +960,10 @@
this.btnUpdownP12.ForeColor = System.Drawing.Color.Red; this.btnUpdownP12.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP12.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP12.Location = new System.Drawing.Point(922, 385); this.btnUpdownP12.Location = new System.Drawing.Point(922, 385);
this.btnUpdownP12.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpdownP12.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP12.Name = "btnUpdownP12"; this.btnUpdownP12.Name = "btnUpdownP12";
this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP12.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP12.Size = new System.Drawing.Size(225, 41); this.btnUpdownP12.Size = new System.Drawing.Size(180, 41);
this.btnUpdownP12.TabIndex = 228; this.btnUpdownP12.TabIndex = 228;
this.btnUpdownP12.Text = "升降轴NG放料高点P12:"; this.btnUpdownP12.Text = "升降轴NG放料高点P12:";
this.btnUpdownP12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP12.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -977,7 +978,7 @@ ...@@ -977,7 +978,7 @@
this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP11.Location = new System.Drawing.Point(191, 391); this.txtMiddleP11.Location = new System.Drawing.Point(191, 391);
this.txtMiddleP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMiddleP11.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP11.MaxLength = 0; this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11"; this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -994,7 +995,7 @@ ...@@ -994,7 +995,7 @@
this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP2.ForeColor = System.Drawing.Color.Purple; this.btnComP2.ForeColor = System.Drawing.Color.Purple;
this.btnComP2.Location = new System.Drawing.Point(615, 286); this.btnComP2.Location = new System.Drawing.Point(615, 286);
this.btnComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnComP2.Margin = new System.Windows.Forms.Padding(4);
this.btnComP2.Name = "btnComP2"; this.btnComP2.Name = "btnComP2";
this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP2.Size = new System.Drawing.Size(175, 41); this.btnComP2.Size = new System.Drawing.Size(175, 41);
...@@ -1013,7 +1014,7 @@ ...@@ -1013,7 +1014,7 @@
this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnComP3.ForeColor = System.Drawing.Color.Purple; this.btnComP3.ForeColor = System.Drawing.Color.Purple;
this.btnComP3.Location = new System.Drawing.Point(615, 335); this.btnComP3.Location = new System.Drawing.Point(615, 335);
this.btnComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnComP3.Margin = new System.Windows.Forms.Padding(4);
this.btnComP3.Name = "btnComP3"; this.btnComP3.Name = "btnComP3";
this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP3.Size = new System.Drawing.Size(175, 41); this.btnComP3.Size = new System.Drawing.Size(175, 41);
...@@ -1033,10 +1034,10 @@ ...@@ -1033,10 +1034,10 @@
this.btnUpdownP11.ForeColor = System.Drawing.Color.Red; this.btnUpdownP11.ForeColor = System.Drawing.Color.Red;
this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpdownP11.Location = new System.Drawing.Point(615, 385); this.btnUpdownP11.Location = new System.Drawing.Point(615, 385);
this.btnUpdownP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpdownP11.Margin = new System.Windows.Forms.Padding(4);
this.btnUpdownP11.Name = "btnUpdownP11"; this.btnUpdownP11.Name = "btnUpdownP11";
this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpdownP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpdownP11.Size = new System.Drawing.Size(225, 41); this.btnUpdownP11.Size = new System.Drawing.Size(180, 41);
this.btnUpdownP11.TabIndex = 226; this.btnUpdownP11.TabIndex = 226;
this.btnUpdownP11.Text = "升降轴NG放料低点P11:"; this.btnUpdownP11.Text = "升降轴NG放料低点P11:";
this.btnUpdownP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpdownP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1052,7 +1053,7 @@ ...@@ -1052,7 +1053,7 @@
this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP2.Location = new System.Drawing.Point(795, 292); this.txtComP2.Location = new System.Drawing.Point(795, 292);
this.txtComP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComP2.Margin = new System.Windows.Forms.Padding(4);
this.txtComP2.MaxLength = 0; this.txtComP2.MaxLength = 0;
this.txtComP2.Name = "txtComP2"; this.txtComP2.Name = "txtComP2";
this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1070,10 +1071,10 @@ ...@@ -1070,10 +1071,10 @@
this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP11.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP11.Location = new System.Drawing.Point(12, 385); this.btnMiddleP11.Location = new System.Drawing.Point(12, 385);
this.btnMiddleP11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMiddleP11.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP11.Name = "btnMiddleP11"; this.btnMiddleP11.Name = "btnMiddleP11";
this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP11.Size = new System.Drawing.Size(206, 41); this.btnMiddleP11.Size = new System.Drawing.Size(165, 41);
this.btnMiddleP11.TabIndex = 224; this.btnMiddleP11.TabIndex = 224;
this.btnMiddleP11.Text = "旋转轴NG放料点P11:"; this.btnMiddleP11.Text = "旋转轴NG放料点P11:";
this.btnMiddleP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP11.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1088,7 +1089,7 @@ ...@@ -1088,7 +1089,7 @@
this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP3.Location = new System.Drawing.Point(795, 341); this.txtComP3.Location = new System.Drawing.Point(795, 341);
this.txtComP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComP3.Margin = new System.Windows.Forms.Padding(4);
this.txtComP3.MaxLength = 0; this.txtComP3.MaxLength = 0;
this.txtComP3.Name = "txtComP3"; this.txtComP3.Name = "txtComP3";
this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1114,7 +1115,7 @@ ...@@ -1114,7 +1115,7 @@
this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSavePosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSavePosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSavePosition.Location = new System.Drawing.Point(771, 26); this.btnSavePosition.Location = new System.Drawing.Point(771, 26);
this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSavePosition.Margin = new System.Windows.Forms.Padding(4);
this.btnSavePosition.Name = "btnSavePosition"; this.btnSavePosition.Name = "btnSavePosition";
this.btnSavePosition.Size = new System.Drawing.Size(131, 48); this.btnSavePosition.Size = new System.Drawing.Size(131, 48);
this.btnSavePosition.TabIndex = 217; this.btnSavePosition.TabIndex = 217;
...@@ -1128,7 +1129,7 @@ ...@@ -1128,7 +1129,7 @@
this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnStartAuTo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnStartAuTo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStartAuTo.Location = new System.Drawing.Point(588, 26); this.btnStartAuTo.Location = new System.Drawing.Point(588, 26);
this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnStartAuTo.Margin = new System.Windows.Forms.Padding(4);
this.btnStartAuTo.Name = "btnStartAuTo"; this.btnStartAuTo.Name = "btnStartAuTo";
this.btnStartAuTo.Size = new System.Drawing.Size(176, 48); this.btnStartAuTo.Size = new System.Drawing.Size(176, 48);
this.btnStartAuTo.TabIndex = 222; this.btnStartAuTo.TabIndex = 222;
...@@ -1150,7 +1151,7 @@ ...@@ -1150,7 +1151,7 @@
// txtJiange // txtJiange
// //
this.txtJiange.Location = new System.Drawing.Point(238, 85); this.txtJiange.Location = new System.Drawing.Point(238, 85);
this.txtJiange.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtJiange.Margin = new System.Windows.Forms.Padding(4);
this.txtJiange.Name = "txtJiange"; this.txtJiange.Name = "txtJiange";
this.txtJiange.Size = new System.Drawing.Size(64, 31); this.txtJiange.Size = new System.Drawing.Size(64, 31);
this.txtJiange.TabIndex = 221; this.txtJiange.TabIndex = 221;
...@@ -1164,7 +1165,7 @@ ...@@ -1164,7 +1165,7 @@
this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtComP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtComP1.Location = new System.Drawing.Point(795, 241); this.txtComP1.Location = new System.Drawing.Point(795, 241);
this.txtComP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtComP1.Margin = new System.Windows.Forms.Padding(4);
this.txtComP1.MaxLength = 0; this.txtComP1.MaxLength = 0;
this.txtComP1.Name = "txtComP1"; this.txtComP1.Name = "txtComP1";
this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1180,7 +1181,7 @@ ...@@ -1180,7 +1181,7 @@
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(494, 292); this.txtInOutP2.Location = new System.Drawing.Point(494, 292);
this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInOutP2.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP2.MaxLength = 0; this.txtInOutP2.MaxLength = 0;
this.txtInOutP2.Name = "txtInOutP2"; this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1196,7 +1197,7 @@ ...@@ -1196,7 +1197,7 @@
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(494, 241); this.txtInOutP1.Location = new System.Drawing.Point(494, 241);
this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP1.MaxLength = 0; this.txtInOutP1.MaxLength = 0;
this.txtInOutP1.Name = "txtInOutP1"; this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1212,7 +1213,7 @@ ...@@ -1212,7 +1213,7 @@
this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP1.Location = new System.Drawing.Point(191, 241); this.txtMiddleP1.Location = new System.Drawing.Point(191, 241);
this.txtMiddleP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMiddleP1.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP1.MaxLength = 0; this.txtMiddleP1.MaxLength = 0;
this.txtMiddleP1.Name = "txtMiddleP1"; this.txtMiddleP1.Name = "txtMiddleP1";
this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1228,7 +1229,7 @@ ...@@ -1228,7 +1229,7 @@
this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP1.Location = new System.Drawing.Point(191, 138); this.txtUpDownP1.Location = new System.Drawing.Point(191, 138);
this.txtUpDownP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP1.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP1.MaxLength = 0; this.txtUpDownP1.MaxLength = 0;
this.txtUpDownP1.Name = "txtUpDownP1"; this.txtUpDownP1.Name = "txtUpDownP1";
this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1244,7 +1245,7 @@ ...@@ -1244,7 +1245,7 @@
this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP2.Location = new System.Drawing.Point(191, 188); this.txtUpDownP2.Location = new System.Drawing.Point(191, 188);
this.txtUpDownP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP2.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP2.MaxLength = 0; this.txtUpDownP2.MaxLength = 0;
this.txtUpDownP2.Name = "txtUpDownP2"; this.txtUpDownP2.Name = "txtUpDownP2";
this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1260,7 +1261,7 @@ ...@@ -1260,7 +1261,7 @@
this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtInOutP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP3.Location = new System.Drawing.Point(494, 341); this.txtInOutP3.Location = new System.Drawing.Point(494, 341);
this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.txtInOutP3.MaxLength = 0; this.txtInOutP3.MaxLength = 0;
this.txtInOutP3.Name = "txtInOutP3"; this.txtInOutP3.Name = "txtInOutP3";
this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1276,7 +1277,7 @@ ...@@ -1276,7 +1277,7 @@
this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText; this.txtMiddleP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtMiddleP2.Location = new System.Drawing.Point(191, 292); this.txtMiddleP2.Location = new System.Drawing.Point(191, 292);
this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.txtMiddleP2.MaxLength = 0; this.txtMiddleP2.MaxLength = 0;
this.txtMiddleP2.Name = "txtMiddleP2"; this.txtMiddleP2.Name = "txtMiddleP2";
this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1292,7 +1293,7 @@ ...@@ -1292,7 +1293,7 @@
this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP5.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP5.Location = new System.Drawing.Point(795, 138); this.txtUpDownP5.Location = new System.Drawing.Point(795, 138);
this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP5.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP5.MaxLength = 0; this.txtUpDownP5.MaxLength = 0;
this.txtUpDownP5.Name = "txtUpDownP5"; this.txtUpDownP5.Name = "txtUpDownP5";
this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1308,7 +1309,7 @@ ...@@ -1308,7 +1309,7 @@
this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP6.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP6.Location = new System.Drawing.Point(795, 188); this.txtUpDownP6.Location = new System.Drawing.Point(795, 188);
this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP6.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP6.MaxLength = 0; this.txtUpDownP6.MaxLength = 0;
this.txtUpDownP6.Name = "txtUpDownP6"; this.txtUpDownP6.Name = "txtUpDownP6";
this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1322,7 +1323,7 @@ ...@@ -1322,7 +1323,7 @@
this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPosition.FormattingEnabled = true; this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(12, 32); this.cmbPosition.Location = new System.Drawing.Point(12, 32);
this.cmbPosition.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.cmbPosition.Margin = new System.Windows.Forms.Padding(4);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(289, 31); this.cmbPosition.Size = new System.Drawing.Size(289, 31);
this.cmbPosition.TabIndex = 174; this.cmbPosition.TabIndex = 174;
...@@ -1336,7 +1337,7 @@ ...@@ -1336,7 +1337,7 @@
this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP3.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP3.Location = new System.Drawing.Point(494, 138); this.txtUpDownP3.Location = new System.Drawing.Point(494, 138);
this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP3.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP3.MaxLength = 0; this.txtUpDownP3.MaxLength = 0;
this.txtUpDownP3.Name = "txtUpDownP3"; this.txtUpDownP3.Name = "txtUpDownP3";
this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1350,7 +1351,7 @@ ...@@ -1350,7 +1351,7 @@
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(310, 26); this.btnInStore.Location = new System.Drawing.Point(310, 26);
this.btnInStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInStore.Margin = new System.Windows.Forms.Padding(4);
this.btnInStore.Name = "btnInStore"; this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(131, 48); this.btnInStore.Size = new System.Drawing.Size(131, 48);
this.btnInStore.TabIndex = 102; this.btnInStore.TabIndex = 102;
...@@ -1364,7 +1365,7 @@ ...@@ -1364,7 +1365,7 @@
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(449, 26); this.btnOutStore.Location = new System.Drawing.Point(449, 26);
this.btnOutStore.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnOutStore.Margin = new System.Windows.Forms.Padding(4);
this.btnOutStore.Name = "btnOutStore"; this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(131, 48); this.btnOutStore.Size = new System.Drawing.Size(131, 48);
this.btnOutStore.TabIndex = 101; this.btnOutStore.TabIndex = 101;
...@@ -1380,7 +1381,7 @@ ...@@ -1380,7 +1381,7 @@
this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText; this.txtUpDownP4.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtUpDownP4.Location = new System.Drawing.Point(494, 188); this.txtUpDownP4.Location = new System.Drawing.Point(494, 188);
this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtUpDownP4.Margin = new System.Windows.Forms.Padding(4);
this.txtUpDownP4.MaxLength = 0; this.txtUpDownP4.MaxLength = 0;
this.txtUpDownP4.Name = "txtUpDownP4"; this.txtUpDownP4.Name = "txtUpDownP4";
this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -1398,7 +1399,7 @@ ...@@ -1398,7 +1399,7 @@
this.btnComP1.ForeColor = System.Drawing.Color.Purple; this.btnComP1.ForeColor = System.Drawing.Color.Purple;
this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnComP1.Location = new System.Drawing.Point(615, 235); this.btnComP1.Location = new System.Drawing.Point(615, 235);
this.btnComP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnComP1.Margin = new System.Windows.Forms.Padding(4);
this.btnComP1.Name = "btnComP1"; this.btnComP1.Name = "btnComP1";
this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnComP1.Size = new System.Drawing.Size(175, 41); this.btnComP1.Size = new System.Drawing.Size(175, 41);
...@@ -1418,10 +1419,10 @@ ...@@ -1418,10 +1419,10 @@
this.btnInOutP2.ForeColor = System.Drawing.Color.Green; this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(315, 286); this.btnInOutP2.Location = new System.Drawing.Point(315, 286);
this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInOutP2.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP2.Name = "btnInOutP2"; this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(204, 41); this.btnInOutP2.Size = new System.Drawing.Size(175, 41);
this.btnInOutP2.TabIndex = 211; this.btnInOutP2.TabIndex = 211;
this.btnInOutP2.Text = "进出轴扫码放料点P2:"; this.btnInOutP2.Text = "进出轴扫码放料点P2:";
this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1438,7 +1439,7 @@ ...@@ -1438,7 +1439,7 @@
this.btnInOutP1.ForeColor = System.Drawing.Color.Green; this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(315, 235); this.btnInOutP1.Location = new System.Drawing.Point(315, 235);
this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInOutP1.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP1.Name = "btnInOutP1"; this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(175, 41); this.btnInOutP1.Size = new System.Drawing.Size(175, 41);
...@@ -1457,11 +1458,11 @@ ...@@ -1457,11 +1458,11 @@
this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnMiddleP1.Location = new System.Drawing.Point(12, 235); this.btnMiddleP1.Location = new System.Drawing.Point(7, 235);
this.btnMiddleP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMiddleP1.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP1.Name = "btnMiddleP1"; this.btnMiddleP1.Name = "btnMiddleP1";
this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP1.Size = new System.Drawing.Size(204, 41); this.btnMiddleP1.Size = new System.Drawing.Size(163, 41);
this.btnMiddleP1.TabIndex = 207; this.btnMiddleP1.TabIndex = 207;
this.btnMiddleP1.Text = "旋转轴待机扫码点P1:"; this.btnMiddleP1.Text = "旋转轴待机扫码点P1:";
this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1478,10 +1479,10 @@ ...@@ -1478,10 +1479,10 @@
this.btnUpDownP1.ForeColor = System.Drawing.Color.Red; this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP1.Location = new System.Drawing.Point(12, 131); this.btnUpDownP1.Location = new System.Drawing.Point(12, 131);
this.btnUpDownP1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP1.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP1.Name = "btnUpDownP1"; this.btnUpDownP1.Name = "btnUpDownP1";
this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP1.Size = new System.Drawing.Size(185, 41); this.btnUpDownP1.Size = new System.Drawing.Size(158, 41);
this.btnUpDownP1.TabIndex = 199; this.btnUpDownP1.TabIndex = 199;
this.btnUpDownP1.Text = "升降轴扫码低点P1:"; this.btnUpDownP1.Text = "升降轴扫码低点P1:";
this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1498,10 +1499,10 @@ ...@@ -1498,10 +1499,10 @@
this.btnUpDownP2.ForeColor = System.Drawing.Color.Red; this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnUpDownP2.Location = new System.Drawing.Point(12, 181); this.btnUpDownP2.Location = new System.Drawing.Point(12, 181);
this.btnUpDownP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP2.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP2.Name = "btnUpDownP2"; this.btnUpDownP2.Name = "btnUpDownP2";
this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP2.Size = new System.Drawing.Size(185, 41); this.btnUpDownP2.Size = new System.Drawing.Size(158, 41);
this.btnUpDownP2.TabIndex = 201; this.btnUpDownP2.TabIndex = 201;
this.btnUpDownP2.Text = "升降轴扫码高点P2:"; this.btnUpDownP2.Text = "升降轴扫码高点P2:";
this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1517,7 +1518,7 @@ ...@@ -1517,7 +1518,7 @@
this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnInOutP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP3.ForeColor = System.Drawing.Color.Green; this.btnInOutP3.ForeColor = System.Drawing.Color.Green;
this.btnInOutP3.Location = new System.Drawing.Point(315, 335); this.btnInOutP3.Location = new System.Drawing.Point(315, 335);
this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnInOutP3.Margin = new System.Windows.Forms.Padding(4);
this.btnInOutP3.Name = "btnInOutP3"; this.btnInOutP3.Name = "btnInOutP3";
this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP3.Size = new System.Drawing.Size(175, 41); this.btnInOutP3.Size = new System.Drawing.Size(175, 41);
...@@ -1536,10 +1537,10 @@ ...@@ -1536,10 +1537,10 @@
this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnMiddleP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192))))); this.btnMiddleP2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
this.btnMiddleP2.Location = new System.Drawing.Point(12, 286); this.btnMiddleP2.Location = new System.Drawing.Point(12, 286);
this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnMiddleP2.Margin = new System.Windows.Forms.Padding(4);
this.btnMiddleP2.Name = "btnMiddleP2"; this.btnMiddleP2.Name = "btnMiddleP2";
this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnMiddleP2.Size = new System.Drawing.Size(175, 41); this.btnMiddleP2.Size = new System.Drawing.Size(158, 41);
this.btnMiddleP2.TabIndex = 191; this.btnMiddleP2.TabIndex = 191;
this.btnMiddleP2.Text = "旋转轴库位点P2:"; this.btnMiddleP2.Text = "旋转轴库位点P2:";
this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnMiddleP2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1555,10 +1556,10 @@ ...@@ -1555,10 +1556,10 @@
this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP5.ForeColor = System.Drawing.Color.Red; this.btnUpDownP5.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP5.Location = new System.Drawing.Point(615, 131); this.btnUpDownP5.Location = new System.Drawing.Point(615, 131);
this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP5.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP5.Name = "btnUpDownP5"; this.btnUpDownP5.Name = "btnUpDownP5";
this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP5.Size = new System.Drawing.Size(185, 41); this.btnUpDownP5.Size = new System.Drawing.Size(175, 41);
this.btnUpDownP5.TabIndex = 187; this.btnUpDownP5.TabIndex = 187;
this.btnUpDownP5.Text = "升降轴出料前点P5:"; this.btnUpDownP5.Text = "升降轴出料前点P5:";
this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1574,10 +1575,10 @@ ...@@ -1574,10 +1575,10 @@
this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP6.ForeColor = System.Drawing.Color.Red; this.btnUpDownP6.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP6.Location = new System.Drawing.Point(615, 181); this.btnUpDownP6.Location = new System.Drawing.Point(615, 181);
this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP6.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP6.Name = "btnUpDownP6"; this.btnUpDownP6.Name = "btnUpDownP6";
this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP6.Size = new System.Drawing.Size(204, 41); this.btnUpDownP6.Size = new System.Drawing.Size(175, 41);
this.btnUpDownP6.TabIndex = 189; this.btnUpDownP6.TabIndex = 189;
this.btnUpDownP6.Text = "升降轴出料缓冲点P6:"; this.btnUpDownP6.Text = "升降轴出料缓冲点P6:";
this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1593,10 +1594,10 @@ ...@@ -1593,10 +1594,10 @@
this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP3.ForeColor = System.Drawing.Color.Red; this.btnUpDownP3.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP3.Location = new System.Drawing.Point(315, 131); this.btnUpDownP3.Location = new System.Drawing.Point(315, 131);
this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP3.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP3.Name = "btnUpDownP3"; this.btnUpDownP3.Name = "btnUpDownP3";
this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP3.Size = new System.Drawing.Size(185, 41); this.btnUpDownP3.Size = new System.Drawing.Size(175, 41);
this.btnUpDownP3.TabIndex = 161; this.btnUpDownP3.TabIndex = 161;
this.btnUpDownP3.Text = "升降轴入料前点P3:"; this.btnUpDownP3.Text = "升降轴入料前点P3:";
this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1612,10 +1613,10 @@ ...@@ -1612,10 +1613,10 @@
this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnUpDownP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnUpDownP4.ForeColor = System.Drawing.Color.Red; this.btnUpDownP4.ForeColor = System.Drawing.Color.Red;
this.btnUpDownP4.Location = new System.Drawing.Point(315, 181); this.btnUpDownP4.Location = new System.Drawing.Point(315, 181);
this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUpDownP4.Margin = new System.Windows.Forms.Padding(4);
this.btnUpDownP4.Name = "btnUpDownP4"; this.btnUpDownP4.Name = "btnUpDownP4";
this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnUpDownP4.Size = new System.Drawing.Size(204, 41); this.btnUpDownP4.Size = new System.Drawing.Size(175, 41);
this.btnUpDownP4.TabIndex = 165; this.btnUpDownP4.TabIndex = 165;
this.btnUpDownP4.Text = "升降轴入料缓冲点P4:"; this.btnUpDownP4.Text = "升降轴入料缓冲点P4:";
this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.btnUpDownP4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -1624,6 +1625,7 @@ ...@@ -1624,6 +1625,7 @@
// //
// groupBox3 // groupBox3
// //
this.groupBox3.Controls.Add(this.chbLockedShelf);
this.groupBox3.Controls.Add(this.btnClearcurState); this.groupBox3.Controls.Add(this.btnClearcurState);
this.groupBox3.Controls.Add(this.lblMoveInfo); this.groupBox3.Controls.Add(this.lblMoveInfo);
this.groupBox3.Controls.Add(this.lblTemp); this.groupBox3.Controls.Add(this.lblTemp);
...@@ -1632,14 +1634,25 @@ ...@@ -1632,14 +1634,25 @@
this.groupBox3.Controls.Add(this.lblThisSta); this.groupBox3.Controls.Add(this.lblThisSta);
this.groupBox3.Controls.Add(this.chbDebug); this.groupBox3.Controls.Add(this.chbDebug);
this.groupBox3.Location = new System.Drawing.Point(4, 4); this.groupBox3.Location = new System.Drawing.Point(4, 4);
this.groupBox3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox3.Margin = new System.Windows.Forms.Padding(4);
this.groupBox3.Name = "groupBox3"; this.groupBox3.Name = "groupBox3";
this.groupBox3.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox3.Padding = new System.Windows.Forms.Padding(4);
this.groupBox3.Size = new System.Drawing.Size(1630, 192); this.groupBox3.Size = new System.Drawing.Size(1630, 192);
this.groupBox3.TabIndex = 268; this.groupBox3.TabIndex = 268;
this.groupBox3.TabStop = false; this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态"; this.groupBox3.Text = "设备状态";
// //
// btnClearcurState
//
this.btnClearcurState.Location = new System.Drawing.Point(1232, 19);
this.btnClearcurState.Name = "btnClearcurState";
this.btnClearcurState.Size = new System.Drawing.Size(133, 53);
this.btnClearcurState.TabIndex = 273;
this.btnClearcurState.Text = "忽略料叉信号";
this.btnClearcurState.UseVisualStyleBackColor = true;
this.btnClearcurState.Visible = false;
this.btnClearcurState.Click += new System.EventHandler(this.btnClearcurState_Click);
//
// lblMoveInfo // lblMoveInfo
// //
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
...@@ -1707,7 +1720,7 @@ ...@@ -1707,7 +1720,7 @@
this.chbDebug.AutoSize = true; this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(1462, 20); this.chbDebug.Location = new System.Drawing.Point(1462, 20);
this.chbDebug.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.chbDebug.Margin = new System.Windows.Forms.Padding(4);
this.chbDebug.Name = "chbDebug"; this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(114, 31); this.chbDebug.Size = new System.Drawing.Size(114, 31);
this.chbDebug.TabIndex = 271; this.chbDebug.TabIndex = 271;
...@@ -1721,9 +1734,9 @@ ...@@ -1721,9 +1734,9 @@
this.tabPage1.Controls.Add(this.groupBox7); this.tabPage1.Controls.Add(this.groupBox7);
this.tabPage1.Controls.Add(this.axisMoveControl1); this.tabPage1.Controls.Add(this.axisMoveControl1);
this.tabPage1.Location = new System.Drawing.Point(4, 32); this.tabPage1.Location = new System.Drawing.Point(4, 32);
this.tabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
this.tabPage1.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
this.tabPage1.Size = new System.Drawing.Size(1641, 678); this.tabPage1.Size = new System.Drawing.Size(1641, 678);
this.tabPage1.TabIndex = 0; this.tabPage1.TabIndex = 0;
this.tabPage1.Text = " 伺服/温湿度 "; this.tabPage1.Text = " 伺服/温湿度 ";
...@@ -1738,9 +1751,9 @@ ...@@ -1738,9 +1751,9 @@
this.groupBox2.Controls.Add(this.label4); this.groupBox2.Controls.Add(this.label4);
this.groupBox2.Controls.Add(this.btnSaveCID); this.groupBox2.Controls.Add(this.btnSaveCID);
this.groupBox2.Location = new System.Drawing.Point(700, 221); this.groupBox2.Location = new System.Drawing.Point(700, 221);
this.groupBox2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Margin = new System.Windows.Forms.Padding(4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox2.Padding = new System.Windows.Forms.Padding(4);
this.groupBox2.Size = new System.Drawing.Size(665, 121); this.groupBox2.Size = new System.Drawing.Size(665, 121);
this.groupBox2.TabIndex = 273; this.groupBox2.TabIndex = 273;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
...@@ -1749,7 +1762,7 @@ ...@@ -1749,7 +1762,7 @@
// btnUPosId // btnUPosId
// //
this.btnUPosId.Location = new System.Drawing.Point(402, 74); this.btnUPosId.Location = new System.Drawing.Point(402, 74);
this.btnUPosId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnUPosId.Margin = new System.Windows.Forms.Padding(4);
this.btnUPosId.Name = "btnUPosId"; this.btnUPosId.Name = "btnUPosId";
this.btnUPosId.Size = new System.Drawing.Size(196, 41); this.btnUPosId.Size = new System.Drawing.Size(196, 41);
this.btnUPosId.TabIndex = 246; this.btnUPosId.TabIndex = 246;
...@@ -1760,7 +1773,7 @@ ...@@ -1760,7 +1773,7 @@
// numericUpDown1 // numericUpDown1
// //
this.numericUpDown1.Location = new System.Drawing.Point(162, 79); this.numericUpDown1.Location = new System.Drawing.Point(162, 79);
this.numericUpDown1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.numericUpDown1.Margin = new System.Windows.Forms.Padding(4);
this.numericUpDown1.Maximum = new decimal(new int[] { this.numericUpDown1.Maximum = new decimal(new int[] {
24, 24,
0, 0,
...@@ -1797,7 +1810,7 @@ ...@@ -1797,7 +1810,7 @@
// //
this.txtCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtCID.Location = new System.Drawing.Point(160, 34); this.txtCID.Location = new System.Drawing.Point(160, 34);
this.txtCID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtCID.Margin = new System.Windows.Forms.Padding(4);
this.txtCID.MaxLength = 30; this.txtCID.MaxLength = 30;
this.txtCID.Name = "txtCID"; this.txtCID.Name = "txtCID";
this.txtCID.Size = new System.Drawing.Size(229, 31); this.txtCID.Size = new System.Drawing.Size(229, 31);
...@@ -1820,7 +1833,7 @@ ...@@ -1820,7 +1833,7 @@
// btnSaveCID // btnSaveCID
// //
this.btnSaveCID.Location = new System.Drawing.Point(402, 30); this.btnSaveCID.Location = new System.Drawing.Point(402, 30);
this.btnSaveCID.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSaveCID.Margin = new System.Windows.Forms.Padding(4);
this.btnSaveCID.Name = "btnSaveCID"; this.btnSaveCID.Name = "btnSaveCID";
this.btnSaveCID.Size = new System.Drawing.Size(196, 41); this.btnSaveCID.Size = new System.Drawing.Size(196, 41);
this.btnSaveCID.TabIndex = 88; this.btnSaveCID.TabIndex = 88;
...@@ -1840,9 +1853,9 @@ ...@@ -1840,9 +1853,9 @@
this.groupBox7.Controls.Add(this.btnTempClose); this.groupBox7.Controls.Add(this.btnTempClose);
this.groupBox7.Controls.Add(this.btnTempInit); this.groupBox7.Controls.Add(this.btnTempInit);
this.groupBox7.Location = new System.Drawing.Point(700, 21); this.groupBox7.Location = new System.Drawing.Point(700, 21);
this.groupBox7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox7.Margin = new System.Windows.Forms.Padding(4);
this.groupBox7.Name = "groupBox7"; this.groupBox7.Name = "groupBox7";
this.groupBox7.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4); this.groupBox7.Padding = new System.Windows.Forms.Padding(4);
this.groupBox7.Size = new System.Drawing.Size(665, 192); this.groupBox7.Size = new System.Drawing.Size(665, 192);
this.groupBox7.TabIndex = 272; this.groupBox7.TabIndex = 272;
this.groupBox7.TabStop = false; this.groupBox7.TabStop = false;
...@@ -1851,7 +1864,7 @@ ...@@ -1851,7 +1864,7 @@
// btnSelTemp // btnSelTemp
// //
this.btnSelTemp.Location = new System.Drawing.Point(265, 102); this.btnSelTemp.Location = new System.Drawing.Point(265, 102);
this.btnSelTemp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnSelTemp.Margin = new System.Windows.Forms.Padding(4);
this.btnSelTemp.Name = "btnSelTemp"; this.btnSelTemp.Name = "btnSelTemp";
this.btnSelTemp.Size = new System.Drawing.Size(196, 41); this.btnSelTemp.Size = new System.Drawing.Size(196, 41);
this.btnSelTemp.TabIndex = 248; this.btnSelTemp.TabIndex = 248;
...@@ -1863,7 +1876,7 @@ ...@@ -1863,7 +1876,7 @@
// //
this.txtHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtHum.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtHum.Location = new System.Drawing.Point(119, 122); this.txtHum.Location = new System.Drawing.Point(119, 122);
this.txtHum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtHum.Margin = new System.Windows.Forms.Padding(4);
this.txtHum.MaxLength = 10; this.txtHum.MaxLength = 10;
this.txtHum.Name = "txtHum"; this.txtHum.Name = "txtHum";
this.txtHum.Size = new System.Drawing.Size(108, 31); this.txtHum.Size = new System.Drawing.Size(108, 31);
...@@ -1887,7 +1900,7 @@ ...@@ -1887,7 +1900,7 @@
// //
this.txtTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTemp.Location = new System.Drawing.Point(119, 79); this.txtTemp.Location = new System.Drawing.Point(119, 79);
this.txtTemp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtTemp.Margin = new System.Windows.Forms.Padding(4);
this.txtTemp.MaxLength = 10; this.txtTemp.MaxLength = 10;
this.txtTemp.Name = "txtTemp"; this.txtTemp.Name = "txtTemp";
this.txtTemp.Size = new System.Drawing.Size(108, 31); this.txtTemp.Size = new System.Drawing.Size(108, 31);
...@@ -1911,7 +1924,7 @@ ...@@ -1911,7 +1924,7 @@
// //
this.txtTempPort.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtTempPort.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtTempPort.Location = new System.Drawing.Point(119, 35); this.txtTempPort.Location = new System.Drawing.Point(119, 35);
this.txtTempPort.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.txtTempPort.Margin = new System.Windows.Forms.Padding(4);
this.txtTempPort.MaxLength = 10; this.txtTempPort.MaxLength = 10;
this.txtTempPort.Name = "txtTempPort"; this.txtTempPort.Name = "txtTempPort";
this.txtTempPort.Size = new System.Drawing.Size(108, 31); this.txtTempPort.Size = new System.Drawing.Size(108, 31);
...@@ -1934,7 +1947,7 @@ ...@@ -1934,7 +1947,7 @@
// btnTempClose // btnTempClose
// //
this.btnTempClose.Location = new System.Drawing.Point(402, 38); this.btnTempClose.Location = new System.Drawing.Point(402, 38);
this.btnTempClose.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnTempClose.Margin = new System.Windows.Forms.Padding(4);
this.btnTempClose.Name = "btnTempClose"; this.btnTempClose.Name = "btnTempClose";
this.btnTempClose.Size = new System.Drawing.Size(125, 41); this.btnTempClose.Size = new System.Drawing.Size(125, 41);
this.btnTempClose.TabIndex = 89; this.btnTempClose.TabIndex = 89;
...@@ -1945,7 +1958,7 @@ ...@@ -1945,7 +1958,7 @@
// btnTempInit // btnTempInit
// //
this.btnTempInit.Location = new System.Drawing.Point(265, 38); this.btnTempInit.Location = new System.Drawing.Point(265, 38);
this.btnTempInit.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.btnTempInit.Margin = new System.Windows.Forms.Padding(4);
this.btnTempInit.Name = "btnTempInit"; this.btnTempInit.Name = "btnTempInit";
this.btnTempInit.Size = new System.Drawing.Size(125, 41); this.btnTempInit.Size = new System.Drawing.Size(125, 41);
this.btnTempInit.TabIndex = 88; this.btnTempInit.TabIndex = 88;
...@@ -1957,21 +1970,26 @@ ...@@ -1957,21 +1970,26 @@
// //
this.axisMoveControl1.Enabled = false; this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(9, 5); this.axisMoveControl1.Location = new System.Drawing.Point(9, 5);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(4);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(684, 561); this.axisMoveControl1.Size = new System.Drawing.Size(684, 561);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// btnClearcurState // chbLockedShelf
// //
this.btnClearcurState.Location = new System.Drawing.Point(1232, 19); this.chbLockedShelf.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearcurState.Name = "btnClearcurState"; this.chbLockedShelf.AutoSize = true;
this.btnClearcurState.Size = new System.Drawing.Size(133, 53); this.chbLockedShelf.Checked = true;
this.btnClearcurState.TabIndex = 273; this.chbLockedShelf.CheckState = System.Windows.Forms.CheckState.Checked;
this.btnClearcurState.Text = "忽略料叉信号"; this.chbLockedShelf.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnClearcurState.UseVisualStyleBackColor = true; this.chbLockedShelf.Location = new System.Drawing.Point(1462, 59);
this.btnClearcurState.Visible = false; this.chbLockedShelf.Margin = new System.Windows.Forms.Padding(4);
this.btnClearcurState.Click += new System.EventHandler(this.btnClearcurState_Click); this.chbLockedShelf.Name = "chbLockedShelf";
this.chbLockedShelf.Size = new System.Drawing.Size(154, 31);
this.chbLockedShelf.TabIndex = 274;
this.chbLockedShelf.Text = "锁定料架扫码";
this.chbLockedShelf.UseVisualStyleBackColor = true;
this.chbLockedShelf.CheckedChanged += new System.EventHandler(this.chbLockedShelf_CheckedChanged);
// //
// FrmBox // FrmBox
// //
...@@ -1982,7 +2000,7 @@ ...@@ -1982,7 +2000,7 @@
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
this.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5); this.Margin = new System.Windows.Forms.Padding(5);
this.Name = "FrmBox"; this.Name = "FrmBox";
this.Opacity = 0D; this.Opacity = 0D;
this.Text = "AC_SA_料仓"; this.Text = "AC_SA_料仓";
...@@ -2127,6 +2145,7 @@ ...@@ -2127,6 +2145,7 @@
public System.Windows.Forms.Label label5; public System.Windows.Forms.Label label5;
public System.Windows.Forms.TextBox txtCom7_P3_P2; public System.Windows.Forms.TextBox txtCom7_P3_P2;
private System.Windows.Forms.Button btnClearcurState; private System.Windows.Forms.Button btnClearcurState;
private System.Windows.Forms.CheckBox chbLockedShelf;
} }
} }
source/ACPackingStore/FrmBox.cs
...@@ -1081,9 +1081,20 @@ namespace OnlineStore.ACPackingStore ...@@ -1081,9 +1081,20 @@ namespace OnlineStore.ACPackingStore
{ {
if (BoxBean.MoveInfo.MoveStep.Equals(StoreMoveStep.SO_07_CheckComSig)) if (BoxBean.MoveInfo.MoveStep.Equals(StoreMoveStep.SO_07_CheckComSig))
{ {
LogUtil.info("手动忽略料叉信号，BoxBean.MoveInfo.EndStepWait(); 重置BoxBean.IsIgnoreComSig = true ");
BoxBean.IsIgnoreComSig = true; BoxBean.IsIgnoreComSig = true;
BoxBean.MoveInfo.EndStepWait(); BoxBean.MoveInfo.EndStepWait();
} }
} }
/// <summary>
/// 锁定的料架扫码
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
private void chbLockedShelf_CheckedChanged(object sender, EventArgs e)
{
BoxBean.IsScanCodeWithLockedShelf = chbLockedShelf.Checked;
}
} }
} }
source/Common/util/HttpHelper.cs
...@@ -21,7 +21,41 @@ namespace OnlineStore.Common ...@@ -21,7 +21,41 @@ namespace OnlineStore.Common
// public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // public static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public static string Post(string url, string paramData) public static string Post(string url, string paramData)
{ {
return Post(url, paramData, Encoding.UTF8); string postRes = "";
DateTime startTime = DateTime.Now;
System.Threading.Tasks.Task postTask = new System.Threading.Tasks.Task(delegate
{
while ((DateTime.Now - startTime).TotalMinutes < 60)
{
postRes = Post(url, paramData, Encoding.UTF8, out bool isTimeOut);
ResponseData data = JsonHelper.DeserializeJsonToObject<ResponseData>(postRes);
if (data != null)
{
if (data.code.Equals(99) || data.code.Equals(100))
{
LogUtil.info("Response Code=" + data.code + " 系统正在更新。。。3秒后重试");
System.Threading.Thread.Sleep(3000);
}
else if (isTimeOut.Equals(true))
{
LogUtil.info(" 从服务器获取信息超时。。。3秒后重试");
System.Threading.Thread.Sleep(3000);
}
else
{
break;
}
}
else if (isTimeOut.Equals(true))
{
LogUtil.info(" 从服务器获取信息超时。。。3秒后重试");
System.Threading.Thread.Sleep(3000);
}
}
});
postTask.Wait();
return postRes;
} }
//public static bool PingURLIP(string url, int ms=100) //public static bool PingURLIP(string url, int ms=100)
//{ //{
...@@ -114,13 +148,13 @@ namespace OnlineStore.Common ...@@ -114,13 +148,13 @@ namespace OnlineStore.Common
} }
private static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open); private static int isLog = ConfigAppSettings.GetIntValue(Setting_Init.Server_Log_Open);
public static string LastServerMsg = ""; public static string LastServerMsg = "";
public static string Post(string url, string paramData, Encoding encoding) public static string Post(string url, string paramData, Encoding encoding, out bool isTimeOut)
{ {
//if (PingURLIP(url, 100).Equals(false)) //if (PingURLIP(url, 100).Equals(false))
//{ //{
// return null; // return null;
//} //}
isTimeOut = false;
if (isLog == 1) if (isLog == 1)
{ {
LogUtil.info("给服务器发送数据【" + paramData + "】 "); LogUtil.info("给服务器发送数据【" + paramData + "】 ");
...@@ -147,10 +181,16 @@ namespace OnlineStore.Common ...@@ -147,10 +181,16 @@ namespace OnlineStore.Common
result = wc.UploadString(url, "POST", paramData); result = wc.UploadString(url, "POST", paramData);
//LogUtil.info(result); //LogUtil.info(result);
} }
catch (Exception e) catch (WebException e)
{
isTimeOut = true;
LogUtil.error("POST TimeOut:" + e.ToString(), 1);
}
catch (Exception ex)
{ {
LogUtil.error("POST ERROR:" + e.ToString(), 1); LogUtil.error("POST ERROR:" + ex.ToString(), 1);
} }
if (!result.Contains("null") && result.Length != 0) if (!result.Contains("null") && result.Length != 0)
{ {
//LogUtil.debug(LOGGER,"receive << " + result); //LogUtil.debug(LOGGER,"receive << " + result);
...@@ -192,5 +232,15 @@ namespace OnlineStore.Common ...@@ -192,5 +232,15 @@ namespace OnlineStore.Common
} }
return ""; return "";
} }
}
internal class ResponseData
{
//{"code":0,"msg":"ok","data":"7"}
public int code { get; set; }
public string msg { get; set; }
public Dictionary<string, string> data { get; set; }
} }
} }
\ No newline at end of file \ No newline at end of file
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Partial.cs
...@@ -16,6 +16,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -16,6 +16,7 @@ namespace OnlineStore.DeviceLibrary
#region 出入库结果验证 #region 出入库结果验证
public bool CompressSigTimeOut = false; public bool CompressSigTimeOut = false;
public bool IsScanCodeWithLockedShelf = true; //锁定的料架是否扫码
private void CheckWait() private void CheckWait()
{ {
List<WaitResultInfo> list = MoveInfo.WaitList; List<WaitResultInfo> list = MoveInfo.WaitList;
...@@ -76,6 +77,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -76,6 +77,11 @@ namespace OnlineStore.DeviceLibrary
{ {
ConfigIO io = Config.getWaitIO(wait.IoType); ConfigIO io = Config.getWaitIO(wait.IoType);
WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时"; WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时";
if (WarnMsg.Contains(IO_Type.Compress_Check) && MoveInfo.MoveStep.Equals(StoreMoveStep.SO_07_CheckComSig))
{
CompressSigTimeOut = true;
WarnMsg += "出库时料叉未检测到信号！";
}
Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType); Alarm(StoreAlarmType.IoSingleTimeOut, io.ElectricalDefinition, WarnMsg, MoveInfo.MoveType);
LogUtil.error(Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", logType + 14); LogUtil.error(Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "] 等待(" + io.DisplayStr + "=" + wait.IoValue + ") 超时", logType + 14);
if (!MoveInfo.OneWaitCanEndStep) if (!MoveInfo.OneWaitCanEndStep)
...@@ -83,10 +89,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -83,10 +89,6 @@ namespace OnlineStore.DeviceLibrary
isOk = false; isOk = false;
break; break;
} }
if (wait.IoType.Equals(IO_Type.Compress_Check) && MoveInfo.MoveStep.Equals(StoreMoveStep.SO_07_CheckComSig))
{
CompressSigTimeOut = true;
}
} }
} }
else if (wait.WaitType.Equals(WaitEnum.W003_Time)) else if (wait.WaitType.Equals(WaitEnum.W003_Time))
...@@ -188,10 +190,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -188,10 +190,15 @@ namespace OnlineStore.DeviceLibrary
} }
else if (span.TotalSeconds > MoveInfo.TimeOutSeconds) else if (span.TotalSeconds > MoveInfo.TimeOutSeconds)
{ {
WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]等待" + NotOkMsg if (NotOkMsg.Contains(IO_Type.Compress_Check) && MoveInfo.MoveStep.Equals(StoreMoveStep.SO_07_CheckComSig))
{
CompressSigTimeOut = true;
NotOkMsg += "出库时料叉未检测到信号！";
}
WarnMsg = Name + "[" + MoveInfo.MoveType + "][" + MoveInfo.MoveStep + "]等待 " + NotOkMsg
+ "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
int second = 10; int second = 10;
second = (int)(MoveInfo.TimeOutSeconds / span.TotalSeconds) * 10; second = (int)(MoveInfo.TimeOutSeconds / span.TotalSeconds) * 10;
if (second > 120) if (second > 120)
{ {
...@@ -372,7 +379,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -372,7 +379,10 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor); MoveInfo.NextMoveStep(StoreMoveStep.BI_71_ToNGDoor);
InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴到NG门口高点P12，旋转轴到NG门口P11"); InOutStoreLog("送出料盘 " + MoveInfo.SLog + "：" + str + "，升降轴到NG门口高点P12，旋转轴到NG门口P11");
if(MoveInfo.IsShelfLocked)//锁定料架，扫码失败则清除当前位置
{
StoreManager.ClearLockLoc(Name, CurrShelfID, MoveInfo.currShelfIndex);
}
ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed); ACAxisMove(Config.UpDown_Axis, MoveInfo.MoveParam.MoveP.UpDown_P12, Config.UpDownAxis_P1_Speed);
ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed); ACAxisMove(Config.Middle_Axis, MoveInfo.MoveParam.MoveP.Middle_P11, Config.MiddleAxis_P1_Speed);
} }
...@@ -503,7 +513,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -503,7 +513,7 @@ namespace OnlineStore.DeviceLibrary
//单盘入库，不需要扫码 //单盘入库，不需要扫码
StartMoveToBag(); StartMoveToBag();
} }
else if(MoveInfo.IsShelfLocked) else if(MoveInfo.IsShelfLocked && !IsScanCodeWithLockedShelf)
{ {
//该料架已锁定库位，不需要扫码,直接查询服务器 //该料架已锁定库位，不需要扫码,直接查询服务器
GetPosId(); GetPosId();
...@@ -612,11 +622,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -612,11 +622,11 @@ namespace OnlineStore.DeviceLibrary
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam); MoveInfo.NextMoveStep(StoreMoveStep.BI_30_SetInstoreParam);
InOutStoreLog("扫码 " + MoveInfo.SLog + ": 获取库位号"); InOutStoreLog("扫码 " + MoveInfo.SLog + ": 获取库位号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime((int)TimeSpan.FromMinutes(75).TotalMilliseconds));
bool result = GetPosIdByCode(MoveInfo.currShelfIndex, out CodeResultType codeResult); bool result = GetPosIdByCode(MoveInfo.currShelfIndex, out CodeResultType codeResult);
if (!result)//获取库位失败 if (!result)//获取库位失败
{ {
if (codeResult == CodeResultType.NotFoundPos)//库位不在该料仓，将该料盘放回料架 if (codeResult == CodeResultType.NotPosForPutIn)//库位不在该料仓，将该料盘放回料架
{ {
//MoveInfo.MoveParam.PosID = ""; //MoveInfo.MoveParam.PosID = "";
StartMoveTrayBack("此料盘不属于该仓库,放回料架"); StartMoveTrayBack("此料盘不属于该仓库,放回料架");
...@@ -1021,6 +1031,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1021,6 +1031,7 @@ namespace OnlineStore.DeviceLibrary
{ {
IsIgnoreComSig = false; IsIgnoreComSig = false;
CompressSigTimeOut = false; CompressSigTimeOut = false;
LogUtil.info("出库步骤 SO_07_CheckComSig ：IsIgnoreComSig = false, CompressSigTimeOut = false");
MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition); MoveInfo.NextMoveStep(StoreMoveStep.SO_08_ToShelfPosition);
InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 "); InOutStoreLog("出库 " + MoveInfo.SLog + "：走到料架位置，旋转轴至P101，升降轴至P102 ");
ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed); ACAxisMove(Config.UpDown_Axis, moveP.UpDown_HP102, Config.UpDownAxis_P102_Speed);
......
source/DeviceLibrary/ACPackingStore/AC_BOX_Bean_Shelf.cs
...@@ -123,7 +123,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -123,7 +123,7 @@ namespace OnlineStore.DeviceLibrary
MoveInfo.NextMoveStep(StoreMoveStep.BI_08_LocationUp); MoveInfo.NextMoveStep(StoreMoveStep.BI_08_LocationUp);
InOutStoreLog(moveName + MoveInfo.SLog + "停止线体，读取料架" + CurrShelfID + "，设置" + Config.AgvNodeName + "=None"); InOutStoreLog(moveName + MoveInfo.SLog + "停止线体，读取料架" + CurrShelfID + "，设置" + Config.AgvNodeName + "=None");
AgvClient.SetStatus(Config.AgvNodeName); AgvClient.SetStatus(Config.AgvNodeName, mark);
// CylinderMove(MoveInfo, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up); // CylinderMove(MoveInfo, IO_Type.LocationCylinder_Down, IO_Type.LocationCylinder_Up);
if (!instoreShelf) if (!instoreShelf)
...@@ -162,15 +162,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -162,15 +162,18 @@ namespace OnlineStore.DeviceLibrary
if (instoreShelf) if (instoreShelf)
{ {
MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray); MoveInfo.NextMoveStep(StoreMoveStep.BI_10_StartGetTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(10000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime((int)TimeSpan.FromMinutes(75).TotalMilliseconds));
//获取料架的锁定状态 //获取料架的锁定状态
bool lockState = StoreManager.GetShelfLockInfo(Name,CID, CurrShelfID, out MoveInfo.shelfLockDatas); bool lockState = StoreManager.GetShelfLockInfo(Name, CID, CurrShelfID, out MoveInfo.shelfLockDatas);
if (lockState && MoveInfo.shelfLockDatas != null) if (lockState && MoveInfo.shelfLockDatas != null)
{ {
MoveInfo.IsShelfLocked = true; MoveInfo.IsShelfLocked = true;
InOutStoreLog(moveName + MoveInfo.SLog + "开始到料架指定位置取料盘 "); if (MoveInfo.shelfLockDatas.Count.Equals(0))
InOutStoreLog(moveName + MoveInfo.SLog + "该锁定料架上的料盘不属于该料仓，即将送出锁定料架");
else
InOutStoreLog(moveName + MoveInfo.SLog + "开始到料架指定位置取料盘 ");
} }
else else
{ {
...@@ -721,7 +724,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -721,7 +724,7 @@ namespace OnlineStore.DeviceLibrary
//发送扫码内容到服务器进行入库操作 //发送扫码内容到服务器进行入库操作
Operation operation = getLineBoxStatus(); Operation operation = getLineBoxStatus();
operation.op = 1; operation.op = 1;
operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID }}; operation.data = new Dictionary<string, string>() { { "code", message }, { "boxId", 1.ToString() }, { ParamDefine.rfid, CurrShelfID } };
string server = ConfigAppSettings.GetValue(Setting_Init.http_server); string server = ConfigAppSettings.GetValue(Setting_Init.http_server);
Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false); Operation resultOperation = HttpHelper.Post(StoreManager.GetPostApi(server), operation, false);
if (resultOperation == null) if (resultOperation == null)
...@@ -784,23 +787,38 @@ namespace OnlineStore.DeviceLibrary ...@@ -784,23 +787,38 @@ namespace OnlineStore.DeviceLibrary
} }
/// <summary> /// <summary>
/// 扫码结果类型 /// 扫码枪数据接收
/// </summary> /// </summary>
enum CodeResultType /// <param name="codeResultType">扫码结果</param>
/// <returns></returns>
public enum CodeResultType
{ {
/// <summary>
/// 未扫到二维码
/// </summary>
NoCode, NoCode,
/// <summary>
/// 设备未启动
/// </summary>
DeviceNotOpen, DeviceNotOpen,
/// <summary>
///未收到服务器反馈
/// </summary>
NotResponseFromServer, NotResponseFromServer,
WarnMsg, WarnMsg,
/// <summary>
/// 未找到库位
/// </summary>
NotFoundPos, NotFoundPos,
/// <summary>
/// 不属于该仓位
/// </summary>
NotPosForPutIn,
Error, Error,
Success Success
} }
/// <summary>
/// 扫码枪数据接收
/// </summary>
/// <param name="codeResultType">扫码结果</param>
/// <returns></returns>
private bool GetPosIdByCode(int rfidLoc, out CodeResultType codeResultType) private bool GetPosIdByCode(int rfidLoc, out CodeResultType codeResultType)
{ {
try try
...@@ -828,14 +846,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -828,14 +846,24 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + "二维码【 " + message + "】，发送给服务器获取入库PosID"); LogUtil.info(Name + "二维码【 " + message + "】，发送给服务器获取入库PosID");
//查询该料盘所在料仓以及仓位 //查询该料盘所在料仓以及仓位
bool checkRelationship = StoreManager.GetPosForPutIn(Name, Config, message, CurrShelfID, rfidLoc); StoreManager.ResultType resultType = StoreManager.GetPosForPutIn(Name, Config, message, CurrShelfID, rfidLoc, out bool isLockInfoMatch);
if (!checkRelationship) if (resultType == StoreManager.ResultType.Error)
{ {
codeResultType = CodeResultType.NotFoundPos; codeResultType = CodeResultType.Error;
return false; return false;
} }
else if(resultType == StoreManager.ResultType.NotInThisBox)
{
codeResultType = CodeResultType.NotPosForPutIn;
return false;
}
if (!isLockInfoMatch && MoveInfo.IsShelfLocked)//锁定信息不匹配则从第一层开始重新取料,一个料架只重新开始一次
{
MoveInfo.IsShelfLocked = false;
MoveInfo.currShelfIndex = -1;
LogUtil.info(Name + "该锁定料架" + CurrShelfID + "上的料盘信息不匹配，即将从开始位置循环取料");
}
//发送扫码内容到服务器进行入库操作 //发送扫码内容到服务器进行入库操作
Operation operation = getLineBoxStatus(); Operation operation = getLineBoxStatus();
operation.op = 1; operation.op = 1;
......
source/DeviceLibrary/ACPackingStore/StoreManager.cs
...@@ -401,7 +401,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -401,7 +401,6 @@ namespace OnlineStore.DeviceLibrary
string server = GetAddr(Addr_clearPutInRfid, paramMap); string server = GetAddr(Addr_clearPutInRfid, paramMap);
string resultStr = HttpHelper.Post(server, ""); string resultStr = HttpHelper.Post(server, "");
LogUtil.info(deviceName + "clearPutInRfid 【" + server + "】【" + resultStr + "】"); LogUtil.info(deviceName + "clearPutInRfid 【" + server + "】【" + resultStr + "】");
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -618,9 +617,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -618,9 +617,20 @@ namespace OnlineStore.DeviceLibrary
private static string Addr_PosForPutin = "/service/store/emptyPosForPutin"; //获取当前料盘属于的料仓编号 private static string Addr_PosForPutin = "/service/store/emptyPosForPutin"; //获取当前料盘属于的料仓编号
public static bool GetPosForPutIn(string deviceName, AC_BOX_Config boxConfig, string barcode, string rfid, int rfidLoc) /// <summary>
/// 查询仓位结果
/// </summary>
public enum ResultType
{
NotInThisBox,
Error,
Success
}
public static ResultType GetPosForPutIn(string deviceName, AC_BOX_Config boxConfig, string barcode, string rfid, int rfidLoc, out bool IsLockInfoMatch)
{ {
string msg = ""; string msg = "";
IsLockInfoMatch = true;//锁定信息是否匹配
try try
{ {
...@@ -645,15 +655,25 @@ namespace OnlineStore.DeviceLibrary ...@@ -645,15 +655,25 @@ namespace OnlineStore.DeviceLibrary
{ {
msg = deviceName + " 【" + barcode + "】结果：没有收到服务器反馈 "; msg = deviceName + " 【" + barcode + "】结果：没有收到服务器反馈 ";
LogUtil.info(msg); LogUtil.info(msg);
return false; return ResultType.Error;
}
//else if ((!string.IsNullOrEmpty(serverResult.msg)))// || serverResult.result.Equals(0).Equals(false)
//{
// msg = deviceName + " 【" + barcode + "】结果：" + serverResult.msg;
// LogUtil.info(msg);
// // return false;
//}
else if (serverResult.result.Equals(-1))
{
IsLockInfoMatch = false;
} }
else if ((!string.IsNullOrEmpty(serverResult.msg)) || serverResult.result.Equals(0).Equals(false)) else if (!serverResult.result.Equals(0))
{ {
msg = deviceName + " 【" + barcode + "】结果：" + serverResult.msg; msg = deviceName + " 【" + barcode + "】结果：" + serverResult.msg;
LogUtil.info(msg); LogUtil.info(msg);
return false; return ResultType.Error;
} }
if (serverResult.cid.Equals(boxConfig.CID)) //该料盘在此料仓 if (serverResult.cid.Equals(boxConfig.CID)) //该料盘在此料仓
{ {
// 仓位命名: 4D01020304 // 仓位命名: 4D01020304
...@@ -666,22 +686,70 @@ namespace OnlineStore.DeviceLibrary ...@@ -666,22 +686,70 @@ namespace OnlineStore.DeviceLibrary
//4D19050208 表示4楼19号料仓(包装料仓)第5列第2行架子上的第8个隔板位置 //4D19050208 表示4楼19号料仓(包装料仓)第5列第2行架子上的第8个隔板位置
msg = deviceName + " 料盘【" + barcode + "】属于该料仓【" + boxConfig.CID + "】"; msg = deviceName + " 料盘【" + barcode + "】属于该料仓【" + boxConfig.CID + "】";
LogUtil.info(msg); LogUtil.info(msg);
return true; return ResultType.Success;
} }
else else
{ {
msg = deviceName + " 料盘【" + barcode + "】不属于该料仓【" + boxConfig.CID + "】"; msg = deviceName + " 料盘【" + barcode + "】不属于该料仓【" + boxConfig.CID + "】";
LogUtil.info(msg); LogUtil.info(msg);
return false; return ResultType.NotInThisBox;
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(deviceName + " ", ex); LogUtil.error(deviceName + " ", ex);
} }
return ResultType.Error;
}
private static string Addr_clearLockLoc = "/rest/api/qisda/device/clearLockLoc";
/// <summary>
/// 清除料架指定位置的锁定信息
/// </summary>
/// <param name="rfid"></param>
/// <param name="rfidLoc"></param>
/// <returns></returns>
public static bool ClearLockLoc(string deviceName,string rfid, int rfidLoc)
{
string msg = "";
try
{
Dictionary<string, string> paramMap = new Dictionary<string, string>();
paramMap.Add(ParamDefine.rfid, rfid);
paramMap.Add("rfidLoc", rfidLoc.ToString());
string server = GetAddr(Addr_clearLockLoc, paramMap);
DateTime startTime = DateTime.Now;
LogUtil.info("清除RFID="+ rfid+ ",rfidLoc="+ rfidLoc.ToString()+"的锁定信息");
string resultStr = HttpHelper.Post(server, "");
LogUtil.info(deviceName+" CodeReceived " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
RfidData data = JsonHelper.DeserializeJsonToObject<RfidData>(resultStr);
if (data == null)
{
msg = deviceName + " ClearLockLoc【 " + rfid + "-"+ rfidLoc + "】 没有收到服务器反馈";
LogUtil.info(msg);
return false;
}
else if (data.code.Equals(0).Equals(false))
{
msg = deviceName + " ClearLockLoc【 " + rfid +"-" + rfidLoc+"】：" + data.msg;
LogUtil.info(msg);
return false;
}
return true;
}
catch (Exception ex)
{
LogUtil.error(deviceName+" ClearLockLoc ", ex);
}
return false; return false;
} }
} }
public class AfterPutData public class AfterPutData
{ {
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -125,6 +125,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -125,6 +125,7 @@ namespace OnlineStore.DeviceLibrary
LastSetpTime = DateTime.Now; LastSetpTime = DateTime.Now;
WaitList = new List<WaitResultInfo>(); WaitList = new List<WaitResultInfo>();
currShelfIndex = -1; currShelfIndex = -1;
lockShelfIndex = -1;
SingleInstore = false; SingleInstore = false;
} }
public void EndMove() public void EndMove()
...@@ -150,7 +151,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -150,7 +151,7 @@ namespace OnlineStore.DeviceLibrary
public List<string> ShelfPositionList = new List<string>(); public List<string> ShelfPositionList = new List<string>();
private string currShelfPosId = ""; private string currShelfPosId = "";
public int currShelfIndex = -1; public int currShelfIndex = -1;
private int lockShelfIndex = -1;
public bool NextShelfPos() public bool NextShelfPos()
{ {
currShelfIndex++; currShelfIndex++;
...@@ -168,26 +169,26 @@ namespace OnlineStore.DeviceLibrary ...@@ -168,26 +169,26 @@ namespace OnlineStore.DeviceLibrary
/// 入库时，料架已锁定库位的位置，无需扫码 /// 入库时，料架已锁定库位的位置，无需扫码
/// </summary> /// </summary>
public bool IsShelfLocked = false;//料架是否锁定 public bool IsShelfLocked = false;//料架是否锁定
/// <summary> /// <summary>
/// 料架锁定位置的料 /// 料架锁定位置的料
/// </summary> /// </summary>
public List<ShelfLockData> shelfLockDatas =null; public List<ShelfLockData> shelfLockDatas = null;
public bool NextLockedShelfPos() public bool NextLockedShelfPos()
{ {
lockShelfIndex++;
currShelfIndex++; if (lockShelfIndex >= shelfLockDatas.Count)
if (currShelfIndex >= shelfLockDatas.Count)
{ {
shelfLockDatas = null; shelfLockDatas = null;
return false; return false;
} }
currShelfPosId = ShelfPositionList[shelfLockDatas[currShelfIndex].rfidLoc]; currShelfIndex = shelfLockDatas[lockShelfIndex].rfidLoc;
currShelfPosId = ShelfPositionList[currShelfIndex];
//设置取料位置 //设置取料位置
MoveParam.UpdatePosIdAndShelfId(shelfLockDatas[currShelfIndex].barcode, MoveParam.UpdatePosIdAndShelfId(shelfLockDatas[lockShelfIndex].barcode,
shelfLockDatas[currShelfIndex].rfid, shelfLockDatas[lockShelfIndex].rfid,
shelfLockDatas[currShelfIndex].lockPos, currShelfPosId); shelfLockDatas[lockShelfIndex].lockPos, currShelfPosId);
return true; return true;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!