1

dengjunjie

2025-02-20 37ea017aad42d0682d068b65e82aa62ea9e2c1ea

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

@@ -135,6 +135,16 @@
        {
            return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.NextAddress == currentAddress && x.PalletCode == Barcode && x.TaskState == (int)TaskInStatusEnum.AGV_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish && x.CurrentAddress == currentAddress), TaskOrderBy);
        }
        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、当前地址查询输送线未执行的任务
        /// </summary>
        /// <param name="deviceNo">设备编号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns></returns>
        public Dt_Task QueryConveyorLineTaskNum(string deviceNo, string currentAddress, int TaskNum)
        {
            return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.NextAddress == currentAddress && x.TaskNum == TaskNum && x.TaskState == (int)TaskInStatusEnum.AGV_InFinish || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish && x.CurrentAddress == currentAddress), TaskOrderBy);
        }

        /// <summary>
        /// æ ¹æ®ä»»åŠ¡å·ã€ä¸‹ä¸€åœ°å€æŸ¥è¯¢è¾“送线执行中的任务
@@ -169,6 +179,13 @@
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
        }

        public Dt_Task QuertOutProductionLineTask(bool NextAddIsNull)
        {
            if (NextAddIsNull)
                return BaseDal.QueryFirst(x => x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish && string.IsNullOrEmpty(x.NextAddress), TaskOrderBy);
            else
                return BaseDal.QueryFirst(x => x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish, TaskOrderBy);
        }
        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、任务类型分组(可选)按照优先级以及创建时间排序查询任务池新增的任务
        /// </summary>
@@ -517,17 +534,20 @@
            }
            return content;
        }

        /// <summary>
        /// æ ¹æ®ä»»åŠ¡å·æŸ¥è¯¢ä»»åŠ¡
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public Dt_Task GetTaskInfo(int taskNum)
        {
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum);
        }
        /// <summary>
        /// æ ¹æ®ä»»åŠ¡å·å’Œä»»åŠ¡çŠ¶æ€æŸ¥è¯¢ä»»åŠ¡
        /// </summary>
        /// <param name="taskNum"></param>
        /// <returns></returns>
        public Dt_Task GetTaskInfo(int taskNum, int taskState)
        {
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.TaskState == taskState);
        }
        /// <summary>
        /// æ ¹æ®ä»»åŠ¡çŠ¶æ€ã€ç±»åž‹æŸ¥è¯¢ä»»åŠ¡
        /// </summary>
        /// <param name="TaskState"></param>