入库时检测料门口信号需要持续1秒

LN
Commit 37cce6d8 由 LN 编写于 2020-07-23 17:47:42 +0800
source/ACSingleStore/FrmStoreBox.Designer.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
source/DeviceLibrary/acSingleStore/StoreManager.cs
source/DeviceLibrary/store/StoreStep.cs
source/DeviceLibrary/store/model/StoreMoveInfo.cs
--- a/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @37cce6d
+++ b/source/ACSingleStore/FrmStoreBox.Designer.cs
查看文件 @37cce6d
@@ -253,7 +253,7 @@
            this.tabControl2.Controls.Add(this.tabPage5);
            this.tabControl2.Controls.Add(this.tabPage6);
            this.tabControl2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.tabControl2.Location = new System.Drawing.Point(6, 10);
+            this.tabControl2.Location = new System.Drawing.Point(6, 3);
            this.tabControl2.Name = "tabControl2";
            this.tabControl2.SelectedIndex = 0;
            this.tabControl2.Size = new System.Drawing.Size(1080, 78);
@@ -270,7 +270,7 @@
            this.tabPage4.Controls.Add(this.btnStoreStart);
            this.tabPage4.Location = new System.Drawing.Point(4, 30);
            this.tabPage4.Name = "tabPage4";
-            this.tabPage4.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage4.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage4.Size = new System.Drawing.Size(1072, 44);
            this.tabPage4.TabIndex = 0;
            this.tabPage4.Text = "     料仓操作     ";
@@ -367,7 +367,7 @@
            this.tabPage5.Controls.Add(this.btnIO);
            this.tabPage5.Location = new System.Drawing.Point(4, 30);
            this.tabPage5.Name = "tabPage5";
-            this.tabPage5.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage5.Padding = new System.Windows.Forms.Padding(3);
            this.tabPage5.Size = new System.Drawing.Size(1072, 44);
            this.tabPage5.TabIndex = 1;
            this.tabPage5.Text = "     设备调试     ";
@@ -504,10 +504,10 @@
            this.tabControl1.Controls.Add(this.tabPage3);
            this.tabControl1.Controls.Add(this.tabPage1);
            this.tabControl1.Controls.Add(this.tabPage2);
-            this.tabControl1.Location = new System.Drawing.Point(509, 207);
+            this.tabControl1.Location = new System.Drawing.Point(509, 187);
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(577, 626);
+            this.tabControl1.Size = new System.Drawing.Size(577, 536);
            this.tabControl1.TabIndex = 272;
            // 
            // tabPage3
@@ -519,17 +519,16 @@
            this.tabPage3.Controls.Add(this.groupBox2);
            this.tabPage3.Location = new System.Drawing.Point(4, 29);
            this.tabPage3.Name = "tabPage3";
-            this.tabPage3.Size = new System.Drawing.Size(569, 593);
+            this.tabPage3.Size = new System.Drawing.Size(569, 503);
            this.tabPage3.TabIndex = 2;
            this.tabPage3.Text = "     操作日志      ";
            this.tabPage3.UseVisualStyleBackColor = true;
            // 
            // btnClearLog
            // 
-            this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
            this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnClearLog.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnClearLog.Location = new System.Drawing.Point(284, 550);
+            this.btnClearLog.Location = new System.Drawing.Point(296, 6);
            this.btnClearLog.Name = "btnClearLog";
            this.btnClearLog.Size = new System.Drawing.Size(105, 38);
            this.btnClearLog.TabIndex = 224;
@@ -539,10 +538,9 @@
            // 
            // btnCloseDoor
            // 
-            this.btnCloseDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
            this.btnCloseDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnCloseDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCloseDoor.Location = new System.Drawing.Point(120, 550);
+            this.btnCloseDoor.Location = new System.Drawing.Point(132, 6);
            this.btnCloseDoor.Name = "btnCloseDoor";
            this.btnCloseDoor.Size = new System.Drawing.Size(105, 38);
            this.btnCloseDoor.TabIndex = 258;
@@ -552,10 +550,9 @@
            // 
            // btnOpenDoor
            // 
-            this.btnOpenDoor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
            this.btnOpenDoor.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnOpenDoor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnOpenDoor.Location = new System.Drawing.Point(3, 550);
+            this.btnOpenDoor.Location = new System.Drawing.Point(15, 6);
            this.btnOpenDoor.Name = "btnOpenDoor";
            this.btnOpenDoor.Size = new System.Drawing.Size(105, 38);
            this.btnOpenDoor.TabIndex = 257;
@@ -569,9 +566,9 @@
            | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.richTextBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.richTextBox1.Location = new System.Drawing.Point(3, 0);
+            this.richTextBox1.Location = new System.Drawing.Point(3, 50);
            this.richTextBox1.Name = "richTextBox1";
