Administrator 3 years ago
parent
commit
933b2e82ed

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

@@ -75,7 +75,7 @@ namespace WCS.Service.Works.RGV
         }
     }
 
-    [WorkTitle(typeof(RGVHandler), "涂布环穿取货")]
+    //[WorkTitle(typeof(RGVHandler), "涂布环穿取货")]
     public class 涂布环穿取货 : Work<StationDeviceGroup>
     {
         protected override void Do(StationDeviceGroup obj)
@@ -108,7 +108,7 @@ namespace WCS.Service.Works.RGV
         }
     }
 
-    [WorkTitle(typeof(RGVHandler), "涂布环穿放货")]
+    //[WorkTitle(typeof(RGVHandler), "涂布环穿放货")]
     public class 涂布环穿放货 : Work<StationDeviceGroup>
     {
         protected override void Do(StationDeviceGroup obj)

+ 5 - 5
Projects/永冠OPP/WCS.Service/Works/Station/一楼出库.cs

@@ -56,11 +56,11 @@ namespace WCS.Service.Works.Station
                     foreach (var dev in obj.Items)
                     {
                         //当前组有一个运行的设备就停止执行
-                        if (dev.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException("设备运行中");
-                        if (dev.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new WarnException("有光电,产品未离开设备");
-                        if (dev.Data2.Tasknum < 10000) throw new DoException("无任务号");
-                        if (dev.Data2.Request != IstationRequest.月台出库口任务完成) throw new WarnException("无完成任务请求");
-                        if (dev.Data2.Tasknum < 10000) throw new WarnException("任务号错误");
+                        if (dev.Data3.Status.HasFlag(StationStatus.运行状态位)) continue;
+                        if (dev.Data2.Status.HasFlag(IstationStatus.光电状态)) continue;
+                        if (dev.Data2.Tasknum < 10000) continue;
+                        if (dev.Data2.Request != IstationRequest.月台出库口任务完成) continue;
+                        if (dev.Data2.Tasknum < 10000) continue;
 
                         var task = db.Default.Set<WCS_TASK>().Where(v => v.ID == dev.Data2.Tasknum).FirstOrDefault();
                         if (task.STATUS != TaskStatus.执行中)