Merge branch 'master' of http://120.77.11.229:3000/zuolinhao/ZT-CP-WCS

成品库/WCS.WorkEngineering/Systems/库尾入库.cs

@@ -92,17 +92,17 @@ namespace WCS.WorkEngineering.Systems
                             .Select(v => "SRM" + v)
                             .ToList();
 
-                        //if (taskInfo.Floor == 10 && tunnelNo.Contains("SRM5"))
-                        //{
-                        //    // 优化：直接在查询中完成条件判断，避免实例化不必要的对象
-                        //    var srm5 = Device.All.FirstOrDefault(x => x.Code == "SRM5" && 
-                        //                                              new Device<ISRM521>(x, World).Data.AutoStatus == SrmAutoStatus.Automatic);
-                        //    if (srm5 != null)
-                        //    {
-                        //        // 如果任务在10楼且SRM5处于自动模式，则只保留SRM5
-                        //        tunnelNo = new List<string> { "SRM5" };
-                        //    }
-                        //}
+                        if (taskInfo.Floor == 10 && tunnelNo.Contains("SRM5"))
+                        {
+                            // 优化：直接在查询中完成条件判断，避免实例化不必要的对象
+                            var srm5 = Device.All.FirstOrDefault(x => x.Code == "SRM5" &&
+                                                                      new Device<ISRM521>(x, World).Data.AutoStatus == SrmAutoStatus.Automatic);
+                            if (srm5 != null)
+                            {
+                                // 如果任务在10楼且SRM5处于自动模式，则只保留SRM5
+                                tunnelNo = new List<string> { "SRM5" };
+                            }
+                        }
 
                         SRM srm = null;
                         List<Station> stations = new List<Station>();