出入库动作优化

张东亮
Commit f465e1c4 由 张东亮 编写于 2022-03-24 11:56:53 +0800
source/ACSquareStore/FrmStoreBox.Designer.cs
source/ACSquareStore/FrmStoreBox.cs
source/DeviceLibrary/StoreConfig/StoreConfig.csv
source/DeviceLibrary/acSquareStore/Square_BoxBean_Partial.cs
source/DeviceLibrary/store/LineMoveP.cs
source/DeviceLibrary/store/StoreStep.cs
source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
--- a/source/ACSquareStore/FrmStoreBox.Designer.cs
查看文件 @f465e1c
+++ b/source/ACSquareStore/FrmStoreBox.Designer.cs
查看文件 @f465e1c
@@ -65,6 +65,9 @@
            this.label49 = new System.Windows.Forms.Label();
            this.richTextBox1 = new System.Windows.Forms.RichTextBox();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.axis_1_Alarm = new UserFromControl.IOStatusControl();
+            this.axis_3_Alarm = new UserFromControl.IOStatusControl();
+            this.axis_2_Alarm = new UserFromControl.IOStatusControl();
            this.label38 = new System.Windows.Forms.Label();
            this.txtMiddleTarget = new System.Windows.Forms.TextBox();
            this.txtInoutTarget = new System.Windows.Forms.TextBox();
@@ -169,9 +172,8 @@
            this.button4 = new System.Windows.Forms.Button();
            this.btnClearL = new System.Windows.Forms.Button();
            this.btnLogDebug = new System.Windows.Forms.Button();
-            this.axis_1_Alarm = new UserFromControl.IOStatusControl();
+            this.txtMiddleSafe = new System.Windows.Forms.TextBox();
-            this.axis_3_Alarm = new UserFromControl.IOStatusControl();
+            this.btnMiddleSafe = new System.Windows.Forms.Button();
-            this.axis_2_Alarm = new UserFromControl.IOStatusControl();
            this.groupAxis.SuspendLayout();
            this.groupBox1.SuspendLayout();
            this.groupInout.SuspendLayout();
@@ -716,6 +718,36 @@
            this.groupBox1.TabStop = false;
            this.groupBox1.Text = "伺服状态";
            // 
+            // axis_1_Alarm
+            // 
+            this.axis_1_Alarm.IOName = "";
+            this.axis_1_Alarm.IOValue = 0;
+            this.axis_1_Alarm.isCanClick = false;
+            this.axis_1_Alarm.Location = new System.Drawing.Point(135, 44);
+            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;
+            // 
+            // axis_3_Alarm
+            // 
+            this.axis_3_Alarm.IOName = "";
+            this.axis_3_Alarm.IOValue = 0;
+            this.axis_3_Alarm.isCanClick = false;
+            this.axis_3_Alarm.Location = new System.Drawing.Point(240, 44);
+            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;
+            // 
+            // axis_2_Alarm
+            // 
+            this.axis_2_Alarm.IOName = "";
+            this.axis_2_Alarm.IOValue = 0;
+            this.axis_2_Alarm.isCanClick = false;
+            this.axis_2_Alarm.Location = new System.Drawing.Point(338, 44);
+            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;
+            // 
            // label38
            // 
            this.label38.AutoSize = true;
@@ -860,6 +892,8 @@
            // 
            // groupInout
            // 
+            this.groupInout.Controls.Add(this.txtMiddleSafe);
+            this.groupInout.Controls.Add(this.btnMiddleSafe);
            this.groupInout.Controls.Add(this.rdbRight);
            this.groupInout.Controls.Add(this.rdbLeft);
            this.groupInout.Controls.Add(this.btnClearLog);
@@ -935,7 +969,7 @@
            // 
            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(377, 468);
+            this.btnClearLog.Location = new System.Drawing.Point(372, 506);
            this.btnClearLog.Name = "btnClearLog";
            this.btnClearLog.Size = new System.Drawing.Size(105, 38);
            this.btnClearLog.TabIndex = 224;
@@ -950,7 +984,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(399, 252);
+            this.txtInOutP3.Location = new System.Drawing.Point(399, 304);
            this.txtInOutP3.MaxLength = 20;
            this.txtInOutP3.Name = "txtInOutP3";
            this.txtInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -967,7 +1001,7 @@
            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.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.btnInOutP3.Location = new System.Drawing.Point(251, 247);
+            this.btnInOutP3.Location = new System.Drawing.Point(251, 299);
            this.btnInOutP3.Name = "btnInOutP3";
            this.btnInOutP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP3.Size = new System.Drawing.Size(146, 33);
@@ -982,7 +1016,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(11, 476);
+            this.lblTemp.Location = new System.Drawing.Point(6, 514);
            this.lblTemp.Name = "lblTemp";
            this.lblTemp.Size = new System.Drawing.Size(159, 20);
            this.lblTemp.TabIndex = 270;
