林豪 左 3 жил өмнө
parent
commit
a86184ed58

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

@@ -122,8 +122,8 @@ namespace WCS.Service.Works.RGV
                             DB.Do(db =>
                             {
                                 if (obj.Data2.TaskType_1 != RGVTaskType.移动) throw new WarnException($"RGV正在执行{obj.Data2.TaskType_1}");
-                                if (obj.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGVStatus.光电)) throw new WarnException("RGV有光电,无法取货,请检查实际情况");
-                                if (!obj.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGVStatus.RGV到站)) throw new WarnException("RGV无到站状态,请检查RGV实际状态");
+                                if (obj.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电)) throw new WarnException("RGV有光电,无法取货,请检查实际情况");
+                                if (!obj.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.RGV到站)) throw new WarnException("RGV无到站状态,请检查RGV实际状态");
 
                                 var taskids = devs.Select(v => v.Data2.Tasknum);
                                 var tasks = db.Default.Set<WCS_TASK>().Where(p => taskids.Contains(p.ID));