From 05d580b4357829263c9c44449621ca6017576dcb Mon Sep 17 00:00:00 2001 From: duyongjia <adu_555@163.com> Date: 星期二, 19 十一月 2024 16:26:46 +0800 Subject: [PATCH] 现场修改提交 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs | 53 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 49 insertions(+), 4 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" index aad8fe0..132957d 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs" @@ -55,6 +55,14 @@ /// <returns>杩斿洖澶勭悊缁撴灉</returns> WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs); + + /// <summary> + /// 鎺ユ敹MES浠诲姟淇℃伅 + /// </summary> + /// <param name="taskDTO">MES浠诲姟瀵硅薄闆嗗悎</param> + /// <returns>杩斿洖澶勭悊缁撴灉</returns> + WebResponseContent ReceiveMESTask([NotNull] MESTaskDTO taskDTO); + /// <summary> /// 鏍规嵁鎵樼洏鍙枫�佽捣濮嬪湴鍧�鍚慦MS璇锋眰浠诲姟 /// </summary> @@ -96,12 +104,40 @@ Dt_Task? QuertStackerCraneTask(string deviceNo, TaskTypeGroup? taskTypeGroup = null); /// <summary> - /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� + /// 鏍规嵁璁惧缂栧彿鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鏂板鐨勪换鍔� /// </summary> /// <param name="deviceNo">璁惧缂栧彿</param> /// <param name="currentAddress">褰撳墠鍦板潃</param> /// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns> - Dt_Task QueryStackerCraneTask(string deviceNo, string currentAddress = ""); + Dt_Task QueryStackerCraneTask(string deviceNo); + + /// <summary> + /// 鏌ヨ灏忓爢鍨涙満浠诲姟 + /// </summary> + /// <returns></returns> + Dt_Task QueryStackerCraneTask(); + + + /// <summary> + /// 鏌ヨ灏忓爢鍨涙満鍑哄簱瀹屾垚浠诲姟 + /// </summary> + /// <returns></returns> + Dt_Task QueryStackerCraneFinishTask(); + + /// <summary> + /// 鏌ヨ鍏ュ簱浠诲姟 瀵瑰簲WMS璇锋眰 1001-AGV璇锋眰鏄惁鍏佽杩涘叆 + /// </summary> + /// <param name="deviceNo"></param> + /// <returns></returns> + Dt_Task QueryStackerCraneTaskByAGVRequest(string deviceNo); + + + /// <summary> + /// 瀵瑰簲WMS璇锋眰 3001-AGV鏀捐揣瀹屾垚 + /// </summary> + /// <param name="deviceNo"></param> + /// <returns></returns> + Dt_Task QueryStackerCraneTaskByAGVPutFinish(string deviceNo); /// <summary> /// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鎸夌収浼樺厛绾т互鍙婂垱寤烘椂闂存帓搴忔煡璇换鍔℃睜鍏ュ簱绫诲瀷鐨勬柊澧炵殑浠诲姟 @@ -137,9 +173,18 @@ /// <summary> /// 鏇存柊浠诲姟鐘舵�佷俊鎭紝骞跺悓姝ヨ嚦WMS /// </summary> - /// <param name="taskNum">浠诲姟鍙�</param> + /// <param name="taskId">浠诲姟鍙�</param> /// <param name="status">浠诲姟鐘舵��</param> - void UpdateTaskStatus(int taskNum, int status); + void UpdateTaskStatus(int taskId, int status); + + + /// <summary> + /// 鏇存柊浠诲姟鐘舵�佷俊鎭拰鏃х殑浠诲姟鍙凤紙1001锛�3001鏃朵竴鏍蜂换鍔″彿锛� + /// </summary> + /// <param name="taskId">浠诲姟ID</param> + /// <param name="taskId">WMS涓婁竴鐜妭(3001)鐨勪换鍔″彿</param> + /// <param name="status">浠诲姟鐘舵��</param> + void UpdateTaskStatus(int taskId, int oldtaskId, int status); /// <summary> /// 灏嗕换鍔$姸鎬佷慨鏀逛负涓嬩竴涓姸鎬� -- Gitblit v1.9.3