Merge branch 'debug' of zuolinhao/YG-OPP-WCS into master

Projects/永冠OPP/WCS.Service/Works/SRM/SRMWork.cs

@@ -269,38 +269,38 @@ namespace WCS.Service.Works.SRM
                         else if (v.Data2.Status.HasFlag(IstationStatus.光电状态)) res = false;
                         else if (v.Data2.Request == IstationRequest.堆垛机放货完成请求目标地址) res = false;
                         else if (v.Data2.Tasknum > 10000) res = false;
-                        else if (v.Entity.Is(DF.SRM涂布放货)) //涂布分货，应为电控不会等到RGV取货点无货时，再让货物离开无动力站台，因此需要判断一次旋转台的状态
-                        {
-                            var devise = new List<StationDevice>();
-                            switch (v.Entity.CODE)
-                            {
-                                case "1283" or "1284":
-                                    devise = Device.Where(b => b.CODE is "1281" or "1282").Select(b => b.Create<StationDevice>()).ToList();
-                                    break;
-
-                                case "1290" or "1291" or "1292" or "1293":
-                                    devise = Device.Where(b => b.CODE is "1288" or "1289").Select(b => b.Create<StationDevice>()).ToList();
-                                    break;
-
-                                case "1299" or "1300" or "1301" or "1302":
-                                    devise = Device.Where(b => b.CODE is "1297" or "1298").Select(b => b.Create<StationDevice>()).ToList();
-                                    break;
-
-                                case "1308" or "1309" or "1310" or "1311":
-                                    devise = Device.Where(b => b.CODE is "1306" or "1307").Select(b => b.Create<StationDevice>()).ToList();
-                                    break;
-                            }
-
-                            if (!devise.Any()) return res;
-                            foreach (var stationDevice in devise)
-                            {
-                                //放货点是否有货
-                                if (stationDevice.Data3.Status.HasFlag(StationStatus.运行状态位)) res = false;
-                                else if (stationDevice.Data2.Status.HasFlag(IstationStatus.光电状态)) res = false;
-                                else if (stationDevice.Data2.Request == IstationRequest.堆垛机放货完成请求目标地址) res = false;
-                                else if (stationDevice.Data2.Tasknum > 10000) res = false;
-                            }
-                        }
+                        //else if (v.Entity.Is(DF.SRM涂布放货)) //涂布分货，应为电控不会等到RGV取货点无货时，再让货物离开无动力站台，因此需要判断一次旋转台的状态
+                        //{
+                        //    var devise = new List<StationDevice>();
+                        //    switch (v.Entity.CODE)
+                        //    {
+                        //        case "1283" or "1284":
+                        //            devise = Device.Where(b => b.CODE is "1281" or "1282").Select(b => b.Create<StationDevice>()).ToList();
+                        //            break;
+
+                        //        case "1290" or "1291" or "1292" or "1293":
+                        //            devise = Device.Where(b => b.CODE is "1288" or "1289").Select(b => b.Create<StationDevice>()).ToList();
+                        //            break;
+
+                        //        case "1299" or "1300" or "1301" or "1302":
+                        //            devise = Device.Where(b => b.CODE is "1297" or "1298").Select(b => b.Create<StationDevice>()).ToList();
+                        //            break;
+
+                        //        case "1308" or "1309" or "1310" or "1311":
+                        //            devise = Device.Where(b => b.CODE is "1306" or "1307").Select(b => b.Create<StationDevice>()).ToList();
+                        //            break;
+                        //    }
+
+                        //    if (!devise.Any()) return res;
+                        //    foreach (var stationDevice in devise)
+                        //    {
+                        //        //放货点是否有货
+                        //        if (stationDevice.Data3.Status.HasFlag(StationStatus.运行状态位)) res = false;
+                        //        else if (stationDevice.Data2.Status.HasFlag(IstationStatus.光电状态)) res = false;
+                        //        else if (stationDevice.Data2.Request == IstationRequest.堆垛机放货完成请求目标地址) res = false;
+                        //        else if (stationDevice.Data2.Tasknum > 10000) res = false;
+                        //    }
+                        //}
 
                         return res;
                     }).ToList();