diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/GetHoistStatus/GetHoistStatusResultDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/GetHoistStatus/GetHoistStatusResultDto.cs index 75422f6..c9dbed5 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Dto/GetHoistStatus/GetHoistStatusResultDto.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/GetHoistStatus/GetHoistStatusResultDto.cs @@ -26,7 +26,6 @@ using Sln.Wcs.Common.Domain.Dto; using Sln.Wcs.HoistAdapter.Domain.Enum; using Sln.Wcs.HoistAdapter.Domain.Model.GetHoistStatus; -using Sln.Wcs.HoistAdapter.Domain.Model.HoistControl; namespace Sln.Wcs.HoistAdapter.Domain.Dto.GetHoistStatus; diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionDto.cs similarity index 86% rename from Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlDto.cs rename to Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionDto.cs index 1b74790..475d0e3 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlDto.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.HoistControl +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.SetHoistAction * 唯一标识:2B61FFB2-F10E-47BC-8B36-56524EB4F054 * * 创建者:WenJY @@ -25,9 +25,9 @@ using Sln.Wcs.HoistAdapter.Domain.Enum; -namespace Sln.Wcs.HoistAdapter.Domain.Dto.HoistControl; +namespace Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAction; -public class HoistControlDto +public class SetHoistActionDto { /// /// 提升机编号 diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlResultDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionResultDto.cs similarity index 72% rename from Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlResultDto.cs rename to Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionResultDto.cs index b7b2550..d485a03 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistControl/HoistControlResultDto.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAction/SetHoistActionResultDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.HoistControl +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.SetHoistAction * 唯一标识:2D12D182-6A86-4516-8AF2-B8E8FAC44CC6 * * 创建者:WenJY @@ -25,11 +25,11 @@ using Sln.Wcs.Common.Domain.Dto; using Sln.Wcs.HoistAdapter.Domain.Enum; -using Sln.Wcs.HoistAdapter.Domain.Model.HoistControl; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAction; -namespace Sln.Wcs.HoistAdapter.Domain.Dto.HoistControl; +namespace Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAction; -public class HoistControlResultDto:ResultDto +public class SetHoistActionResultDto:ResultDto { } \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmDto.cs new file mode 100644 index 0000000..a76c484 --- /dev/null +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmDto.cs @@ -0,0 +1,54 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2026 WenJY 保留所有权利。 +* CLR版本:4.0.30319.42000 +* 机器名称:Mr.Wen's MacBook Pro +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm +* 唯一标识:99CE0D25-6378-428E-BDF3-D948B1455BA3 +* +* 创建者:WenJY +* 电子邮箱: +* 创建时间:2026-06-03 16:08:53 +* 版本:V1.0.0 +* 描述: +* +*-------------------------------------------------------------------- +* 修改人: +* 时间: +* 修改说明: +* +* 版本:V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +namespace Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm; + +public class SetHoistAlarmDto +{ + /// + /// 提升机编号 + /// + public string hoistCode { get; set; } + + /// + /// 设备序号 + /// + public int deviceSerialNo { get; set; } + + /// + /// 当前楼层 + /// + public int floor { get; set; } + + /// + /// 参数Key + /// + public string key{get;set;} + + /// + /// 下发值 + /// + public int value { get; set; } +} \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs new file mode 100644 index 0000000..b9ed089 --- /dev/null +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs @@ -0,0 +1,35 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2026 WenJY 保留所有权利。 +* CLR版本:4.0.30319.42000 +* 机器名称:Mr.Wen's MacBook Pro +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm +* 唯一标识:4E55E41C-4565-4E47-9907-E53E338E0F2A +* +* 创建者:WenJY +* 电子邮箱: +* 创建时间:2026-06-03 16:09:03 +* 版本:V1.0.0 +* 描述: +* +*-------------------------------------------------------------------- +* 修改人: +* 时间: +* 修改说明: +* +* 版本:V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +using Sln.Wcs.Common.Domain.Dto; +using Sln.Wcs.HoistAdapter.Domain.Enum; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAlarm; + +namespace Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm; + +public class SetHoistAlarmResultDto:ResultDto +{ + +} \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskDto.cs similarity index 87% rename from Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeDto.cs rename to Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskDto.cs index a6cc66d..fabdf72 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeDto.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.HoistTaskExecutor +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.SetHoistTask * 唯一标识:217D981D-DC12-4004-9B15-30E2C1D091C1 * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistAdapter.Domain.Dto.HoistTaskExecutor; +namespace Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistTask; -public class HoistTaskExeDto +public class SetHoistTaskDto { /// /// 提升机编号 diff --git a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskResultDto.cs similarity index 78% rename from Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs rename to Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskResultDto.cs index 085c769..d34a153 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Dto/SetHoistTask/SetHoistTaskResultDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.HoistTaskExecutor +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Domain.SetHoistTask * 唯一标识:399F7475-BEC6-42FA-AF32-AC99F5CBC35F * * 创建者:WenJY @@ -25,11 +25,11 @@ using Sln.Wcs.Common.Domain.Dto; using Sln.Wcs.HoistAdapter.Domain.Enum; -using Sln.Wcs.HoistAdapter.Domain.Model.HoistTaskExecutor; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistTask; namespace Sln.Wcs.HoistAdapter.Domain.Dto.HoistTaskExecutor; -public class HoistTaskExeResultDto:ResultDto +public class SetHoistTaskResultDto:ResultDto { } \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Domain/Model/HoistControl/HoistControlResultModel.cs b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAction/SetHoistActionResultModel.cs similarity index 84% rename from Sln.Wcs.HoistAdapter/Domain/Model/HoistControl/HoistControlResultModel.cs rename to Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAction/SetHoistActionResultModel.cs index c40174a..7d8da8b 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Model/HoistControl/HoistControlResultModel.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAction/SetHoistActionResultModel.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Model.HoistControl +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAction * 唯一标识:4974C976-A0D5-4FB2-B4AD-F45E11935008 * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistAdapter.Domain.Model.HoistControl; +namespace Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAction; -public class HoistControlResultModel +public class SetHoistActionResultModel { /// /// 返回码 diff --git a/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAlarm/SetHoistAlarmResultModel.cs b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAlarm/SetHoistAlarmResultModel.cs new file mode 100644 index 0000000..b2600d2 --- /dev/null +++ b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistAlarm/SetHoistAlarmResultModel.cs @@ -0,0 +1,39 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2026 WenJY 保留所有权利。 +* CLR版本:4.0.30319.42000 +* 机器名称:Mr.Wen's MacBook Pro +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAlarm +* 唯一标识:697FD24A-CA2C-4282-A4B3-DEFD2A76915D +* +* 创建者:WenJY +* 电子邮箱: +* 创建时间:2026-06-03 16:12:23 +* 版本:V1.0.0 +* 描述: +* +*-------------------------------------------------------------------- +* 修改人: +* 时间: +* 修改说明: +* +* 版本:V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +namespace Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAlarm; + +public class SetHoistAlarmResultModel +{ + /// + /// 返回码 + /// + public string code { get; set; } + + /// + /// 返回消息 + /// + public string message { get; set; } +} \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Domain/Model/HoistTaskExecutor/HoistTaskExeResultModel.cs b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistTask/SetHoistTaskResultModel.cs similarity index 84% rename from Sln.Wcs.HoistAdapter/Domain/Model/HoistTaskExecutor/HoistTaskExeResultModel.cs rename to Sln.Wcs.HoistAdapter/Domain/Model/SetHoistTask/SetHoistTaskResultModel.cs index b3f9e69..ebefed0 100644 --- a/Sln.Wcs.HoistAdapter/Domain/Model/HoistTaskExecutor/HoistTaskExeResultModel.cs +++ b/Sln.Wcs.HoistAdapter/Domain/Model/SetHoistTask/SetHoistTaskResultModel.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistAdapter.Domain.Model.HoistTaskExecutor +* 命名空间:Sln.Wcs.HoistAdapter.Domain.Model.SetHoistTask * 唯一标识:A4E0666A-66FA-46AE-B783-E385F905092E * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistAdapter.Domain.Model.HoistTaskExecutor; +namespace Sln.Wcs.HoistAdapter.Domain.Model.SetHoistTask; -public class HoistTaskExeResultModel +public class SetHoistTaskResultModel { /// /// 返回码 diff --git a/Sln.Wcs.HoistAdapter/Service/IHoistService.cs b/Sln.Wcs.HoistAdapter/Service/IHoistService.cs index acaa89f..7954394 100644 --- a/Sln.Wcs.HoistAdapter/Service/IHoistService.cs +++ b/Sln.Wcs.HoistAdapter/Service/IHoistService.cs @@ -24,27 +24,29 @@ #endregion << 版 本 注 释 >> using Sln.Wcs.HoistAdapter.Domain.Dto.GetHoistStatus; -using Sln.Wcs.HoistAdapter.Domain.Dto.HoistControl; using Sln.Wcs.HoistAdapter.Domain.Dto.HoistTaskExecutor; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAction; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistTask; namespace Sln.Wcs.HoistAdapter.Service; public interface IHoistService { /// - /// 提升机控制 + /// 设置提升机动作 /// MOVE_TO, STOP, EMERGENCY_STOP, RESET, CALIBRATE /// - /// + /// /// - HoistControlResultDto HoistControl(HoistControlDto hoistControlDto); + SetHoistActionResultDto SetHoistAction(SetHoistActionDto setHoistActionDto); /// - /// 提升机任务执行 + /// 设置提升机任务 /// - /// + /// /// - HoistTaskExeResultDto HoistTaskExecutor(HoistTaskExeDto hoistTaskExeDto); + SetHoistTaskResultDto SetHoistTask(SetHoistTaskDto setHoistTaskDto); /// /// 获取提升机状态 @@ -52,4 +54,11 @@ public interface IHoistService /// /// GetHoistStatusResultDto GetHoistStatus(GetHoistStatusDto hoistStatusDto); + + /// + /// 设置提升机报警 + /// + /// + /// + SetHoistAlarmResultDto SetHoistAlarm(SetHoistAlarmDto hoistAlarmDto); } \ No newline at end of file diff --git a/Sln.Wcs.HoistAdapter/Service/Impl/HoistService.cs b/Sln.Wcs.HoistAdapter/Service/Impl/HoistService.cs index 0ea50b0..f316f7f 100644 --- a/Sln.Wcs.HoistAdapter/Service/Impl/HoistService.cs +++ b/Sln.Wcs.HoistAdapter/Service/Impl/HoistService.cs @@ -24,12 +24,15 @@ #endregion << 版 本 注 释 >> using Sln.Wcs.HoistAdapter.Domain.Dto.GetHoistStatus; -using Sln.Wcs.HoistAdapter.Domain.Dto.HoistControl; using Sln.Wcs.HoistAdapter.Domain.Dto.HoistTaskExecutor; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAction; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAlarm; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistTask; using Sln.Wcs.HoistAdapter.Domain.Enum; using Sln.Wcs.HoistAdapter.Domain.Model.GetHoistStatus; -using Sln.Wcs.HoistAdapter.Domain.Model.HoistControl; -using Sln.Wcs.HoistAdapter.Domain.Model.HoistTaskExecutor; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAction; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistAlarm; +using Sln.Wcs.HoistAdapter.Domain.Model.SetHoistTask; using Sln.Wcs.HoistAdapter.Util; using Sln.Wcs.HoistSdk; @@ -48,35 +51,35 @@ public class HoistService:IHoistService } /// - /// 提升机控制 + /// 设置提升机动作 /// - /// + /// /// /// - public HoistControlResultDto HoistControl(HoistControlDto hoistControlDto) + public SetHoistActionResultDto SetHoistAction(SetHoistActionDto setHoistActionDto) { try { - if (hoistControlDto == null) + if (setHoistActionDto == null) { throw new ArgumentException($"输入参数为空。"); } - var data = new HoistSdk.Dto.HoistControl.HoistControlDto() + var data = new HoistSdk.Dto.HoistControl.SetHoistActionDto() { - hoistCode = hoistControlDto.hoistCode, - action = (HoistSdk.Enum.ControlAction)hoistControlDto.action, + hoistCode = setHoistActionDto.hoistCode, + action = (HoistSdk.Enum.ControlAction)setHoistActionDto.action, }; - var resp = this.hoistSdk.HoistControl(data); + var resp = this.hoistSdk.SetHoistAction(data); bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HoistStatusEnum hoistStatusEnum); - return new HoistControlResultDto() + return new SetHoistActionResultDto() { code = hoistStatusEnum, msg = resp.message, - data = new HoistControlResultModel() + data = new SetHoistActionResultModel() { code = resp.code, message = resp.message, @@ -87,7 +90,7 @@ public class HoistService:IHoistService } catch (Exception ex) { - return new HoistControlResultDto() + return new SetHoistActionResultDto() { code = HoistStatusEnum.SDK调用异常, msg = ex.Message, @@ -96,39 +99,39 @@ public class HoistService:IHoistService } /// - /// 提升机任务执行 + /// 设置提升机任务 /// - /// + /// /// /// - public HoistTaskExeResultDto HoistTaskExecutor(HoistTaskExeDto hoistTaskExeDto) + public SetHoistTaskResultDto SetHoistTask(SetHoistTaskDto setHoistTaskDto) { try { - if (hoistTaskExeDto == null) + if (setHoistTaskDto == null) { throw new ArgumentException($"输入参数为空。"); } - var data = new HoistSdk.Dto.HoistTaskExecutor.HoistTaskExeDto() + var data = new HoistSdk.Dto.SetHoistTask.SetHoistTaskDto() { - hoistCode = hoistTaskExeDto.hoistCode, - taskCode = hoistTaskExeDto.taskCode, - deviceSerialNo = hoistTaskExeDto.deviceSerialNo, - startPoint = hoistTaskExeDto.startPoint, - endPoint = hoistTaskExeDto.endPoint, + hoistCode = setHoistTaskDto.hoistCode, + taskCode = setHoistTaskDto.taskCode, + deviceSerialNo = setHoistTaskDto.deviceSerialNo, + startPoint = setHoistTaskDto.startPoint, + endPoint = setHoistTaskDto.endPoint, }; - var resp = this.hoistSdk.HoistTaskExecutor(data); + var resp = this.hoistSdk.SetHoistTask(data); bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HoistStatusEnum hoistStatusEnum); - return new HoistTaskExeResultDto() + return new SetHoistTaskResultDto() { code = hoistStatusEnum, msg = resp.message, - data = new HoistTaskExeResultModel() + data = new SetHoistTaskResultModel() { code = resp.code, message = resp.message, @@ -139,7 +142,7 @@ public class HoistService:IHoistService } catch (Exception ex) { - return new HoistTaskExeResultDto() + return new SetHoistTaskResultDto() { code = HoistStatusEnum.SDK调用异常, msg = ex.Message, @@ -194,4 +197,53 @@ public class HoistService:IHoistService }; } } + + /// + /// 设置提升机报警 + /// + /// + /// + /// + public SetHoistAlarmResultDto SetHoistAlarm(SetHoistAlarmDto hoistAlarmDto) + { + try + { + if (hoistAlarmDto == null) + { + throw new ArgumentException($"输入参数为空。"); + } + + var data = new HoistSdk.Dto.SetHoistAlarm.SetHoistAlarmDto() + { + hoistCode = hoistAlarmDto.hoistCode, + deviceSerialNo = hoistAlarmDto.deviceSerialNo, + key = hoistAlarmDto.key, + value = hoistAlarmDto.value, + }; + + var resp = this.hoistSdk.SetHoistAlarm(data); + + bool parseRes = this.codeUtil.parse(resp.code, resp.message, out HoistStatusEnum hoistStatusEnum); + + return new SetHoistAlarmResultDto() + { + code = hoistStatusEnum, + msg = resp.message, + data = new SetHoistAlarmResultModel() + { + code = resp.code, + message = resp.message, + }, + }; + + } + catch (Exception ex) + { + return new SetHoistAlarmResultDto() + { + code = HoistStatusEnum.SDK调用异常, + msg = ex.Message, + }; + } + } } \ No newline at end of file diff --git a/Sln.Wcs.HoistDispatcher/HoistDispatchHub.cs b/Sln.Wcs.HoistDispatcher/HoistDispatchHub.cs index 54334a1..dcc5637 100644 --- a/Sln.Wcs.HoistDispatcher/HoistDispatchHub.cs +++ b/Sln.Wcs.HoistDispatcher/HoistDispatchHub.cs @@ -25,8 +25,9 @@ using Newtonsoft.Json; using Sln.Wcs.HoistAdapter.Domain.Dto.GetHoistStatus; -using Sln.Wcs.HoistAdapter.Domain.Dto.HoistControl; using Sln.Wcs.HoistAdapter.Domain.Dto.HoistTaskExecutor; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistAction; +using Sln.Wcs.HoistAdapter.Domain.Dto.SetHoistTask; using Sln.Wcs.HoistAdapter.Domain.Enum; using Sln.Wcs.HoistAdapter.Service; using Sln.Wcs.Model.Domain; @@ -34,6 +35,9 @@ using Sln.Wcs.Serilog; namespace Sln.Wcs.HoistDispatcher; +/// +/// 提升机调度中心 +/// public class HoistDispatchHub { private readonly SerilogHelper _logger; @@ -43,6 +47,25 @@ public class HoistDispatchHub _hoistAdapter = hoistAdapter; _logger = logger; } + + /// + /// 接收托盘 + /// + /// + /// + public void ReceivePallet(LiveTaskDetail taskDetail,BaseDeviceInfo deviceInfo) + { + //读取托盘RFID信息 + string palletStr = "202606030001"; + if (taskDetail.palletBarcode == palletStr) + { + this.TaskRun(deviceInfo); + } + else + { + _logger.Info($"托盘条码与计划不符"); + } + } /// /// 提升机启动:放置完成下发 @@ -52,7 +75,7 @@ public class HoistDispatchHub { try { - HoistControlResultDto res = _hoistAdapter.HoistControl(new HoistControlDto() + SetHoistActionResultDto res = _hoistAdapter.SetHoistAction(new SetHoistActionDto() { hoistCode = deviceInfo.hostCode, deviceSerialNo = deviceInfo.deviceSerialNo, @@ -91,7 +114,7 @@ public class HoistDispatchHub int endPoint = Convert.ToInt32(deviceInfo.deviceSerialNo + startFloor + endFloor); //调用适配层下发 提升机调度任务 - HoistTaskExeResultDto res = _hoistAdapter.HoistTaskExecutor(new HoistTaskExeDto() + SetHoistTaskResultDto res = _hoistAdapter.SetHoistTask(new SetHoistTaskDto() { hoistCode = deviceInfo.hostCode, taskCode = liveTaskDetail.taskCode, diff --git a/Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionDto.cs similarity index 92% rename from Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlDto.cs rename to Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionDto.cs index 0ff97ff..8f18f4f 100644 --- a/Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlDto.cs +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistSdk.HoistControl +* 命名空间:Sln.Wcs.HoistSdk.SetHoistAction * 唯一标识:DBFC7326-690D-41AE-8ACA-E6447525508F * * 创建者:WenJY @@ -27,7 +27,7 @@ using Sln.Wcs.HoistSdk.Enum; namespace Sln.Wcs.HoistSdk.Dto.HoistControl; -public class HoistControlDto +public class SetHoistActionDto { /// /// 提升机编号 diff --git a/Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlResultDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionResultDto.cs similarity index 87% rename from Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlResultDto.cs rename to Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionResultDto.cs index 12117bc..c2bc853 100644 --- a/Sln.Wcs.HoistSdk/Dto/HoistControl/HoistControlResultDto.cs +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistAction/SetHoistActionResultDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistSdk.HoistControl +* 命名空间:Sln.Wcs.HoistSdk.SetHoistAction * 唯一标识:C07056AD-8242-4096-88D0-B82DB5024F0E * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistSdk.Dto.HoistControl; +namespace Sln.Wcs.HoistSdk.Dto.SetHoistAction; -public class HoistControlResultDto +public class SetHoistActionResultDto { /// /// 返回码 diff --git a/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmDto.cs new file mode 100644 index 0000000..7aac5eb --- /dev/null +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmDto.cs @@ -0,0 +1,54 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2026 WenJY 保留所有权利。 +* CLR版本:4.0.30319.42000 +* 机器名称:Mr.Wen's MacBook Pro +* 命名空间:Sln.Wcs.HoistSdk.Dto.SetHoistAlarm +* 唯一标识:C0D133E2-89EB-4D5A-884B-BADEDC658F77 +* +* 创建者:WenJY +* 电子邮箱: +* 创建时间:2026-06-03 16:02:41 +* 版本:V1.0.0 +* 描述: +* +*-------------------------------------------------------------------- +* 修改人: +* 时间: +* 修改说明: +* +* 版本:V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +namespace Sln.Wcs.HoistSdk.Dto.SetHoistAlarm; + +public class SetHoistAlarmDto +{ + /// + /// 提升机编号 + /// + public string hoistCode { get; set; } + + /// + /// 设备序号 + /// + public int deviceSerialNo { get; set; } + + /// + /// 当前楼层 + /// + public int floor { get; set; } + + /// + /// 参数Key + /// + public string key{get;set;} + + /// + /// 下发值 + /// + public int value { get; set; } +} \ No newline at end of file diff --git a/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs new file mode 100644 index 0000000..d119e99 --- /dev/null +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistAlarm/SetHoistAlarmResultDto.cs @@ -0,0 +1,39 @@ +#region << 版 本 注 释 >> + +/*-------------------------------------------------------------------- +* 版权所有 (c) 2026 WenJY 保留所有权利。 +* CLR版本:4.0.30319.42000 +* 机器名称:Mr.Wen's MacBook Pro +* 命名空间:Sln.Wcs.HoistSdk.Dto.SetHoistAlarm +* 唯一标识:368D0B1B-1F71-4B78-A64D-F17B973ADDC2 +* +* 创建者:WenJY +* 电子邮箱: +* 创建时间:2026-06-03 16:02:50 +* 版本:V1.0.0 +* 描述: +* +*-------------------------------------------------------------------- +* 修改人: +* 时间: +* 修改说明: +* +* 版本:V1.0.0 +*--------------------------------------------------------------------*/ + +#endregion << 版 本 注 释 >> + +namespace Sln.Wcs.HoistSdk.Dto.SetHoistAlarm; + +public class SetHoistAlarmResultDto +{ + /// + /// 返回码 + /// + public string code { get; set; } + + /// + /// 返回消息 + /// + public string message { get; set; } +} \ No newline at end of file diff --git a/Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskDto.cs similarity index 89% rename from Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeDto.cs rename to Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskDto.cs index 8e12def..56f12b0 100644 --- a/Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeDto.cs +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistSdk.Domain.HoistTaskExecutor +* 命名空间:Sln.Wcs.HoistSdk.Domain.SetHoistTask * 唯一标识:56358DE7-36A6-4906-926B-DFDF21A3EBE2 * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistSdk.Dto.HoistTaskExecutor; +namespace Sln.Wcs.HoistSdk.Dto.SetHoistTask; -public class HoistTaskExeDto +public class SetHoistTaskDto { /// /// 提升机编号 diff --git a/Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs b/Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskResultDto.cs similarity index 86% rename from Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs rename to Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskResultDto.cs index 0066f48..9d1a3c6 100644 --- a/Sln.Wcs.HoistSdk/Dto/HoistTaskExecutor/HoistTaskExeResultDto.cs +++ b/Sln.Wcs.HoistSdk/Dto/SetHoistTask/SetHoistTaskResultDto.cs @@ -4,7 +4,7 @@ * 版权所有 (c) 2026 WenJY 保留所有权利。 * CLR版本:4.0.30319.42000 * 机器名称:Mr.Wen's MacBook Pro -* 命名空间:Sln.Wcs.HoistSdk.Domain.HoistTaskExecutor +* 命名空间:Sln.Wcs.HoistSdk.Domain.SetHoistTask * 唯一标识:5C951BAC-FDE6-4458-A559-BF31508EEE64 * * 创建者:WenJY @@ -23,9 +23,9 @@ #endregion << 版 本 注 释 >> -namespace Sln.Wcs.HoistSdk.Dto.HoistTaskExecutor; +namespace Sln.Wcs.HoistSdk.Dto.SetHoistTask; -public class HoistTaskExeResultDto +public class SetHoistTaskResultDto { /// /// 返回码 diff --git a/Sln.Wcs.HoistSdk/HoistSdk.cs b/Sln.Wcs.HoistSdk/HoistSdk.cs index ec3b48a..8f3fb65 100644 --- a/Sln.Wcs.HoistSdk/HoistSdk.cs +++ b/Sln.Wcs.HoistSdk/HoistSdk.cs @@ -28,7 +28,9 @@ using Newtonsoft.Json.Linq; using Sln.Wcs.HoistSdk.Config; using Sln.Wcs.HoistSdk.Dto.GetHoistStatus; using Sln.Wcs.HoistSdk.Dto.HoistControl; -using Sln.Wcs.HoistSdk.Dto.HoistTaskExecutor; +using Sln.Wcs.HoistSdk.Dto.SetHoistAction; +using Sln.Wcs.HoistSdk.Dto.SetHoistAlarm; +using Sln.Wcs.HoistSdk.Dto.SetHoistTask; using Sln.Wcs.Model.Configs; using Sln.Wcs.Plc.Service; @@ -46,14 +48,19 @@ public class HoistSdk:IHoistSdk _plcs = plcs; } - public HoistControlResultDto HoistControl(HoistControlDto hoistControlDto) + /// + /// 设置提升机动作 + /// + /// + /// + public SetHoistActionResultDto SetHoistAction(SetHoistActionDto setHoistActionDto) { - HoistControlResultDto result = new HoistControlResultDto(); + SetHoistActionResultDto result = new SetHoistActionResultDto(); try { - string paramAddress = GetPlcParam(hoistControlDto.hoistCode,hoistControlDto.deviceSerialNo,"放置完成"); - var plc = _plcs.Where(x => x.ConfigKey.Equals(hoistControlDto.hoistCode)).ToList().First(); - var res = plc.writeInt16ByAddress(paramAddress, (int)hoistControlDto.action); + string paramAddress = GetPlcParam(setHoistActionDto.hoistCode,setHoistActionDto.deviceSerialNo,"放置完成"); + var plc = _plcs.Where(x => x.ConfigKey.Equals(setHoistActionDto.hoistCode)).ToList().First(); + var res = plc.writeInt16ByAddress(paramAddress, (int)setHoistActionDto.action); if (res) { result.code = "0"; @@ -73,14 +80,19 @@ public class HoistSdk:IHoistSdk return result; } - public HoistTaskExeResultDto HoistTaskExecutor(HoistTaskExeDto hoistTaskExeDto) + /// + /// 设置提升机任务 + /// + /// + /// + public SetHoistTaskResultDto SetHoistTask(SetHoistTaskDto setHoistTaskDto) { - HoistTaskExeResultDto result = new HoistTaskExeResultDto(); + SetHoistTaskResultDto result = new SetHoistTaskResultDto(); try { - string paramAddress = GetPlcParam(hoistTaskExeDto.hoistCode,hoistTaskExeDto.deviceSerialNo,"任务执行指令"); - var plc = _plcs.Where(x => x.ConfigKey.Equals(hoistTaskExeDto.hoistCode)).ToList().First(); - var res = plc.writeInt16ByAddress(paramAddress, hoistTaskExeDto.endPoint); + string paramAddress = GetPlcParam(setHoistTaskDto.hoistCode,setHoistTaskDto.deviceSerialNo,"任务执行指令"); + var plc = _plcs.Where(x => x.ConfigKey.Equals(setHoistTaskDto.hoistCode)).ToList().First(); + var res = plc.writeInt16ByAddress(paramAddress, setHoistTaskDto.endPoint); if (res) { result.code = "0"; @@ -100,6 +112,11 @@ public class HoistSdk:IHoistSdk return result; } + /// + /// 获取提升机状态 + /// + /// + /// public GetHoistStatusResultDto GetHoistStatus(GetHoistStatusDto hoistStatusDto) { GetHoistStatusResultDto result = new GetHoistStatusResultDto(); @@ -163,6 +180,45 @@ public class HoistSdk:IHoistSdk return result; } + /// + /// 设置提升机报警 + /// + /// + /// + public SetHoistAlarmResultDto SetHoistAlarm(SetHoistAlarmDto hoistAlarmDto) + { + SetHoistAlarmResultDto result = new SetHoistAlarmResultDto(); + try + { + string paramAddress = GetPlcParam(hoistAlarmDto.hoistCode,hoistAlarmDto.deviceSerialNo,hoistAlarmDto.key); + var plc = _plcs.Where(x => x.ConfigKey.Equals(hoistAlarmDto.hoistCode)).ToList().First(); + var res = plc.writeInt16ByAddress(paramAddress, hoistAlarmDto.value); + if (res) + { + result.code = "0"; + result.message = "设置成功"; + } + else + { + result.code = "99"; + result.message = "设置失败"; + } + } + catch (Exception e) + { + result.code = "99"; + result.message = e.Message; + } + return result; + } + + /// + /// 获取参数地址 + /// + /// + /// + /// + /// private string GetPlcParam(string hostCode,int deviceSerialNo,string paramName) { List paramStr = JsonConvert.DeserializeObject>(_hoistConfig.hoist_plc_param); diff --git a/Sln.Wcs.HoistSdk/IHoistSdk.cs b/Sln.Wcs.HoistSdk/IHoistSdk.cs index 2a3301b..c5804a4 100644 --- a/Sln.Wcs.HoistSdk/IHoistSdk.cs +++ b/Sln.Wcs.HoistSdk/IHoistSdk.cs @@ -25,7 +25,9 @@ using Sln.Wcs.HoistSdk.Dto.GetHoistStatus; using Sln.Wcs.HoistSdk.Dto.HoistControl; -using Sln.Wcs.HoistSdk.Dto.HoistTaskExecutor; +using Sln.Wcs.HoistSdk.Dto.SetHoistAction; +using Sln.Wcs.HoistSdk.Dto.SetHoistAlarm; +using Sln.Wcs.HoistSdk.Dto.SetHoistTask; namespace Sln.Wcs.HoistSdk; @@ -38,16 +40,16 @@ public interface IHoistSdk /// 提升机控制 /// MOVE_TO, STOP, EMERGENCY_STOP, RESET, CALIBRATE /// - /// + /// /// - HoistControlResultDto HoistControl(HoistControlDto hoistControlDto); + SetHoistActionResultDto SetHoistAction(SetHoistActionDto setHoistActionDto); /// /// 提升机任务执行 /// - /// + /// /// - HoistTaskExeResultDto HoistTaskExecutor(HoistTaskExeDto hoistTaskExeDto); + SetHoistTaskResultDto SetHoistTask(SetHoistTaskDto setHoistTaskDto); /// /// 获取提升机状态 @@ -56,4 +58,10 @@ public interface IHoistSdk /// GetHoistStatusResultDto GetHoistStatus(GetHoistStatusDto hoistStatusDto); + /// + /// 设置提升机报警 + /// + /// + /// + SetHoistAlarmResultDto SetHoistAlarm(SetHoistAlarmDto hoistAlarmDto); } \ No newline at end of file