From 11313e97aa1ff4d4d1c8c7bccc383351440e5158 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Thu, 29 Jun 2023 09:56:25 +0800 Subject: [PATCH] 2023-06-29 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 253952 -> 253440 bytes SGGL/BLL/API/HJGL/APIPipeJointService.cs | 59 ++++++++++++------ .../Controllers/HJGL/PipeJointController.cs | 30 +++++++++ 3 files changed, 70 insertions(+), 19 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 809a674edfd39e657b53fc68672d2e7ea9ef8201..c2c0eec08dd8cb3a9103a661c320dbf0a8bb102e 100644 GIT binary patch delta 2035 zcmeH|OH3PA6o%*C8H0hbG5CQE1;Rs7>)5RwW3Y{(jX)JdRCW+;lQw-A68cEm(qy1C zX$w*pW#I+*MsjzRP=%6ZVpVLqpfZ~-8dy}7vdgM3i4F0_5()j!U>lPri0(Vm=W`$D z_?~+nGxKY;^FP)u#;e*TNvZ>l;*?^|SUfjaieIjh;_DB-zjcqbifO(f1|2@3$w{UP zrZk9`6x-625;nu=(eCc91+pGAfQOjdAtCgqqA;$7d=8NQ!=;3E?ieO*paYOmC**NJ zR?dQ?@!w36PGIfT1%jX(^nefug9zvaQP2na!Hbf_B(YO{cJ4LI zUI%BvIq(K}6PyQcfw#ds;9Zaa<6r_@02jd|cn`b}J^&wrOW-p22z(4a0aM^pa0Ofi z8knXF&0z2um<6AMYv4Ng0(=R+0&`#CH34R9|=DE*O?SrZd%0)#wIit0|$~zOmKu@U4 zH|ZS@jQ4oEf_|Sj?4RiN1}762CoW8e1L44UW~;@@mfbuR8Zfc{QZezzin#SzDjhMX zSZ+@(u;xGD-k;zvK<}9?$fAcf`jjk9g;GwONkw+Ba-LFTF}Gu(F~c%Sxd#%d)c9Up-EF_MiR```&f2<>cWU{_yZmbIymk-1*JiJM;U^ z&TZRbY3sGDbm_^8qF9iMU{>~8HK4V`v=-Ghtm@va&J>Ha0evEe5^;b{Bv`VA&(N-# zglbG_oD%8Ii0oxZI_)^f(@d(O?5EEhbzH{CP4>%e2+?iXXC+=ohbLXnjhs8geuJkm zJi*Ks=cp5$)NPehlhc|6Ir|Pz(&QNSa!PWFa>(JK_lv*cZ2IuPvEk_d4&1408}&ZT ztl9{e3VA~KfrR3BnoJ`)EQ7j?l23M&s06o3i;B=|_ zi;&HwPorZv3E`>qI*np!Qk`z+fV|B^*9aB3M88%niZud~R|Hb4MYX{pe5r%Fd@O0v zvA!8DUEZK9is1`Pn8iO8;_qZ<_%c3wy*Yd=B`QXQ>@HpAE-SjzmohNgP;S%VhOs%v zc5mVAMLq7k@J;4z%Wf(yTUgoLTwGXQ>h%_uc*?zn70rt(3%!mKZ;8X}X!2A#g1_h4 z)Igchq){C5Ia4hD-)P4o4m!+;hXqz7AQ3hsAsKe0AQh7_1!+h}2Bu;fGLePpn1O7} zL=JM1rz(EsC>r^gg#r}fXcVCs4jhBoC_yR8P>u>zVh)Z)6^_I4I018UBIcnQH8=?; z;}pzS{fcrbjaoQShXptd^>E>IoPjgpMgz{m**FL1;yj#>3veMW!o_HW2TfRrW-Nji zm*7&_c^NLp6==bgxC&RJ71!WeTn8T(V+pRuQrv(WaT9LFEw~kav>}jFqszBl*0|i{ z8x-{AG-zX}8hg#y--q^awaQ|XFZBP#HtxkHEAhw{TX1Oh8be2`hu2C`8SOUQj%Bz5 zcj7KA#|qqydvGt>aUbr-16YX;1R(GrR^cJ6#>037Yw#!@!{c}Y{wMkK6rM&Wp21o? zi!MBeZmh%ecmXfsCA^GRupS$*5kb6)O?VAG*o@cl2HwOLyoI;r&)PdQdhssaLm&F_ zKDOcme28uM2p{7UY{w1^U=W|;GklJn_yW7|CBDLLe2s6g2jAj5b-JQ_Ph&5Bz>oL| zKjRnt3f{+nZZ!TuQ>-tl>&(~uq@+ zgURVZ>zqFgVzVbU0elW0Z-vr@s=P%25_vE|PUF*6uO%smV zO(J9df*$RFI;3@(G_A|18M|V&iGi^!dsb`n)FiPtWEZ_#6PH(6wVo=gp?`bV9)tD| D_gc9s diff --git a/SGGL/BLL/API/HJGL/APIPipeJointService.cs b/SGGL/BLL/API/HJGL/APIPipeJointService.cs index 4d88808e..a5e440d5 100644 --- a/SGGL/BLL/API/HJGL/APIPipeJointService.cs +++ b/SGGL/BLL/API/HJGL/APIPipeJointService.cs @@ -7,6 +7,7 @@ namespace BLL public static class APIPipeJointService { #region 获取管线信息 + /// /// 根据单位工程ID获取管线列表 /// @@ -23,16 +24,31 @@ namespace BLL { BaseInfoId = x.PipelineId, BaseInfoCode = x.PipelineCode - } ).ToList(); return getDataLists; } } - #endregion + public static List GetPipelineidListByCode(string pipelineCode, string projectid) + { + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + // 从数据库中获取符合条件的管线数据 + var pipelines = db.HJGL_Pipeline + .Where(p =>p.ProjectId==projectid&& p.PipelineCode.Contains(pipelineCode)) + .OrderBy(p => p.PipelineCode) + .ToList(); + return pipelines; + } + } + + #endregion 获取管线信息 + + #region 获取未焊接的焊口信息 + /// /// 根据管线ID获取未焊接的焊口信息 /// @@ -53,13 +69,14 @@ namespace BLL } ).ToList(); - return getData; } } - #endregion + + #endregion 获取未焊接的焊口信息 #region 根据管线ID获取所有焊口信息 + /// /// 根据管线ID获取所有焊口信息 /// @@ -81,9 +98,11 @@ namespace BLL return getDataLists; } } - #endregion + + #endregion 根据管线ID获取所有焊口信息 #region 获取焊工列表 + /// /// 根据管线ID获取焊口列表 /// @@ -162,6 +181,7 @@ namespace BLL } #region 焊工资质判断 + /// /// 一种焊接方法资质判断 /// @@ -216,6 +236,7 @@ namespace BLL return isok; } + /// /// 两种焊接方法资质判断 /// @@ -273,7 +294,6 @@ namespace BLL { isok = true; } - else { fThicknessMax = floorQ.Max(x => x.ThicknessMax); @@ -295,12 +315,13 @@ namespace BLL return isok; } - #endregion - #endregion + #endregion 焊工资质判断 + #endregion 获取焊工列表 #region 根据焊口ID获取焊口信息 + /// /// 根据焊口ID获取焊口信息 /// @@ -329,12 +350,12 @@ namespace BLL DetectionRate = GetDetectionRate(x.PipelineId), IsHotProess = x.IsHotProess == true ? "是" : "否", AttachUrl = x.AttachUrl - }; return getDateInfo.FirstOrDefault(); } } - #endregion + + #endregion 根据焊口ID获取焊口信息 /// /// 根据管线ID获取探伤比例 @@ -354,6 +375,7 @@ namespace BLL } #region 根据焊口标识获取焊口详细信息 + /// /// 根据焊口标识获取焊口详细信息 /// @@ -387,14 +409,15 @@ namespace BLL CoverWelderCode = db.SitePerson_Person.First(z => z.PersonId == x.CoverWelderId).WelderCode, IsHotProess = x.IsHotProess == true ? "是" : "否", AttachUrl = x.AttachUrl - }; return getDateInfo.FirstOrDefault(); } } - #endregion + + #endregion 根据焊口标识获取焊口详细信息 #region 保存管线焊口信息 + /// /// 保存管线焊口信息 /// @@ -461,7 +484,6 @@ namespace BLL db.HJGL_Pipeline.InsertOnSubmit(newPipe); db.SubmitChanges(); - } var jot = db.HJGL_WeldJoint.Where(x => x.PipelineId == pipelineId && (x.WeldJointCode == addItem.WeldJointCode || x.WeldJointIdentify == addItem.WeldJointIdentify)).FirstOrDefault(); @@ -532,9 +554,11 @@ namespace BLL } } } - #endregion + + #endregion 保存管线焊口信息 #region 批量保存管线焊口信息 + /// /// 批量保存管线焊口信息 /// @@ -550,7 +574,7 @@ namespace BLL } } - #endregion + #endregion 批量保存管线焊口信息 /// /// 保存预提交日报 @@ -583,13 +607,10 @@ namespace BLL JointAttribute = addItem.JointAttribute, WeldingMode = addItem.WeldingMode, AttachUrl = addItem.AttachUrl - }; db.HJGL_PreWeldingDaily.InsertOnSubmit(newP); db.SubmitChanges(); } - } - } -} +} \ No newline at end of file diff --git a/SGGL/WebAPI/Controllers/HJGL/PipeJointController.cs b/SGGL/WebAPI/Controllers/HJGL/PipeJointController.cs index 97645038..3dbd3398 100644 --- a/SGGL/WebAPI/Controllers/HJGL/PipeJointController.cs +++ b/SGGL/WebAPI/Controllers/HJGL/PipeJointController.cs @@ -1,6 +1,7 @@ using BLL; using System; using System.Collections.Generic; +using System.Linq; using System.Web.Http; namespace WebAPI.Controllers @@ -30,7 +31,36 @@ namespace WebAPI.Controllers return responeData; } + /// + /// 根据管线号查找pipelinid + /// + /// + /// + /// + /// + /// + public Model.ResponeData GetPipelineidListByCode(string pipelineCode, string projectid,int pageindex, int pageSize) + { + var responeData = new Model.ResponeData(); + try + { + var pipelineidList = APIPipeJointService.GetPipelineidListByCode(pipelineCode,projectid); + + int pageCount = pipelineidList.Count; + if (pageCount > 0 && pageindex > 0 && pageSize > 0) + { + pipelineidList = pipelineidList.Skip(pageSize * (pageindex - 1)).Take(pageSize).ToList(); + } + responeData.data = new { pageCount, pipelineidList }; + } + catch (Exception ex) + { + responeData.code = 0; + responeData.message = ex.Message; + } + return responeData; + } /// /// 根据管线ID获取未焊接的焊口信息 ///