-            this.richTextBox1.Size = new System.Drawing.Size(569, 542);
+            this.richTextBox1.Size = new System.Drawing.Size(558, 450);
            this.richTextBox1.TabIndex = 256;
            this.richTextBox1.Text = "";
            this.richTextBox1.VisibleChanged += new System.EventHandler(this.richTextBox1_VisibleChanged);
@@ -581,7 +578,7 @@
            this.groupBox2.Controls.Add(this.button6);
            this.groupBox2.Controls.Add(this.button3);
            this.groupBox2.Controls.Add(this.button5);
-            this.groupBox2.Location = new System.Drawing.Point(7, 8);
+            this.groupBox2.Location = new System.Drawing.Point(7, 71);
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.Size = new System.Drawing.Size(545, 78);
            this.groupBox2.TabIndex = 276;
@@ -628,8 +625,8 @@
            this.tabPage1.Controls.Add(this.groupBox1);
            this.tabPage1.Location = new System.Drawing.Point(4, 29);
            this.tabPage1.Name = "tabPage1";
-            this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage1.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage1.Size = new System.Drawing.Size(569, 593);
+            this.tabPage1.Size = new System.Drawing.Size(569, 503);
            this.tabPage1.TabIndex = 0;
            this.tabPage1.Text = "     伺服调试       ";
            this.tabPage1.UseVisualStyleBackColor = true;
@@ -1145,7 +1142,7 @@
            this.axis_4_Alarm.IOValue = 0;
            this.axis_4_Alarm.isCanClick = false;
            this.axis_4_Alarm.Location = new System.Drawing.Point(432, 39);
-            this.axis_4_Alarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.axis_4_Alarm.Margin = new System.Windows.Forms.Padding(4);
            this.axis_4_Alarm.Name = "axis_4_Alarm";
            this.axis_4_Alarm.Size = new System.Drawing.Size(43, 39);
            this.axis_4_Alarm.TabIndex = 271;
@@ -1190,7 +1187,7 @@
            this.axis_1_Alarm.IOValue = 0;
            this.axis_1_Alarm.isCanClick = false;
            this.axis_1_Alarm.Location = new System.Drawing.Point(127, 40);
-            this.axis_1_Alarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.axis_1_Alarm.Margin = new System.Windows.Forms.Padding(4);
            this.axis_1_Alarm.Name = "axis_1_Alarm";
            this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
            this.axis_1_Alarm.TabIndex = 264;
@@ -1201,7 +1198,7 @@
            this.axis_3_Alarm.IOValue = 0;
            this.axis_3_Alarm.isCanClick = false;
            this.axis_3_Alarm.Location = new System.Drawing.Point(329, 40);
-            this.axis_3_Alarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.axis_3_Alarm.Margin = new System.Windows.Forms.Padding(4);
            this.axis_3_Alarm.Name = "axis_3_Alarm";
            this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
            this.axis_3_Alarm.TabIndex = 266;
@@ -1212,7 +1209,7 @@
            this.axis_2_Alarm.IOValue = 0;
            this.axis_2_Alarm.isCanClick = false;
            this.axis_2_Alarm.Location = new System.Drawing.Point(224, 40);
-            this.axis_2_Alarm.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.axis_2_Alarm.Margin = new System.Windows.Forms.Padding(4);
            this.axis_2_Alarm.Name = "axis_2_Alarm";
            this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
            this.axis_2_Alarm.TabIndex = 265;
@@ -1364,8 +1361,8 @@
            this.tabPage2.Controls.Add(this.groupBox7);
            this.tabPage2.Location = new System.Drawing.Point(4, 29);
            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+            this.tabPage2.Padding = new System.Windows.Forms.Padding(3);
-            this.tabPage2.Size = new System.Drawing.Size(569, 593);
+            this.tabPage2.Size = new System.Drawing.Size(569, 503);
            this.tabPage2.TabIndex = 1;
            this.tabPage2.Text = "    温湿度        ";
            this.tabPage2.UseVisualStyleBackColor = true;
@@ -1495,9 +1492,9 @@
            this.groupBox3.Controls.Add(this.lblMoveEquipInfo);
            this.groupBox3.Controls.Add(this.lblWarnMsg);
            this.groupBox3.Controls.Add(this.lblThisSta);
-            this.groupBox3.Location = new System.Drawing.Point(6, 88);
+            this.groupBox3.Location = new System.Drawing.Point(6, 81);
            this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(1079, 111);
+            this.groupBox3.Size = new System.Drawing.Size(1079, 103);
            this.groupBox3.TabIndex = 268;
            this.groupBox3.TabStop = false;
            this.groupBox3.Text = "设备状态";
