Merge branch '堆垛机' of zuolinhao/YG-OPP-WCS into master

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -962,14 +962,14 @@ namespace WCS.Service.Extensions
                             srm = Device.Find("SRM8").Create<SRMDevice>();
                             task = db.Default.Set<WCS_TASK>().Any(v => v.STATUS == TaskStatus.堆垛机执行 && v.DEVICE == "SRM8" && v.TYPE == TaskType.出库);
                             if (srm.Data3.SCAlarm == 0 && srm.Data2.SRMMode == WCS.Entity.Protocol.SRM.SCMode.远程 && task)
-                                throw new DoException("SRM7正在执行出库任务");
+                                throw new DoException("SRM8正在执行出库任务");
                             break;
 
                         case "SRM8":
                             srm = Device.Find("SRM7").Create<SRMDevice>();
                             task = db.Default.Set<WCS_TASK>().Any(v => v.STATUS == TaskStatus.堆垛机执行 && v.DEVICE == "SRM7" && v.TYPE == TaskType.出库);
                             if (srm.Data3.SCAlarm == 0 && srm.Data2.SRMMode == WCS.Entity.Protocol.SRM.SCMode.远程 && task)
-                                throw new DoException("SRM8正在执行出库任务");
+                                throw new DoException("SRM7正在执行出库任务");
                             break;
                     }
                 }