@@ -1004,7 +1038,7 @@
            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(266, 468);
+            this.btnSavePosition.Location = new System.Drawing.Point(261, 506);
            this.btnSavePosition.Name = "btnSavePosition";
            this.btnSavePosition.Size = new System.Drawing.Size(105, 38);
            this.btnSavePosition.TabIndex = 217;
@@ -1050,7 +1084,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(153, 251);
+            this.txtInOutP2.Location = new System.Drawing.Point(153, 303);
            this.txtInOutP2.MaxLength = 20;
            this.txtInOutP2.Name = "txtInOutP2";
            this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1065,7 +1099,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(153, 211);
+            this.txtInOutP1.Location = new System.Drawing.Point(153, 263);
            this.txtInOutP1.MaxLength = 20;
            this.txtInOutP1.Name = "txtInOutP1";
            this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1095,7 +1129,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(153, 372);
+            this.txtUpDownP7.Location = new System.Drawing.Point(153, 424);
            this.txtUpDownP7.MaxLength = 20;
            this.txtUpDownP7.Name = "txtUpDownP7";
            this.txtUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1110,7 +1144,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(153, 412);
+            this.txtUpDownP8.Location = new System.Drawing.Point(153, 464);
            this.txtUpDownP8.MaxLength = 20;
            this.txtUpDownP8.Name = "txtUpDownP8";
            this.txtUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1125,7 +1159,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(153, 292);
+            this.txtUpDownP1.Location = new System.Drawing.Point(153, 344);
            this.txtUpDownP1.MaxLength = 20;
            this.txtUpDownP1.Name = "txtUpDownP1";
            this.txtUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1140,7 +1174,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(153, 332);
+            this.txtUpDownP2.Location = new System.Drawing.Point(153, 384);
            this.txtUpDownP2.MaxLength = 20;
            this.txtUpDownP2.Name = "txtUpDownP2";
            this.txtUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1155,7 +1189,7 @@
            this.txtInOutP4.Cursor = System.Windows.Forms.Cursors.IBeam;
            this.txtInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.txtInOutP4.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.txtInOutP4.Location = new System.Drawing.Point(399, 211);
+            this.txtInOutP4.Location = new System.Drawing.Point(399, 263);
            this.txtInOutP4.MaxLength = 20;
            this.txtInOutP4.Name = "txtInOutP4";
            this.txtInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1185,7 +1219,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(399, 372);
+            this.txtUpDownP5.Location = new System.Drawing.Point(399, 424);
            this.txtUpDownP5.MaxLength = 20;
            this.txtUpDownP5.Name = "txtUpDownP5";
            this.txtUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1200,7 +1234,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(399, 412);
+            this.txtUpDownP6.Location = new System.Drawing.Point(399, 464);
            this.txtUpDownP6.MaxLength = 20;
            this.txtUpDownP6.Name = "txtUpDownP6";
            this.txtUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1240,7 +1274,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(399, 292);
+            this.txtUpDownP3.Location = new System.Drawing.Point(399, 344);
            this.txtUpDownP3.MaxLength = 20;
            this.txtUpDownP3.Name = "txtUpDownP3";
            this.txtUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1281,7 +1315,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(399, 332);
+            this.txtUpDownP4.Location = new System.Drawing.Point(399, 384);
            this.txtUpDownP4.MaxLength = 20;
            this.txtUpDownP4.Name = "txtUpDownP4";
            this.txtUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
@@ -1298,7 +1332,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(6, 246);
+            this.btnInOutP2.Location = new System.Drawing.Point(6, 298);
            this.btnInOutP2.Name = "btnInOutP2";
            this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP2.Size = new System.Drawing.Size(145, 33);
@@ -1317,7 +1351,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(6, 206);
+            this.btnInOutP1.Location = new System.Drawing.Point(6, 258);
            this.btnInOutP1.Name = "btnInOutP1";
            this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP1.Size = new System.Drawing.Size(145, 33);
@@ -1355,7 +1389,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(6, 367);
+            this.btnUpDownP7.Location = new System.Drawing.Point(6, 419);
            this.btnUpDownP7.Name = "btnUpDownP7";
            this.btnUpDownP7.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP7.Size = new System.Drawing.Size(145, 33);
@@ -1374,7 +1408,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(6, 407);
+            this.btnUpDownP8.Location = new System.Drawing.Point(6, 459);
            this.btnUpDownP8.Name = "btnUpDownP8";
            this.btnUpDownP8.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP8.Size = new System.Drawing.Size(145, 33);
@@ -1393,7 +1427,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(6, 287);
+            this.btnUpDownP1.Location = new System.Drawing.Point(6, 339);
            this.btnUpDownP1.Name = "btnUpDownP1";
            this.btnUpDownP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP1.Size = new System.Drawing.Size(145, 33);
