代码提交

wankeda

2025-06-24 1caea0fdc7ed1788d854a2aba8853984b4494e01

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs

@@ -208,11 +208,11 @@
        /// æŸ¥è¯¢AGV新建任务
        /// </summary>
        /// <returns></returns>
        public Dt_Task GetTasks()
        public List<Dt_Task> GetTasks()
        {
            WebResponseContent content = new WebResponseContent();
            Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
            return BaseDal.QueryFirst(x => x.TaskStatus == AGVTaskStatusEnum.AGV_New.ObjToInt());
            //Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
            return BaseDal.QueryData(x => x.TaskStatus == AGVTaskStatusEnum.AGV_New.ObjToInt() || x.TaskStatus == AGVTaskStatusEnum.AGV_Wait.ObjToInt()).ToList();
        }
        /// <summary>
        /// æŸ¥è¯¢åŽŸææ–™å‡ºåº“任务
@@ -221,8 +221,8 @@
        public Dt_Task GetTasksout()
        {
            WebResponseContent content = new WebResponseContent();
            Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
            return BaseDal.QueryFirst(x => x.TaskType == TaskTypeEnum.Outbound.ObjToInt()&&x.SourceAddress.Contains("原材料")&&x.TaskStatus==AGVTaskStatusEnum.AGV_Query.ObjToInt());
            //Expression<Func<Dt_Task, bool>> expressionOrder = x => true;
            return BaseDal.QueryFirst(x => x.TaskType == TaskTypeEnum.Outbound.ObjToInt() && x.SourceAddress.Contains("原材料") && x.TaskStatus == AGVTaskStatusEnum.AGV_Query.ObjToInt());
        }
        /// <summary>
        /// æŸ¥è¯¢æˆå“æœ‰è´§è´§ä½
@@ -347,15 +347,26 @@
            {
                int TaskStatus = AGVTaskStatusEnum.AGV_Cancel.ObjToInt();
                _taskHtyService.AddTaskHty(task, TaskStatus);
                HCJFree(task, TaskStatus);
                BaseDal.DeleteData(task);
                WriteLog.GetLog("无人叉车任务取消").Write("任务号：" + task.TaskNum, "无人叉车任务取消");
            }
            //else if (taskState == 91)
            //{
            //    int TaskStatus = AGVTaskStatusEnum.AGV_Fail.ObjToInt();
            //    _taskHtyService.AddTaskHty(task, TaskStatus);
            //    BaseDal.DeleteData(task);
            //}
            else if (taskState == 91)
            {
                int TaskStatus = AGVTaskStatusEnum.AGV_Fail.ObjToInt();
                _taskHtyService.AddTaskHty(task, TaskStatus);
                HCJFree(task, TaskStatus);
                BaseDal.DeleteData(task);
            }
            else if (taskState == 93)
            {
                int TaskStatus = AGVTaskStatusEnum.AGV_Complete.ObjToInt();
                if (task.SourceAddress.Contains("原材料库"))
                {
                    HCJCope(task, TaskStatus);
                }
                BaseDal.UpdateData(task);
            }
            else if (taskState == 60)
            {
                task.TaskStatus = AGVTaskStatusEnum.AGV_Executing.ObjToInt();
@@ -523,7 +534,7 @@
                if (res.success)
                {
                    int TaskStatus = AGVTaskStatusEnum.AGV_Finish.ObjToInt();
                    _taskHtyService.AddTaskHty(task, TaskStatus);
                    //_taskHtyService.AddTaskHty(task, TaskStatus);
                    BaseDal.DeleteData(task);
                    return WebResponseContent.Instance.OK();
                }