跨车间不分配任务

DeviceLibrary/Control.cs

@@ -38,7 +38,7 @@ namespace DeviceLibrary
 
 
             AgvStateTimer = new System.Timers.Timer
             AgvStateTimer = new System.Timers.Timer
             {
             {
-                Interval = 3000,
+                Interval = 1000,
                 AutoReset = true,
                 AutoReset = true,
                 Enabled = false
                 Enabled = false
             };
             };
@@ -197,7 +197,7 @@ namespace DeviceLibrary
                 try
                 try
                 {
                 {
                     AgvInfo agv = AGVManager.agvInfo[i];
                     AgvInfo agv = AGVManager.agvInfo[i];
-                    if (!agv.IsCon) continue;   //AGV网络连接
+                    //if (!agv.IsCon) continue;   //AGV网络连接
                     if (!AGVManager.agvInfo[i].Auto) continue;   //AGV是否可用
                     if (!AGVManager.agvInfo[i].Auto) continue;   //AGV是否可用
                     if (AGVManager.agvInfo[i].StateID.Equals(eAGVState.Error))
                     if (AGVManager.agvInfo[i].StateID.Equals(eAGVState.Error))
                     {
                     {

DeviceLibrary/bean/job/SwitchShelfJob.cs

@@ -23,14 +23,16 @@ namespace DeviceLibrary
         public SwitchShelfJob(JobParam jobParam) : base(jobParam)
         public SwitchShelfJob(JobParam jobParam) : base(jobParam)
         {
         {
             JobName = "电梯交换料车任务";
             JobName = "电梯交换料车任务";
-            MissionInfo info= manager.MissionManager.GetMission(JobParam?.LiftStatus?.missionId ?? "");
-            liftMission = new MissionInfo() { 
-            missionId=info.missionId,
-             state= info.state,
+            MissionInfo info = manager.MissionManager.GetMission(JobParam?.LiftStatus?.missionId ?? "");
+            liftMission = new MissionInfo()
+            {
+                missionId = info.missionId,
+                state = info.state,
                 liftName = info.liftName,
                 liftName = info.liftName,
-                sourcePoint=info.sourcePoint,
-                destinationPoint=info.destinationPoint,
-                needBack=info.needBack
+                sourcePoint = info.sourcePoint,
+                destinationPoint = info.destinationPoint,
+                needBack = info.needBack,
+                shelfType = info.shelfType
             };
             };
 
 
         }
         }
@@ -257,7 +259,7 @@ namespace DeviceLibrary
                     setMissionState(state);
                     setMissionState(state);
                 }
                 }
                 bool continueUse = false;
                 bool continueUse = false;
-                if ((mission.state >= MissionState.到达电梯 && mission.state <= MissionState.电梯运行)||
+                if ((mission.state >= MissionState.到达电梯 && mission.state <= MissionState.电梯运行) ||
                     (mission.state >= MissionState.返回到达电梯内 && mission.state <= MissionState.返回电梯运行))
                     (mission.state >= MissionState.返回到达电梯内 && mission.state <= MissionState.返回电梯运行))
                     continueUse = true;
                     continueUse = true;
                 //关门
                 //关门

DeviceLibrary/manager/MissionManager.cs

@@ -794,6 +794,10 @@ namespace DeviceLibrary.manager
                             {
                             {
                                 liftname = SettingString.LIFT_D2;
                                 liftname = SettingString.LIFT_D2;
                             }
                             }
+                            if (missionInfo.destinationWorkshop.Equals(SettingString._4C))
+                            {
+                                liftname = SettingString.LIFT_D2;
+                            }
                         }
                         }
                         else if (missionInfo.sourceWorkshop.StartsWith("1"))
                         else if (missionInfo.sourceWorkshop.StartsWith("1"))
                         {
                         {

DeviceLibrary/manager/UploadManager.cs

@@ -95,17 +95,21 @@ namespace DeviceLibrary.manager
         /// <param name="transportStatus"></param>
         /// <param name="transportStatus"></param>
         public static void UploadTransportStatus(service.model.TransportStatus transportStatus)
         public static void UploadTransportStatus(service.model.TransportStatus transportStatus)
         {
         {
-            try
+            Task.Factory.StartNew(() =>
             {
             {
-                string txt = Common.JsonHelper.SerializeObject(transportStatus);
-                //Common.LogUtil.info($"运输状态上报{txt}");
-                HttpManager.UpdateAGVtranstask(txt);
-                System.Threading.Thread.Sleep(2000);
-            }
-            catch (Exception ex)
-            {
-                Common.LogUtil.error($"UploadTransportStatus:{Common.JsonHelper.SerializeObject(transportStatus)}", ex);
-            }
+                try
+                {
+                    string txt = Common.JsonHelper.SerializeObject(transportStatus);
+                    //Common.LogUtil.info($"运输状态上报{txt}");
+                    HttpManager.UpdateAGVtranstask(txt);
+                }
+                catch (Exception ex)
+                {
+                    Common.LogUtil.error($"UploadTransportStatus:{Common.JsonHelper.SerializeObject(transportStatus)}", ex);
+                }
+
+            });
+
         }
         }
         #endregion
         #endregion
     }
     }