@@ -1412,7 +1446,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(6, 327);
+            this.btnUpDownP2.Location = new System.Drawing.Point(6, 379);
            this.btnUpDownP2.Name = "btnUpDownP2";
            this.btnUpDownP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP2.Size = new System.Drawing.Size(145, 33);
@@ -1430,7 +1464,7 @@
            this.btnInOutP4.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
            this.btnInOutP4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
            this.btnInOutP4.ForeColor = System.Drawing.Color.Green;
-            this.btnInOutP4.Location = new System.Drawing.Point(251, 206);
+            this.btnInOutP4.Location = new System.Drawing.Point(251, 258);
            this.btnInOutP4.Name = "btnInOutP4";
            this.btnInOutP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnInOutP4.Size = new System.Drawing.Size(146, 33);
@@ -1466,7 +1500,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(251, 367);
+            this.btnUpDownP5.Location = new System.Drawing.Point(251, 419);
            this.btnUpDownP5.Name = "btnUpDownP5";
            this.btnUpDownP5.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP5.Size = new System.Drawing.Size(146, 33);
@@ -1484,7 +1518,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(251, 407);
+            this.btnUpDownP6.Location = new System.Drawing.Point(251, 459);
            this.btnUpDownP6.Name = "btnUpDownP6";
            this.btnUpDownP6.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP6.Size = new System.Drawing.Size(146, 33);
@@ -1502,7 +1536,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(251, 287);
+            this.btnUpDownP3.Location = new System.Drawing.Point(251, 339);
            this.btnUpDownP3.Name = "btnUpDownP3";
            this.btnUpDownP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP3.Size = new System.Drawing.Size(146, 33);
@@ -1520,7 +1554,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(251, 327);
+            this.btnUpDownP4.Location = new System.Drawing.Point(251, 379);
            this.btnUpDownP4.Name = "btnUpDownP4";
            this.btnUpDownP4.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.btnUpDownP4.Size = new System.Drawing.Size(146, 33);
@@ -2075,35 +2109,39 @@
            this.btnLogDebug.UseVisualStyleBackColor = true;
            this.btnLogDebug.Click += new System.EventHandler(this.开启DEBUGToolStripMenuItem_Click);
            // 
-            // axis_1_Alarm
+            // txtMiddleSafe
            // 
-            this.axis_1_Alarm.IOName = "";
+            this.txtMiddleSafe.AcceptsReturn = true;
-            this.axis_1_Alarm.IOValue = 0;
+            this.txtMiddleSafe.BackColor = System.Drawing.SystemColors.Window;
-            this.axis_1_Alarm.isCanClick = false;
+            this.txtMiddleSafe.Cursor = System.Windows.Forms.Cursors.IBeam;
-            this.axis_1_Alarm.Location = new System.Drawing.Point(135, 44);
+            this.txtMiddleSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.axis_1_Alarm.Name = "axis_1_Alarm";
+            this.txtMiddleSafe.ForeColor = System.Drawing.SystemColors.WindowText;
-            this.axis_1_Alarm.Size = new System.Drawing.Size(43, 39);
+            this.txtMiddleSafe.Location = new System.Drawing.Point(152, 211);
-            this.axis_1_Alarm.TabIndex = 264;
+            this.txtMiddleSafe.MaxLength = 20;
-            // 
+            this.txtMiddleSafe.Name = "txtMiddleSafe";
-            // axis_3_Alarm
+            this.txtMiddleSafe.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            // 
+            this.txtMiddleSafe.Size = new System.Drawing.Size(89, 23);
-            this.axis_3_Alarm.IOName = "";
+            this.txtMiddleSafe.TabIndex = 276;
-            this.axis_3_Alarm.IOValue = 0;
+            this.txtMiddleSafe.Text = "-52388";
-            this.axis_3_Alarm.isCanClick = false;
+            // 
-            this.axis_3_Alarm.Location = new System.Drawing.Point(240, 44);
+            // btnMiddleSafe
-            this.axis_3_Alarm.Name = "axis_3_Alarm";
+            // 
-            this.axis_3_Alarm.Size = new System.Drawing.Size(43, 39);
+            this.btnMiddleSafe.AutoSize = true;
-            this.axis_3_Alarm.TabIndex = 266;
+            this.btnMiddleSafe.BackColor = System.Drawing.SystemColors.Control;
-            // 
+            this.btnMiddleSafe.Cursor = System.Windows.Forms.Cursors.Default;
-            // axis_2_Alarm
+            this.btnMiddleSafe.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            // 
+            this.btnMiddleSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.axis_2_Alarm.IOName = "";
+            this.btnMiddleSafe.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
-            this.axis_2_Alarm.IOValue = 0;
+            this.btnMiddleSafe.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.axis_2_Alarm.isCanClick = false;
+            this.btnMiddleSafe.Location = new System.Drawing.Point(5, 206);
-            this.axis_2_Alarm.Location = new System.Drawing.Point(338, 44);
+            this.btnMiddleSafe.Name = "btnMiddleSafe";
-            this.axis_2_Alarm.Name = "axis_2_Alarm";
+            this.btnMiddleSafe.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.axis_2_Alarm.Size = new System.Drawing.Size(43, 39);
+            this.btnMiddleSafe.Size = new System.Drawing.Size(145, 33);
-            this.axis_2_Alarm.TabIndex = 265;
+            this.btnMiddleSafe.TabIndex = 275;
+            this.btnMiddleSafe.Text = "X-前后轴安全位置:";
+            this.btnMiddleSafe.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            this.btnMiddleSafe.UseVisualStyleBackColor = false;
+            this.btnMiddleSafe.Click += new System.EventHandler(this.btnMiddleSafe_Click);
            // 
            // FrmStoreBox
            // 