@@ -1530,9 +1527,9 @@
            // 
            this.lblWarnMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblWarnMsg.ForeColor = System.Drawing.Color.Red;
-            this.lblWarnMsg.Location = new System.Drawing.Point(7, 54);
+            this.lblWarnMsg.Location = new System.Drawing.Point(7, 45);
            this.lblWarnMsg.Name = "lblWarnMsg";
-            this.lblWarnMsg.Size = new System.Drawing.Size(884, 50);
+            this.lblWarnMsg.Size = new System.Drawing.Size(884, 52);
            this.lblWarnMsg.TabIndex = 224;
            this.lblWarnMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            // 
@@ -1549,6 +1546,8 @@
            // 
            // groupInout
            // 
+            this.groupInout.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
            this.groupInout.Controls.Add(this.btnStartAutoCheck);
            this.groupInout.Controls.Add(this.btnCheckPos);
            this.groupInout.Controls.Add(this.lblTemp);
@@ -1594,9 +1593,9 @@
            this.groupInout.Controls.Add(this.btnUpDownP3);
            this.groupInout.Controls.Add(this.btnUpDownP4);
            this.groupInout.Enabled = false;
-            this.groupInout.Location = new System.Drawing.Point(6, 205);
+            this.groupInout.Location = new System.Drawing.Point(6, 185);
            this.groupInout.Name = "groupInout";
-            this.groupInout.Size = new System.Drawing.Size(496, 605);
+            this.groupInout.Size = new System.Drawing.Size(496, 538);
            this.groupInout.TabIndex = 100;
            this.groupInout.TabStop = false;
            this.groupInout.Text = "料仓操作";
@@ -1606,7 +1605,7 @@
            this.btnStartAutoCheck.BackColor = System.Drawing.SystemColors.Control;
            this.btnStartAutoCheck.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnStartAutoCheck.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnStartAutoCheck.Location = new System.Drawing.Point(378, 110);
+            this.btnStartAutoCheck.Location = new System.Drawing.Point(381, 62);
            this.btnStartAutoCheck.Name = "btnStartAutoCheck";
            this.btnStartAutoCheck.Size = new System.Drawing.Size(105, 38);
            this.btnStartAutoCheck.TabIndex = 274;
@@ -1619,7 +1618,7 @@
            this.btnCheckPos.BackColor = System.Drawing.SystemColors.Control;
            this.btnCheckPos.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnCheckPos.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnCheckPos.Location = new System.Drawing.Point(271, 110);
+            this.btnCheckPos.Location = new System.Drawing.Point(273, 62);
            this.btnCheckPos.Name = "btnCheckPos";
            this.btnCheckPos.Size = new System.Drawing.Size(105, 38);
            this.btnCheckPos.TabIndex = 273;
@@ -1632,7 +1631,7 @@
            this.lblTemp.AutoSize = true;
            this.lblTemp.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblTemp.ForeColor = System.Drawing.Color.Black;
-            this.lblTemp.Location = new System.Drawing.Point(12, 571);
+            this.lblTemp.Location = new System.Drawing.Point(10, 493);
            this.lblTemp.Name = "lblTemp";
            this.lblTemp.Size = new System.Drawing.Size(159, 20);
            this.lblTemp.TabIndex = 270;
@@ -1643,7 +1642,7 @@
            this.lblMsg.AutoSize = true;
            this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.lblMsg.ForeColor = System.Drawing.Color.Green;
-            this.lblMsg.Location = new System.Drawing.Point(22, 132);
+            this.lblMsg.Location = new System.Drawing.Point(15, 114);
            this.lblMsg.Name = "lblMsg";
            this.lblMsg.Size = new System.Drawing.Size(135, 20);
            this.lblMsg.TabIndex = 223;
@@ -1654,9 +1653,9 @@
            this.btnSavePosition.BackColor = System.Drawing.SystemColors.Control;
            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.Location = new System.Drawing.Point(338, 552);
+            this.btnSavePosition.Location = new System.Drawing.Point(379, 106);
            this.btnSavePosition.Name = "btnSavePosition";
-            this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
+            this.btnSavePosition.Size = new System.Drawing.Size(107, 38);
            this.btnSavePosition.TabIndex = 217;
            this.btnSavePosition.Text = "保存位置";
            this.btnSavePosition.UseVisualStyleBackColor = false;
@@ -1667,7 +1666,7 @@
            this.btnStartAuTo.BackColor = System.Drawing.SystemColors.Control;
            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.Location = new System.Drawing.Point(379, 26);
+            this.btnStartAuTo.Location = new System.Drawing.Point(160, 62);
            this.btnStartAuTo.Name = "btnStartAuTo";
            this.btnStartAuTo.Size = new System.Drawing.Size(105, 38);
            this.btnStartAuTo.TabIndex = 222;
