diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs index 3dd9d1b..ee7073f 100644 --- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs +++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs @@ -593,8 +593,8 @@ namespace Khd.Core.Wcs.Wcs wcsTask.serialNo ??= SystemData.GetSerialNo(dbContext); if (wcsTasks.Where(t => t.taskStatus > 0).Where(t => t.objid != wcsTask.objid).Any()) { - warningMsg = "提升机线程:有其他任务正在执行,跳过当前任务"; - _logger.Info("提升机线程:有其他任务正在执行,跳过当前任务"); + warningMsg = "提升机线程:目的楼层有其他任务正在执行,跳过当前任务"; + _logger.Info("提升机线程:目的楼层有其他任务正在执行,跳过当前任务"); continue; } BaseEquip lineEquip = dbContext.BaseEquip.First(t => t.objid == wcsTask.floorNo); @@ -605,8 +605,8 @@ namespace Khd.Core.Wcs.Wcs if (lineEquip.equipStatus == 1 && InTask == null) { - warningMsg = $"提升机{wcsTask.floorNo}楼接驳位有物体或任务正在执行,跳过当前任务"; - _logger.Info($"提升机{wcsTask.floorNo}楼接驳位有物体或任务正在执行,跳过当前任务"); + warningMsg = $"提升机目的楼层{wcsTask.floorNo}楼接驳位有物体或任务正在执行,跳过当前任务"; + _logger.Info($"提升机目的楼层{wcsTask.floorNo}楼接驳位有物体或任务正在执行,跳过当前任务"); continue; } BasePlcpoint floorPoint = StaticData.BasePlcpointList.First(t => t.plcpointNo == "RFID00" + wcsTask.fromFloorNo); @@ -732,7 +732,7 @@ namespace Khd.Core.Wcs.Wcs var clearValue = StaticData.PlcDic[0].Read(clearPoint.plcpointAddress); if (clearPoint != null && Convert.ToBoolean(clearValue) == false) { - warningMsg = $"{wcsTask.floorNo}接驳位外侧有东西,货物无法继续出提升机"; + warningMsg = $"目的楼层{wcsTask.floorNo}接驳位外侧有东西,货物无法继续出提升机"; StaticData.PlcDic[0].WriteToPoint(clearPoint.plcpointAddress, true, clearPoint.plcpointLength.ToString()); } }