canReelToBelt接口默认返回false。

增加禁用托盘上传。

source/Common/util/MyWebClient.cs

@@ -149,21 +149,21 @@ namespace OnlineStore.Common
         {
         {
             try
             try
             {
             {
-                LogUtil.info( "HTTP GET FROM: " + url);
+                LogUtil.debug( "HTTP GET FROM: " + url);
                 using (var wc = new WebClient { Encoding = encoding })
                 using (var wc = new WebClient { Encoding = encoding })
                 {
                 {
                     var readStream = wc.OpenRead(url);
                     var readStream = wc.OpenRead(url);
                     using (var sr = new StreamReader(readStream, encoding))
                     using (var sr = new StreamReader(readStream, encoding))
                     {
                     {
                         var result = sr.ReadToEnd();
                         var result = sr.ReadToEnd();
-                        LogUtil.info("receive << " + result);
+                        LogUtil.debug("receive << " + result);
                         return result;
                         return result;
                     }
                     }
                 }
                 }
             }
             }
             catch (Exception e)
             catch (Exception e)
             {
             {
-                LogUtil.error("HTTP GET ERROR:" + e.Message, 102);
+                LogUtil.error("HTTP GET ERROR ["+ url + "] :" + e.Message, 102);
             }
             }
             return "";
             return "";
         }
         }

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -1176,13 +1176,17 @@ namespace OnlineStore.DeviceLibrary
                         alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                         alarmList.Add(new AlarmMsg(equip.Name, "line." + equip.Name + "_" + equip.alarmType, equip.WarnMsg));
                     }
                     }
 
 
-                    List<TrayDisableInfo> list = TrayDisableManager.GetDisableList();
-                    foreach (TrayDisableInfo t in list)
-                    {
-                        alarmList.Add(new AlarmMsg("托盘" + t.TrayCode + "禁用", "line.tray_" + t.TrayCode, t.DDescribe));
-                    }
+                    //List<TrayDisableInfo> list = TrayDisableManager.GetDisableList();
+                    //foreach (TrayDisableInfo t in list)
+                    //{
+                    //    alarmList.Add(new AlarmMsg("托盘" + t.TrayCode + "禁用", "line.tray_" + t.TrayCode, t.DDescribe));
+                    //}
                 }
                 }
                 SServerManager.updateDeviceAlarmMsg(alarmList);
                 SServerManager.updateDeviceAlarmMsg(alarmList);
+
+                //托盘禁用信息更新
+                SServerManager.disabledTray(TrayDisableManager.GetDisableList());
+
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -683,21 +683,29 @@ namespace OnlineStore.DeviceLibrary
                 if (data != null)
                 if (data != null)
                 {
                 {
                     bool result = Convert.ToBoolean(data.data);
                     bool result = Convert.ToBoolean(data.data);
-                    if (data.code.Equals(0) && (!result))
+                    if (data.code.Equals(0))
+                    {
+                        if (!result)
                         {
                         {
+                            LogUtil.error($"{deviceName}canReelToBelt【 {barcode}】 返回失败 ：【{resultStr}】{data.msg}={data.msg}");
+                        }
                         return result;
                         return result;
                     }
                     }
                     else if (!data.code.Equals(0))
                     else if (!data.code.Equals(0))
                     {
                     {
-                        LogUtil.error($"{deviceName}canReelToBelt【 {barcode}】 返回错误 ：{data.msg}={data.msg}");
+                        LogUtil.error($"{deviceName}canReelToBelt【 {barcode}】 返回错误 ：【{resultStr}】{data.msg}={data.msg}");
                     }
                     }
                 }
                 }
+                else
+                {
+                    LogUtil.error($"{deviceName}canReelToBelt  未收到服务器反馈  {FormUtil.GetSpanStr(DateTime.Now - startTime)}  【{server}】【{resultStr}】");
+                }
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error(deviceName + " " + ex.ToString());
                 LogUtil.error(deviceName + " " + ex.ToString());
             }
             }
-            return true;
+            return false;
         }
         }
 
 
         public static bool IgnoreServerStop = false;
         public static bool IgnoreServerStop = false;
@@ -903,7 +911,52 @@ namespace OnlineStore.DeviceLibrary
             catch (Exception ex)
             catch (Exception ex)
             {
             {
                 LogUtil.error(deviceName + " ", ex);
                 LogUtil.error(deviceName + " ", ex);
-                return "GetReelSize 条码【 " + barcode + "】出错："+ex.ToString();
+                return "GetReelSize 条码【 " + barcode + "】出错：" + ex.ToString();
+            }
+        }
+
+        //http://localhost:8080/rest/api/qisda/device/updateDisabledTray?disabledTray=E23,E25
+        private static string Addr_updateDisabledTray = "/rest/api/qisda/device/updateDisabledTray";
+        public static void disabledTray(List<TrayDisableInfo> trayDisList)
+        {
+            try
+            {
+                string disabledTray = "";
+                if (trayDisList == null || trayDisList.Count <= 0)
+                {
+                    return;
+                }
+                foreach (TrayDisableInfo dis in trayDisList)
+                {
+                    if (String.IsNullOrEmpty(disabledTray))
+                    {
+                        disabledTray += "E" + dis.TrayCode;
+                    }
+                    else
+                    {
+                        disabledTray += ",E" + dis.TrayCode;
+                    }
+                }
+                try
+                { 
+                    //code= 0 表示正常,其他为异常
+                    Dictionary<string, string> paramMap = new Dictionary<string, string>();
+                    paramMap.Add("disabledTray", disabledTray);//  disabledTray = 禁用托盘
+
+                    string server = GetAddr(Addr_updateDisabledTray, paramMap);
+                    DateTime startTime = DateTime.Now;
+                    string resultStr = HttpHelper.Get(server);
+
+                    LogUtil.debug("disabledTray   " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】"); 
+                }
+                catch (Exception ex)
+                {
+                    LogUtil.error("disabledTray = " + disabledTray + " 出错", ex);
+                }
+            }
+            catch (Exception ex)
+            {
+                LogUtil.error("disabledTray  出错", ex);
             }
             }
         }
         }
     }
     }