@@ -1679,7 +1678,7 @@
            // 
            this.label9.AutoSize = true;
            this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.label9.Location = new System.Drawing.Point(4, 87);
+            this.label9.Location = new System.Drawing.Point(14, 72);
            this.label9.Name = "label9";
            this.label9.Size = new System.Drawing.Size(83, 17);
            this.label9.TabIndex = 220;
@@ -1687,7 +1686,7 @@
            // 
            // txtJiange
            // 
-            this.txtJiange.Location = new System.Drawing.Point(93, 82);
+            this.txtJiange.Location = new System.Drawing.Point(103, 67);
            this.txtJiange.Name = "txtJiange";
            this.txtJiange.Size = new System.Drawing.Size(40, 26);
            this.txtJiange.TabIndex = 221;
@@ -1700,7 +1699,7 @@
            this.txtComP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 468);
+            this.txtComP1.Location = new System.Drawing.Point(154, 446);
            this.txtComP1.MaxLength = 20;
            this.txtComP1.Name = "txtComP1";
            this.txtComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1715,7 +1714,7 @@
            this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 385);
+            this.txtInOutP2.Location = new System.Drawing.Point(154, 364);
            this.txtInOutP2.MaxLength = 20;
            this.txtInOutP2.Name = "txtInOutP2";
            this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1730,7 +1729,7 @@
            this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(395, 385);
+            this.txtInOutP1.Location = new System.Drawing.Point(395, 364);
            this.txtInOutP1.MaxLength = 20;
            this.txtInOutP1.Name = "txtInOutP1";
            this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1745,7 +1744,7 @@
            this.txtMiddleP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 340);
+            this.txtMiddleP1.Location = new System.Drawing.Point(154, 323);
            this.txtMiddleP1.MaxLength = 20;
            this.txtMiddleP1.Name = "txtMiddleP1";
            this.txtMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1760,7 +1759,7 @@
            this.txtUpDownP7.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP7.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP7.Location = new System.Drawing.Point(154, 260);
+            this.txtUpDownP7.Location = new System.Drawing.Point(154, 243);
            this.txtUpDownP7.MaxLength = 20;
            this.txtUpDownP7.Name = "txtUpDownP7";
            this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1775,7 +1774,7 @@
            this.txtUpDownP8.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtUpDownP8.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtUpDownP8.Location = new System.Drawing.Point(154, 300);
+            this.txtUpDownP8.Location = new System.Drawing.Point(154, 283);
            this.txtUpDownP8.MaxLength = 20;
            this.txtUpDownP8.Name = "txtUpDownP8";
            this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1790,7 +1789,7 @@
            this.txtUpDownP1.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 180);
+            this.txtUpDownP1.Location = new System.Drawing.Point(154, 163);
            this.txtUpDownP1.MaxLength = 20;
            this.txtUpDownP1.Name = "txtUpDownP1";
            this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1805,7 +1804,7 @@
            this.txtUpDownP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 220);
+            this.txtUpDownP2.Location = new System.Drawing.Point(154, 203);
            this.txtUpDownP2.MaxLength = 20;
            this.txtUpDownP2.Name = "txtUpDownP2";
            this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1820,7 +1819,7 @@
            this.txtComP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 425);
+            this.txtComP3.Location = new System.Drawing.Point(396, 404);
            this.txtComP3.MaxLength = 20;
            this.txtComP3.Name = "txtComP3";
            this.txtComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1835,7 +1834,7 @@
            this.txtComP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 463);
+            this.txtComP2.Location = new System.Drawing.Point(396, 446);
            this.txtComP2.MaxLength = 20;
            this.txtComP2.Name = "txtComP2";
            this.txtComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1850,7 +1849,7 @@
            this.txtInOutP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(154, 428);
+            this.txtInOutP3.Location = new System.Drawing.Point(154, 404);
            this.txtInOutP3.MaxLength = 20;
            this.txtInOutP3.Name = "txtInOutP3";
            this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1865,7 +1864,7 @@
            this.txtMiddleP2.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 341);
+            this.txtMiddleP2.Location = new System.Drawing.Point(396, 323);
            this.txtMiddleP2.MaxLength = 20;
            this.txtMiddleP2.Name = "txtMiddleP2";
            this.txtMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1880,7 +1879,7 @@
            this.txtUpDownP5.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 260);
+            this.txtUpDownP5.Location = new System.Drawing.Point(396, 243);
            this.txtUpDownP5.MaxLength = 20;
            this.txtUpDownP5.Name = "txtUpDownP5";
            this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1895,7 +1894,7 @@
            this.txtUpDownP6.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 300);
