修改websocket；

yanjinhui

2025-03-22 2f0c81709876d76b6b120cf6ac43f05cda6dfe4c

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

@@ -39,21 +39,23 @@
            return base.GetPageData(options);
        }

    


        //获取套筒数量
        public WebResponseContent GetSleeveandStep(string gruops)
        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,25 +65,115 @@
        }


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

        //        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,
        //                CreateDate = DateTime.Now
        //            };

        //            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.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.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;

        //            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(); // ä»…查询一次所有数据
                var allProcesses = BaseDal.QueryData().OrderBy(x => x.SetpNum).ToList(); // æŒ‰ setnum æŽ’序

                if (addProcessDTO.id == 0) // æ·»åŠ 
                {
                    // æ£€æŸ¥æ˜¯å¦å·²ç»å­˜åœ¨ç›¸åŒçš„ setnum
                    if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype))
                    if (allProcesses.Any(x => x.SetpNum == addProcessDTO.setpNum && x.CraftType == addProcessDTO.craftstype))
                    {
                        return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤æ·»åŠ ï¼" };
                        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 proces = new Dt_Process
                    {
                        SetpNum = addProcessDTO.setnum,
                        Nodal=addProcessDTO.Nodal,
                        SetpNum = addProcessDTO.setpNum,
                        CraftType = addProcessDTO.craftstype,
                        CraftsStep = addProcessDTO.craftsstep,
                        CraftContent = addProcessDTO.craftcontent,
@@ -91,8 +183,11 @@
                        ArticleOne = addProcessDTO.articleone,
                        ArticleTowid = addProcessDTO.aritcletowid,
                        ArticleTwo = addProcessDTO.articletwo,
                        CreateDate = DateTime.Now
                        CreateDate = DateTime.Now,
                        //为空就是0，不为空就是1
                        TorqueSum = (string.IsNullOrEmpty(addProcessDTO.articleone) ? 0 : 1) + (string.IsNullOrEmpty(addProcessDTO.articletwo) ? 0 : 1)
                    };
                  

                    BaseDal.AddData(proces);
                    return new WebResponseContent { Status = true, Data = proces };
@@ -105,15 +200,53 @@
                        return new WebResponseContent { Status = false, Message = "未找到该工艺步骤，无法更新！" };
                    }

                    // åªæœ‰å½“ setnum å‘生变化时，才进行重复性检查
                    if (existingProcess.SetpNum != addProcessDTO.setnum && allProcesses.Any(x => x.SetpNum == addProcessDTO.setnum && x.CraftType == addProcessDTO.craftstype && x.CraftID != addProcessDTO.id))
                    int oldSetNum = existingProcess.SetpNum;
                    int newSetNum = addProcessDTO.setpNum;

                    if (oldSetNum == newSetNum) // å¦‚果没改顺序，直接更新其他内容
                    {
                        return new WebResponseContent { Status = false, Message = $"步骤 {addProcessDTO.setnum} å·²å­˜åœ¨ï¼Œä¸èƒ½é‡å¤ï¼" };
                        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(existingProcess);
                        return new WebResponseContent { Status = true, Data = existingProcess };
                    }
                    // æ›´æ–° TorqueSum
                    



                    // è°ƒæ•´é¡ºåº
                    if (newSetNum < oldSetNum) // å‘前移动，后续数据往后移
                    {
                        foreach (var process in allProcesses.Where(x => x.SetpNum >= newSetNum && x.SetpNum < oldSetNum))
                        {
                            process.SetpNum++; // åŽç§»ä¸€ä½
                            BaseDal.UpdateData(process);
                        }
                    }
                    else if (newSetNum > oldSetNum) // å‘后移动，前面数据往前移
                    {
                        foreach (var process in allProcesses.Where(x => x.SetpNum > oldSetNum && x.SetpNum <= newSetNum))
                        {
                            process.SetpNum--; // å‰ç§»ä¸€ä½
                            BaseDal.UpdateData(process);
                        }
                    }

                    // æ›´æ–°æ•°æ®
                    // æ›´æ–°å½“前步骤的新序号
                    existingProcess.SetpNum = newSetNum;
                    existingProcess.Nodal = addProcessDTO.Nodal;
                    existingProcess.SetpNum = addProcessDTO.setnum;
                    existingProcess.CraftType = addProcessDTO.craftstype;
                    existingProcess.CraftsStep = addProcessDTO.craftsstep;
                    existingProcess.CraftContent = addProcessDTO.craftcontent;
@@ -136,9 +269,6 @@
        }




        //获取当前任务工作步骤
        public WebResponseContent Getcircuit(string group, string takeid)
        {
            try
@@ -155,13 +285,13 @@

                //返回当前工艺的最大步骤
                var maxproce = process.Max(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 } };
                    return new WebResponseContent { Status = true, Message = "返回工艺表中的第一条", Data = new { proNoe, maxproce } };
                }

                var nowNum = torp.Max(x => x.ProcessSte);//获得当前最大步骤
@@ -169,7 +299,7 @@
                //op.Modifier="true"  è¡¨ç¤ºæ˜¯å¼ºåˆ¶æ‰§è¡Œï¼Œå°±ä¸éœ€è¦åˆ¤æ–­åº”扭的次数，直接返回 op.ProcessSte+1
                if (Mod == "true")
                {
                   var  now= maxproce + 1;
                    var now = maxproce + 1;
                    return new WebResponseContent { Status = true, Data = new { proNoe, maxproce, now } };
                }

@@ -179,7 +309,7 @@

                //判断当前步骤的扭力次数是否完成，没完成返回当前步骤，完成返回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)
@@ -188,7 +318,7 @@
            }
        }

        public WebResponseContent Nextprocess(SetpDTO setpDTO,bool flag)//强制执行给我true
        public WebResponseContent Nextprocess(SetpDTO setpDTO, bool flag)//强制执行给我true
        {
            try
            {
@@ -204,17 +334,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 || (practiceCount != TargetCount && flag))//强制执行 å‰ç«¯ç»™æˆ‘一个flag=ture时
                {
                    //强制跳转下一步，插入op表当前步骤
                    op.TakeId = setpDTO.takeid;
@@ -236,7 +367,7 @@


                _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 } };
            }
            catch (Exception ex)
            {
@@ -267,8 +398,36 @@
                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;
            }
        }
    }


}