林豪 左 3 năm trước cách đây
mục cha
commit
a63ddba2fe
1 tập tin đã thay đổi với 6 bổ sung12 xóa
  1. 6 12
      Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

+ 6 - 12
Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -142,19 +142,13 @@ namespace WCS.Service.Works.RGV
 
                                 if (pickStation.Entity.CODE != "G2" && pickStation.Entity.CODE != "G3")
                                 {
+                                    var a = Device.Where(v => v.CODE is "G1" or "G1340" or "G1337").Select(v => v.Create<StationDeviceGroup>()).Count(v => v.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)
+                                        || v.Data2.Status.HasFlag(IstationStatus.光电状态)
+                                        || v.Data2.Tasknum > 10000
+                                        || !v.Data3.Status.HasFlag(StationStatus.自动)));
+                                    var b = rgvDevice.RGVList.Count(v => v.Data.DestPosition_1 == 1);
                                     //最大三个任务
-                                    if (rgvDevice.RGVList.Count(v => v.Data.DestPosition_1 == 1) < 3)
-                                    {
-                                        //放货点是否有货
-                                        var G1 = Device.Find("G1").Create<StationDeviceGroup>();
-                                        //只能有一组任务的下一个地址是交货点同时,放货点必须无货
-
-                                        if (G1.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位)
-                                                              || v.Data2.Status.HasFlag(IstationStatus.光电状态)
-                                                              || v.Data2.Tasknum > 10000
-                                                              || !v.Data3.Status.HasFlag(StationStatus.自动))) return;
-                                    }
-                                    else return;
+                                    if (b >= 3) return;
                                 }
 
                                 var taskids = devs.Select(v => v.Data2.Tasknum);