1

HuBingJie

2025-11-13 d58196721475e968769d708d9c14f60dd8d5671f

 ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -407,7 +407,9 @@

                    //int nextStatus = task.TaskState.GetNextNotCompletedStatus<TaskOutStatusEnum>();


                    task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;

                    task.Dispatchertime = DateTime.Now;
                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound)
@@ -497,7 +499,7 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent StackCraneTaskCompleted(int taskNum)
        /*public WebResponseContent StackCraneTaskCompleted(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
@@ -509,44 +511,31 @@
                {
                    task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
                    BaseDal.UpdateData(task);
                    content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
                    Console.WriteLine("任务完成，wms反馈信息："+content.Message);
                    //BaseDal.DeleteData(task);
                    // _task_HtyService.AddTaskHty(task); éœ€è¦æ·»åŠ ç§»å…¥åŽ†å²
                    //_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"出库完成");

                }
                else if (task.TaskType == (int)TaskInboundTypeEnum.Inbound && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                {
                    task.TaskState = (int)TaskInStatusEnum.InFinish;
                    BaseDal.UpdateData(task);

                    content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");

                    task.ModifyDate = DateTime.Now;
                    task.Modifier = "System";
                    BaseDal.DeleteData(task);
                    // _task_HtyService.AddTaskHty(task); éœ€è¦æ·»åŠ ç§»å…¥åŽ†å²
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库完成");

                }
                else if (task.TaskType == (int)TaskRelocationTypeEnum.Relocation)
                {
                    task.TaskState = (int)TaskRelocationStatusEnum.SC_RelocationFinish;
                    BaseDal.UpdateData(task);

                    content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");

                  
                    task.ModifyDate = DateTime.Now;
                    BaseDal.DeleteData(task);
                   // _task_HtyService.AddTaskHty(task); éœ€è¦æ·»åŠ ç§»å…¥åŽ†å²
                    BaseDal.UpdateData(task);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"移库完成");
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
                {

                    BaseDal.DeleteData(task);
                    content = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={task.TaskNum}");
                   // _task_HtyService.AddTaskHty(task); éœ€è¦æ·»åŠ ç§»å…¥åŽ†å²
                }
                else
                {
@@ -559,6 +548,145 @@
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】，原因：{ex.Message}");
            }
            return content;
        }*/


        public bool StackCraneTaskCompleted(int taskNum)
        {
            bool res;

            try
            {
                Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return false;

                // éªŒè¯ä»»åŠ¡çŠ¶æ€æ˜¯å¦å…è®¸å®Œæˆ
                if (!IsTaskStateValidForCompletion(task))return false;

                // æ ¹æ®ä»»åŠ¡ç±»åž‹å¤„理
                 res = ProcessTaskCompletion(task);
            }
            catch (Exception ex)
            {
                res = false;
            }

            return res;
        }

        /// <summary>
        /// éªŒè¯ä»»åŠ¡çŠ¶æ€æ˜¯å¦å…è®¸å®Œæˆ
        /// </summary>
        private bool IsTaskStateValidForCompletion(Dt_Task task)
        {
            return task.TaskType switch
            {
                (int)TaskOutboundTypeEnum.Outbound => task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting,
                (int)TaskInboundTypeEnum.Inbound => task.TaskState == (int)TaskInStatusEnum.SC_InExecuting,
                (int)TaskRelocationTypeEnum.Relocation => true, // ç§»åº“任务没有特定状态要求
                _ => false
            };
        }

        /// <summary>
        /// å¤„理任务完成逻辑
        /// </summary>
        private bool ProcessTaskCompletion(Dt_Task task)
        {
            // æ›´æ–°ä»»åŠ¡åŸºç¡€ä¿¡æ¯
            UpdateTaskBaseInfo(task);

            bool result = task.TaskType switch
            {
                (int)TaskOutboundTypeEnum.Outbound => ProcessOutboundTask(task),
                (int)TaskInboundTypeEnum.Inbound => ProcessInboundTask(task),
                (int)TaskRelocationTypeEnum.Relocation => ProcessRelocationTask(task),
                _ => throw new Exception($"未知的任务类型:【{task.TaskType}】")
            };

            // é€šçŸ¥ä»»åŠ¡å®Œæˆ
            if (result == true)
            {
                NotifyTaskCompleted(task.TaskNum);
            }

            return result;
        }

        /// <summary>
        /// æ›´æ–°ä»»åŠ¡åŸºç¡€ä¿¡æ¯
        /// </summary>
        private void UpdateTaskBaseInfo(Dt_Task task)
        {
            task.ModifyDate = DateTime.Now;
            task.Modifier = "System";
        }

        /// <summary>
        /// å¤„理出库任务
        /// </summary>
        private bool ProcessOutboundTask(Dt_Task task)
        {
            task.TaskState = (int)TaskOutStatusEnum.SC_OutFinish;
            bool res = BaseDal.UpdateData(task);

            return res;
        }

        /// <summary>
        /// å¤„理入库任务
        /// </summary>
        private bool ProcessInboundTask(Dt_Task task)
        {
            task.TaskState = (int)TaskInStatusEnum.InFinish;
            BaseDal.UpdateData(task);

            // æ·»åŠ å…¥åº“历史记录
            // _task_HtyService.AddTaskHty(task);
            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "入库完成");

            // å…¥åº“完成后删除任务
            bool res = BaseDal.DeleteData(task);

            return res;
        }

        /// <summary>
        /// å¤„理移库任务
        /// </summary>
        private bool ProcessRelocationTask(Dt_Task task)
        {
            task.TaskState = (int)TaskRelocationStatusEnum.SC_RelocationFinish;
            BaseDal.UpdateData(task);

            _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "移库完成");

            // ç§»åº“完成后删除任务
            bool res = BaseDal.DeleteData(task);
            // _task_HtyService.AddTaskHty(task);

            return res;
        }

        /// <summary>
        /// é€šçŸ¥ä»»åŠ¡å®Œæˆ
        /// </summary>
        private void NotifyTaskCompleted(int taskNum)
        {
            try
            {
                var response = HttpHelperh.Get<WebResponseContent>($"{urlTaskCompleted}?TaskNum={taskNum}");
                if (!response.Status)
                {
                    // è®°å½•é€šçŸ¥å¤±è´¥æ—¥å¿—，但不影响主流程
                     //_logger.Warn($"任务完成通知失败,任务号:【{taskNum}】,响应:【{response.Message}】");
                }
            }
            catch (Exception ex)
            {
                // è®°å½•å¼‚常日志，但不影响主流程
                // _logger.Error($"任务完成通知异常,任务号:【{taskNum}】", ex);
            }
        }

        /// <summary>
@@ -721,7 +849,13 @@

        public Dt_Task GetOutTaskInfo2(string PalletCode)
        {
            return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting, TaskOrderBy);
            return BaseDal.QueryFirst(x => x.PalletCode == PalletCode && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish, TaskOrderBy);
        }

        public List<Dt_Task> QueryStackerCraneYKTasks(string deviceNo)
        {
            return BaseDal.QueryData(x => x.Roadway == deviceNo && x.TaskType == (int)TaskRelocationTypeEnum.Relocation && x.TaskState == (int)TaskRelocationStatusEnum.RelocationNew, TaskOrderBy);

        }
    }
}