@@ -2298,6 +2336,8 @@
        private System.Windows.Forms.ComboBox cmbHumpPort;
        private System.Windows.Forms.CheckBox chbUseTrayCheck;
        private System.Windows.Forms.CheckBox checkBox1;
+        public System.Windows.Forms.TextBox txtMiddleSafe;
+        public System.Windows.Forms.Button btnMiddleSafe;
    }
 }
--- a/source/ACSquareStore/FrmStoreBox.cs
查看文件 @f465e1c
+++ b/source/ACSquareStore/FrmStoreBox.cs
查看文件 @f465e1c
@@ -91,6 +91,7 @@ namespace OnlineStore.ACSquareStore
            }
            txtMiddleP1.Text = store.Config.MiddleAxis_P1_Position.ToString();
+            txtMiddleSafe.Text = store.Config.MiddleAxis_Safe_Position.ToString();
            txtUpDownP1.Text = store.Config.UpDownAxis_DoorO_P1.ToString();
            txtInOutP1.Text = store.Config.InOutAxis_P1_Position.ToString();
@@ -423,7 +424,7 @@ namespace OnlineStore.ACSquareStore
            ktk.InOut_P4 = FormUtil.GetIntValue(txtInOutP4);
            ktk.Middle_P1 = FormUtil.GetIntValue(txtMiddleP1);
            ktk.Middle_P2 = FormUtil.GetIntValue(txtMiddleP2);
+            ktk.MiddleAxis_Safe_Position= FormUtil.GetIntValue(txtMiddleSafe);
            ktk.UpDown_P1 = FormUtil.GetIntValue(txtUpDownP1);
            ktk.UpDown_P2 = FormUtil.GetIntValue(txtUpDownP2);
            ktk.UpDown_P3 = FormUtil.GetIntValue(txtUpDownP3);
@@ -432,6 +433,7 @@ namespace OnlineStore.ACSquareStore
            ktk.UpDown_P6 = FormUtil.GetIntValue(txtUpDownP6);
            ktk.UpDown_P7 = FormUtil.GetIntValue(txtUpDownP7);
            ktk.UpDown_P8 = FormUtil.GetIntValue(txtUpDownP8);
            return ktk;
        }
        private void btnComAlarmClear_Click(object sender, EventArgs e)
@@ -612,6 +614,11 @@ namespace OnlineStore.ACSquareStore
                store.Config.MiddleAxis_P1_Position = FormUtil.GetIntValue(txtMiddleP1);
                needUpdate = true;
            }
+            if (store.Config.MiddleAxis_Safe_Position != FormUtil.GetIntValue(txtMiddleSafe))
+            {
+                store.Config.MiddleAxis_Safe_Position = FormUtil.GetIntValue(txtMiddleSafe);
+                needUpdate = true;
+            }
            if (store.Config.UpDownAxis_DoorO_P1 != FormUtil.GetIntValue(txtUpDownP1))
            {
                store.Config.UpDownAxis_DoorO_P1 = FormUtil.GetIntValue(txtUpDownP1);
@@ -1324,5 +1331,14 @@ namespace OnlineStore.ACSquareStore
            store.use_Alarm_Buzzer = checkBox1.Checked;
            ConfigAppSettings.SaveValue(Setting_Init.UseAlarmBuzzer, store.use_Alarm_Buzzer ? 1 : 0);
        }
+        private void btnMiddleSafe_Click(object sender, EventArgs e)
+        {
+            if (InOutIsIsP1())
+            {
+                int value = FormUtil.GetIntValue(txtMiddleSafe);
+                AxisABSMove(store.Config.Middle_Axis, value, store.Config.MiddleAxis_P1_Speed);
+            }
+        }
    }
 }
