扭矩控制系统
blame | 历史 | 补丁 | 提交 | 提交对比 | 显示空白
qiuyao
2025-03-25 b46664a981918f4704df1b7b2108c0548c9c8187 
 ÏîÄ¿´úÂë/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=="机械")


                        {