qiuyao
2025-03-31 e789e002de5174c0fa51f78a05bf11f9b4c63345
ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/PutakeServer.cs
@@ -55,7 +55,8 @@
        {
            try
            {
                var putake = BaseDal.QueryData(i => i.Njtakeid == id&&i.Grouptype==gruops).FirstOrDefault();
                var putakeList = BaseDal.QueryData(i => i.Grouptype == gruops && i.Pustatus != (int)cond.已完成).ToList();
                var putake = putakeList.Where(i => i.Njtakeid == id).FirstOrDefault();
                var nj = _iNjTaskRepository.QueryData(i => i.NJtaskID == id).FirstOrDefault();
                if (putake == null)
                {
@@ -74,6 +75,10 @@
                {
                    
                    case cond.待领筒: //
                        if(putakeList.Where(a=>a.Pustatus== (int)cond.待作业).Count() > 0)
                        {
                            return new WebResponseContent { Status = false, Message = "当前有作业未完成,请先完成正在执行的作业" };
                        }
                        putake.Pustatus = (int)cond.待作业; // æžšä¸¾è½¬ int
                        if (gruops=="机械")
                        {
@@ -216,8 +221,24 @@
            }
        }
        public WebResponseContent PerformTasks(string group)
        {
            try
            {
                var putake=BaseDal.QueryData(x=>x.Grouptype==group&&x.Pustatus==1)
                    .OrderBy(x=>x.Dispatchtime)
                    .FirstOrDefault();
                if (putake == null)
                {
                    return new WebResponseContent { Status = false, Message = "没找到该任务" };
                }
                return new WebResponseContent { Status = true,Data=putake};
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status=false, Message="错误信息:"+ex.Message};
            }
        }
    }
}