1116

source/DISTLineClient/DISTLineClient.csproj

@@ -139,7 +139,6 @@
     <Content Include="AuToRunManager.exe">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="box.ico" />
     <Content Include="dist.ico" />
     <Content Include="记录.txt" />
   </ItemGroup>

source/DeviceLibrary/LineConfig/DISTLineConfig.csv

@@ -15,9 +15,9 @@ DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI
 DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
 DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
 DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
-,,,12,PRO_AOI_IP_1,0,,X753,DI-13,0,
-,,,13,PRO_AOI_IP_1,0,,X754,DI-14,0,
-,,,14,PRO_AOI_IP_1,0,,X755,DI-15,0,
+DI,包装料架检测信号,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号,X753,DI-13,0,
+DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X754,DI-14,0,
+DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X755,DI-15,0,
 ,,,15,PRO_AOI_IP_1,0,,X756,DI-16,0,
 DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y741,D0-01,0,
 DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y742,DO-02,0,
@@ -25,12 +25,12 @@ DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y743,DO-03,0,
 DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y744,DO-04,0,
 DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y745,DO-05,0,
 DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DO-06,0,
-DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0,
-DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0,
-DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0,
-DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
-,,,10,PRO_AOI_IP_1,0,,Y751,DO-11,0,
-,,,11,PRO_AOI_IP_1,0,,Y752,DO-12,0,
+DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,分盘线横移机构上升SOL,Y747,DO-07,0,
+DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,分盘线横移机构下降SOL,Y748,DO-08,0,
+DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,分盘线横移电机运转,Y749,DO-09,0,
+DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,分盘线滚筒电机运转,Y750,DO-10,0,
+DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y751,DO-11,0,
+DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y752,DO-12,0,
 ,,,12,PRO_AOI_IP_1,0,,Y753,DO-13,0,
 ,,,13,PRO_AOI_IP_1,0,,Y754,DO-14,0, 
 ,,,14,PRO_AOI_IP_1,0,,Y755,DO-15,0, 

source/DeviceLibrary/acDISTLine/DISTLineBean.cs

@@ -335,7 +335,7 @@ namespace OnlineStore.DeviceLibrary
             //出口信号需要持续1秒钟
             if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.HIGH) && span.TotalSeconds > 60)
             {
-                if (LastOutShelfId.Equals("000").Equals(false))
+                if (LastOutShelfId.Equals("00").Equals(false))
                 {
                     if (LineManager.checkWatch(il_outstopCheckWarch, 1000))
                     {

source/LoadCVSLibrary/Config/bean/IO_Type.cs

@@ -79,6 +79,18 @@ namespace OnlineStore.LoadCSVLibrary
         public static string L2_UpDown_Down_Sig = "L2_UpDown_Down_Sig";
 
         /// <summary>
+        /// DI,包装料架检测信号,PackingShelf_Sig,12,PRO_AOI_IP_1,0,包装料架检测信号,X753,DI-13,0,
+        /// </summary>
+        public static string PackingShelf_Sig = "PackingShelf_Sig";
+        /// <summary>
+        /// DI,料串切换气缸前进端,Switch_Forward_Sig,13,PRO_AOI_IP_1,0,料串切换气缸前进端,X754,DI-14,0,
+        /// </summary>
+        public static string Switch_Forward_Sig = "Switch_Forward_Sig";
+        /// <summary>
+        /// DI,料串切换气缸后退端,Switch_Back_Sig,14,PRO_AOI_IP_1,0,料串切换气缸后退端,X755,DI-15,0,
+        /// </summary>
+        public static string Switch_Back_Sig = "Switch_Back_Sig";
+        /// <summary>
         /// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0,
         /// </summary>
         public static string L1_Run = "L1_Run";
@@ -118,6 +130,14 @@ namespace OnlineStore.LoadCSVLibrary
         /// DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
         /// </summary>
         public static string Roller_Run = "Roller_Run";
+        /// <summary>
+        /// DO,料串切换气缸前进,Switch_Forward,10,PRO_AOI_IP_1,0,料串切换气缸前进,Y751,DO-11,0,
+        /// </summary>
+        public static string Switch_Forward = "Switch_Forward";
+        /// <summary>
+        /// DO,料串切换气缸后退,Switch_Back,11,PRO_AOI_IP_1,0,料串切换气缸后退,Y752,DO-12,0,
+        /// </summary>
+        public static string Switch_Back = "Switch_Back";
 
     }
     public enum IO_VALUE