美型

yanjinhui

2025-03-12 0a430c14f3e3ceb4ba63462c4f2c92768fc79e87

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/WIDESEAWCS_Tasks/SerialPort/SerialPortJob.cs

@@ -32,15 +32,15 @@
        public enum CommandType
        {
            None = 0,
            Get = 1,
            Set = 2,
            Get = 1,//发信号
            Set = 2,//设值
        }

        public enum CommandResult
        {
            SetOK = 0,
            GetOK = 1,
            GetError = 2,
            SetOK = 0,//parseok
            GetOK = 1,//03
            GetError = 2,//04
        }
        private readonly IPutakeRepository _putakeRepository;
        private readonly IProcessRepository _processRepository;
@@ -67,59 +67,107 @@
                            DeviceProtocolDetailDTO? deviceProtocolDetail = serialPortDevice.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(CommandType) && x.ProtocolDetailType == nameof(CommandType.Set));
                            if (deviceProtocolDetail != null)
                            {
                                //我要前端返回给我一个组别，和任务id

                                //先查状态和组，按时间降序
                                string group = "电气";
                                
                                
                                string group = item.DeviceProDataBlock;


                                //这里判断组别三个看是那个，就查那个工艺表的值
                                if (group=="电气")
                                if (group == "电气")
                                {
                                   
                                    //先看工艺表中步骤一中要扭的值有多少个 å†æŸ¥çœ‹Dt_TorqueOp表中是否有该任务号id和步骤总数是否满足工艺表
                                    // æŸ¥è¯¢æ‰€æœ‰å·¥è‰ºæ•°æ®ï¼ŒæŒ‰ç…§æ­¥éª¤å· SetpNum é€’增排序                                                                                                                                            
                                    var processList = _processRepository.QueryData(x => x.CraftType == group)
                                                                        .OrderBy(x => x.SetpNum)
                                                                        .ToList();

                                    foreach (var process in processList)
                                    
                                    //        å…ˆçœ‹Dt_TorqueOp表，查询到现在这条数据的任务号和步骤
                                    var take = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderBy(x => x.Dispatchtime).First();
                                    if (take==null)
                                    {
                                        float  torqueone = process.TorqueOne;//读到值了
                                        float torquetow = process.TorqueTwo;
                                        if (torqueone!=0)
                                        {
                                            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
                                        }
                                        if (torquetow != 0)
                                        {
                                            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
                                        }
                                      
                                        // è®¡ç®—当前步骤所需的 Torque æ€»æ•°
                                        int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

                                        // æŸ¥è¯¢å½“前步骤的 TorqueOp è®°å½•ï¼ŒåŒ¹é… ProcessSte和组，检查是否达到要求
                                        int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum&& x.GroupOp== group).Count();

                                        if (torqueCount < requiredTorqueCount)
                                        {
                                            // å¦‚果数量不满足，停止读取
                                           
                                            break;
                                        }
                                        //符合要求，继续读取下一步
                                       
                                        //等于空就停
                                    }

                                }
                                if (group == "机械")
                                {
                                    //查到有该条数据了
                                    var process = _processRepository.QueryData(x => x.CraftType == group).OrderBy(x => x.SetpNum).First();

                                }
                                if (group == "地沟")
                                {

                                }

                                    float torqueone = process.TorqueOne;//读到值了
                                    float torquetow = process.TorqueTwo;
                                    if (torqueone != 0)
                                    {
                                        serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
                                        //这里给它设完值就  æŸ¥å­˜å‚¨å€¼è¡¨ è¿™ä¸ªæ•°æ®æ˜¯å¦æ»¡è¶³äº†ï¼Œæ»¡è¶³äº†å°±è¿›è¡Œä¸‹ä¸€ä¸ªå€¼ï¼Œä¸æ»¡è¶³å°±ä¸å˜ä¸€ç›´ç»™å€¼
                                     var num=   _orqueOpRepository.QueryData(x => x.TakeId == take.Njtakeid && x.GroupOp == group && x.TorqueSize == torqueone).Count();
                                        if (num!= process.TorqueOneQuantity)
                                        {

                                        }

                                    }
                                    if (torquetow != 0)
                                    {
                                        serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
                                    }

                                    //        // è®¡ç®—当前步骤所需的 Torque æ€»æ•°
                                    int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

                                    // æŸ¥è¯¢å½“前步骤的 TorqueOp è®°å½•ï¼ŒåŒ¹é… ProcessSte和组，检查是否达到要求
                                    int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum && x.GroupOp == group).Count();

                                    if (torqueCount < requiredTorqueCount)
                                    {
                                        // å¦‚果数量不满足，停止读取

                                        break;
                                    }
                                #region

                                //    //先看工艺表中步骤一中要扭的值有多少个 å†æŸ¥çœ‹Dt_TorqueOp表中是否有该任务号id和步骤总数是否满足工艺表
                                //    // æŸ¥è¯¢æ‰€æœ‰å·¥è‰ºæ•°æ®ï¼ŒæŒ‰ç…§æ­¥éª¤å· SetpNum é€’增排序                                                                                                                                            
                                //    var processList = _processRepository.QueryData(x => x.CraftType == group)
                                //                                        .OrderBy(x => x.SetpNum)
                                //                                        .ToList();

                                //    foreach (var process in processList)
                                //    {
                                //        float  torqueone = process.TorqueOne;//读到值了
                                //        float torquetow = process.TorqueTwo;
                                //        if (torqueone!=0)
                                //        {
                                //            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torqueone * 1000).ToString().PadLeft(7, '0')) + "\r");
                                //        }
                                //        if (torquetow != 0)
                                //        {
                                //            serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (torquetow * 1000).ToString().PadLeft(7, '0')) + "\r");
                                //        }

                                //        // è®¡ç®—当前步骤所需的 Torque æ€»æ•°
                                //        int requiredTorqueCount = process.TorqueOneQuantity + process.TorqueTwoQuantity;

                                //        // æŸ¥è¯¢å½“前步骤的 TorqueOp è®°å½•ï¼ŒåŒ¹é… ProcessSte和组，检查是否达到要求
                                //        int torqueCount = _orqueOpRepository.QueryData(x => x.ProcessSte == process.SetpNum&& x.GroupOp== group).Count();

                                //        if (torqueCount < requiredTorqueCount)
                                //        {
                                //            // å¦‚果数量不满足，停止读取

                                //            break;
                                //        }
                                //        //符合要求，继续读取下一步

                            }

                                //}
                                //if (group == "机械")
                                //{

                                //}
                                //if (group == "地沟")
                                //{

                                //}
                                #endregion


                                serialPortDevice.Communicator.Write(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue.Replace("[setNum]", (5 * 1000).ToString().PadLeft(7, '0')) + "\r");
                                //打开串口时先设值
                                item.DeviceProParamName = CommandType.Set.ToString();
                            }
