更新通讯源码

qiuyao

2025-03-24 45045dab394abe534fa5221a1e09a90c1eebf835

 ÏîÄ¿´úÂë/WIDESEAWCS_Server Õýʽ/SerialPortService/ProcessServer.cs

@@ -1,10 +1,13 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using AutoMapper;
using AutoMapper.Configuration.Conventions;
using OfficeOpenXml.FormulaParsing.Excel.Functions.DateTime;
using SqlSugar;
using WIDESEA_ISerialPortRepository;
using WIDESEA_SerialPortRepository;
@@ -22,11 +25,14 @@
        private IPutakeRepository _putakeRepository;
        private IUnitOfWorkManage _unitOfWorkManage;
        private ITorqueOpRepository _torqueOpRepository;
        public ProcessServer(IProcessRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IPutakeRepository putakeRepository, ITorqueOpRepository torqueOpRepository) : base(BaseDal)
        private readonly IMapper _mapper;

        public ProcessServer(IProcessRepository BaseDal, IUnitOfWorkManage unitOfWorkManage, IPutakeRepository putakeRepository, ITorqueOpRepository torqueOpRepository, IMapper mapper) : base(BaseDal)
        {
            _putakeRepository = putakeRepository;
            _unitOfWorkManage = unitOfWorkManage;
            _torqueOpRepository = torqueOpRepository;
            _mapper = mapper;
        }

        public override PageGridData<Dt_Process> GetPageData(PageDataOptions options)
