1

DeviceLibrary/AutoScan/T1Machine.cs

@@ -314,6 +314,7 @@ namespace DeviceLibrary
             if (!calledagv && IOValue(IO_T1_Type.Empty_LineIn_Check).Equals(IO_VALUE.LOW)&& IOValue(IO_T1_Type.EmptyString_In_Check).Equals(IO_VALUE.LOW))
             if (!calledagv && IOValue(IO_T1_Type.Empty_LineIn_Check).Equals(IO_VALUE.LOW)&& IOValue(IO_T1_Type.EmptyString_In_Check).Equals(IO_VALUE.LOW))
             {
             {
                 calledagv = true;
                 calledagv = true;
+                if (!ConfigHelper.Config.Get("wiston_disable_agv_NeedEnter", false))
                     RobotManage.wistonAgvClient.NeedEnter();
                     RobotManage.wistonAgvClient.NeedEnter();
             }
             }
             else if (IOValue(IO_T1_Type.Empty_LineIn_Check).Equals(IO_VALUE.HIGH) || IOValue(IO_T1_Type.EmptyString_In_Check).Equals(IO_VALUE.HIGH))
             else if (IOValue(IO_T1_Type.Empty_LineIn_Check).Equals(IO_VALUE.HIGH) || IOValue(IO_T1_Type.EmptyString_In_Check).Equals(IO_VALUE.HIGH))

DeviceLibrary/AutoScan/XRayMachine.XRay.cs

@@ -66,7 +66,7 @@ namespace DeviceLibrary
                     MoveInfo.NextMoveStep(MoveStep.XRay_05_GetImage);
                     MoveInfo.NextMoveStep(MoveStep.XRay_05_GetImage);
                     RobotManage.XRay.Start();
                     RobotManage.XRay.Start();
                     MoveInfo.log($"打开X光");
                     MoveInfo.log($"打开X光");
-                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
+                    
                     var pps = MoveInfo.ReelParam.PN.Split('-');
                     var pps = MoveInfo.ReelParam.PN.Split('-');
                     var pn = pps[0];
                     var pn = pps[0];
 
 
@@ -75,6 +75,7 @@ namespace DeviceLibrary
                         MoveInfo.log($"判断为需要多次拍照的料盘,PN:{pn}");
                         MoveInfo.log($"判断为需要多次拍照的料盘,PN:{pn}");
                         countlist.Clear();
                         countlist.Clear();
                     }
                     }
+                    MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(ConfigHelper.Config.Get("xray_light_delay", 1000)));
                     break;
                     break;
                 case MoveStep.XRay_05_GetImage:
                 case MoveStep.XRay_05_GetImage:
                     if (GrabImage())
                     if (GrabImage())

DeviceLibrary/AutoScan/XRayMachine.cs

@@ -37,7 +37,7 @@ namespace DeviceLibrary
 
 
         public bool Init(out string msg)
         public bool Init(out string msg)
         {
         {
-            
+            ConfigHelper.Config.Get("xray_light_delay", 1000);
             msg = "";
             msg = "";
             try
             try
             {
             {

DeviceLibrary/DeviceLibrary/WistonAgvClientcs.cs

@@ -24,6 +24,7 @@ namespace DeviceLibrary
         List<(DateTime, string)> InCommandHistroy;
         List<(DateTime, string)> InCommandHistroy;
         public WistonAgvClient()
         public WistonAgvClient()
         {
         {
+            ConfigHelper.Config.Get("wiston_disable_agv_NeedEnter", false);
             commandLoad();
             commandLoad();
             //端口及IP
             //端口及IP
             ipe = new IPEndPoint(IPAddress.Parse(ConfigHelper.Config.Get("WistonAgvServerIP")), ConfigHelper.Config.Get<int>("WistonAgvServerPort"));
             ipe = new IPEndPoint(IPAddress.Parse(ConfigHelper.Config.Get("WistonAgvServerIP")), ConfigHelper.Config.Get<int>("WistonAgvServerPort"));