gkj 2 lat temu
rodzic
commit
91825b5c80

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

@@ -40,7 +40,7 @@ namespace WCS.WorkEngineering.Systems
                 SqlSugarHelper.Do(db =>
                 {
                     //获取所有未结束的AGV任务
-                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => v.TaskType == AGVTaskType.CallMaterial && v.Status < AGVTaskStatus.MissionCompleted && v.Status > AGVTaskStatus.NewBuild && v.Station == obj.Entity.Code).SplitTable(tabs => tabs.Take(2)).ToList();
+                    var agvTaks = db.Default.Queryable<WCS_AgvTaskInfo>().Where(v => (v.TaskType == AGVTaskType.CallMaterial || v.TaskType == AGVTaskType.CallForMaterial) && v.Status < AGVTaskStatus.MissionCompleted && v.Status > AGVTaskStatus.NewBuild).SplitTable(tabs => tabs.Take(2)).ToList();
 
                     foreach (var agv in agvTaks)
                     {
@@ -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 && v.Station == obj.Entity.Code).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();
 
                     foreach (var agv in agvTaks)
                     {
@@ -145,8 +145,8 @@ namespace WCS.WorkEngineering.Systems
 
         public override bool Select(Device dev)
         {
-            return dev.HasFlag(DeviceFlags.巷道口);
-            //return dev.Code is "1011" or "1012";
+            //return dev.HasFlag(DeviceFlags.巷道口);
+            return dev.Code is "1011" or "1012";
         }
     }
 }

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

@@ -204,6 +204,7 @@ namespace WCS.WorkEngineering.Systems
                 obj.Data.ELine = addrTo[0].ToShort();
                 obj.Data.ECol = addrTo[1].ToShort();
                 obj.Data.ELayer = addrTo[2].ToShort();
+                obj.Data.TaskType = SrmTaskTypeEnum.MoveGoods;
                 obj.Data.VoucherNo++;
             }