+            this.txtUpDownP6.Location = new System.Drawing.Point(396, 283);
            this.txtUpDownP6.MaxLength = 20;
            this.txtUpDownP6.Name = "txtUpDownP6";
            this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1908,7 +1907,7 @@
            this.cmbPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            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.Location = new System.Drawing.Point(76, 31);
+            this.cmbPosition.Location = new System.Drawing.Point(76, 23);
            this.cmbPosition.Name = "cmbPosition";
            this.cmbPosition.Size = new System.Drawing.Size(189, 28);
            this.cmbPosition.TabIndex = 174;
@@ -1920,7 +1919,7 @@
            this.label21.Cursor = System.Windows.Forms.Cursors.Default;
            this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.label21.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.label21.Location = new System.Drawing.Point(11, 37);
+            this.label21.Location = new System.Drawing.Point(11, 29);
            this.label21.Name = "label21";
            this.label21.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.label21.Size = new System.Drawing.Size(59, 17);
@@ -1935,7 +1934,7 @@
            this.txtUpDownP3.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 180);
+            this.txtUpDownP3.Location = new System.Drawing.Point(396, 163);
            this.txtUpDownP3.MaxLength = 20;
            this.txtUpDownP3.Name = "txtUpDownP3";
            this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1948,7 +1947,7 @@
            this.btnInStore.BackColor = System.Drawing.SystemColors.Control;
            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.Location = new System.Drawing.Point(271, 26);
+            this.btnInStore.Location = new System.Drawing.Point(273, 18);
            this.btnInStore.Name = "btnInStore";
            this.btnInStore.Size = new System.Drawing.Size(105, 38);
            this.btnInStore.TabIndex = 102;
@@ -1961,7 +1960,7 @@
            this.btnOutStore.BackColor = System.Drawing.SystemColors.Control;
            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.Location = new System.Drawing.Point(270, 67);
+            this.btnOutStore.Location = new System.Drawing.Point(381, 18);
            this.btnOutStore.Name = "btnOutStore";
            this.btnOutStore.Size = new System.Drawing.Size(105, 38);
            this.btnOutStore.TabIndex = 101;
@@ -1976,7 +1975,7 @@
            this.txtUpDownP4.Cursor = System.Windows.Forms.Cursors.IBeam;
            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.Location = new System.Drawing.Point(396, 220);
+            this.txtUpDownP4.Location = new System.Drawing.Point(396, 203);
            this.txtUpDownP4.MaxLength = 20;
            this.txtUpDownP4.Name = "txtUpDownP4";
            this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1993,7 +1992,7 @@
            this.btnComP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnComP1.ForeColor = System.Drawing.Color.Purple;
            this.btnComP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnComP1.Location = new System.Drawing.Point(10, 463);
+            this.btnComP1.Location = new System.Drawing.Point(10, 441);
            this.btnComP1.Name = "btnComP1";
            this.btnComP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP1.Size = new System.Drawing.Size(140, 33);
@@ -2012,7 +2011,7 @@
            this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
            this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP2.Location = new System.Drawing.Point(10, 380);
+            this.btnInOutP2.Location = new System.Drawing.Point(10, 359);
            this.btnInOutP2.Name = "btnInOutP2";
            this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
@@ -2031,7 +2030,7 @@
            this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
            this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP1.Location = new System.Drawing.Point(252, 379);
+            this.btnInOutP1.Location = new System.Drawing.Point(252, 359);
            this.btnInOutP1.Name = "btnInOutP1";
            this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
@@ -2050,7 +2049,7 @@
            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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnMiddleP1.Location = new System.Drawing.Point(10, 335);
+            this.btnMiddleP1.Location = new System.Drawing.Point(10, 318);
            this.btnMiddleP1.Name = "btnMiddleP1";
            this.btnMiddleP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnMiddleP1.Size = new System.Drawing.Size(140, 33);
@@ -2069,7 +2068,7 @@
            this.btnUpDownP7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP7.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP7.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP7.Location = new System.Drawing.Point(10, 255);
+            this.btnUpDownP7.Location = new System.Drawing.Point(10, 238);
            this.btnUpDownP7.Name = "btnUpDownP7";
            this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP7.Size = new System.Drawing.Size(140, 33);
@@ -2088,7 +2087,7 @@
            this.btnUpDownP8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP8.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP8.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP8.Location = new System.Drawing.Point(10, 295);
+            this.btnUpDownP8.Location = new System.Drawing.Point(10, 278);
            this.btnUpDownP8.Name = "btnUpDownP8";
            this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP8.Size = new System.Drawing.Size(140, 33);
@@ -2107,7 +2106,7 @@
            this.btnUpDownP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP1.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP1.Location = new System.Drawing.Point(10, 175);