--- a/source/DeviceLibrary/StoreConfig/StoreConfig.csv
查看文件 @f465e1c
+++ b/source/DeviceLibrary/StoreConfig/StoreConfig.csv
查看文件 @f465e1c
@@ -45,6 +45,7 @@ PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorI_P2,321500,,,,,,,
 PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOB_P7,321500,,,,,,,
 PRO,升降轴 进料口出料缓冲点 P8,UpDownAxis_DoorIB_P8,301400,,,,,,,
 PRO,（X轴-前后轴）P1 待机原位点,MiddleAxis_P1_Position,325000,,,,,,,
+PRO,（X轴-前后轴）安全位置点,MiddleAxis_Safe_Position,325000,,,,,,,
 PRO,（ Y轴-进出轴）P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
 PRO,（ Y轴-进出轴）P1左侧托架取料点P2,InOutAxis_P2_Position,7900,,,,,,,
 PRO,（ Y轴-进出轴）P1右侧托架取料点P3,InOutAxis_P3_Position,-7900,,,,,,,  

--- a/source/DeviceLibrary/acSquareStore/Square_BoxBean_Partial.cs
查看文件 @f465e1c
+++ b/source/DeviceLibrary/acSquareStore/Square_BoxBean_Partial.cs
查看文件 @f465e1c
@@ -56,7 +56,7 @@ namespace OnlineStore.DeviceLibrary
                p.InOut_P1 = Config.InOutAxis_P1_Position;
                p.Middle_P1 = Config.MiddleAxis_P1_Position;
+                p.MiddleAxis_Safe_Position = Config.MiddleAxis_Safe_Position;
                if (param.PosInfo.ShelfType.Equals(1))
                {
                    p.InOut_P2 = Config.InOutAxis_P2_Position;
@@ -291,24 +291,23 @@ namespace OnlineStore.DeviceLibrary
                storeRunStatus = StoreRunStatus.Busy;
                storeStatus = StoreStatus.InStoreExecute;
                StoreMove.NewMove(StoreMoveType.InStore, param);
+                //料盘检测
-                if (StoreManager.UseShelfCheck)
-                { //料盘检测
                StoreMove.NextMoveStep(StoreMoveStep.SI_00_TrayCheck);
-                    InStoreLog("入库：检测料盘信号 ");
+                //if (StoreManager.UseShelfCheck)
-                    if (param.PosInfo.ShelfType.Equals(1))
+                //{ 
-                    {
+                //    if (param.PosInfo.ShelfType.Equals(1))
-                        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.HIGH));
+                //    {
-                    }
+                //        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.HIGH));
-                    else
+                //    }
-                    {
+                //    else
-                        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.HIGH));
+                //    {
-                    }
+                //        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.HIGH));
-                }
+                //    }
-                else
+                //}
-                {
+                //else
-                    SI_02_Move();
+                //{
-                }
+                //    SI_02_Move();
+                //}
            }
            else
            {
@@ -342,11 +341,22 @@ namespace OnlineStore.DeviceLibrary
            else if (StoreMove.MoveStep == StoreMoveStep.SI_02_InOutToP1)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_03_ToP1);
-                InStoreLog("入库：升降轴到P1[" + moveP.UpDown_P1 + "]，前进轴到P1[" + moveP.Middle_P1 + "] ，托架后退");
+                InStoreLog("入库：升降轴到P1[" + moveP.UpDown_P1 + "]，前进轴到P1[" + moveP.Middle_P1 + "] ，托架后退,检测料盘信号");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                ShelfBack(StoreMove.MoveParam.PosInfo.ShelfType, StoreMove);
+                if (StoreManager.UseShelfCheck)
+                {
+                    if (StoreMove.MoveParam.PosInfo.ShelfType.Equals(1))
+                    {
+                        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.LeftShelf_Check, IO_VALUE.HIGH));
+                    }
+                    else
+                    {
+                        StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.RightShelf_Check, IO_VALUE.HIGH));
+                    }
+                }
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_03_ToP1)
            {
@@ -363,13 +373,13 @@ namespace OnlineStore.DeviceLibrary
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_06_UpdownAxisUp)
            {
-                StoreMove.NextMoveStep(StoreMoveStep.SI_07_InOutToP1 );
+                StoreMove.NextMoveStep(StoreMoveStep.SI_07_InOutToP1);
                InStoreLog("入库： 叉子 从入料口抽出，进出轴至P1(待机点) [" + moveP.InOut_P1 + "]");
                InOutBackToP1(moveP.InOut_P1);
            }
