bug修改

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -13,6 +13,7 @@ namespace OnlineStore.DeviceLibrary
 {
 {
     public abstract class EquipBase : KTK_Store
     public abstract class EquipBase : KTK_Store
     {
     {
+        public ClampJawBean ClampJwa = null;
         public bool MoveStop = false;
         public bool MoveStop = false;
 
 
         public string CurrShelfId = "";//当前的料架ID
         public string CurrShelfId = "";//当前的料架ID
@@ -552,6 +553,25 @@ namespace OnlineStore.DeviceLibrary
                     else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                     else if (wait.WaitType.Equals(WaitEnum.W003_Time))
                     {
                     {
                         wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
                         wait.IsEnd = (span.TotalMilliseconds >= wait.TimeMSeconds);
+                    }else if (wait.WaitType.Equals(WaitEnum.W004_ClampReached))
+                    {
+                        if (ClampJwa != null)
+                        {
+                            if (ClampJwa.IsReached())
+                            {
+                                float currp = ClampJwa.GetPosition() -(float) wait.TargetPosition;
+                                if (currp < 1)
+                                {
+                                    wait.IsEnd = true;
+                                }
+                            }
+                        }
+                    }else if (wait.WaitType.Equals(WaitEnum.W005_WaitHasReel))
+                    {
+                        if (ClampJwa != null)
+                        {
+                            wait.IsEnd = ClampJwa.HasReel();
+                        }
                     }
                     }
                     else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
                     else if (wait.WaitType.Equals(WaitEnum.W008_InStoreCheckOK))
                     {
                     {

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
         public bool OutEndSendShelfOut = false;
         public bool OutEndSendShelfOut = false;
         public AxisBean BatchAxis = null;
         public AxisBean BatchAxis = null;
         public bool HasOutLine = false;//是否有出料线体，T3和T4 
         public bool HasOutLine = false;//是否有出料线体，T3和T4 
-        public ClampJawBean ClampJwa = null;
+     
         public FeedingEquip(string cid, FeedingEquip_Config config, ConfigClampJaw jawconfig)
         public FeedingEquip(string cid, FeedingEquip_Config config, ConfigClampJaw jawconfig)
         {
         {
             this.DeviceID = config.Id;
             this.DeviceID = config.Id;

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -13,7 +13,7 @@ namespace OnlineStore.DeviceLibrary
     public partial class MoveEquip : EquipBase
     public partial class MoveEquip : EquipBase
     {
     {
         public MoveEquip_Config Config;
         public MoveEquip_Config Config;
-        public ClampJawBean ClampJwa = null;
+        //public ClampJawBean ClampJwa = null;
         public bool OnlyProOutTray = false;
         public bool OnlyProOutTray = false;
         public MoveEquip(string cid, MoveEquip_Config config,ConfigClampJaw jawconfig)
         public MoveEquip(string cid, MoveEquip_Config config,ConfigClampJaw jawconfig)
         {
         {