fix：alarm

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

@@ -115,9 +115,9 @@ namespace WCS.Service.Extensions
         {
             foreach (var item in Items)
             {
-                if (item.Data.VoucherNo != item.Data2.VoucherNo) throw new WarnException($"等待{item.Entity.Code}执行任务{item.Data.Tasknum},凭证号不一致");
-                if (item.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException($"{item.Entity.Code}运行中");
-                if (!item.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException($"[{item.Entity.Code}]无光电");
+                if (item.Data.VoucherNo != item.Data2.VoucherNo) throw new WarnException($"等待{item.Entity.CODE}执行任务{item.Data.Tasknum},凭证号不一致");
+                if (item.Data3.Status.HasFlag(StationStatus.运行状态位)) throw new DoException($"{item.Entity.CODE}运行中");
+                if (!item.Data2.Status.HasFlag(IstationStatus.光电状态)) throw new DoException($"[{item.Entity.CODE}]无光电");
             }
         }
 
@@ -501,7 +501,7 @@ namespace WCS.Service.Extensions
         public void Put(StationDeviceGroup addr, int task1 = 0, int task2 = 0)
         {
             Data.TaskType_1 = RGVTaskType.放货;
-            Data.DestPosition_1 = addr.Entity.CODE.Replace("G","").ToShort();
+            Data.DestPosition_1 = addr.Entity.CODE.Replace("G", "").ToShort();
             if (task1 != 0) Data.TaskID_1 = task1;
             if (task2 != 0) Data.TaskID_2 = task2;
             Data.Trigger_1++;

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

@@ -83,7 +83,7 @@ namespace WCS.Service.Works.RGV
         {
             obj.EX(obj =>
             {
-                if (obj.Data2.Trigger_1 != obj.Data.Trigger_1) throw new WarnException($"等待执行任务{obj.Data2.TaskID_1}{obj.Data2.TaskID_2}");
+                if (obj.Data2.Trigger_1 != obj.Data.Trigger_1) throw new WarnException($"等待执行任务{obj.Data2.TaskID_1}--{obj.Data2.TaskID_2}");
                 if (!obj.Data2.WorkMode.HasFlag(RGVMode.自动)) throw new DoException(obj.Data2.WorkMode.ToString());
                 if (!obj.Data2.SystemStatus.HasFlag(RGVRunStatus.空闲)) throw new DoException(obj.Data2.SystemStatus.ToString());
                 //RGV当前是否刚刚完成取货任务，等待放货
@@ -129,7 +129,7 @@ namespace WCS.Service.Works.RGV
                             var gw2 = pickStation.Items.ToArray()[1];
                             if (gw1.Data2.Tasknum != 0 && gw2.Data2.Tasknum != 0)
                             {
-                                if (gw1.Data2.Goodsend != gw2.Data2.Goodsend) throw new WarnException($"{obj.Entity.Code}目标地址不一致");
+                                if (gw1.Data2.Goodsend != gw2.Data2.Goodsend) throw new WarnException($"{obj.Entity.CODE}目标地址不一致");
                             }
                             obj.Data.TaskID_1 = gw1.Data2.Tasknum;
                             obj.Data.TaskID_2 = gw2.Data2.Tasknum;