-            else if (StoreMove.MoveStep == StoreMoveStep.SI_07_InOutToP1 )
+            else if (StoreMove.MoveStep == StoreMoveStep.SI_07_InOutToP1)
            {
-                StoreMove.NextMoveStep(StoreMoveStep.SI_08_WaitShelfDI);
+                StoreMove.NextMoveStep(StoreMoveStep.SI_08_ToSafePosition);
                InStoreLog("入库： 判断是否拿到物料");
                if (StoreManager.UseShelfCheck)
                {
@@ -385,20 +395,27 @@ namespace OnlineStore.DeviceLibrary
                }
            }
            //判断是否拿到料
-            else if (StoreMove.MoveStep == StoreMoveStep.SI_08_WaitShelfDI)
+            else if (StoreMove.MoveStep == StoreMoveStep.SI_08_ToSafePosition)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_09_MiddleToP3);
-                InStoreLog("入库： 移动到库位点，前后轴至P2(库位点), [" + moveP.Middle_P2 + "]");
+                InStoreLog("入库： 移动到安全点，前后轴至安全点, [" + moveP.MiddleAxis_Safe_Position + "]");
-                ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.MiddleAxis_Safe_Position, Config.MiddleAxis_P1_Speed);
-                // ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_09_MiddleToP3)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_10_UpdownToBag);
-                InStoreLog("入库： 移动到库位点，升降轴至P3(库位入库前点) [" + moveP.UpDown_P3 + "] ");
+                InStoreLog("入库： 移动到库位点，前后轴至P2(库位点), [" + moveP.Middle_P2 + "],升降轴至P3(库位入库前点)[" + moveP.UpDown_P3 + "] ");
-                //ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
            }
+            //else if (StoreMove.MoveStep == StoreMoveStep.SI_09_MiddleToP3)
+            //{
+            //    StoreMove.NextMoveStep(StoreMoveStep.SI_10_UpdownToBag);
+            //    InStoreLog("入库： 移动到库位点，升降轴至P3(库位入库前点) [" + moveP.UpDown_P3 + "] ");
+            //    //ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
+            //    ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P3, Config.UpDownAxis_P3_Speed);
+            //}
            else if (StoreMove.MoveStep == StoreMoveStep.SI_10_UpdownToBag)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_11_InoutToP4);
@@ -417,14 +434,14 @@ namespace OnlineStore.DeviceLibrary
                //SendLineStatus(StoreID, posId, StoreStatus.InStoreEnd);
                StoreMove.NextMoveStep(StoreMoveStep.SI_12_PutWare);
-                InStoreLog("入库：放下物品，升降轴至P4(库位入料缓冲点) ["+ moveP.UpDown_P4 + "], 更新状态=InStoreEnd, "+ lastDoor);
+                InStoreLog("入库：放下物品，升降轴至P4(库位入料缓冲点) [" + moveP.UpDown_P4 + "], 更新状态=InStoreEnd, " + lastDoor);
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P4, Config.UpDownAxis_P4_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_12_PutWare)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_13_InoutToP1);
-                InStoreLog("入库：叉子从库位中返回，进出轴动作至P1(待机点) ["+ moveP.InOut_P1 + "] ");
+                InStoreLog("入库：叉子从库位中返回，进出轴动作至P1(待机点) [" + moveP.InOut_P1 + "] ");
                InOutBackToP1(moveP.InOut_P1);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_13_InoutToP1)
@@ -439,16 +456,17 @@ namespace OnlineStore.DeviceLibrary
            else if (StoreMove.MoveStep == StoreMoveStep.SI_14_CheckTrayIsGo)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_15_UpdownBack);
-                InStoreLog("入库：升降轴 返回待机点P1["+ moveP.UpDown_P1 + "]  ，托架前进");
+                InStoreLog("入库：升降轴 返回待机点P1[" + moveP.UpDown_P1 + "] ，前后轴返回安全位置["+moveP.MiddleAxis_Safe_Position+"]托架前进");
                //  ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.MiddleAxis_Safe_Position, Config.MiddleAxis_P1_Speed);
                ShelfForward(StoreMove.MoveParam.PosInfo.ShelfType);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_15_UpdownBack)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SI_16_GoBack);
-                InStoreLog("入库： 前后轴 返回待机点P1 ["+ moveP.Middle_P1 + "]，打开门锁 ");
+                InStoreLog("入库： 前后轴 返回待机点P1 [" + moveP.Middle_P1 + "]，打开门锁 ");
                ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SI_16_GoBack)
@@ -528,26 +546,27 @@ namespace OnlineStore.DeviceLibrary
            if (StoreMove.MoveStep == StoreMoveStep.SO_01_InoutToP1)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_02_MiddleToP2);
