1

Zhang-Hong-Lin

2025-03-07 cf1d3c24ed1ca4596d950a4dace9550bdaf8252c

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

@@ -185,6 +185,17 @@
        }

        /// <summary>
        /// æ ¹æ®ä»»åŠ¡çŠ¶æ€æŸ¥è¯¢ä»»åŠ¡
        /// </summary>
        /// <param name="deviceNo">设备编号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns></returns>
        public Dt_Task QueryTaskState()
        {
            return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
        }

        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、当前地址查询输送线未执行的任务
        /// </summary>
        /// <param name="deviceNo">设备编号</param>
@@ -252,19 +263,30 @@
                    //优先返回执行到一半的任务继续执行
                    return task;
                }
                else {
                    //查询天车移动任务
                    task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
                    if (task!=null)
                    {
                        return task;
                    }
                }
                //查询当前任务池中是否存在状态为非新建的
                //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
                //if (task != null)
                //{
                //    throw new Exception($"当前任务池中存在执行中的任务,任务号:【{task.TaskNum}】");
                //}
                if (workTpe.Equals("In"))
                if (task.TaskState!= (int)TaskMoveStatusEnum.OutNewMove)
                {
                    task = BaseDal.QueryData(v=>v.TaskType==(int)TaskInboundTypeEnum.Inbound && v.TaskState==(int)TaskInStatusEnum.InNew).OrderByDescending(v=>v.Grade) .OrderBy(v=>v.CreateDate).First();
                }
                else if (workTpe.Equals("Out"))
                {
                    task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    if (workTpe.Equals("In"))
                    {
                        task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
                    }
                    else if (workTpe.Equals("Out"))
                    {
                        task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
                    }
                }
            }
            catch (Exception)
@@ -426,6 +448,10 @@
                else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                {
                    task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
                }
                else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
                {
                    task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
                }
                task.ModifyDate = DateTime.Now;
                BaseDal.UpdateData(task);
@@ -674,7 +700,7 @@
                    //提交事务
                    _unitOfWorkManage.CommitTran();
                }
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
                else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
                {
                    //处理任务信息
                    Dt_Task_hty taskhty = new Dt_Task_hty();
@@ -691,8 +717,12 @@
                    taskhty.PalletCode = nawtask.PalletCode;
                    taskhty.NextAddress = nawtask.NextAddress;
                    taskhty.CurrentAddress = nawtask.CurrentAddress;
                    //开始数据库事务
                    _unitOfWorkManage.BeginTran();
                    _taskhtyRepository.AddData(taskhty);
                    BaseDal.DeleteData(nawtask);
                    //提交事务
                    _unitOfWorkManage.CommitTran();
                }
                content = WebResponseContent.Instance.OK();
            }