添加停用上报状态

AGVControl-ProductionLine/BLL/Control.cs

@@ -187,7 +187,12 @@ namespace AGVControl.BLL
                 bool isAlarm = false;
                 bool isAlarm = false;
                 try
                 try
                 {
                 {
-                    if (!Common.agvInfo[i].IsCon)
+                    if (!Common.agvInfo[i].IsCon && !Common.agvInfo[i].IsUse)
+                    {
+                        isAlarm = true;
+                        msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", "停用"));
+                    }
+                    if (!isAlarm && !Common.agvInfo[i].IsCon)
                     {
                     {
                         isAlarm = true;
                         isAlarm = true;
                         msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", "离线"));
                         msglist.Add(new AlarmMsg(Common.agvInfo[i].Name, "lineAgv." + Common.agvInfo[i].Name + ".Msg", "离线"));

AGVControl-ProductionLine/bean/node/DoubleLineNodeFor4C.cs

@@ -118,7 +118,7 @@ namespace AGVControl
         /// <returns></returns>
         /// <returns></returns>
         private bool CanEmptyTask(int emptytASKAGV)
         private bool CanEmptyTask(int emptytASKAGV)
         {
         {
-            if ((SettingString.AGVCNT / 2 - emptytASKAGV).Equals(2))//保留1辆小车出满料架
+            if (emptytASKAGV>=1)//确保一辆车回收
             {
             {
                 return false;
                 return false;
             }
             }

AGVControl-ProductionLine/bean/node/DoubleLineNodeFor4D.cs

@@ -129,7 +129,7 @@ namespace AGVControl
         /// <returns></returns>
         /// <returns></returns>
         private bool CanEmptyTask(int emptytASKAGV)
         private bool CanEmptyTask(int emptytASKAGV)
         {
         {
-            if ((SettingString.AGVCNT / 2 - emptytASKAGV).Equals(1))//保留1辆小车出满料架
+            if (emptytASKAGV>=1)//确保一辆车回收架子
             {
             {
                 return false;
                 return false;
             }
             }

AGVControl-ProductionLine/obj/Debug/AGVControl-ProductionLine.csproj.FileListAbsolute.txt

@@ -71,4 +71,3 @@ E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLi
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csproj.CopyComplete
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.exe
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
 E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.pdb
-E:\Neotel\Projects\Gitee\AGVControl-Qisda-ProductionLine\AGVControl-ProductionLine\obj\Debug\AGVControl-ProductionLine.csprojAssemblyReference.cache