1

qinchulong

2025-02-28 6ff7cbed707a5bbc6a97f44257285bc8fdb2c9c9

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

@@ -170,7 +170,7 @@
        /// <returns></returns>
        public Dt_Task QueryExecutingConveyorLineTask(int taskNum, string nextAddress)
        {
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
            return null;// BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.NextAddress == nextAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InExecuting || x.TaskState == (int)TaskOutStatusEnum.Line_OutExecuting), TaskOrderBy);
        }

        /// <summary>
@@ -181,7 +181,7 @@
        /// <returns></returns>
        public Dt_Task QueryCompletedConveyorLineTask(int taskNum, string currentAddress)
        {
            return BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
            return null;// BaseDal.QueryFirst(x => x.TaskNum == taskNum && x.CurrentAddress == currentAddress && (x.TaskState == (int)TaskInStatusEnum.Line_InFinish || x.TaskState == (int)TaskOutStatusEnum.Line_OutFinish), TaskOrderBy);
        }

        /// <summary>
@@ -244,6 +244,56 @@
        }

        /// <summary>
        /// æ ¹æ®ä»»åŠ¡å·è¿”回当前任务
        /// </summary>
        /// <param name="deviceNo">设备编号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns>返回任务实体对象，可能为null</returns>
        public Dt_Task QueryTakNnmTask(int taskNum)
        {
            return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
        }
        /// <summary>
        /// ä¿®æ”¹å¤©è½¦ä»»åŠ¡çŠ¶æ€ï¼Œå°†å…¥åº“取货执行中修改为入库取货完成
        /// </summary>
        /// <returns></returns>
        public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task) 
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                task.TaskState = (int)TaskInStatusEnum.Line_Ingrab;
                BaseDal.UpdateData(task);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// ä¿®æ”¹å¤©è½¦ä»»åŠ¡çŠ¶æ€ï¼Œå°†å‡ºåº“取货执行中修改为出库取货完成
        /// </summary>
        /// <returns></returns>
        public WebResponseContent UpdateTaskStatusToLine_Outgrab(Dt_Task task)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                task.TaskState = (int)TaskOutStatusEnum.SC_OutExecuting;
                BaseDal.UpdateData(task);
                content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error(ex.Message);
            }
            return content;
        }

        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、当前地址按照优先级以及创建时间排序查询任务池出库类型的新增的任务
        /// </summary>
        /// <param name="deviceNo">设备编号</param>