gkj 2 년 전
부모
커밋
75f9cf8193

+ 1 - 1
WCS.WorkEngineering/Systems/AgvSystems.cs

@@ -65,7 +65,7 @@ namespace WCS.WorkEngineering.Systems
                 SqlSugarHelper.Do(db =>
                 {
                     //获取所有未结束的AGV任务
-                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot).SplitTable(tabs => tabs.Take(2)).ToList();
+                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.Status < AGVTaskStatus.MissionCompleted && v.TaskType == AGVTaskType.EnterDepot).SplitTable(tabs => tabs.Take(2)).ToList().OrderBy(v => v.EditTime);
 
                     foreach (var agv in agvTaks)
                     {

+ 1 - 1
WCS.WorkEngineering/Systems/NoInteractionSystems.cs

@@ -165,7 +165,7 @@ namespace WCS.WorkEngineering.Systems
                             //更新WCS数据
                             wcs.Status = Entity.TaskStatus.AGVExecution;
                             db.Default.Updateable(wcs).ExecuteCommand();
-                            wcs.AddWCS_TASK_DTL(db, wcs.Device, $"任务下发至AGV");
+                            wcs.AddWCS_TASK_DTL(db, wcs.Device, $"任务下发至AGV-AGV任务ID{agv.AgvID}");
                         }
                         catch (Exception ex)
                         {

+ 1 - 1
WCS.WorkEngineering/Systems/SrmSystems.cs

@@ -328,7 +328,7 @@ namespace WCS.WorkEngineering.Systems
 
         public override bool Select(Device dev)
         {
-            //return dev.Code == "SRM2";
+            //return dev.Code == "SRM3";
             return dev.HasProtocol(typeof(ISRM520));
         }
     }

+ 2 - 2
WCS.WorkEngineering/Systems/一楼入库工位处理系统.cs

@@ -13,10 +13,10 @@ using DeviceFlags = WCS.WorkEngineering.Extensions.DeviceFlags;
 namespace WCS.WorkEngineering.Systems
 {
     /// <summary>
-    ///  入站站点交互系统
+    ///  一楼入库工位处理系统
     /// </summary>
     [BelongTo(typeof(MainWorld))]
-    [Description("入站站点交互系统")]
+    [Description("一楼入库工位处理系统")]
     public class 一楼入库工位处理系统 : DeviceSystem<Station>
     {
         protected override bool ParallelDo => true;