From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 02 七月 2025 13:55:55 +0800 Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法,支持根据托盘号和下一地址查询任务,同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法,允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法,简化了任务查询逻辑并删除了多余的注释代码。同时,增加了对 `taskNext` 的处理逻辑,确保在任务未找到时的相应处理,并更新在途数据的逻辑,提升数据一致性和准确性。 --- Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs | 62 +++++++++++++++++++++++++++--- 1 files changed, 55 insertions(+), 7 deletions(-) diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs index 9ab2c8e..97fa599 100644 --- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs +++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs @@ -1,4 +1,5 @@ 锘�#region << 鐗� 鏈� 娉� 閲� >> + /*---------------------------------------------------------------- * 鍛藉悕绌洪棿锛歐IDESEAWCS_Tasks.ConveyorLineJob * 鍒涘缓鑰咃細鑳$搴� @@ -11,8 +12,9 @@ * 淇敼鏃堕棿锛� * 鐗堟湰锛歏1.0.1 * 淇敼璇存槑锛� - * + * *----------------------------------------------------------------*/ + #endregion << 鐗� 鏈� 娉� 閲� >> using System; @@ -25,16 +27,62 @@ { public enum ConveyorLineDBName { - InteractiveSignal, - ConveyorLineBarcode, - ConveyorLineTargetAddress, - ConveyorLineTaskNum, - ConveyorLineTrayType, + #region ReadDevice + /// <summary> + /// 鏈夌洏 + /// </summary> + InteractiveSignal, + + /// <summary> + /// 鎵樼洏鍙� + /// </summary> + ConveyorLineBarcode, + + /// <summary> + /// 鐩殑鍦板潃 + /// </summary> + ConveyorLineTargetAddress, + + /// <summary> + /// 浠诲姟鍙� + /// </summary> + ConveyorLineTaskNum, + + /// <summary> + /// 鎶ヨ浠g爜 + /// </summary> + ConveyorLineAlarm, + + #endregion + + #region WriteDevice + + /// <summary> + /// 浜や簰 + /// </summary> WriteInteractiveSignal, + + /// <summary> + /// 鎵樼洏鍙� + /// </summary> WriteConveyorLineBarcode, + + /// <summary> + /// 鐩爣鍦板潃 + /// </summary> WriteConveyorLineTargetAddress, + + /// <summary> + /// 浠诲姟鍙� + /// </summary> WriteConveyorLineTaskNum, + + /// <summary> + /// 鎵樼洏绫诲瀷 + /// </summary> WriteConveyorLineTrayType + + #endregion } -} +} \ No newline at end of file -- Gitblit v1.9.3