根据IsUse_Tray_Check判断是否需要检测叉子料盘信号

source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv

@@ -125,12 +125,12 @@ PRO,模拟信号4默认高度,AIDI4_DefaultPosition,2500,,,,,,,
 ,,,,,,,,, ,
 ,,,,,,,,, ,
 PRO,模拟信号1的地址,AIDI1_Addr,0,,,,,,,
 PRO,模拟信号1的地址,AIDI1_Addr,0,,,,,,,
 PRO,模拟信号2的地址,AIDI2_Addr,1,,,,,,,
 PRO,模拟信号2的地址,AIDI2_Addr,1,,,,,,,
-PRO,模拟信号3的地址,AIDI3_Addr,2,,,,,,,
-PRO,模拟信号4的地址,AIDI4_Addr,3,,,,,,,
+PRO,模拟信号3的地址(13寸高度),AIDI3_Addr,2,,,,,,,
+PRO,模拟信号4的地址(15寸高度),AIDI4_Addr,3,,,,,,,
 ,,,,,,,,, ,
 ,,,,,,,,, ,
 PRO,模拟转换系数,AI_ConvertPosition,55,,,,,,,
 PRO,模拟转换系数,AI_ConvertPosition,55,,,,,,,
 ,,,,,,,,, ,
 ,,,,,,,,, ,
-PRO,默认的料盘宽度（多种尺寸为0）,Default_TrayWidth,7,,,,,,,
+PRO,默认的料盘宽度（多种尺寸为0）,Default_TrayWidth,0,,,,,,,
 PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32,,,,,,,
 PRO,特殊二维码尺寸配置,CodeSizeConfig,XA=13x48#XB=13x32,,,,,,,
 ,,,,,,,,, ,
 ,,,,,,,,, ,
 PRO,扫码枪IP,Scanner_Ip,192.168.201.21,,,,,,, 
 PRO,扫码枪IP,Scanner_Ip,192.168.201.21,,,,,,, 

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -416,6 +416,13 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
             else if (StoreMove.MoveStep == StoreMoveStep.SI_07_DeviceBackFromDoor)
             {
             {
+                if (Config.IsUse_Tray_Check.Equals(1))
+                {
+                    InStoreLog("入库：SI_08 检测叉子料盘检测信号 ");
+                    StoreMove.NextMoveStep(StoreMoveStep.SI_08_CheckTray);
+                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
+                }
+                else 
                 //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 {
                 {
                     InStoreLog("入库：SI_09 移动到库位点，旋转轴至P2(库位点),升降轴至P3(库位入库前点) ");
                     InStoreLog("入库：SI_09 移动到库位点，旋转轴至P2(库位点),升降轴至P3(库位入库前点) ");
@@ -642,7 +649,8 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
             else if (StoreMove.MoveStep == StoreMoveStep.SO_06_BagDeviceBack)
             {
             {
-                if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.LOW))
+                if(Config.IsUse_Tray_Check.Equals(1))
                 {
                 {
                     StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray);
                     StoreMove.NextMoveStep(StoreMoveStep.SO_07_CheckTray);
                     OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High ");
                     OutStoreLog("出库：SO_07 等待TrayCheck_Fixture=High ");