出入库中断时打印日志

source/AssemblyLineClient/FrmMoveEquip.Designer.cs

@@ -286,9 +286,9 @@
             this.groupBox4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.groupBox4.Controls.Add(this.tableLayoutPanel2);
-            this.groupBox4.Location = new System.Drawing.Point(232, 174);
+            this.groupBox4.Location = new System.Drawing.Point(232, 178);
             this.groupBox4.Name = "groupBox4";
-            this.groupBox4.Size = new System.Drawing.Size(220, 337);
+            this.groupBox4.Size = new System.Drawing.Size(220, 333);
             this.groupBox4.TabIndex = 104;
             this.groupBox4.TabStop = false;
             this.groupBox4.Text = "DO列表";
@@ -306,7 +306,7 @@
             this.tableLayoutPanel2.RowCount = 2;
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(209, 317);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(209, 313);
             this.tableLayoutPanel2.TabIndex = 103;
             // 
             // groupBox3
@@ -314,9 +314,9 @@
             this.groupBox3.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.groupBox3.Controls.Add(this.tableLayoutPanel1);
-            this.groupBox3.Location = new System.Drawing.Point(6, 174);
+            this.groupBox3.Location = new System.Drawing.Point(6, 178);
             this.groupBox3.Name = "groupBox3";
-            this.groupBox3.Size = new System.Drawing.Size(220, 337);
+            this.groupBox3.Size = new System.Drawing.Size(220, 333);
             this.groupBox3.TabIndex = 103;
             this.groupBox3.TabStop = false;
             this.groupBox3.Text = "DI列表";
@@ -334,7 +334,7 @@
             this.tableLayoutPanel1.RowCount = 2;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 17F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 317);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(209, 313);
             this.tableLayoutPanel1.TabIndex = 102;
             // 
             // groupDO

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -61,7 +61,7 @@ namespace OnlineStore.DeviceLibrary
             this.alarmType = alarmType;
             if (alarmType.Equals(LineAlarmType.SuddenStop) || alarmType.Equals(LineAlarmType.NoAirCheck))
             {
-                StopMove();
+                StopMove(alarmType + "报警");
             }
         }
         public virtual void CheckAlarmProcess(LineMoveInfo moveInfo,LineAlarmType alarmType)

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -93,7 +93,7 @@ namespace OnlineStore.DeviceLibrary
         public override bool Reset()
         { 
             runStatus = LineRunStatus.Reset; 
-            StopMove(); 
+            StopMove("复位"); 
             MoveInfo.NewMove(LineMoveType.Reset);
             SecondMoveInfo.EndMove();
             if (RunAxis(true, BatchAxis) && RunAxis(true, UpdownAxis))
@@ -306,8 +306,15 @@ namespace OnlineStore.DeviceLibrary
             IOMove(IO_Type.SL_LocationSideWay_Run, value);
             IOMove(IO_Type.SL_OutSideWay_Run, value); 
         }
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         {
+            if (!String.IsNullOrEmpty(stopDes))
+            {
+                if (MoveInfo.MoveType.Equals(LineMoveType.InStore) || MoveInfo.MoveType.Equals(LineMoveType.OutStore))
+                {
+                    LogInfo("[" + stopDes + "]时中止运动: " + MoveInfo.ToStr());
+                }
+            }
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             //StopMove时设置状态为none

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -799,7 +799,7 @@ namespace OnlineStore.DeviceLibrary
         }
         #endregion 
 
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         {
 
             foreach (EquipBase equip in this.AllEquipMap.Values)

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -67,7 +67,7 @@ namespace OnlineStore.DeviceLibrary
 
         public override bool Reset()
         {
-            StopMove();
+            StopMove("复位");
             if (!RunAxis(true, UpdownAxis))
             {
                 return false;
@@ -152,8 +152,16 @@ namespace OnlineStore.DeviceLibrary
             }
         }
          
-        internal override void StopMove()
+       internal override void StopMove(string stopDes = "")
         {
+            if (!String.IsNullOrEmpty(stopDes))
+            {
+                if (MoveInfo.MoveType.Equals(LineMoveType.InStore) || MoveInfo.MoveType.Equals(LineMoveType.OutStore))
+                {
+                    LogInfo("[" + stopDes + "]时中止运动: " + MoveInfo.ToStr());
+                }
+            }
+
             trayCheck2LowWait.Stop();
             trayCheckWait.Stop();
 

source/DeviceLibrary/model/KTK_Store.cs

@@ -192,8 +192,8 @@ namespace OnlineStore.DeviceLibrary
  
         public abstract bool Reset();
          
-        internal abstract void StopMove( );
-         
+        internal abstract void StopMove(string stopDes = "");
+
         protected abstract void ResetProcess();
         
         protected virtual void Init()

source/DeviceLibrary/model/LineMoveInfo.cs

@@ -168,6 +168,20 @@ namespace OnlineStore.DeviceLibrary
             moveStep = PreMoveStep;
             IsInWait = false;
         }
+
+        internal string ToStr()
+        {
+            string str = "";
+            if (MoveParam != null)
+            {
+                str = "[" + MoveType + "][" + MoveStep + "]" + MoveParam.ToStr();
+            }
+            else
+            {
+                str = "[" + MoveType + "][" + MoveStep + "]";
+            }
+            return str;
+        }
     }
     public class WriteIOInfo
     {