huanghongfeng
20 小时以前 78d5eca8ea11c60ac88ebf133329fddad7c2aad2
´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -60,6 +60,7 @@
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
using static Microsoft.IO.RecyclableMemoryStreamManager;
using static System.Net.Mime.MediaTypeNames;
namespace WIDESEAWCS_TaskInfoService
{
@@ -149,11 +150,14 @@
                        dt_Task.SourceAddress = item.startAddress;
                        dt_Task.TargetAddress = item.endAddress;
                        dt_Task.CurrentAddress = item.startAddress;
                        dt_Task.NextAddress = "0";   //目前暂无
                        dt_Task.NextAddress = "1021";   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;
                        int taskidt= BaseDal.QueryFirst(x=>x.TaskNum== dt_Task.TaskNum).TaskId;
                        _taskExecuteDetailService.AddTaskExecuteDetail(taskidt, $"系统自动流程,创建任务");
                    }
                    else if (item.type == 2)    //出库
                    {
@@ -195,6 +199,8 @@
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
                        content.code = 0;
                        _taskExecuteDetailService.AddTaskExecuteDetail(dt_Task.TaskId,$"系统自动流程,创建任务");
                    }
                    else
                    {
@@ -614,20 +620,42 @@
        private void HandleInboundZichemove(Dt_Task task)
        {
            var route = _routerRepository.QueryFirst(x =>
                x.IsEnd == true &&
                x.ChildPosi == task.NextAddress &&
                x.InOutType == 1
            );
            try
            {
                Dt_Router dt_Router = null;
                task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
                if (task.TargetAddress == "4" || task.TargetAddress == "3")
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.StartPosi == task.NextAddress &&
                    x.InOutType == 1);
                    if (task.CurrentAddress != "1061") task.TaskState = (int)TaskInStatusEnum.RGV_InReleaseFinish;
            if (route == null)
                throw new InvalidOperationException("未找到对应的结束路由");
                }
                else
                {
                    dt_Router = _routerRepository.QueryFirst(x =>
                    x.IsEnd == true &&
                    x.ChildPosi == task.NextAddress &&
                    x.InOutType == 1);
                }
            task.TaskState = (int)TaskInStatusEnum.RGV_InZichemoveFinish;
            task.RGVTaskType = (int)RGVTaskTypeEnum.TravelingOnly;
            task.CurrentAddress = route.StartPosi;
            task.NextAddress = route.NextPosi;
            task.Roadway = route.ChildPosiDeviceCode;
                if (dt_Router == null)
                    throw new InvalidOperationException("未找到对应的结束路由");
                task.RGVTaskType = (int)RGVTaskTypeEnum.PickingUp;
                task.CurrentAddress = dt_Router.StartPosi;
                task.NextAddress = dt_Router.NextPosi;
                task.Roadway = dt_Router.ChildPosiDeviceCode;
            }
            catch (Exception ex)
            {
                throw;
            }
        }
        #endregion
@@ -1124,7 +1152,7 @@
                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                //if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew || dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                /*if (dt_task.TaskType >= 200 && dt_task.TaskType <= 203)
                {
                    if (dt_task.TaskState > (int)TaskInStatusEnum.RGV_InNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
@@ -1132,7 +1160,7 @@
                {
                    if (dt_task.TaskState > (int)TaskOutStatusEnum.OutNew) return WebResponseContent.Instance.Error($"任务状态不允许取消");
                }
                }*/
                Dt_Task_hty dt_Task_Hty = new Dt_Task_hty
                {
@@ -1164,8 +1192,8 @@
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);
                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) {
                bool deletetask = BaseDal.DeleteData(dt_task);
                if (!deletetask) {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚!");
                }
@@ -1178,5 +1206,65 @@
                return WebResponseContent.Instance.Error("取消任务失败!");
            }
        }
        /// <summary>
        /// ä»»åŠ¡ä¸‹ä¸€æ­¥æ‰§è¡Œ
        /// </summary>
        /// <param name="sCErrorStatus"></param>
        /// <returns></returns>
        public WebResponseContent NextStepeXecuted(int taskid)
        {
            WebResponseContent responseContent = new WebResponseContent();
            Dt_Task task = BaseDal.QueryData().Where(x => x.TaskNum == taskid).FirstOrDefault();
            if (task == null) return WebResponseContent.Instance.Error($"未查询到任务");
            switch (task.TaskState)
            {
                //入库状态
                case (int)TaskInStatusEnum.RGV_InNew:
                case (int)TaskInStatusEnum.RGV_InPickupFinish:
                case (int)TaskInStatusEnum.RGV_InReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZicheFinish:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseFinish:
                case (int)TaskInStatusEnum.RGV_InZichemoveFinish:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.OutNew:
                case (int)TaskOutStatusEnum.RGV_OutMothercarFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheFinish:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish:
                case (int)TaskOutStatusEnum.RGV_OutPickupFinish:
                    //出库状态
                    //调取下发的接口
                    responseContent = UpdateTaskStatusToNext(task);
                    break;
                //入库状态
                case (int)TaskInStatusEnum.RGV_InPickupExecuting:
                case (int)TaskInStatusEnum.RGV_InReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheExecuting:
                case (int)TaskInStatusEnum.RGV_InZicheReleaseExecuting:
                case (int)TaskInStatusEnum.RGV_InZichemoveExecuting:
                case (int)TaskInStatusEnum.RGV_InMothercarExecuting:
                //入库状态
                //出库状态
                case (int)TaskOutStatusEnum.RGV_OutMothercarExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheExecuting:
                case (int)TaskOutStatusEnum.RGV_OutZicheReleaseExecuting:
                case (int)TaskOutStatusEnum.RGV_OutPickupExecuting:
                case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
                    //出库状态
                    //调取完成接口
                    responseContent = UpdateTaskStatus(task.TaskNum);
                    break;
                default:
                    return WebResponseContent.Instance.Error("任务状态错误,执行下一步失败");
            }
            // åˆ›å»ºå¹¶èµ‹å€¼
            return responseContent;
        }
    }
}