فهرست منبع

update 不再管控放货旋转台状态

林豪 左 3 سال پیش
والد
کامیت
7fdbf3ec4d
1فایلهای تغییر یافته به همراه0 افزوده شده و 23 حذف شده
  1. 0 23
      Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

+ 0 - 23
Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -248,29 +248,6 @@ namespace WCS.Service.Works.SRM
                             else if (v.Data2.Status.HasFlag(IstationStatus.光电状态)) res = false;
                             else if (v.Data2.Status.HasFlag(IstationStatus.光电状态)) res = false;
                             else if (v.Data2.Request == IstationRequest.堆垛机放货完成请求目标地址) res = false;
                             else if (v.Data2.Request == IstationRequest.堆垛机放货完成请求目标地址) res = false;
                             else if (v.Data2.Tasknum > 10000) res = false;
                             else if (v.Data2.Tasknum > 10000) res = false;
-                            //TODO:因放货设备过短且无动力,因此需要占用对应旋转台   后续考虑优化方式
-                            if (res)
-                            {
-                                List<StationDevice> moveDevs = null;
-                                if (v.Entity.CODE is "1473" or "1474" or "1475" or "1476")
-                                    moveDevs = Device.Find("1471", "1472").Select(p => p.Create<StationDevice>()).ToList();
-                                else if (v.Entity.CODE is "1491" or "1492" or "1493" or "1494")
-                                    moveDevs = Device.Find("1489", "1490").Select(p => p.Create<StationDevice>()).ToList();
-                                else if (v.Entity.CODE is "1520" or "1521" or "1522" or "1523")
-                                    moveDevs = Device.Find("1518", "1519").Select(p => p.Create<StationDevice>()).ToList();
-                                else if (v.Entity.CODE is "1545" or "1546")
-                                    moveDevs = Device.Find("1543", "1544").Select(p => p.Create<StationDevice>()).ToList();
-                                else if (v.Entity.CODE is "1555" or "1556")
-                                    moveDevs = Device.Find("1551", "1553").Select(p => p.Create<StationDevice>()).ToList();
-                                //如果放货点有移动设备 旋转台的两个设备必须都以停止运行 并无任务及请求
-                                if (moveDevs != null)
-                                {
-                                    if (moveDevs.Any(p => p.Data.VoucherNo != p.Data2.VoucherNo)) res = false;
-                                    //else if (moveDevs.Any(p => p.Data3.Status.HasFlag(StationStatus.有货状态位))) res = false;
-                                    //else if (moveDevs.Any(p => p.Data2.Status.HasFlag(IstationStatus.光电状态))) res = false;
-                                    //else if (moveDevs.Any(p => p.Data2.Tasknum > 10000)) res = false;
-                                }
-                            }
                             return res;
                             return res;
                         }).ToList();
                         }).ToList();