@@ -173,28 +221,28 @@

                                    if (deviceProtocolDetail != null && receiveData.Contains(item.DeviceChildCode + deviceProtocolDetail.ProtocalDetailValue))
                                    {
                                        //这里成功之后，要存储到看Dt_TorqueOp（存任务号，组，值）
                                        string group = "";
                                        if (group == "电气")
                                        {
                                            var putake = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderByDescending(x => x.Dispatchtime).FirstOrDefault();//每次都拿最早的那条
                                            var punjid = putake.ID;
                                            var Nj = new Dt_TorqueOp()
                                            {
                                                TakeId = putake.Njtakeid,
                                                GroupOp = group,
                                                //ProcessSte= processList
                                                TorqueSize = receiveData
                                        ////这里成功之后，要存储到看Dt_TorqueOp（存任务号，组，值）
                                        //string group = "";
                                        //if (group == "电气")
                                        //{
                                        //    var putake = _putakeRepository.QueryData(x => x.Pustatus == 2 && x.Grouptype == group).OrderByDescending(x => x.Dispatchtime).FirstOrDefault();//每次都拿最早的那条
                                        //    var punjid = putake.ID;
                                        //    var Nj = new Dt_TorqueOp()
                                        //    {
                                        //        TakeId = putake.Njtakeid,
                                        //        GroupOp = group,
                                        //        //ProcessSte= processList
                                        //        TorqueSize = receiveData

                                            };
                                            _orqueOpRepository.AddData(Nj);
                                        //    };
                                        //    _orqueOpRepository.AddData(Nj);

                                        }
                                        if (group == "机械")
                                        {
                                        //}
                                        //if (group == "机械")
                                        //{

                                        }
                                        if (group == "地沟")
                                        //}
                                        //if (group == "地沟")


                                            item.DeviceProParamName = CommandType.Set.ToString();