出入库

huanghongfeng

2025-09-26 83f3c63f1cae6224320a8d19251e3bc0404da096

 ´úÂë¹ÜÀí/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -17,6 +17,7 @@

using Autofac.Core;
using AutoMapper;
using HslCommunication;
using Magicodes.ExporterAndImporter.Core;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.RazorPages;
@@ -73,6 +74,7 @@
        private readonly ITask_HtyService _task_HtyService;
        private readonly IMapper _mapper;
        private readonly IEquipmentStatusService _equipmentStatus;
        private readonly IAgvStationService _gvStationService;


        private Dictionary<string, OrderByType> _taskOrderBy = new()
@@ -87,7 +89,7 @@

        public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ITask_HtyService task_HtyService, IRouterRepository routerRepository, IEquipmentStatusService equipmentStatus, IAgvStationService agvStationService) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -96,6 +98,7 @@
            _mapper = mapper;
            _routerRepository = routerRepository;
            _equipmentStatus = equipmentStatus;
            _gvStationService = agvStationService;
        }

        /// <summary>
@@ -162,26 +165,23 @@
                    else if (item.type == 2)    //出库
                    {
                        string roadway = "";
                        string CurrentAddress = "";
                        switch (item.startAddress)
                        {
                            case "1":
                                roadway = "RGV110";
                                CurrentAddress = "1101";
                                break;
                            case "2":
                                roadway = "RGV112";
                                CurrentAddress = "1121";
                                break;
                            case "3":
                                roadway = "RGV114";
                                CurrentAddress = "1141";
                                break;
                            case "4":
                                roadway = "RGV115";
                                CurrentAddress = "1151";
                                break;
                        }

                        AGVStation gVStation = _gvStationService.Corridorequipment(roadway);

                        Dt_Task dt_Task = new Dt_Task();
                        dt_Task.TaskNum = item.taskNo;
@@ -192,9 +192,9 @@
                        dt_Task.RGVCurrentexecution = "0";      //目前暂无
                        dt_Task.TaskState = (int)TaskOutStatusEnum.OutNew;      //目前暂无
                        dt_Task.SourceAddress = item.startAddress;
                        dt_Task.TargetAddress = "";
                        dt_Task.CurrentAddress = CurrentAddress;
                        dt_Task.NextAddress = "0";   //目前暂无
                        dt_Task.TargetAddress ="0";
                        dt_Task.CurrentAddress = gVStation.Motherinlaw.ToString();
                        dt_Task.NextAddress = gVStation.ZicheMotherinlaw.ToString();   //目前暂无
                        dt_Task.Grade = item.priority;
                        dt_Task.WMSId = 0;   //目前暂无
                        BaseDal.AddData(dt_Task);
@@ -230,6 +230,68 @@
            return BaseDal.QueryFirst(x => x.Roadway == DeviceCode, TaskOrderBy);
        }

        public Dt_Task ChildVehicleMission(AGVStation aGVStation)
        {
            Dt_Task dt_Tasks =BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress== aGVStation.MotherCarDeviceCode.ToString() && x.RGVTaskType== (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
            if(dt_Tasks !=null) return dt_Tasks;
            Dt_Task dt_Tasks2 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.MotherCardeputy.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
            if (dt_Tasks2 != null) return dt_Tasks2;
            Dt_Task dt_Tasks3 = BaseDal.QueryFirst(x => x.Roadway == aGVStation.ChildPosiDeviceCode && x.CurrentAddress == aGVStation.HCJStorageaddress.ToString() && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
            if (dt_Tasks3 != null) return dt_Tasks3;
            return null;
        }
        public Dt_Task GetFinhuoTask(string DeviceCode)
        {
            return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
        }

        public Dt_Task GetOutkouFinhuoTask(string DeviceCode,string curraderr,int type)
        {
            if (type == 1)
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp && x.CurrentAddress == curraderr, TaskOrderBy);
            }
            else
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskOutStatusEnum.RGV_OutPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing && x.NextAddress !="", TaskOrderBy);
            }
        }

        public Dt_Task GetInkouFinhuoTask(string DeviceCode,int type)
        {
            if (type == 1)
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InNew && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
            }
            else
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InPickupFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
            }
        }

        public Dt_Task GetInzicheTask(string DeviceCode, int type)
        {
            if (type == 1)
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.PickingUp, TaskOrderBy);
            }
            else
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.Placing, TaskOrderBy);
            }
        }
        public Dt_Task GetInzicheTaskMobile(string DeviceCode, int type)
        {
            if (type == 1)  //1为子车移动任务    2为母车移动任务
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZicheReleaseFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
            }
            else
            {
                return BaseDal.QueryFirst(x => x.Roadway == DeviceCode && x.TaskState == (int)TaskInStatusEnum.RGV_InZichemoveFinish && x.RGVTaskType == (int)RGVTaskTypeEnum.TravelingOnly, TaskOrderBy);
            }
        }

        public WebResponseContent UpdateRGVTasktype(int taskNum, int RGVTasktype)
        {
            WebResponseContent content = new WebResponseContent();
@@ -256,8 +318,6 @@
                }
                task.RGVTaskType = RGvtype;
                bool updatesta = BaseDal.UpdateData(task);
                string Meesgt = $"目标地址：{task.CurrentAddress},任务类型：{rwlx}，修改状态：{updatesta}";
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, Meesgt);

                content = WebResponseContent.Instance.OK();
            }
