合并冲突

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

@@ -159,7 +159,7 @@ namespace WCS.Service.Works.RGV
                                 rgvDevice.Data.TaskID_2 = gw2.Data2.Tasknum;
                                 rgvDevice.Data.TaskType_1 = RGVTaskType.取货;
                                 rgvDevice.Data.DestPosition_1 = pickStation.Entity.CODE.Replace("G", "").ToShort();
-                                InfoLog.INFO_RGVINFO($"[{rgvDevice.Entity.CODE}]--写入RGV取货任务-开始:{rgvDevice.Data.TaskID_1},{rgvDevice.Data.TaskID_2},{rgvDevice.Data.TaskType_1},{rgvDevice.Data.DestPosition_1},{rgvDevice.Data.Trigger_1}");
+                                InfoLog.INFO_RGVINFO($"[{rgvDevice.Entity.CODE}]--写入RGV取货任务-结束:{rgvDevice.Data.TaskID_1},{rgvDevice.Data.TaskID_2},{rgvDevice.Data.TaskType_1},{rgvDevice.Data.DestPosition_1},{rgvDevice.Data.Trigger_1}");
 
                                 rgvDevice.Data.Trigger_1++;