接口修改

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,,,,,
 PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 
 
-
+20200604
 
 
 1.增加X光启用禁用功能
 1.增加X光启用禁用功能
 2.Xray料盘信息显示
 2.Xray料盘信息显示
@@ -79,3 +79,8 @@ PRO,0,贴标机构Z轴P4速度,LabelZ_P4Speed,4500,,,,,
 5.X光图片每次删除上次的
 5.X光图片每次删除上次的
 6.X光图片名称增加日期。
 6.X光图片名称增加日期。
 7.点料时挡停要上升
 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 class AgvClient
     {
     {
-        public static bool CurrCancelState = false ;
+        public static bool CurrCancelState = true  ;
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static string ServerIp = ConfigAppSettings.GetValue(Setting_Init.AgvServerIp);
         private static Asa.AgvClient agvClient;
         private static Asa.AgvClient agvClient;
         public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
         public static Dictionary<string, Asa.ClientAction> actionMap = new Dictionary<string, Asa.ClientAction>();
@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                LogUtil.info("开始  Init agvclient");
+              //  LogUtil.info("开始  Init agvclient");
                 if (!isInit)
                 if (!isInit)
                 {
                 {
                     isInit = true;
                     isInit = true;

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

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

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

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

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

@@ -50,7 +50,7 @@ namespace OnlineStore.DeviceLibrary
                 ResultData strData = JsonHelper.DeserializeJsonToObject<ResultData>(resultStr);
                 ResultData strData = JsonHelper.DeserializeJsonToObject<ResultData>(resultStr);
                 if (strData != null && strData.data != null)
                 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;
                         targetP = 1;
                         return "";
                         return "";
@@ -68,6 +68,10 @@ namespace OnlineStore.DeviceLibrary
                         }
                         }
                         return "";
                         return "";
                     }
                     }
+                    else
+                    {
+                        return msg;
+                    }
                 }
                 }
                 else
                 else
                 {
                 {
@@ -107,7 +111,7 @@ namespace OnlineStore.DeviceLibrary
                 }
                 }
                 DateTime startTime = DateTime.Now;
                 DateTime startTime = DateTime.Now;
                 string resultStr = HttpHelper.Get(server);
                 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)
             catch (Exception ex)
             {
             {