@@ -294,7 +354,7 @@
                task.ExceptionMessage = message;
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, task.ExceptionMessage);
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, "更新任务异常："+task.ExceptionMessage);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
@@ -352,7 +412,14 @@
                task.Modifier = "System";
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? $"人工手动将任务状态从【{oldState}】跳转到【{task.TaskState}】" : $"系统自动流程，任务状态从【{oldState}】转到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ? 
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】" 
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -402,7 +469,9 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{task.TaskState}】");
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工恢复挂起任务,恢复挂起时任务状态【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -427,7 +496,20 @@
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                int oldState = task.TaskState;
                Dt_TaskExecuteDetail taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                Dt_TaskExecuteDetail taskExecuteDetail = null;
                
                if (task.CurrentAddress == "1061")
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState > task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });
                }
                else
                {
                    taskExecuteDetail = _taskExecuteDetailRepository.QueryFirst(x => x.TaskId == task.TaskId && x.TaskState < task.TaskState && x.TaskState > 0, new Dictionary<string, OrderByType> { { nameof(Dt_TaskExecuteDetail.TaskDetailId), OrderByType.Desc } });

                }
                
                

                if (taskExecuteDetail != null)
                {
                    task.TaskState = taskExecuteDetail.TaskState;
@@ -443,7 +525,13 @@

                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"人工将任务状态从【{oldState}】回滚到【{task.TaskState}】");
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态

                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId,
                    $"人工手动将任务状态从【{oldstaterem}】回归到【{afterstaterem}】");

                content = WebResponseContent.Instance.OK();
            }
@@ -515,7 +603,7 @@
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent UpdateTaskStatus(int taskNum)
        public WebResponseContent UpdateTaskStatus(int taskNum, int Completetype)
        {
            WebResponseContent content = new WebResponseContent();

@@ -543,10 +631,19 @@
                task.ExceptionMessage = string.Empty;
                BaseDal.UpdateData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(
                    task.TaskId,
                    $"自动任务状态从【{oldState}】进入到【{task.TaskState}】"
                );
                string oldstaterem = _taskExecuteDetailService.GetEnumDescription(oldState); //前一个状态
                string afterstaterem = _taskExecuteDetailService.GetEnumDescription(task.TaskState); //后一个状态

                string rgvtyperem = _taskExecuteDetailService.GetEnumDescription2(task.RGVTaskType); //后一个状态
                _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, App.User.UserId > 0 ?
                    $"人工手动将任务状态从【{oldstaterem}】跳转到【{afterstaterem}】"
                    : $"系统自动流程，任务状态从【{oldstaterem}】转到【{afterstaterem}】");


                if (task.TaskState == (int)TaskInStatusEnum.RGV_InMothercarFinish && Completetype==2)   //入库任务完成
                {
                    CompletedManually(task.TaskId, Completetype);
                }

                return WebResponseContent.Instance.OK();
            }
@@ -1075,7 +1172,13 @@
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id)
        /// <summary>
        /// äººå·¥æ‰‹åŠ¨å®Œæˆ
        /// </summary>
        /// <param name="ids"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent CompletedManually(int id, int CompletionType)
        {

            var db = BaseDal.Db as SqlSugarClient;
@@ -1087,6 +1190,8 @@

                Dt_Task dt_task = BaseDal.QueryData().Where(x => x.TaskId == id).FirstOrDefault();
                if (dt_task == null) return WebResponseContent.Instance.Error($"未查询到任务");
                string Remark = CompletionType == 1 ? "人工手动完成" : "自动完成";


                var res = _task_HtyService.AddData(new Dt_Task_hty
                {
@@ -1101,38 +1206,33 @@
                    NextAddress = dt_task.NextAddress,
                    WMSId = dt_task.WMSId,
                    Dispatchertime = dt_task.Dispatchertime,
                    Remark = "人工手动完成",
                    Remark = Remark,
                    Creater = App.User.UserName,
                    CreateDate = DateTime.Now,
                    RGVTaskType = dt_task.RGVTaskType,
                    RGVCurrentexecution = dt_task.RGVCurrentexecution
                });

                int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_task.TaskState}】"
);

                if (res.Status == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("手动完成失败！");
                    return WebResponseContent.Instance.Error($"{Remark}失败！");
                }

                var deletetask = BaseDal.DeleteData(dt_task);
                if (deletetask == false) { 
                if (deletetask == false)
                {
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！"); 
                    return WebResponseContent.Instance.Error("删除任务失败所有操作回滚！");
                }
                db.Ado.CommitTran();
                return WebResponseContent.Instance.OK("手动完成成功！");
                return WebResponseContent.Instance.OK($"{Remark}成功！");

            }
            catch (Exception ex)
            {
                db.Ado.RollbackTran();
                return WebResponseContent.Instance.Error("手动完成失败！");
                return WebResponseContent.Instance.Error("任务完成失败！");
            }
        }

@@ -1186,11 +1286,11 @@
                    db.Ado.RollbackTran();
                    return WebResponseContent.Instance.Error("取消任务失败！");
                }
                int oldState = dt_task.TaskState;
                /*int oldState = dt_task.TaskState;
                _taskExecuteDetailService.AddTaskExecuteDetail(
    dt_task.TaskId,
    $"自动任务状态从【{oldState}】进入到【{dt_Task_Hty.TaskState}】"
);
);*/

                bool deletetask = BaseDal.DeleteData(dt_task);
                if (!deletetask) {
@@ -1258,8 +1358,10 @@
                case (int)TaskOutStatusEnum.RGV_OutReleaseExecuting:
                    //出库状态
                    //调取完成接口
                    responseContent = UpdateTaskStatus(task.TaskNum);
                    responseContent = UpdateTaskStatus(task.TaskNum, 1);
                    break;
                case (int)TaskInStatusEnum.RGV_InMothercarFinish:
                    return WebResponseContent.Instance.Error("任务已");
                default:
                    return WebResponseContent.Instance.Error("任务状态错误，执行下一步失败");
            }