-                OutStoreLog("出库： 走到库位， 前后轴至P2(库位点) [" + moveP.Middle_P2 + "]");
+                OutStoreLog("出库： 走到安全位置， 前后轴至安全位置 [" + moveP.MiddleAxis_Safe_Position + "]");
-                ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.MiddleAxis_Safe_Position, Config.MiddleAxis_P1_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_02_MiddleToP2)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_03_UpdownToP5);
-                OutStoreLog("出库： 走到库位， 升降轴至P5(库位出库前点)  ["+ moveP.UpDown_P5 + "]");
+                OutStoreLog("出库： 走到库位， 升降轴至P5(库位出库前点)  [" + moveP.UpDown_P5 + "]前后轴至P2(库位点) [" + moveP.Middle_P2 + "]");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P5, Config.UpDownAxis_P5_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.Middle_P2, Config.MiddleAxis_P2_Speed);
                //   ShelfBack(StoreMove.MoveParam.PosInfo.ShelfType);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_03_UpdownToP5)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_04_InoutToP3);
-                OutStoreLog("出库： 叉子进入库位中，  进出轴至P3(库位取放料点) ["+ moveP.InOut_P4 + "]");
+                OutStoreLog("出库： 叉子进入库位中，  进出轴至P3(库位取放料点) [" + moveP.InOut_P4 + "]");
                ACAxisMove(Config.InOut_Axis, moveP.InOut_P4, Config.InOutAxis_P3_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_04_InoutToP3)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_05_GetWare);
-                OutStoreLog("出库： 拿起物品，升降轴至P6(库位出料缓冲点)  ["+ moveP.UpDown_P6 + "]");
+                OutStoreLog("出库： 拿起物品，升降轴至P6(库位出料缓冲点)  [" + moveP.UpDown_P6 + "]");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P6, Config.UpDownAxis_P6_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_05_GetWare)
@@ -573,7 +592,7 @@ namespace OnlineStore.DeviceLibrary
                storeStatus = StoreStatus.OutStoreBoxEnd;
                StoreMove.NextMoveStep(StoreMoveStep.SO_06_InoutToP1);
-                OutStoreLog("出库： 叉子从库位返回，进出轴至P1(待机点)["+ moveP.InOut_P1 + "]，更新状态=OutStoreBoxEnd， " + lastDoor); 
+                OutStoreLog("出库： 叉子从库位返回，进出轴至P1(待机点)[" + moveP.InOut_P1 + "]，更新状态=OutStoreBoxEnd， " + lastDoor);
                InOutBackToP1(moveP.InOut_P1);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_06_InoutToP1)
@@ -595,15 +614,15 @@ namespace OnlineStore.DeviceLibrary
                }
                StoreMove.NextMoveStep(StoreMoveStep.SO_08_UpdownBack);
-                OutStoreLog("出库：升降轴至P2(进料口出料前点), ["+ moveP.UpDown_P2 + "]  ");
+                OutStoreLog("出库：升降轴至P2(进料口出料前点), [" + moveP.UpDown_P2 + "] ,前后轴至安全点，[" + moveP.MiddleAxis_Safe_Position + "] ");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
-                //   ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
+                ACAxisMove(Config.Middle_Axis, moveP.MiddleAxis_Safe_Position, Config.MiddleAxis_P1_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_08_UpdownBack)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_09_ToDoorPosition);
-                OutStoreLog("出库：前后轴至P1(待机点) ["+ moveP.Middle_P1 + "] ");
+                OutStoreLog("出库：前后轴至P1(待机点) [" + moveP.Middle_P1 + "] ");
                //    ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P2, Config.UpDownAxis_P2_Speed);
                ACAxisMove(Config.Middle_Axis, moveP.Middle_P1, Config.MiddleAxis_P1_Speed);
                //  ShelfBack(StoreMove.MoveParam.PosInfo.ShelfType, StoreMove);
@@ -668,19 +687,19 @@ namespace OnlineStore.DeviceLibrary
            else if (StoreMove.MoveStep == StoreMoveStep.SO_11_ShelfBack)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_12_InoutToP2);
-                OutStoreLog("出库： 叉子进出料口，进出轴至P2(进料口取料点) ["+ moveP.InOut_P2 + "] ");
+                OutStoreLog("出库： 叉子进出料口，进出轴至P2(进料口取料点) [" + moveP.InOut_P2 + "] ");
                ACAxisMove(Config.InOut_Axis, moveP.InOut_P2, Config.InOutAxis_P2_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_12_InoutToP2)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_13_PutWare);
-                OutStoreLog("出库： 放下物品，升降轴至P8(进料口出料缓冲点) ["+ moveP.UpDown_P8 + "]");
+                OutStoreLog("出库： 放下物品，升降轴至P8(进料口出料缓冲点) [" + moveP.UpDown_P8 + "]");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P8, Config.UpDownAxis_P8_Speed);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_13_PutWare)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_14_InoutToP1);
-                OutStoreLog("出库： 叉子从出料口返回，，进出轴动作至P1(待机点) ["+ moveP.InOut_P1 + "] ");
+                OutStoreLog("出库： 叉子从出料口返回，，进出轴动作至P1(待机点) [" + moveP.InOut_P1 + "] ");
                InOutBackToP1(moveP.InOut_P1);
            }
            else if (StoreMove.MoveStep == StoreMoveStep.SO_14_InoutToP1)