+            this.btnUpDownP1.Location = new System.Drawing.Point(10, 158);
            this.btnUpDownP1.Name = "btnUpDownP1";
            this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP1.Size = new System.Drawing.Size(140, 33);
@@ -2126,7 +2125,7 @@
            this.btnUpDownP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnUpDownP2.ForeColor = System.Drawing.Color.Red;
            this.btnUpDownP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnUpDownP2.Location = new System.Drawing.Point(10, 215);
+            this.btnUpDownP2.Location = new System.Drawing.Point(10, 198);
            this.btnUpDownP2.Name = "btnUpDownP2";
            this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP2.Size = new System.Drawing.Size(140, 33);
@@ -2144,7 +2143,7 @@
            this.btnComP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 419);
+            this.btnComP3.Location = new System.Drawing.Point(252, 399);
            this.btnComP3.Name = "btnComP3";
            this.btnComP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP3.Size = new System.Drawing.Size(140, 33);
@@ -2162,7 +2161,7 @@
            this.btnComP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 458);
+            this.btnComP2.Location = new System.Drawing.Point(252, 441);
            this.btnComP2.Name = "btnComP2";
            this.btnComP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnComP2.Size = new System.Drawing.Size(140, 33);
@@ -2180,7 +2179,7 @@
            this.btnInOutP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(10, 425);
+            this.btnInOutP3.Location = new System.Drawing.Point(10, 399);
            this.btnInOutP3.Name = "btnInOutP3";
            this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP3.Size = new System.Drawing.Size(140, 33);
@@ -2198,7 +2197,7 @@
            this.btnMiddleP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 335);
+            this.btnMiddleP2.Location = new System.Drawing.Point(252, 318);
            this.btnMiddleP2.Name = "btnMiddleP2";
            this.btnMiddleP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnMiddleP2.Size = new System.Drawing.Size(140, 33);
@@ -2216,7 +2215,7 @@
            this.btnUpDownP5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 255);
+            this.btnUpDownP5.Location = new System.Drawing.Point(252, 238);
            this.btnUpDownP5.Name = "btnUpDownP5";
            this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP5.Size = new System.Drawing.Size(140, 33);
@@ -2234,7 +2233,7 @@
            this.btnUpDownP6.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 295);
+            this.btnUpDownP6.Location = new System.Drawing.Point(252, 278);
            this.btnUpDownP6.Name = "btnUpDownP6";
            this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP6.Size = new System.Drawing.Size(140, 33);
@@ -2252,7 +2251,7 @@
            this.btnUpDownP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 175);
+            this.btnUpDownP3.Location = new System.Drawing.Point(252, 158);
            this.btnUpDownP3.Name = "btnUpDownP3";
            this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP3.Size = new System.Drawing.Size(140, 33);
@@ -2270,7 +2269,7 @@
            this.btnUpDownP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            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.Location = new System.Drawing.Point(252, 215);
+            this.btnUpDownP4.Location = new System.Drawing.Point(252, 198);
            this.btnUpDownP4.Name = "btnUpDownP4";
            this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP4.Size = new System.Drawing.Size(140, 33);
@@ -2284,14 +2283,14 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
-            this.ClientSize = new System.Drawing.Size(1089, 844);
+            this.ClientSize = new System.Drawing.Size(1089, 729);
            this.Controls.Add(this.tabControl2);
            this.Controls.Add(this.tabControl1);
            this.Controls.Add(this.groupBox3);
            this.Controls.Add(this.groupInout);
            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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.Margin = new System.Windows.Forms.Padding(4);
            this.Name = "FrmStoreBox";
            this.Opacity = 0D;
            this.Text = "AC_SA_料仓";

--- a/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @37cce6d
+++ b/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @37cce6d
@@ -706,15 +706,14 @@ namespace OnlineStore.DeviceLibrary
                storeStatus = StoreStatus.SuddenStop;
            }
        }
-        private bool InProcess = false;
+        private bool InProcess = false; 
-        //private DateTime preProcessTime = DateTime.Now;
        private bool IsChongfu = false;
        private Stopwatch stopwatch = new Stopwatch();
