上料机构最后一盘补充高度改为可配置

source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv

@@ -6,6 +6,7 @@ PRO,0,对应的横移模块,SidesWayNum,0,,,,,
 PRO,0,是否是用来出料,IsCanOut,0,,,,,
 PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C3,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C4,,,,,
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,5,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,3,COM2,0,,,
 PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6515100,,,,,

source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv

@@ -6,6 +6,7 @@ PRO,0,对应的横移模块,SidesWayNum,2,,,,,
 PRO,0,是否是用来出料,IsCanOut,0,,,,,
 PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C1,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C2,,,,,
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,5,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,5,COM4,0,,,
 PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6514600,,,,,

source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv

@@ -6,6 +6,7 @@ PRO,0,对应的横移模块,SidesWayNum,3,,,,,
 PRO,0,是否是用来出料,IsCanOut,1,,,,,
 PRO,0,上料流水线入口AGV小车站号名称,AgvInName,C7,,,,,
 PRO,0,上料流水线出口AGV小车站号名称,AgvOutName,C8,,,,,
+PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,5,,,,,
 ,,,,,,,,,
 AXIS,0,轴二提升上料轴,Batch_Axis,7,COM5,0,,,
 PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,6508000,,,,,

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1597,10 +1597,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 = 5;
+            }
             if (isLast)
             {
-                buchongStr = "(最后一盘料已补充5)";
-                height += 5;
+                buchongStr = "(最后一盘料已补充" + lastadd + ")";
+                height += lastadd;
             }
 
             //如果检测出<=15,都按照8计算

source/LoadCVSLibrary/storeConfig/config/FeedingEquip_Config.cs

@@ -226,7 +226,11 @@ namespace OnlineStore.LoadCSVLibrary
         /// </summary>
         [ConfigProAttribute("UpDownP2DetialList", false)]
         public string UpDownP2DetialList { get; set; }
-
+        /// <summary>
+        ///PRO,0,最后一盘料补充高度（mm）,LastReel_AHeight,1,,,,,
+        /// </summary>
+        [ConfigProAttribute("LastReel_AHeight", false)]
+        public int LastReel_AHeight { get; set; }
         private Dictionary<string, int> UpdownP2DetialMap = null;
 
         public Dictionary<string, int> LoadP2DetialMap()