bug修改

source/DUOStore/FrmAxisMove.cs

@@ -47,6 +47,7 @@ namespace OnlineStore.DUOStore
             txtMiddleP1.Text = StoreManager.Store.Config.MiddleAxis_P1.ToString();
             txtMiddleP1.Text = StoreManager.Store.Config.MiddleAxis_P1.ToString();
             txtMiddleP3.Text = StoreManager.Store.Config.MiddleAxis_P3.ToString();
             txtMiddleP3.Text = StoreManager.Store.Config.MiddleAxis_P3.ToString();
             txtMiddleP2.Text = StoreManager.Store.Config.MiddleAxis_P2.ToString();
             txtMiddleP2.Text = StoreManager.Store.Config.MiddleAxis_P2.ToString();
+            txtT2P4.Text = StoreManager.Store.Config.MiddleAxis_P4.ToString();
 
 
 
 
             txtUpdownP1.Text = StoreManager.Store.Config.UpdownAxis_P1.ToString();
             txtUpdownP1.Text = StoreManager.Store.Config.UpdownAxis_P1.ToString();
@@ -144,7 +145,7 @@ namespace OnlineStore.DUOStore
             config.MiddleAxis_P1 = FormUtil.GetIntValue(txtMiddleP1);
             config.MiddleAxis_P1 = FormUtil.GetIntValue(txtMiddleP1);
             config.MiddleAxis_P2 = FormUtil.GetIntValue(txtMiddleP2);
             config.MiddleAxis_P2 = FormUtil.GetIntValue(txtMiddleP2);
             config.MiddleAxis_P3 = FormUtil.GetIntValue(txtMiddleP3);
             config.MiddleAxis_P3 = FormUtil.GetIntValue(txtMiddleP3);
-
+            config.MiddleAxis_P4 = FormUtil.GetIntValue(txtT2P4);
             config.UpdownAxis_P1 = FormUtil.GetIntValue(txtUpdownP1);
             config.UpdownAxis_P1 = FormUtil.GetIntValue(txtUpdownP1);
             config.UpdownAxis_P2 = FormUtil.GetIntValue(txtUpdownP2);
             config.UpdownAxis_P2 = FormUtil.GetIntValue(txtUpdownP2);
             config.UpdownAxis_P3 = FormUtil.GetIntValue(txtUpdownP3);
             config.UpdownAxis_P3 = FormUtil.GetIntValue(txtUpdownP3);

source/DUOStore/FrmBox.cs

@@ -78,7 +78,7 @@ namespace OnlineStore.DUOStore
             chbDebug.Checked = BoxBean.IsDebug;
             chbDebug.Checked = BoxBean.IsDebug;
             this.ShowInTaskbar = true;
             this.ShowInTaskbar = true;
 
 
-            // txtTempPort.Text = BoxBean.Config.Humiture_Port;
+              txtTempPort.Text = BoxBean.Config.Humiture_Port;
             timer1.Start();
             timer1.Start();
         }
         }
         #endregion
         #endregion

source/DeviceLibrary/duoStore/DUOStoreBean.cs

@@ -64,7 +64,7 @@ namespace OnlineStore.DeviceLibrary
                 BoxConfigMap.Add(config.Id, config);
                 BoxConfigMap.Add(config.Id, config);
             }
             }
             Config.T3_Updown_Axis.BreakOnDO = IO_Type.MoveAxis_Break;
             Config.T3_Updown_Axis.BreakOnDO = IO_Type.MoveAxis_Break;
-            Config.T1_Batch_Axis.BreakOnDO = IO_Type.MoveAxis_Break;
+            Config.T1_Batch_Axis.BreakOnDO = IO_Type.BatchAxis_Break;
             T1_BatchAxis = new AxisBean(Config.T1_Batch_Axis, Name);
             T1_BatchAxis = new AxisBean(Config.T1_Batch_Axis, Name);
             T2_MiddleAxis = new AxisBean(Config.T2_Middle_Axis,Name);
             T2_MiddleAxis = new AxisBean(Config.T2_Middle_Axis,Name);
             T3_UpdownAxis = new AxisBean(Config.T3_Updown_Axis,Name);
             T3_UpdownAxis = new AxisBean(Config.T3_Updown_Axis,Name);
@@ -210,11 +210,12 @@ namespace OnlineStore.DeviceLibrary
             else if (MoveInfo.IsStep(StoreMoveStep.LR_02_LineRun))
             else if (MoveInfo.IsStep(StoreMoveStep.LR_02_LineRun))
             {
             {
                 MoveInfo.NextMoveStep(StoreMoveStep.LR_03_BatchAxisHome);
                 MoveInfo.NextMoveStep(StoreMoveStep.LR_03_BatchAxisHome);
-                LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪放松，提升轴回原点，上下轴回原点");
+                LogUtil.info(Name + "复位 " + MoveInfo.MoveStep + " ：夹爪放松，提升轴回原点，上下轴回原点，流水线停止");
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
                 CylinderMove(MoveInfo, IO_Type.ClampCylinder_Clamp, IO_Type.ClampCylinder_Relax);
                 CylinderMove(MoveInfo, IO_Type.ClampCylinder_Clamp, IO_Type.ClampCylinder_Relax);
                 T1_BatchAxis.HomeMove(MoveInfo);
                 T1_BatchAxis.HomeMove(MoveInfo);
                 T3_UpdownAxis.HomeMove(MoveInfo);
                 T3_UpdownAxis.HomeMove(MoveInfo);
+                LineStop(MoveInfo);
             }
             }
             else if (MoveInfo.IsStep(StoreMoveStep.LR_03_BatchAxisHome))
             else if (MoveInfo.IsStep(StoreMoveStep.LR_03_BatchAxisHome))
             {
             {
@@ -299,6 +300,8 @@ namespace OnlineStore.DeviceLibrary
             T1_BatchAxis.SuddenStop(true);
             T1_BatchAxis.SuddenStop(true);
 
 
             CloseAllAxis();
             CloseAllAxis();
+
+            LineStop();
         }
         }
 
 
 
 
@@ -315,7 +318,7 @@ namespace OnlineStore.DeviceLibrary
             runStatus = StoreRunStatus.Wait;
             runStatus = StoreRunStatus.Wait;
             // RFIDManager.Close();
             // RFIDManager.Close();
             TimeSpan span = DateTime.Now - StartTime;
             TimeSpan span = DateTime.Now - StartTime;
-            LogUtil.info(Name + ",停止运行，关闭rfid，总运行时间：" + span.ToString());
+            LogUtil.info(Name + ",停止运行，总运行时间：" + span.ToString());
         } 
         } 
         #endregion
         #endregion