出库时屏蔽料叉检测

source/ACSingleStore/Properties/AssemblyInfo.cs

@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SO951-HC-ACSingleStore 8df519a3f541e9b5045e30ff7459067dc3f30f8a")]
+[assembly: AssemblyProduct("SO951-HC-ACSingleStore 0e1429fb249590453ab89366ff80a630d1edae41")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyCopyright("Copyright ?  2017")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 [assembly: AssemblyCulture("")]

source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs

@@ -442,7 +442,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                 {
                     InStoreLog("入库：SI_08 检测叉子料盘检测信号 ");
                     InStoreLog("入库：SI_08 检测叉子料盘检测信号 ");
                     StoreMove.NextMoveStep(StoreMoveStep.SI_08_CheckTray);
                     StoreMove.NextMoveStep(StoreMoveStep.SI_08_CheckTray);
-                    StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
+                    //StoreMove.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.TrayCheck_Fixture, IO_VALUE.HIGH));
                 }
                 }
                 else 
                 else 
                 //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
                 //if (IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH))
@@ -621,7 +621,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             return false;
             return false;
         }
         }
-        bool fixturestates = false;
+        //bool fixturestates = false;
         LineMoveP movePfix = new LineMoveP();
         LineMoveP movePfix = new LineMoveP();
         protected override void OutStoreProcess()
         protected override void OutStoreProcess()
         {
         {
@@ -646,7 +646,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (StoreMove.MoveStep == StoreMoveStep.SO_02_DeviceBack)
             else if (StoreMove.MoveStep == StoreMoveStep.SO_02_DeviceBack)
             {
             {
-                fixturestates = false;
+                //fixturestates = false;
                 StoreMove.NextMoveStep(StoreMoveStep.SO_03_ToBagPosition);
                 StoreMove.NextMoveStep(StoreMoveStep.SO_03_ToBagPosition);
                 OutStoreLog("出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
                 OutStoreLog("出库：SO_03 走到库位，压紧轴至P3(压紧前点) ,旋转轴至P2(库位点),升降轴至P5(库位出库前点)");
                 ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
                 ComMoveToPosition(moveP.ComPress_P3, Config.CompAxis_P3_Speed);
@@ -693,7 +693,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
 
 
                 HIKCamera.Current.CameraGrabOne(HIKCamera.Current.GetFixtureStateFilename(StoreMove.MoveParam, StoreMove.MoveType, FixtureState.Out));
                 HIKCamera.Current.CameraGrabOne(HIKCamera.Current.GetFixtureStateFilename(StoreMove.MoveParam, StoreMove.MoveType, FixtureState.Out));
-                fixturestates = IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH);
+                //fixturestates = IOManager.IOValue(IO_Type.TrayCheck_Fixture).Equals(IO_VALUE.HIGH);
 
 
                 var fixposid = $"fix#{StoreMove.MoveParam.PlagtW}";
                 var fixposid = $"fix#{StoreMove.MoveParam.PlagtW}";
                 var fixposition = CSVPositionReader<ACStorePosition>.GetPositon(fixposid);
                 var fixposition = CSVPositionReader<ACStorePosition>.GetPositon(fixposid);

source/LoadCVSLibrary/storeConfig/config/StoreConfig.cs

@@ -179,6 +179,10 @@ namespace OnlineStore.LoadCSVLibrary
                                 {
                                 {
                                     prop.SetValue(this, Convert.ChangeType("", prop.PropertyType), null);//赋值****在这里需要考虑类型问题
                                     prop.SetValue(this, Convert.ChangeType("", prop.PropertyType), null);//赋值****在这里需要考虑类型问题
                                 }
                                 }
+                                else if (prop.PropertyType.Equals(typeof(double)))
+                                {
+                                    prop.SetValue(this, Convert.ChangeType(0, prop.PropertyType), null);//赋值****在这里需要考虑类型问题
+                                }
                                 else
                                 else
                                 {
                                 {
                                     prop.SetValue(this, Convert.ChangeType(null, prop.PropertyType), null);//赋值****在这里需要考虑类型问题
                                     prop.SetValue(this, Convert.ChangeType(null, prop.PropertyType), null);//赋值****在这里需要考虑类型问题