@@ -39,21 +45,24 @@
            return base.GetPageData(options);
        }

    

        //获取套筒数量
        public WebResponseContent GetSleeveandStep(string gruops)
        /// <summary>
        /// èŽ·å–套筒数量
        /// </summary>
        /// <returns>返回班组、总步骤、套筒数量</returns>
        public WebResponseContent GetSleeveandStep()
        {
            try
            {
                var result = BaseDal.QueryData(x => x.CraftType == gruops) // å…ˆç­›é€‰ CraftType
                var result = BaseDal.QueryData() // å…ˆæŸ¥å‡ºå…¨éƒ¨
                    .GroupBy(x => x.CraftType) // æŒ‰ CraftType åˆ†ç»„
                    .Select(g => new
                    {
                        maxNodal = g.Max(a => a.Nodal),
                        sumTorqueSum = g.Sum(a => a.TorqueSum)
                        //尽量后端数据给前端的数据，调一次接口就可以拿到，不要让前端多次调用
                        CraftType = g.Key, // æ·»åŠ  CraftType
                        maxNodal = g.Max(a => a.Nodal),//最大步骤
                        sumTorqueSum = g.Sum(a => a.TorqueSum),//套筒数量
                    }).ToList();
                

                return new WebResponseContent { Status = true, Data = result };
            }
            catch (Exception ex)
@@ -63,132 +72,324 @@
        }


        #region
        //public WebResponseContent AddOrUpdateProcess(AddProcessDTO addProcessDTO)
        //{
        //    try
        //    {
        //        var allProcesses = BaseDal.QueryData(); // ä»…查询一次所有数据

        public WebResponseContent AddOrUpdateProcess(AddProcessDTO addProcessDTO)
        {
            try
            {
                
                // åˆ¤æ–­æ˜¯æ·»åŠ è¿˜æ˜¯æ›´æ–°
                if (addProcessDTO.id == 0)//添加
                {
                    var pross = BaseDal.QueryData();
                    // æ£€æŸ¥æ˜¯å¦å·²ç»å­˜åœ¨ç›¸åŒçš„ setnum
                    bool isExist = pross.Where(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype).Any();
                    if (isExist)
                    {
                        return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤æ·»åŠ ï¼" };
                    }
        //        if (addProcessDTO.id == 0) // æ·»åŠ 
        //        {
        //            // æ£€æŸ¥æ˜¯å¦å·²ç»å­˜åœ¨ç›¸åŒçš„ setnum
        //            if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype))
        //            {
        //                return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤æ·»åŠ ï¼" };
        //            }

                    // åˆ›å»ºæ–°å·¥è‰ºæ­¥éª¤
                    var proces = new Dt_Process
                    {
                        SetpNum = addProcessDTO.setnum,
                        CraftType = addProcessDTO.craftstype,
                        CraftsStep = addProcessDTO.craftsstep,
                        CraftContent = addProcessDTO.craftcontent,
                        Tools = addProcessDTO.tools,
                        Material = addProcessDTO.material,
                        ArticleOneid = addProcessDTO.aritcleoneid,
                        ArticleOne = addProcessDTO.articleone,
                        ArticleTowid = addProcessDTO.aritcletowid,
                        ArticleTwo = addProcessDTO.articletwo,
                        Creater = "admin",
                        CreateDate = DateTime.Now
                    };
        //            // åˆ›å»ºæ–°å·¥è‰ºæ­¥éª¤
        //            var proces = new Dt_Process
        //            {
        //                SetpNum = addProcessDTO.setnum,
        //                CraftType = addProcessDTO.craftstype,
        //                CraftsStep = addProcessDTO.craftsstep,
        //                CraftContent = addProcessDTO.craftcontent,
        //                Tools = addProcessDTO.tools,
        //                Material = addProcessDTO.material,
        //                ArticleOneid = addProcessDTO.aritcleoneid,
        //                ArticleOne = addProcessDTO.articleone,
        //                ArticleTowid = addProcessDTO.aritcletowid,
        //                ArticleTwo = addProcessDTO.articletwo,
        //                CreateDate = DateTime.Now
        //            };

                    BaseDal.AddData(proces);
                    return new WebResponseContent { Status = true, Data = proces };
                }
                else//更新
                {
                    // æŸ¥è¯¢å½“前要更新的记录
                    var existingProcess = BaseDal.QueryFirst(x => x.CraftID == addProcessDTO.id);
                    if (existingProcess == null)
                    {
                        return new WebResponseContent { Status = false, Message = "未找到该工艺步骤，无法更新！" };
                    }
        //            BaseDal.AddData(proces);
        //            return new WebResponseContent { Status = true, Data = proces };
        //        }
        //        else // æ›´æ–°
        //        {
        //            var existingProcess = allProcesses.FirstOrDefault(x => x.CraftID == addProcessDTO.id);
        //            if (existingProcess == null)
        //            {
        //                return new WebResponseContent { Status = false, Message = "未找到该工艺步骤，无法更新！" };
        //            }

                    // åªæœ‰å½“ setnum å‘生变化时，才进行重复性检查
                    if (existingProcess.Nodal != addProcessDTO.setnum)
                    {
                        bool isExist = BaseDal.QueryData(x => x.Nodal == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype && x.CraftID != addProcessDTO.id).Any();
                        if (isExist)
                        {
                            return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤ï¼" };
                        }
                    }
        //            // åªæœ‰å½“ setnum å‘生变化时，才进行重复性检查
        //            if (existingProcess.SetpNum != addProcessDTO.setnum && allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype && x.CraftID != addProcessDTO.id))
        //            {
        //                return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤ï¼" };
        //            }

                    // æ›´æ–°æ•°æ®
                    existingProcess.SetpNum = addProcessDTO.setnum;
                    existingProcess.CraftType = addProcessDTO.craftstype;
                    existingProcess.CraftsStep = addProcessDTO.craftsstep;
                    existingProcess.CraftContent = addProcessDTO.craftcontent;
                    existingProcess.Tools = addProcessDTO.tools;
                    existingProcess.Material = addProcessDTO.material;
                    existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
                    existingProcess.ArticleOne = addProcessDTO.articleone;
                    existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
                    existingProcess.ArticleTwo = addProcessDTO.articletwo;
                    existingProcess.CreateDate = DateTime.Now;
                    BaseDal.UpdateData(existingProcess);
                   
        //            // æ›´æ–°æ•°æ®
        //            existingProcess.Nodal = addProcessDTO.Nodal;
        //            existingProcess.SetpNum = addProcessDTO.setnum;
        //            existingProcess.CraftType = addProcessDTO.craftstype;
        //            existingProcess.CraftsStep = addProcessDTO.craftsstep;
        //            existingProcess.CraftContent = addProcessDTO.craftcontent;
        //            existingProcess.Tools = addProcessDTO.tools;
        //            existingProcess.Material = addProcessDTO.material;
        //            existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
        //            existingProcess.ArticleOne = addProcessDTO.articleone;
        //            existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
        //            existingProcess.ArticleTwo = addProcessDTO.articletwo;
        //            existingProcess.CreateDate = DateTime.Now;

                    return new WebResponseContent { Status = true, Data = existingProcess };
                }
            }
            catch (Exception ex)
            {
                
                return new WebResponseContent { Status = false, Message = "操作失败：" + ex.Message };
            }
        }
        //            BaseDal.UpdateData(existingProcess);
        //            return new WebResponseContent { Status = true, Data = existingProcess };
        //        }
        //    }
        //    catch (Exception ex)
        //    {
        //        return new WebResponseContent { Status = false, Message = "操作失败：" + ex.Message };
        //    }
        //}




        //获取当前任务工作步骤
        #endregion

        /// <summary>
        /// æ ¹æ®id来判断，有id就更新没有就添加
        /// </summary>
        /// <param name="addProcessDTO"></param>
        /// <returns></returns>
        public WebResponseContent AddOrUpdateProcess(AddProcessDTO addProcessDTO)
        {
            try
            {
                var allProcesses = BaseDal.QueryData().OrderBy(x => x.SetpNum).ToList(); // æŒ‰ SetpNum æŽ’序
                Dt_Process proces = _mapper.Map<Dt_Process>(addProcessDTO);

                #region æ·»åŠ 
                if (addProcessDTO.CraftID == 0) // æ·»åŠ 
                {
                    //// æ£€æŸ¥æ˜¯å¦å·²ç»å­˜åœ¨ç›¸åŒçš„ SetpNum
                    //if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setpNum && x.CraftType == addProcessDTO.craftstype))
                    //{
                    //    return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setpNum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤æ·»åŠ ï¼" };
                    //}

                    //// éœ€è¦è°ƒæ•´åŽç»­æ­¥éª¤çš„序号
                    //foreach (var process in allProcesses.Where(x => x.SetpNum >= addProcessDTO.setpNum))
                    //{
                    //    process.SetpNum++; // åŽç§»ä¸€ä½
                    //    BaseDal.UpdateData(process);
                    //}

                    // éœ€è¦è°ƒæ•´åŽç»­æ­¥éª¤çš„序号
                    var processList = allProcesses.Where(x => x.SetpNum >= addProcessDTO.SetpNum).ToList();

                    if (processList != null)
                    {
                        for (int i = 0; i < processList.Count; i++)
                        {
                            processList[i].SetpNum += 1;
                        }
                    }

                    // åˆ›å»ºæ–°å·¥è‰ºæ­¥éª¤
                    
                    proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
                    proces.CreateDate = DateTime.Now;

                    //var proces = new Dt_Process
                    //{
                    //    Nodal = addProcessDTO.Nodal,
                    //    SetpNum = addProcessDTO.setpNum,
                    //    CraftType = addProcessDTO.craftstype,
                    //    CraftsStep = addProcessDTO.craftsstep,
                    //    CraftContent = addProcessDTO.craftcontent,
                    //    Tools = addProcessDTO.tools,
                    //    Material = addProcessDTO.material,
                    //    ArticleOneid = addProcessDTO.aritcleoneid,
                    //    ArticleOne = addProcessDTO.articleone,
                    //    ArticleTowid = addProcessDTO.aritcletowid,
                    //    ArticleTwo = addProcessDTO.articletwo,
                    //    CreateDate = DateTime.Now,
                    //    PointAxisXYZ = addProcessDTO.PointAxisXYZ,
                    //    PointAxisHPB = addProcessDTO.PointAxisHPB,
                    //    //为空就是0，不为空就是1
                    //    TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1)
                    //};

                    _unitOfWorkManage.BeginTran();
                    BaseDal.AddData(proces);
                    BaseDal.UpdateData(processList);
                    _unitOfWorkManage.CommitTran();
                    return new WebResponseContent { Status = true, Data = proces };
                }
                #endregion
                #region ä¿®æ”¹
                else // æ›´æ–°
                {
                    var existingProcess = allProcesses.FirstOrDefault(x => x.CraftID == addProcessDTO.CraftID);
                    if (existingProcess == null)
                    {
                        return new WebResponseContent { Status = false, Message = "未找到该工艺步骤，无法更新！" };
                    }

                    int oldSetNum = existingProcess.SetpNum;
                    int newSetNum = addProcessDTO.SetpNum;

                    if (existingProcess.SetpNum == addProcessDTO.SetpNum) // å¦‚果没改顺序，直接更新其他内容
                    {
                        proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
                        proces.ModifyDate = DateTime.Now;

                        //existingProcess.Nodal = addProcessDTO.Nodal;
                        //existingProcess.CraftType = addProcessDTO.craftstype;
                        //existingProcess.CraftsStep = addProcessDTO.craftsstep;
                        //existingProcess.CraftContent = addProcessDTO.craftcontent;
                        //existingProcess.Tools = addProcessDTO.tools;
                        //existingProcess.Material = addProcessDTO.material;
                        //existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
                        //existingProcess.ArticleOne = addProcessDTO.articleone;
                        //existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
                        //existingProcess.ArticleTwo = addProcessDTO.articletwo;
                        //existingProcess.CreateDate = DateTime.Now;
                        //existingProcess.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1);

                        BaseDal.UpdateData(proces);
                        return new WebResponseContent { Status = true, Data = proces };
                    }
                    // æ›´æ–° TorqueSum

                    // è°ƒæ•´é¡ºåº
                    if (newSetNum < oldSetNum) // å‘前移动，后续数据往后移
                    {
                        var processList = allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum).ToList();

                        for (int i = 0; i < processList.Count; i++)
                        {
                            processList[i].SetpNum += 1;
                        }

                        BaseDal.UpdateData(processList);
                        //foreach (var process in allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum))
                        //{
                        //    process.SetpNum++; // åŽç§»ä¸€ä½
                        //    BaseDal.UpdateData(process);
                        //}
                    }
                    else if (newSetNum > oldSetNum) // å‘后移动，前面数据往前移
                    {
                        var processList = allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum).ToList();

                        for (int i = 0; i < processList.Count; i++)
                        {
                            processList[i].SetpNum -= 1;
                        }

                        BaseDal.UpdateData(processList);

                        //foreach (var process in allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum))
                        //{
                        //    process.SetpNum--; // å‰ç§»ä¸€ä½
                        //    BaseDal.UpdateData(process);
                        //}
                    }

                    proces.SetpNum = newSetNum;
                    proces.TorqueSum = (string.IsNullOrEmpty(addProcessDTO.ArticleOne) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.ArticleTwo) ? 0 : 1);
                    proces.ModifyDate = DateTime.Now;

                    //// æ›´æ–°å½“前步骤的新序号
                    //existingProcess.SetpNum = newSetNum;
                    //existingProcess.Nodal = addProcessDTO.Nodal;
                    //existingProcess.CraftType = addProcessDTO.craftstype;
                    //existingProcess.CraftsStep = addProcessDTO.craftsstep;
                    //existingProcess.CraftContent = addProcessDTO.craftcontent;
                    //existingProcess.Tools = addProcessDTO.tools;
                    //existingProcess.Material = addProcessDTO.material;
                    //existingProcess.ArticleOneid = addProcessDTO.aritcleoneid;
                    //existingProcess.ArticleOne = addProcessDTO.articleone;
                    //existingProcess.ArticleTowid = addProcessDTO.aritcletowid;
                    //existingProcess.ArticleTwo = addProcessDTO.articletwo;
                    //existingProcess.CreateDate = DateTime.Now;

                    BaseDal.UpdateData(proces);
                    return new WebResponseContent { Status = true, Data = proces };
                }
                #endregion
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "操作失败：" + ex.Message };
            }
        }


        public WebResponseContent Getcircuit(string group, string takeid)
        {
            try
            {
                //根据组和任务号获得top表全部数据
                Dt_Process proNow = new Dt_Process();
                //根据组和任务号获得torqueOp表全部数据
                var torp = _torqueOpRepository.QueryData(x => x.GroupOp == group && x.TakeId == takeid);


                //获取Modifier  ="true"  è¡¨ç¤ºæ˜¯å¼ºåˆ¶æ‰§è¡Œ
                var Mod = torp.Select(x => x.Modifier).FirstOrDefault();
                //var Mod = torp.Select(x => x.Modifier).FirstOrDefault();

                //查出工艺表
                var process = BaseDal.QueryData(x => x.CraftType == group);

                //返回当前工艺的最大步骤
                var maxproce = process.Max(x => x.SetpNum);
                


                //拿到工艺表中步骤为1的
                var proNoe = process.Where(x => x.SetpNum == 1);//获得工艺表中的第一步
                //var proNoe = process.Where(x => x.SetpNum == 1);//获得工艺表中的第一步
                if (torp.Count == 0)
                {
                    return new WebResponseContent { Status = true, Message = "返回工艺表中的第一条", Data =new { proNoe, maxproce } };
                    proNow = process.Where(x => x.SetpNum == 1).First();
                    return new WebResponseContent { Status = true, Message = "返回工艺表中的第一条", Data = new { proNow, maxproce } };
                }

                var nowNum = torp.Max(x => x.ProcessSte);//获得当前最大步骤

                var flag = torp.Where(a => a.ProcessSte == nowNum && a.Modifier == "true").FirstOrDefault();
                //op.Modifier="true"  è¡¨ç¤ºæ˜¯å¼ºåˆ¶æ‰§è¡Œï¼Œå°±ä¸éœ€è¦åˆ¤æ–­åº”扭的次数，直接返回 op.ProcessSte+1
                if (Mod == "true")
                //if (Mod == "true")
                //{
                //    var now = maxproce + 1;
                //    return new WebResponseContent { Status = true, Data = new { proNoe, maxproce, now } };
                //}
                if (flag != null)
                {
                   var  now= maxproce + 1;
                    return new WebResponseContent { Status = true, Data = new { proNoe, maxproce, now } };
                    var now = maxproce + 1;
                    proNow = process.Where(x => x.SetpNum == now).First();
                    var finish= process.Where(x => x.SetpNum > now);
                    return new WebResponseContent { Status = true, Data = new { proNow, maxproce, now, finish } };
                }

                //如果存值表中有数据就返回给他当前工艺步骤
                var maxpro = process.Where(x => x.SetpNum == nowNum);

                var maxpro = process.Where(x => x.SetpNum == nowNum).FirstOrDefault();
                if (maxpro != null)
                {
                    if (maxpro.TorqueOneQuantity + maxpro.TorqueTwoQuantity > torp.Where(a => a.ProcessSte == nowNum).Count())
                    {
                        proNow = maxpro;
                        var finish = process.Where(x => x.SetpNum < nowNum);
                        return new WebResponseContent { Status = true, Message = "返回当前任务做到的大步骤", Data = new { proNow, maxproce, finish } };
                    }
                    else
                    {
                        var now = nowNum + 1;
                        proNow = process.Where(x => x.SetpNum == now).First();
                        var finish = process.Where(x => x.SetpNum < now);
                        return new WebResponseContent { Status = true, Message = "返回当前任务做到的大步骤", Data = new { proNow, maxproce, finish } };
                    }
                }
                else
                {
                    return new WebResponseContent { Status = false, Message = "工艺数据有误"};
                }

                //判断当前步骤的扭力次数是否完成，没完成返回当前步骤，完成返回op.ProcessSte+1，状态值给false   

                return new WebResponseContent { Status = true, Message = "返回当前任务做到的大步骤", Data =new { maxpro, maxproce } };
                //return new WebResponseContent { Status = true, Message = "返回当前任务做到的大步骤", Data = new { maxpro, maxproce } };

            }
            catch (Exception ex)
@@ -197,7 +398,13 @@
            }
        }

        public WebResponseContent Nextprocess(SetpDTO setpDTO,bool flag)//强制执行给我true
        /// <summary>
        /// å·¥è‰ºä¸‹ä¸€æ­¥è·³è½¬
        /// </summary>
        /// <param name="setpDTO">当前班组的任务当前步骤</param>
        /// <param name="flag">是否强制执行；是true，否false</param>
        /// <returns>返回1、当前步骤；2、最大步骤；3、已完成的工艺</returns>
        public WebResponseContent Nextprocess(SetpDTO setpDTO, bool flag)//强制执行给我true
        {
            try
            {
@@ -213,17 +420,18 @@

                //返回当前工艺的最大步骤
                var maxproce = process.Max(x => x.SetpNum);

                var TorqueOneQuantity = nowdate.Select(x => x.TorqueOneQuantity).FirstOrDefault();
                var TorqueTwoQuantity= nowdate.Select(x => x.TorqueTwoQuantity).FirstOrDefault();
                var TorqueTwoQuantity = nowdate.Select(x => x.TorqueTwoQuantity).FirstOrDefault();

                //判断存值表的数据是否满足该步骤需要几条数据的条数
                int TargetCount = TorqueOneQuantity + TorqueTwoQuantity;//一共要有多少条数据（目标数量）

                if (practiceCount < TargetCount && !flag)
                {
                    return new WebResponseContent { Status = true, Message = "没有完成当前步骤", Data =new { nowdate, maxproce } };
                    return new WebResponseContent { Status = true, Message = "没有完成当前步骤", Data = new { nowdate, maxproce } };
                }
                else if(practiceCount == TargetCount || (practiceCount != TargetCount && flag))//强制执行 å‰ç«¯ç»™æˆ‘一个flag=ture时
                else if ((practiceCount == TargetCount && TargetCount == 0) || (practiceCount != TargetCount && flag))//强制执行 å‰ç«¯ç»™æˆ‘一个flag=ture时
                {
                    //强制跳转下一步，插入op表当前步骤
                    op.TakeId = setpDTO.takeid;
@@ -241,17 +449,18 @@
                int num = setpDTO.setnum + 1;

                //返回下一步步骤
                var nex = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == num).FirstOrDefault();

                var nex = process.Where(x => x.SetpNum == num).FirstOrDefault();
                var finish = process.Where(x => x.SetpNum < num).ToList();

                _torqueOpRepository.AddData(op);
                return new WebResponseContent { Status = true,Message= $"你已完成当前第{setpDTO.setnum}，准备第{num}步任务", Data = new { nex, maxproce } };
                return new WebResponseContent { Status = true, Message = $"你已完成当前第{setpDTO.setnum}，准备第{num}步任务", Data = new { nex, maxproce, finish } };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "查询失败：" + ex.Message };
            }
        }


        public WebResponseContent PreviousProcess(SetpDTO setpDTO)
        {
@@ -269,15 +478,44 @@
                var maxproce = process.Max(x => x.SetpNum);
                int num = setpDTO.setnum - 1;
                var nex = process.Where(x => x.CraftType == setpDTO.group && x.SetpNum == num).FirstOrDefault();
                return new WebResponseContent { Status = true, Message = $"上一步{setpDTO.setnum}", Data = new { nex, maxproce } };
                var finish = process.Where(x => x.SetpNum < num).ToList();
                return new WebResponseContent { Status = true, Message = $"上一步{setpDTO.setnum}", Data = new { nex, maxproce, finish } };
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false, Message = "查询失败：" + ex.Message };
            }
        }
    }
       

        /// <summary>
        /// è¯»å–当前工艺步骤的扭力值与次数
        /// </summary>
        /// <param name="grop"></param>
        /// <param name="setnum"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        public WebResponseContent GetValueandNumber(string grop, int setnum)
        {
            try
            {
                var result = BaseDal.QueryData(x => x.CraftType == grop && x.SetpNum == setnum)
                    .Select(g => new
                    {
                        g.TorqueOne,
                        g.TorqueOneQuantity,
                        g.TorqueTwo,
                        g.TorqueTwoQuantity
                    });
                return new WebResponseContent { Status = true, Data = result }; 
              
            }
            catch (Exception ex)
            {
                return new WebResponseContent { Status = false,Message="错误："+ex }; throw;
            }
        }
    }


}