接口修改

data=0，IFneed=不需要
data=1，IFneed=需要

RC1266-AutoCountMachine/source/AutoCountClient/记录.txt

@@ -70,7 +70,7 @@ PRO,0,贴标机构Z轴旋转点P4,LabelZ_P4,2000,,,,,
 
 PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 
-
+20200604
 
 1.增加X光启用禁用功能
 2.Xray料盘信息显示
@@ -78,4 +78,9 @@ PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 4.X射线增加手动调试按钮
 5.X光图片每次删除上次的
 6.X光图片名称增加日期。
-7.点料时挡停要上升
\ No newline at end of file
+7.点料时挡停要上升
+
+
+接口修改
+data=0，IFneed=不需要
+data=1，IFneed=需要

RC1266-AutoCountMachine/source/DeviceLibrary/agvClient/AgvClient.cs

@@ -11,7 +11,7 @@ namespace OnlineStore.DeviceLibrary
 {
     public class AgvClient
     {
-        public static bool CurrCancelState = false ;
+        public static bool CurrCancelState = true  ;
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static Asa.AgvClient agvClient;
         public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
         {
             try
             {
-                LogUtil.info("开始  Init agvclient");
+              //  LogUtil.info("开始  Init agvclient");
                 if (!isInit)
                 {
                     isInit = true;

RC1266-AutoCountMachine/source/DeviceLibrary/bean/BatchMoveBean_Partial.cs

@@ -210,6 +210,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 MoveInfo.NextMoveStep(StepEnum.IB23_ShelfOut);
                 MoveInfo.TimeOutSeconds = 30;
+                MoveInfo.OneWaitCanEndStep = true;
                 WorkLog("上料完成 ：通知agv来取料串，等待料串离开");
                 AgvClient.NeedLeave(AgvName, CurrShelfId, ClientLevel.High);
                 MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_LineIn_Check, IO_VALUE.LOW));

RC1266-AutoCountMachine/source/DeviceLibrary/bean/X_RAY_Equip_Partial.cs

@@ -339,13 +339,13 @@ namespace OnlineStore.DeviceLibrary
             GetImageEvent?.Invoke(bmp);
             bool result = xRay.Stop();
             if (!result)
-            {
+            { 
+                LogUtil.error(" xRay.Stop() 第一次失败，再次调用Stop");
+                result = xRay.Stop(); 
                 if (!result)
                 {
-                    LogUtil.error(" xRay.Stop() 第一次失败，再次调用Stop");
-                    result = xRay.Stop();
+                    LogUtil.error(" xRay.Stop()失败：" + result);
                 }
-                LogUtil.error(" xRay.Stop()失败：" + result);
             }
             MoveInfo.EndStepWait();
         }

RC1266-AutoCountMachine/source/DeviceLibrary/manager/SServerManager.cs

@@ -16,7 +16,7 @@ namespace OnlineStore.DeviceLibrary
         //结果上传:
         //http://10.85.17.233/ReturnOne/WebServiceF.asmx?op=Return_Material
 
-      //  http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMICheckRLC?reelID=R014212020051100876&partNum=6C.R0034.1D1
+        //  http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMICheckRLC?reelID=R014212020051100876&partNum=6C.R0034.1D1
         private static string Addr_VMICheckRLC = "/ESMTCommonInterface/CommonService.asmx/VMICheckRLC";
         private static string Addr_Return_Material = "/ReturnOne/WebServiceF.asmx/Return_Material";
 
@@ -49,8 +49,8 @@ namespace OnlineStore.DeviceLibrary
                 //{"data":{"IFneed":"不需要","iftest":"","component":"","msg":"不需要测量RLC","status":1}}
                 ResultData strData = JsonHelper.DeserializeJsonToObject<ResultData>(resultStr);
                 if (strData != null && strData.data != null)
-                { 
-                    if (strData.data.status.Equals(1) && strData.data.IFneed.Equals("不需要"))
+                {
+                    if (strData.data.status.Equals(0) && strData.data.IFneed.Equals("不需要"))
                     {
                         targetP = 1;
                         return "";
@@ -68,10 +68,14 @@ namespace OnlineStore.DeviceLibrary
                         }
                         return "";
                     }
+                    else
+                    {
+                        return msg;
+                    }
                 }
                 else
                 {
-                    return "获取是否测值失败"; 
+                    return "获取是否测值失败";
                 }
             }
             catch (Exception ex)
@@ -107,7 +111,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 DateTime startTime = DateTime.Now;
                 string resultStr = HttpHelper.Get(server);
-                LogUtil.info(deviceName+ "Return_Material   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】"); 
+                LogUtil.info(deviceName + "Return_Material   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
             }
             catch (Exception ex)
             {
@@ -138,14 +142,14 @@ namespace OnlineStore.DeviceLibrary
         }
 
         private static string server = ConfigAppSettings.GetValue(Setting_Init.ServerAddr).Trim();
-        public static  bool CanConnect()
+        public static bool CanConnect()
         {
             return !String.IsNullOrEmpty(server);
         }
     }
-   // http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMICheckRLC?reelID=R014212020051100876&partNum=6C.R0034.1D1
-  // {"data":{"IFneed":"需要","iftest":"未测值","component":"","msg":"未获取到测量RLC时间","status":1}}
-        public class ResultData
+    // http://10.85.17.233/ESMTCommonInterface/CommonService.asmx/VMICheckRLC?reelID=R014212020051100876&partNum=6C.R0034.1D1
+    // {"data":{"IFneed":"需要","iftest":"未测值","component":"","msg":"未获取到测量RLC时间","status":1}}
+    public class ResultData
     {
         public CheckData data { get; set; }
     }