@@ -703,7 +722,7 @@ namespace OnlineStore.DeviceLibrary
            else if (StoreMove.MoveStep == StoreMoveStep.SO_15_CheckShelfDI)
            {
                StoreMove.NextMoveStep(StoreMoveStep.SO_16_GoBack);
-                OutStoreLog("出库： 升降轴到P1(待机点) ["+ moveP.UpDown_P1 + "] ,托架前进，打开门锁");
+                OutStoreLog("出库： 升降轴到P1(待机点) [" + moveP.UpDown_P1 + "] ,托架前进，打开门锁");
                ACAxisMove(Config.UpDown_Axis, moveP.UpDown_P1, Config.UpDownAxis_P1_Speed);
                OpenDoor(StoreMove.MoveParam.PosInfo.ShelfType);
                ShelfForward(StoreMove.MoveParam.PosInfo.ShelfType, StoreMove);
@@ -857,7 +876,7 @@ namespace OnlineStore.DeviceLibrary
        private void OutStoreLog(string msg)
        {
            string posId = StoreMove.MoveParam != null ? StoreMove.MoveParam.PosInfo.PosId : "";
-            LogUtil.info(LOGGER, "【" + posId + "】["+StoreMove.MoveStep+"] " + msg, storeMoveColor);
+            LogUtil.info(LOGGER, "【" + posId + "】[" + StoreMove.MoveStep + "] " + msg, storeMoveColor);
        }
        private bool OpenDoor(int doorType)
        {
@@ -867,7 +886,7 @@ namespace OnlineStore.DeviceLibrary
        {
            return OpenCloseDoor(doorType, IO_VALUE.HIGH);
        }
-        private bool OpenCloseDoor(int doorType,IO_VALUE value)
+        private bool OpenCloseDoor(int doorType, IO_VALUE value)
        {
            if (doorType.Equals(1))
            {

--- a/source/DeviceLibrary/store/LineMoveP.cs
查看文件 @f465e1c
+++ b/source/DeviceLibrary/store/LineMoveP.cs
查看文件 @f465e1c
@@ -44,7 +44,10 @@ namespace OnlineStore.DeviceLibrary
        /// 轴2（ 升降轴） 进料口出料缓冲点P8
        /// </summary>
        public int UpDown_P8 { get; set; }
+        /// <summary>
+        /// 轴1前后轴 安全位置点
+        /// </summary>
+        public int MiddleAxis_Safe_Position { get; set; }
        /// <summary>
        /// 轴1前后轴 待机原位点 P1
        /// </summary>

--- a/source/DeviceLibrary/store/StoreStep.cs
查看文件 @f465e1c
+++ b/source/DeviceLibrary/store/StoreStep.cs
查看文件 @f465e1c
@@ -278,11 +278,14 @@ namespace OnlineStore.DeviceLibrary
        /// 入库。。叉子 从入料口抽出，轴3（ 叉子） 至P1（ 待机点）
        /// </summary>
        SI_07_InOutToP1  = 207,
+        /// <summary>
+        /// 入库。。X轴到安全点
+        /// </summary>
+        SI_08_ToSafePosition=208,
        /// <summary>
        /// 入库。。等待物料信号到位
        /// </summary>
-        SI_08_WaitShelfDI = 208,
+        //SI_08_WaitShelfDI = 208,
        /// <summary>
        /// 入库。。移动到库位点，前后轴 至P3(库位入库前点）
        /// </summary>
@@ -317,7 +320,6 @@ namespace OnlineStore.DeviceLibrary
        /// 入库。。进出轴返回
        /// </summary>
        SI_16_GoBack = 216,
        #endregion
        #region 手动料仓出入库步骤

--- a/source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
查看文件 @f465e1c
+++ b/source/LoadCVSLibrary/storeConfig/config/Box_Config.cs
查看文件 @f465e1c
@@ -316,6 +316,11 @@ namespace OnlineStore.LoadCSVLibrary
        [ConfigProAttribute("MiddleAxis_P1_Position")]
        public int MiddleAxis_P1_Position { get; set; }
        /// <summary>
+        /// PRO	（X轴-前后轴）安全位置点	MiddleAxis_Safe_Position
+        /// </summary>
+        [ConfigProAttribute("MiddleAxis_Safe_Position")]
+        public int MiddleAxis_Safe_Position { get; set; }
+        /// <summary>
        /// PRO	( Y轴-进出轴）P1待机原位点	InOutAxis_P1_Position
        /// </summary>
        [ConfigProAttribute("InOutAxis_P1_Position")]