复位时打印中断的出入库信息。

source/DeviceLibrary/assemblyLine/EquipBase.cs

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

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -91,12 +91,11 @@ namespace OnlineStore.DeviceLibrary
         public override bool Reset()
         public override bool Reset()
         { 
         { 
             runStatus = LineRunStatus.Reset; 
             runStatus = LineRunStatus.Reset; 
-            StopMove(); 
+            StopMove("复位"); 
             MoveInfo.NewMove(LineMoveType.Reset);
             MoveInfo.NewMove(LineMoveType.Reset);
             SecondMoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             if (RunAxis(true, BatchAxis) && RunAxis(true, UpdownAxis))
             if (RunAxis(true, BatchAxis) && RunAxis(true, UpdownAxis))
             {              
             {              
-              
                 alarmType = LineAlarmType.None;
                 alarmType = LineAlarmType.None;
                 LogInfo("开始重置： ");
                 LogInfo("开始重置： ");
                 runStatus = LineRunStatus.Reset;
                 runStatus = LineRunStatus.Reset;
@@ -305,8 +304,15 @@ namespace OnlineStore.DeviceLibrary
             IOMove(IO_Type.SL_OutSideWay_Run, value);
             IOMove(IO_Type.SL_OutSideWay_Run, value);
             IOMove(IO_Type.SL_RollerLine_Run, value);
             IOMove(IO_Type.SL_RollerLine_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();
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             //StopMove时设置状态为none
             //StopMove时设置状态为none

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
 
 
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         {
         {
             MoveInfo.EndMove();
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             SecondMoveInfo.EndMove();

source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs

@@ -101,7 +101,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
          
          
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         { 
         { 
             MoveInfo.EndMove();
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove();
             SecondMoveInfo.EndMove();

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor.cs

@@ -127,7 +127,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
             }
             }
         }
         }
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         {
         {
             LogInfo("停止运动：关闭所有DO  ");
             LogInfo("停止运动：关闭所有DO  ");
             MoveInfo.EndMove();
             MoveInfo.EndMove();

source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs

@@ -79,7 +79,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
         }
         }
 
 
-        internal override void StopMove()
+        internal override void StopMove(string stopDes = "")
         {
         {
             MoveInfo.EndMove();
             MoveInfo.EndMove();
             SecondMoveInfo.EndMove(); 
             SecondMoveInfo.EndMove(); 

source/DeviceLibrary/assemblyLine/LineBean.cs

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

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -87,7 +87,7 @@ namespace OnlineStore.DeviceLibrary
 
 
         public override bool Reset()
         public override bool Reset()
         {
         {
-            StopMove();
+            StopMove("复位");
             if (!RunAxis(true, UpdownAxis))
             if (!RunAxis(true, UpdownAxis))
             {
             {
                 return false;
                 return false;
@@ -171,8 +171,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();
             trayCheck2LowWait.Stop();
             trayCheckWait.Stop();
             trayCheckWait.Stop();
 
 

source/DeviceLibrary/model/InOutParam.cs

@@ -67,12 +67,11 @@ namespace OnlineStore.DeviceLibrary
         public string NgMsg = "";
         public string NgMsg = "";
         public string ToStr()
         public string ToStr()
         {
         {
-            return " [" + TrayNumber + "] [" + WareCode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "]，InStoreNg [" + InStoreNg + 
-                "],urgentReel [" + urgentReel + "],cutReel [" + cutReel + "],smallReel [" + smallReel + "],rfid [" + rfid + "],rfidLoc [" + rfidLoc + "]";
+            return $" [{ TrayNumber }] [{ WareCode }] [{ PosId }] [{ PlateW }x{ PlateH }]，InStoreNg [{ InStoreNg }],urgentReel [{ urgentReel }],cutReel [{ cutReel }],smallReel [{ smallReel }],rfid [{ rfid }],rfidLoc [{ rfidLoc }]";
         }
         }
         public string ToShortStr()
         public string ToShortStr()
         {
         {
-            return " [" + rfid + "][" + WareCode + "] [" + PosId + "] [" + PlateW + "x" + PlateH + "] " + (urgentReel ? "[紧急料]" : "") + (cutReel ? "[分盘料]" : "");
+            return $" [{ rfid }][{ WareCode }] [{ PosId }] [{ PlateW }x{ PlateH }] {( urgentReel ? "[紧急料]" : "")} {( cutReel ? "[分盘料]" : "")}";
         }
         }
         /// <summary>
         /// <summary>
         /// 根据PosId获取对应的料仓ID，若PosId=="",返回-1
         /// 根据PosId获取对应的料仓ID，若PosId=="",返回-1

source/DeviceLibrary/model/KTK_Store.cs

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

source/DeviceLibrary/model/LineMoveInfo.cs

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