+        private Stopwatch doorCheckWatch = new Stopwatch();
        protected override void timersTimer_Elapsed(object sender, System.Timers.ElapsedEventArgs e)
        {
            if (InProcess)
-            {
+            { 
-                //TimeSpan span = DateTime.Now - preProcessTime;
                if (stopwatch.Elapsed.TotalMinutes < 1)
                {
                    return;
@@ -727,6 +726,15 @@ namespace OnlineStore.DeviceLibrary
            }
            try
            {
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
+                {
+                    StoreManager.checkWatch(doorCheckWatch, 1000, false);
+                }
+                else
+                {
+                    doorCheckWatch.Stop();
+                }
                InProcess = true;
                //preProcessTime = DateTime.Now;
                stopwatch.Restart();
@@ -960,12 +968,11 @@ namespace OnlineStore.DeviceLibrary
            }
        }
        public void TimerProcess()
        {
            try
-            {
+            { 
-                DateTime time = DateTime.Now;
                if (StoreMove.MoveType != StoreMoveType.None)
                {
                    BusyMoveProcess();
@@ -1013,6 +1020,10 @@ namespace OnlineStore.DeviceLibrary
                    {
                        return;
                    }
+                    if (WarnMsg.Contains("等待料仓门口检测到料盘"))
+                    {
+                        return;
+                    }
                    //若BOX和移栽都没有在等待Io的过程中则此Io超时异常可能已经处理过
                    if (StoreMove.IsInWait == false)

--- a/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @37cce6d
+++ b/source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @37cce6d
@@ -288,7 +288,7 @@ namespace OnlineStore.DeviceLibrary
        /// </summary> 
        public override void StartInStoreMove(InOutParam param)
        {
-            bool isNeedCheckIO = true;
+            //   bool isNeedCheckIO = true;
            startInStoreTime = DateTime.Now;
            string posId = param != null ? param.PosInfo.PosId : "";
            if (storeRunStatus == StoreRunStatus.Runing)
@@ -307,28 +307,36 @@ namespace OnlineStore.DeviceLibrary
                storeRunStatus = StoreRunStatus.Busy;
                storeStatus = StoreStatus.InStoreExecute;
                StoreMove.NewMove(StoreMoveType.InStore, param);
-                if (isNeedCheckIO)
+                //if (isNeedCheckIO)
+                //{
+                //料盘检测
+                InStoreLog("  入库：SI_00   入库等待仓门口料盘信号");
+                StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
+                StoreMove.TimeOutSeconds = 5;
+                StoreMove.WaitList.Add(WaitResultInfo.WaitTime(100));
+                StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
+                // StoreMove.WaitList.Add(WaitResultInfo.WaitTime(10000));
+                // StoreMove.OneWaitCanEndStep = true;
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
                {
-                    //料盘检测
+                    doorCheckWatch.Restart();
-                    InStoreLog("  入库：SI_00   入库等待仓门口料盘信号");
-                    StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
-                    StoreMove.TimeOutSeconds = 5;
-                    //       StoreMove.WaitList.Add(WaitResultInfo.WaitTime(5000));
-                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
-                    //       StoreMove.OneWaitCanEndStep = true;
                }
                else
                {
-                    SI_02_Move(param.MoveP);
+                    doorCheckWatch.Stop();
                }
+                //}
+                //else
+                //{
+                //    SI_02_Move(param.MoveP);
+                //}
            }
            else
            {
                LogUtil.error(LOGGER, StoreName + " 启动【" + posId + "】入库出错，当前状态，storeStatus=" + storeRunStatus);
            }
        }
        private void SI_02_Move(LineMoveP moveP)
        {
@@ -368,20 +376,22 @@ namespace OnlineStore.DeviceLibrary
            if (StoreMove.MoveStep.Equals(StoreMoveStep.SI_00_TrayCheck))
            {
                //判断是否有料盘信号
-                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH)&&StoreManager.checkWatch(doorCheckWatch,1000,false))
-                {
+                { 
                    SI_02_Move(moveP);
                }
-                else
+                else if(StoreMove.IsTimeOut(10))
                {
-                    InStoreLog("  入库：SI_00   入库等待仓门口料盘信号");
+                    WarnMsg = StoreName + "入库 等待料仓门口检测到料盘 [" + StoreMove.MoveParam.PosInfo.barcode + "] [" + StoreMove.MoveParam.PosInfo.PosId + "] 超时 [" + Math.Round(StoreMove.StepSpan().TotalSeconds, 1) + "]秒 ";
-                    StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
+                    LogUtil.error(LOGGER, WarnMsg, 100);
-                    StoreMove.TimeOutSeconds = 5;
+                    Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
-                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
+                    //InStoreLog("  入库：SI_00   入库等待仓门口料盘信号");
+                    //StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
+                    //StoreMove.TimeOutSeconds = 5;
+                    //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Door, IO_VALUE.HIGH));
-                    //WarnMsg = StoreName + "入库未检测到料盘[" + StoreMove.MoveParam.PosInfo.barcode + "][" + StoreMove.MoveParam.PosInfo.PosId + "]";
-                    //LogUtil.error(LOGGER, WarnMsg, 100);
-                    //Alarm(StoreAlarmType.IoSingleTimeOut, "", WarnMsg, StoreMove.MoveType);
                    //TimeSpan span = DateTime.Now - startInStoreTime;
                    //string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
@@ -392,13 +402,15 @@ namespace OnlineStore.DeviceLibrary
                    //storeStatus = StoreStatus.StoreOnline;
                    //InOutEndProcess(StoreMoveType.InStore);
                }
-            }
+            } 
-            if (StoreMove.MoveStep == StoreMoveStep.SI_01_LocationCylinderDown)
-            {
-                SI_02_Move(moveP);
-            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutAxisHome)
            {
+                if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.LOW))
+                {
+                    string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
+                    CodeMsg = "入库[" + posId + "]叉子去取料前，未检测到进料口有料";
+                    LogUtil.error(CodeMsg);
+                }
                InStoreLog("入库：SI_03    所有轴回到待机点，轴2、轴1 动作到P1,，轴4动作至P3");
                StoreMove.NextMoveStep(StoreMoveStep.SI_03_ReturnHome);
                ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
@@ -440,6 +452,12 @@ namespace OnlineStore.DeviceLibrary
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
            {
+                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                {
+                    string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
+                    CodeMsg = "入库[" + posId + "]叉子取料后退后，未检测到料叉有料";
+                    LogUtil.error(CodeMsg);
+                }
                if (IsHasCompress_Axis || Config.IsHasLocationCylinder.Equals(0))
                {
                    InStoreLog("入库：SI_09 移动到库位点，旋转轴至P2(库位点),升降轴至P3(库位入库前点) ");
@@ -640,7 +658,7 @@ namespace OnlineStore.DeviceLibrary
                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
                {
                    string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
-                    CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料盘有料";
+                    CodeMsg = "出库[" + posId + "]叉子从库位退出后，未检测到料叉有料";
                    LogUtil.error(CodeMsg);
                }
                if (StoreMove.MoveParam.LoadLocationP())

--- a/source/DeviceLibrary/acSingleStore/StoreManager.cs
查看文件 @37cce6d
+++ b/source/DeviceLibrary/acSingleStore/StoreManager.cs
查看文件 @37cce6d
@@ -3,6 +3,7 @@ using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Ports;
 using System.Linq;
@@ -17,7 +18,7 @@ namespace OnlineStore.DeviceLibrary
        /// 当前出入库的模式
        /// </summary>
        public static int CurrInOutType = 0;
        public static readonly ILog LOGGER = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
        public static AC_SA_BoxBean Store = null;
        public static AC_SA_Config Config = null;
@@ -100,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
        /// <summary>
        /// 获取定位库位信息
        /// </summary> 
-        public static string  GetLocationPosId(int width)
+        public static string GetLocationPosId(int width)
        {
            string config = ConfigAppSettings.GetValue(Setting_Init.Location_PosID_ + width);
            return config;
@@ -200,5 +201,22 @@ namespace OnlineStore.DeviceLibrary
            path = path.Substring(0, path.Length - 1);
            return path;
        }
+        public static bool checkWatch(Stopwatch watch, int targetMs, bool isStop = false)
+        {
+            if (!watch.IsRunning)
+            {
+                watch.Restart();
+                return false;
+            }
+            else if (watch.ElapsedMilliseconds >= targetMs)
+            {
+                if (isStop)
+                {
+                    watch.Stop();
+                }
+                return true;
+            }
+            return false;
+        }
    }
 }
--- a/source/DeviceLibrary/store/StoreStep.cs
查看文件 @37cce6d
+++ b/source/DeviceLibrary/store/StoreStep.cs
查看文件 @37cce6d
@@ -279,10 +279,10 @@ namespace OnlineStore.DeviceLibrary
        /// 入库检测
        /// </summary>
        SI_00_TrayCheck = 200,
-        /// <summary>
+        ///// <summary>
-        /// 入库，。定位气缸下降
+        ///// 入库，。定位气缸下降
-        /// </summary>
+        ///// </summary>
-        SI_01_LocationCylinderDown = 201,
+        //SI_01_TrayCheckAgain = 201,
        /// <summary>
        /// 入库。。进出轴（叉子）先返回P1
        /// </summary>

--- a/source/DeviceLibrary/store/model/StoreMoveInfo.cs
查看文件 @37cce6d
+++ b/source/DeviceLibrary/store/model/StoreMoveInfo.cs
查看文件 @37cce6d
@@ -47,6 +47,20 @@ namespace OnlineStore.DeviceLibrary
        {
            get { return moveType; }
        }
+        public TimeSpan StepSpan()
+        {
+            TimeSpan span = DateTime.Now - LastSetpTime;
+            return span;
+        }
+        public bool IsTimeOut(int timeOutSeconds = 60)
+        {
+            TimeSpan span = DateTime.Now - LastSetpTime;
+            if (span.TotalSeconds > timeOutSeconds)
+            {
+                return true;
+            }
+            return false;
+        }
        /// <summary>
        ///出入库参数
        /// </summary>