1.入料最后一盘补充高度改为可配置。

2.宽度检测错误BUG修改。
3.夹爪先改回原来的，脆盘不验证是否夹到料。

source/AssemblyLineClient/记录.txt

-20210510
+20210515
+1.入料最后一盘补充高度改为可配置。
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,1,,,,,
+2.宽度检测错误BUG修改。
+3.夹爪先改回原来的，脆盘不验证是否夹到料。
+
+20210510
 夹爪脆盘和普通料盘参数分开配置
 
 20200428

source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv

@@ -16,6 +16,7 @@ PRO,0,提升上料轴P2速度,BatchAxis_P2Speed,70000,,,,,,,,,,,,
 PRO,0,提升上料轴P3速度,BatchAxis_P3Speed,5000,,,,,,,,,,,,
 PRO,0,提升上料轴P4速度/料盘拿走后提升轴下降速度,BatchAxis_P4Speed,5000,,,,,,,,,,,,
 PRO,0,提升上料轴高度转换系数（1mm对应的脉冲）,Height_ChangeValue,804,,,,,,,,,,,,
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,1,,,,,
 ,,,,,,,,,,,,,,,,
 AXIS,0,轴二移栽上下轴,UpDown_Axis,6,HC,,800000,1500000,1500000,1200,8000,30000,10,100,0,0
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,100,,,,,,,,,,,,

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

-using Asa;
+
+using Asa;
 using OnlineStore.Common;
 using OnlineStore.LoadCSVLibrary;
 using System;
@@ -419,15 +420,14 @@ namespace OnlineStore.DeviceLibrary
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_26_BatchAxisToP3))
             {
-                FI_27_SaveSize();
 
                 MoveInfo.NextMoveStep(LineMoveStep.FI_28_CylinderGive);
                 InLog("料盘移栽" + MoveInfo.SLog + "：上料横移气缸放料SOL");
                 CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give); 
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
-                //LastHeight = GetHeight();
-                //MoveInfo.MoveParam.PlateH = LastHeight;
-                FI_31_GetPosID();
+                LastHeight = GetHeight();
+                MoveInfo.MoveParam.PlateH = LastHeight;
+                //FI_31_GetPosID();
                 //判断是否还有料盘
                 if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW))
                 {
@@ -459,6 +459,7 @@ namespace OnlineStore.DeviceLibrary
             //}
             else if (MoveInfo.IsStep(LineMoveStep.FI_28_CylinderGive))
             {
+                FI_27_SaveSize();
                 MoveInfo.NextMoveStep(LineMoveStep.FI_29_BatchAxisDown);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
 
@@ -466,6 +467,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     FI_BatchAxisDown();
                 }
+                FI_31_GetPosID();
             }
             else if (MoveInfo.IsStep(LineMoveStep.FI_29_BatchAxisDown))
             {
@@ -732,7 +734,7 @@ namespace OnlineStore.DeviceLibrary
         { 
             MoveInfo.MoveParam.PlateH = LastHeight; MoveInfo.NextMoveStep(LineMoveStep.FI_27_SaveSize);
             MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
-            LastHeight = GetHeight();
+            //LastHeight = GetHeight();
 
             LastWidth = GetWidth();
             MoveInfo.MoveParam.PlateW = LastWidth;
@@ -1067,10 +1069,15 @@ namespace OnlineStore.DeviceLibrary
             }
             float height = (float)Math.Ceiling(1F * Math.Abs(EndMovePosition - StartMovePosition) / AxisChangeValue);
             string buchongStr = "";
+            int lastadd = Config.LastReel_AHeight;
+            if (lastadd <= 0)
+            {
+                lastadd = 1;
+            }
             if (isLast)
             {
-                buchongStr = "(最后一盘料已补充1)";
-                height += 1;
+                buchongStr = "(最后一盘料已补充"+ lastadd + ")";
+                height += lastadd;
             }
 
             ////如果检测出<=15,都按照8计算

source/DeviceLibrary/assemblymanager/ALineManager.cs

@@ -368,8 +368,8 @@ namespace OnlineStore.DeviceLibrary
         }
         public static bool NeedWaitHassReel(params string[] codes)
         {
-            return true;
-            //return !IsCrispReel(codes);
+            //return true;
+            return !IsCrispReel(codes);
         }
     }
 }

source/DeviceLibrary/baan/ClampJawBean.cs

@@ -76,9 +76,9 @@ namespace OnlineStore.DeviceLibrary
             if (moveInfo != null)
             {
                 moveInfo.WaitList.Add(WaitResultInfo.WaitClampReached((int)distance));
-                if (checkHasReel )
-                //if (checkHasReel && LineManager.NeedWaitHassReel(code))
-                    {
+                //if (checkHasReel )
+                if (checkHasReel && (!iscrisp))
+                {
                     moveInfo.WaitList.Add(WaitResultInfo.WaitClampHasReel());
                     //有一个到位就算到位
                     moveInfo.OneWaitCanEndStep = true;

source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs

@@ -109,8 +109,12 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         [ConfigProAttribute("Height_ChangeValue", true)]
         public int Height_ChangeValue { get; set; }
-      
-     
+        /// <summary>
+        ///PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,1,,,,,
+        /// </summary>
+        [ConfigProAttribute("LastReel_AHeight", false )]
+        public int LastReel_AHeight { get; set; }
+
 
         /// <summary>
         ///  AXIS	0	移栽上下轴 UpDown_Axis	2