1

source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
 PRO,0,扫码的相机名称(多个用#分隔),CameraNameList,GigE:MV-CE200-10GC (00D77519112),,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 PRO,0,对应的横移模块,SidesWayNum,2,,,,,

source/DeviceLibrary/LineConfig/Config_ProvidingEquip_1.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 PRO,0,对应的横移模块,SidesWayNum,0,,,,,
 PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,,,,
 PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,,,, 
 ,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 AXIS,0,移栽上下轴,UpDown_Axis,15,COM5,0,,,
-PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=203600,,,,,,
-PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000,,,,,,
+PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=203600;12=185000;16=175000;24=165000;32=145000;44=122000;56=100000,,,,,,
+PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=140000;44=120000;56=100000,,,,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,

source/DeviceLibrary/LineConfig/Config_ProvidingEquip_2.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 PRO,0,对应的横移模块,SidesWayNum,0,,,,,
 PRO,0,设备对应的出料流水线的编号,DLineEquipNum,1,,,,,
 PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,,
 ,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 AXIS,0,移栽上下轴,UpDown_Axis,16,COM5,0,,,
-PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=189200,,,,,,
-PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000,,,,,,
+PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=189200;12=172000;16=165000;24=155000;32=133000;44=115000;56=90000,,,,,,
+PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=140000;44=115000;56=80000,,,,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,

source/DeviceLibrary/LineConfig/Config_ProvidingEquip_3.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 PRO,0,对应的横移模块,SidesWayNum,0,,,,,
 PRO,0,设备对应的出料流水线的编号,DLineEquipNum,2,,,,,
 PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,1,,,,,
 ,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 AXIS,0,移栽上下轴,UpDown_Axis,9,COM5,0,,,
-PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000,,,,,,
-PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000,,,,,,
+PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=120000;8=185000;12=183000;16=185000;24=176000;32=154000;44=134000;56=112000,,,,,,
+PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=150000;8=150000;12=150000;16=150000;24=150000;32=150000;44=115000;56=78000,,,,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,

source/DeviceLibrary/LineConfig/Config_ProvidingEquip_4.csv

@@ -7,7 +7,7 @@ PRO,0,设备对应的出料流水线的第几条流水线,DLineLineNum,2,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,1,,,,,
 AXIS,0,移栽上下轴,UpDown_Axis,10,COM5,0,,,
 PRO,0,移栽上下轴在移栽上下降的位置,UpDownP2List,0=80000;8=223000;12=220000;16=215000;24=206000;32=185000;44=160000;56=140000,,,,,,
-PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=90000;8=180000;12=180000;16=180000;24=160000;32=160000;44=140000;56=110000,,,,,,
+PRO,0,移栽上下轴在出料线下降的位置,UpDownP3List,0=90000;8=160000;12=160000;16=160000;24=160000;32=160000;44=140000;56=110000,,,,,,
 PRO,0,移栽上下轴待机点 P1,UpDownAxisP1,2000,,,,,
 PRO,0,移栽上下轴目标速度,UpdownAxis_TargetSpeed,150,,,,,
 PRO,0,移栽上下轴加速度,UpdownAxis_AddSpeed,400,,,,,

source/DeviceLibrary/LineConfig/MoveEquip/Config_MoveEquip_02.csv

 类型,分类编号,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义
-PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,1,,,,,
+PRO,0,设备是否处于调试状态（1=调试，0=正常）,IsDebug,0,,,,,
 ,,,,,,,,,
 PRO,0,移栽上下运动是否使用伺服,UpDownUseAxis,0,,,,, 
 AXIS,0,移栽上下轴,UpDown_Axis,2,COM2,0,,,

source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs

@@ -182,8 +182,8 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(LineMoveStep.DO_06_Wait_SeparateDevice_Check);
                 Line3LastTrayP++;
-                LogInfo(hengyiName + "出口有料，等待料盘到达分盘装置位置");
-                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(3000));
+                LogInfo(hengyiName + "出口有料，等待料盘到达分盘装置位置，最多等待5000");
+                MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000));
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SeparateDevice_Check, IO_VALUE.HIGH));
             }
             else if (MoveInfo.MoveStep.Equals(LineMoveStep.DO_06_Wait_SeparateDevice_Check))

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -32,8 +32,8 @@ namespace OnlineStore.DeviceLibrary
             Config.SetAxisParam();
             UpdownAxis = new AxisBean( config.UpDown_Axis,Name);
             BatchAxis = new AxisBean( config.Batch_Axis,Name);
-            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
-            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
+            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-Move]");
+            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-SMove]");
         }
 
 

source/DeviceLibrary/assemblyLine/MoveEquip.cs

@@ -28,8 +28,8 @@ namespace OnlineStore.DeviceLibrary
             Init();
 
 
-            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
-            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
+            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-Move]");
+            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-SMove]");
 
             UseAxis = config.UpDownUseAxis.Equals(1);
             if (UseAxis)

source/DeviceLibrary/assemblyLine/ProvidingEquip.cs

@@ -27,8 +27,8 @@ namespace OnlineStore.DeviceLibrary
             baseConfig = config;
             Name = (" " + "_出料_" + DeviceID % 100 + " ").ToUpper();
             Init(); 
-            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-Move]");
-            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name + "-SMove]");
+            MoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-Move]");
+            SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + Name.Trim() + "-SMove]");
             UseAxis = config.UpDownUseAxis.Equals(1);
             if (UseAxis)
             {