From a8b2ae27c319ef2f26edb01d31f16b5ba92b6981 Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Fri, 7 Jul 2023 16:19:46 +0800 Subject: [PATCH] 2023-07-07 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 253440 -> 253952 bytes .../ZHGL/Plan/ActionPlanListEdit.aspx | 4 +- .../ZHGL/Plan/ActionPlanListEdit.aspx.cs | 2 +- .../DataIn/PDMS输出（设计）数据模板.xlsx | Bin 9984 -> 10004 bytes .../WeldingManage/PipelineListPDMSIn.aspx.cs | 918 ++++-------------- .../HJGL/WeldingManage/WeldJointEdit.aspx | 15 +- .../HJGL/WeldingManage/WeldJointEdit.aspx.cs | 2 +- .../WeldJointEdit.aspx.designer.cs | 18 +- .../HJGL/WeldingManage/WeldJointList.aspx.cs | 32 +- 9 files changed, 227 insertions(+), 764 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 5b8815fa60549d31d0c8ceefabf12c1434b07aa3..1488becbdd403d6db5eb7fb70ef7fe11c6bc2800 100644 GIT binary patch delta 1785 zcmeIy%TH556bInW+yVt}TONg0C{P|T1gW%8N|AyXFflwr7o;M-01Lhqu^>JnF&Y;v zq(j7&F^v+Igf3uVB9Vn*BP!lxj;tV*daq`7+aUXYRc{XXcK) z){e|;pSThW6$(Wv>=lQVX@TUNapvRAtU%=P+{C(v&(!_XA6Tv!;P2HeK0Ngonn=+W z3a|9C#eg6M_Jn&Gy&BRW31|^r-yiNbG1i2~6sNWowmH_NH<)lS5AvY^_5m#teM*Dt z3sWe}2poV?uz(fHpd4&a0d}Ya2UNj9s0Jt0KrI{sv60k1?8e|2w8L@efD>>MPQht7 z1D((X-EbB>&;z}24$i{`xCocvGF*YHa1Hw4I`qR0@WKH7pFs?6!Vuho+i(Z&!acYT z!!QDo>Le%sqdEywN2oefnG~Q*C!(jy(3o06cuZBJBx})ArKlqGo7&b`S5~$O!QHAt z6Lhq7{+C8EleC~zGfHm`P-a4>B&b=I;}D>e771#XWtvGxBof?pW=fliN6q3T3Ne`4 zq7EGpI%$#RsV-Rx2mS`VX-lHsU=?0nYp4(ETr%x~tmu{A^fr|)IuNW_QipD=-x0O9 zsb~{KZeF>fGVTaCTEzmlilC!a&1f_I*i>lB&#L=mBi=WkvG&kUNjxwLFK9;w1 z$@J)*Z<_9svvI%7=+~HUQi`Drmnt_p7&Nu1qS9R?hV+kp84a$l zxAl0+%spl07PHOKV>MUxdb-RN-F8Q})!yy#R9OOFjcLqhUx+P-qb7#W8V3oK5C`#) z0P7H7IUm_f{vwb4>HZ=W+ib3E2(o5^or zqQPJh-hxrTgZnb-Lp9w_YSVUoP0Mlyl55(LV7)Pr?EKDr&g}(WC$^pgTd!tR%r$8O znz|neVyS*Tu-=%-{71RJImu^SjQuYOtGoC?v3s`I%~oGcZZYN44rzSi`6njNzSv-$ mY{D|fYiDaYf6E@l^T~K=WpY*G6K~ce{j7dX`phQRB>o$sN&~@u}6y6k$`-Bm0)_^&Q!9NSP_ts0Yl3F-kPOWG!N2 zvxLXknVU2bNT!ZLI8re}CzBGagT~Zx3ZToj!6%(;%;%EK9$pc5D5r z=vN(L*fOY@xh`ws+VS@`96hMT5lA~Bc+#G+H7293ml~;vwQ-BhN+!V>x&|>E=hDIm zsQREMen9jm%@-}!ieNTYmnKILdMm+MOsFx1CLowzs!L1fHgepu_js_cDoiw`xlAeg z;BeX!vm!?#yU9XVyJ$+^=qrm6F^L7D!s-y7L^{dF&{7FLgs4Hj$$0$@JxLRNZMvu? zCxY|w;&o>!v5Q{j(!-@nXA_=Eq8m1!|DM&>c(vblhGBE>Ln2A}K z4ZC7!He_>R#Pfje;*?#4a17tLr<#Hek5mb-9eX+cqG zU0%Mk*qv8c@2t;r7u6T%)io5B7CB1l91V_=z_HADrF(9>;%#)x)o&IfsS8hS@dk!7 zEJ{GN?@|BNlVSrSbBt>9edK#T*5Ls>i1pZjjd%zT;}LAaqj(IDqZMBGAg~!vU<=yN zjwkUHp2jnH7F+QgI^CI_yLFUBYwiq_+=hHzv4IijwAR3e?oq8^yL__&?jAfbiD3LfBye7_#d6Ygy0PN zoRuc|mqSjp+*bk~XQ6S5oa!;*4NLYmmiXk}H~Aju(rn!3#C<{JCn^ HVWavt{z|Y- diff --git a/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx b/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx index 92649606..023c48e7 100644 --- a/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx +++ b/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx @@ -1,5 +1,6 @@ <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ActionPlanListEdit.aspx.cs" Inherits="FineUIPro.Mobile.ZHGL.Plan.ActionPlanListEdit" %> + @@ -159,7 +160,7 @@ BodyPadding="10px" EnableCollapse="true" ShowHeader="true" AutoScroll="true" runat="server"> + DataKeyNames="ActionPlanListApproveId" EnableColumnLines="true" OnRowCommand="gvApprove_RowCommand"> - diff --git a/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx.cs b/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx.cs index f17ac9b4..fbafeb10 100644 --- a/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx.cs +++ b/SGGL/FineUIPro.Mobile/ZHGL/Plan/ActionPlanListEdit.aspx.cs @@ -8,7 +8,7 @@ using System.Web.UI.WebControls; namespace FineUIPro.Mobile.ZHGL.Plan { - public partial class ActionPlanListEdit : PageBase + public partial class ActionPlanListEdit : PageBaseMobile { #region 定义项 /// diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/PDMS输出（设计）数据模板.xlsx index e16a45be00ba6ac44144691990a7027d803fec50..c27db7a7ebaa39dad647a4c3a8f049f4f5b2dfa9 100644 GIT binary patch delta 2792 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 delta 2822 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文件路径名 private void ImportXlsToData(string fileName) { - //支持.xls和.xlsx，即包括office2010等版本的 HDR=Yes代表第一行是标题，不是数据； try { - //string oleDBConnString = String.Empty; - //oleDBConnString = "Provider=Microsoft.Jet.OLEDB.4.0;"; - //oleDBConnString += "Data Source="; - //oleDBConnString += fileName; - //oleDBConnString += ";Extended Properties=Excel 8.0;"; - //OleDbConnection oleDBConn = null; - //OleDbDataAdapter oleAdMaster = null; - //DataTable m_tableName = new DataTable(); - //DataSet ds = new DataSet(); - - //oleDBConn = new OleDbConnection(oleDBConnString); - //oleDBConn.Open(); - //m_tableName = oleDBConn.GetOleDbSchemaTable(OleDbSchemaGuid.Tables, null); - - //if (m_tableName != null && m_tableName.Rows.Count > 0) - //{ - // m_tableName.TableName = m_tableName.Rows[0]["TABLE_NAME"].ToString().Trim(); - //} - //string sqlMaster; - //sqlMaster = " SELECT * FROM [" + m_tableName.TableName + "]"; - //oleAdMaster = new OleDbDataAdapter(sqlMaster, oleDBConn); - //oleAdMaster.Fill(ds, "m_tableName"); - //oleAdMaster.Dispose(); - //oleDBConn.Close(); - //oleDBConn.Dispose(); var ds = MiniExcel.Query(fileName).ToList(); var columns = MiniExcel.GetColumns(fileName); var cnt = columns.Count; @@ -214,14 +187,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage { ErrLogInfo.WriteLog("焊接基础数据上传失败!", exc); - //return null; - // return dt; + } - //finally - //{ - // conn.Close(); - // conn.Dispose(); - //} } #endregion @@ -234,524 +201,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// 数据集 /// 数据集行数 /// - private Model.ResponeData AddDatasetToSQL(DataTable pds, int Cols) - { - Model.ResponeData responeData = new Model.ResponeData(); - string result = string.Empty; - int ic, ir; - //pds = BLL.Funs.FilterBlankLines(pds); - ic = pds.Columns.Count; - ir = pds.Rows.Count; - if (ic < Cols) - { - responeData.code = 0; - responeData.message = "导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列"; - return responeData; - - //ShowNotify("导入Excel格式错误！Excel只有" + ic.ToString().Trim() + "列", MessageBoxIcon.Warning); - //return false; - } - if (pds != null && ir > 0) - { - var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x; - var getMedium = from x in Funs.DB.Base_Medium where x.ProjectId == this.CurrUser.LoginProjectId select x;//介质 - var getPipeLineClass = from x in Funs.DB.Base_PipingClass where x.ProjectId == this.CurrUser.LoginProjectId select x;//管道等级 - var getDetectionRate = from x in Funs.DB.Base_DetectionRate select x;//探伤比例 - var getDetectionType = from x in Funs.DB.Base_DetectionType select x;//探伤类型 - var getPressurePipingClass = from x in Funs.DB.Base_PressurePipingClass select x;//压力管道级别 - var getTestMedium = from x in Funs.DB.Base_TestMedium where x.TestType == "1" select x;//压力试验介质 - var getLeakMedium = from x in Funs.DB.Base_TestMedium where x.TestType == "2" select x;//泄露性试验介质 - var getPurgeMethod = from x in Funs.DB.Base_PurgeMethod select x; - var getMaterial = from x in Funs.DB.Base_Material select x; - var getWeldType = from x in Funs.DB.Base_WeldType select x; - //var getComponents = from x in Funs.DB.Base_Components where x.ProjeceId == this.CurrUser.LoginProjectId select x; - - - for (int i = 0; i < ir; i++) - { - Model.View_HJGL_WeldJoint pipeline = new Model.View_HJGL_WeldJoint(); - //pipeline.PipelineId = SQLHelper.GetNewID(); - Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(Request.Params["UnitWorkId"]); - if (unitWork != null) - { - pipeline.UnitWorkId = Request.Params["UnitWorkId"]; - pipeline.UnitId = unitWork.UnitId; - } - - string col0 = pds.Rows[i][0].ToString(); - string pipeLineId = string.Empty; - if (string.IsNullOrEmpty(col0)) - { - result += "第" + (i + 2).ToString() + "行," + "管线号" + "," + "此项为必填项！" + "|"; - } - else - { - pipeline.PipelineCode = col0; - } - - pipeline.SingleNumber = pds.Rows[i][1].ToString(); - pipeline.SingleName = pds.Rows[i][2].ToString(); - - string col3 = pds.Rows[i][3].ToString(); - if (string.IsNullOrEmpty(col3)) - { - result += "第" + (i + 2).ToString() + "行," + "介质名称" + "," + "此项为必填项！" + "|"; - } - else - { - var Medium = getMedium.FirstOrDefault(x => x.MediumName == col3); - if (Medium == null) - { - result += "第" + (i + 2).ToString() + "行," + "该介质不存在！" + "|"; - } - else - { - pipeline.MediumId = Medium.MediumId; - pipeline.MediumName = col3; - } - } - string col4 = pds.Rows[i][4].ToString(); - if (string.IsNullOrEmpty(col4)) - { - result += "第" + (i + 2).ToString() + "行," + "管道等级" + "," + "此项为必填项！" + "|"; - } - else - { - var PipeLineClass = getPipeLineClass.FirstOrDefault(x => x.PipingClassCode == col4); - if (PipeLineClass == null) - { - result += "第" + (i + 2).ToString() + "行," + "该管道等级不存在！" + "|"; - } - else - { - pipeline.PipingClassId = PipeLineClass.PipingClassId; - pipeline.PipingClassCode = col4; - } - } - string col5 = pds.Rows[i][5].ToString(); - if (!string.IsNullOrEmpty(col5)) - { - var DetectionRate = getDetectionRate.FirstOrDefault(x => x.DetectionRateValue.ToString() == col5.Replace("%", "") || x.DetectionRateCode == col5); - if (DetectionRate == null) - { - result += "第" + (i + 2).ToString() + "行," + "该探伤比例不存在！" + "|"; - } - else - { - pipeline.DetectionRateId = DetectionRate.DetectionRateId; - pipeline.DetectionRateCode = col5; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "探伤比例" + "," + "此项为必填项！" + "|"; - } - - string col6 = pds.Rows[i][6].ToString(); - if (!string.IsNullOrEmpty(col6)) - { - string[] types = col6.ToString().Split(','); - foreach (string t in types) - { - var type = getDetectionType.FirstOrDefault(x => x.DetectionTypeCode == t); - if (type == null) - { - result += "第" + (i + 2).ToString() + "行," + "探伤类型【" + t + "】不存在！" + "|"; - } - else - { - pipeline.DetectionType += type.DetectionTypeId + "|"; - } - } - if (!string.IsNullOrEmpty(pipeline.DetectionType)) - { - pipeline.DetectionType = pipeline.DetectionType.Substring(0, pipeline.DetectionType.Length - 1); - pipeline.DetectionTypeStr = col6; - } - - } - else - { - result += "第" + (i + 2).ToString() + "行," + "探伤类型" + "," + "此项为必填项！" + "|"; - } - - string col7 = pds.Rows[i][7].ToString(); - if (!string.IsNullOrEmpty(col7)) - { - pipeline.DesignTemperature = col7; - } - string col8 = pds.Rows[i][8].ToString(); - if (!string.IsNullOrEmpty(col8)) - { - pipeline.DesignPress = col8; - } - string col9 = pds.Rows[i][9].ToString(); - if (!string.IsNullOrEmpty(col9)) - { - var TestMedium = getTestMedium.FirstOrDefault(x => x.MediumName == col9); - if (TestMedium == null) - { - result += "第" + (i + 2).ToString() + "行," + "该压力试验介质不存在！" + "|"; - } - else - { - pipeline.TestMedium = TestMedium.TestMediumId; - pipeline.TestMediumName = col9; - } - } - string col10 = pds.Rows[i][10].ToString(); - if (!string.IsNullOrEmpty(col10)) - { - pipeline.TestPressure = col10; - } - string col11 = pds.Rows[i][11].ToString(); - if (!string.IsNullOrEmpty(col11)) - { - var PressurePipingClass = getPressurePipingClass.FirstOrDefault(x => x.PressurePipingClassCode == col11); - if (PressurePipingClass == null) - { - result += "第" + (i + 2).ToString() + "行," + "该压力管道级别不存在！" + "|"; - } - else - { - pipeline.PressurePipingClassId = PressurePipingClass.PressurePipingClassId; - pipeline.PressurePipingClassCode = col11; - } - } - string col12 = pds.Rows[i][12].ToString(); - if (!string.IsNullOrEmpty(col12)) - { - try - { - var PipeLenth = Funs.GetNewDecimal(col12); - pipeline.PipeLenth = PipeLenth; - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "管线长度(m)格式输入有误" + "|"; - } - } - string col13 = pds.Rows[i][13].ToString(); - if (!string.IsNullOrEmpty(col13)) - { - var LeakMedium = getLeakMedium.FirstOrDefault(x => x.MediumName == col13); - if (LeakMedium == null) - { - result += "第" + (i + 2).ToString() + "行," + "该泄露试验介质不存在！" + "|"; - } - else - { - pipeline.LeakMedium = LeakMedium.TestMediumId; - pipeline.LeakMediumName = col13; - } - } - string col14 = pds.Rows[i][14].ToString(); - if (!string.IsNullOrEmpty(col14)) - { - pipeline.LeakPressure = col14; - } - string col15 = pds.Rows[i][15].ToString(); - if (!string.IsNullOrEmpty(col15)) - { - var PurgeMethod = getPurgeMethod.FirstOrDefault(x => x.PurgeMethodCode == col15); - if (PurgeMethod == null) - { - result += "第" + (i + 2).ToString() + "行," + "该吹洗要求不存在！" + "|"; - } - else - { - pipeline.PCMedium = PurgeMethod.PurgeMethodId; - pipeline.PurgeMethodCode = col15; - - } - } - string col16 = pds.Rows[i][16].ToString(); - if (!string.IsNullOrEmpty(col16)) - { - pipeline.VacuumPressure = col16; - } - string col17 = pds.Rows[i][17].ToString(); - if (!string.IsNullOrEmpty(col17)) - { - var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col17); - if (material == null) - { - result += "第" + (i + 2).ToString() + "行," + "该材质不存在！" + "|"; - } - else - { - pipeline.MaterialId = material.MaterialId; - pipeline.PipeMaterialCode = col17; - } - } - pipeline.Remark = pds.Rows[i][18].ToString(); - - // 以下是焊口信息 - string col19 = pds.Rows[i][19].ToString(); - if (string.IsNullOrEmpty(col19)) - { - result += "第" + (i + 2).ToString() + "行," + "焊口号" + "," + "此项为必填项！" + "|"; - } - else - { - //var oldWeldJoint = getPipeline.FirstOrDefault(x => x.PipelineId == pipeLineId && x.WeldJointCode == col19); - //if (oldWeldJoint != null) - //{ - // pipeline.WeldJointId = oldWeldJoint.WeldJointId; - //} - //else - //{ - // pipeline.WeldJointId = SQLHelper.GetNewID(); - //} - pipeline.WeldJointCode = col19; - } - - string col20 = pds.Rows[i][20].ToString(); - if (!string.IsNullOrEmpty(col20)) - { - var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col20); - if (material == null) - { - result += "第" + (i + 2).ToString() + "行," + "该材质1不存在！" + "|"; - } - else - { - pipeline.Material1Id = material.MaterialId; - pipeline.Material1Code = col20; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "材质1" + "," + "此项为必填项！" + "|"; - } - - string col21 = pds.Rows[i][21].ToString(); - if (!string.IsNullOrEmpty(col21)) - { - var material = getMaterial.FirstOrDefault(x => x.MaterialCode == col21); - if (material == null) - { - result += "第" + (i + 2).ToString() + "行," + "该材质2不存在！" + "|"; - } - else - { - pipeline.Material2Id = material.MaterialId; - pipeline.Material2Code = col21; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "材质2" + "," + "此项为必填项！" + "|"; - } - - string col22 = pds.Rows[i][22].ToString().Replace("Φ", ""); - string col27 = pds.Rows[i][22].ToString(); - if (rbDiaType.SelectedValue=="1") - { - if (!string.IsNullOrEmpty(col27)) - { - try - { - decimal Dia = Convert.ToDecimal(col27); - pipeline.Dia = Dia; - - //var inch = BLL.Base_DNCompareService.GetSizeByDia(Dia); - //if (inch != null) - //{ - // pipeline.Size = inch; - //} - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "外径格式输入有误" + "|"; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "外径" + "," + "此项为必填项！" + "|"; - } - } - else - { - if (!string.IsNullOrEmpty(col22)) - { - pipeline.DNDia = col22; - - } - else - { - result += "第" + (i + 2).ToString() + "行," + "DN公称直径" + "," + "此项为必填项！" + "|"; - } - - } - - - string col23 = pds.Rows[i][23].ToString(); - if (!string.IsNullOrEmpty(col23)) - { - try - { - decimal Size = Convert.ToDecimal(col23); - pipeline.Size = Size; - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "达因格式输入有误" + "|"; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "达因" + "," + "此项为必填项！" + "|"; - } - - string col24 = pds.Rows[i][24].ToString(); - if (!string.IsNullOrEmpty(col24)) - { - try - { - var Thickness = Convert.ToDecimal(col24); - pipeline.Thickness = Thickness; - //是否根据壁厚计算达因 - //Model.Project_Sys_Set thicknessSet = BLL.Project_SysSetService.GetSysSetBySetId("7", this.CurrUser.LoginProjectId); - //if (thicknessSet != null && thicknessSet.IsAuto == true) - //{ - // if (pipeline.Size != null) - // { - // pipeline.Size = Convert.ToDecimal(BLL.WeldJointService.GetSizeByThickness(pipeline.Size, Thickness)); - // } - //} - } - catch (Exception) - { - result += "第" + (i + 2).ToString() + "行," + "壁厚格式输入有误" + "|"; - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "壁厚" + "," + "此项为必填项！" + "|"; - } - if (rbDiaType.SelectedValue=="1") - { - pipeline.Specification = "Φ" + (pipeline.Dia ?? 0).ToString() + "*" + (pipeline.Thickness ?? 0).ToString(); - - } - else - { - pipeline.Specification = pipeline.DNDia + "*" + (pipeline.Thickness ?? 0).ToString(); - - } - - string col25 = pds.Rows[i][25].ToString(); - if (!string.IsNullOrEmpty(col25)) - { - var weldType = getWeldType.FirstOrDefault(x => x.WeldTypeCode == col25); - if (weldType == null) - { - result += "第" + (i + 2).ToString() + "行," + "该焊缝类型不存在！" + "|"; - } - else - { - pipeline.WeldTypeId = weldType.WeldTypeId; - pipeline.WeldTypeCode = col25; - - if (col25.Contains("B")) - { - if (col6.Contains("RT")) - { - Model.Base_DetectionType rt = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode("RT"); - if (rt != null) - { - pipeline.DetectionTypeId = rt.DetectionTypeId; - } - } - else - { - Model.Base_DetectionType ut = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode("UT"); - if (ut != null) - { - pipeline.DetectionTypeId = ut.DetectionTypeId; - } - } - } - else - { - if (col6.Contains("MT")) - { - Model.Base_DetectionType mt = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode("MT"); - if (mt != null) - { - pipeline.DetectionTypeId = mt.DetectionTypeId; - } - } - else - { - Model.Base_DetectionType pt = BLL.Base_DetectionTypeService.GetDetectionTypeIdByDetectionTypeCode("PT"); - if (pt != null) - { - pipeline.DetectionTypeId = pt.DetectionTypeId; - } - } - } - } - } - else - { - result += "第" + (i + 2).ToString() + "行," + "焊缝类型" + "," + "此项为必填项！" + "|"; - } - string col26 = pds.Rows[i][26].ToString(); - if (!string.IsNullOrEmpty(col26)) - { - var JointAttribute = BLL.DropListService.HJGL_JointAttribute(); - - var q = JointAttribute.Where(x => x.Value == col26); - if (q==null ) - { - result += "第" + (i + 2).ToString() + "行," + "该焊口属性不存在！" + "|"; - - } - else - { - pipeline.JointAttribute = col26; - } - - } - else - { - result += "第" + (i + 2).ToString() + "行," + "焊口属性" + "," + "此项为必填项！" + "|"; - - } - - if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode)) - { - pipeline.ProjectId = this.CurrUser.LoginProjectId; - PipelineList.Add(pipeline); - } - - } - if (!string.IsNullOrEmpty(result)) - { - PipelineList.Clear(); - result = result.Substring(0, result.LastIndexOf("|")); - errorInfos = result; - responeData.code = 0; - responeData.message = errorInfos; - } - else - { - errorInfos = string.Empty; - - //ShowNotify("审核完成,请点击导入！", MessageBoxIcon.Success); - - } - } - else - { - responeData.code = 0; - responeData.message = "导入数据为空！"; - //ShowNotify("导入数据为空！", MessageBoxIcon.Warning); - } - return responeData; - } private Model.ResponeData AddDatasetToSQL(List pds, int count) { Model.ResponeData responeData = new Model.ResponeData(); @@ -1261,12 +710,21 @@ namespace FineUIPro.Web.HJGL.WeldingManage result.Add("第" + (i + 1).ToString() + "行," + "焊口属性" + "," + "此项为必填项！" + "|"); } + string col28 = Convert.ToString(pds[i].AD); + if (!string.IsNullOrEmpty(col28)) + { + if (col28.Trim() == "是") + { + pipeline.IsHotProess = true; + } + } if (!string.IsNullOrEmpty(pipeline.PipelineCode) && !string.IsNullOrEmpty(pipeline.WeldJointCode)) { pipeline.ProjectId = this.CurrUser.LoginProjectId; PipelineList.Add(pipeline); } + } if (result.Count > 0) @@ -1443,6 +901,186 @@ namespace FineUIPro.Web.HJGL.WeldingManage addHJGL_WeldJoints(PipelineList, unitworkId); } + void addPipelines(List PipelineList, string UnitWorkId) + { + // var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == UnitWorkId select x; + var pipelines = (from x in PipelineList + select new Model.HJGL_Pipeline + { + PipelineId = x.PipelineId, + ProjectId = this.CurrUser.LoginProjectId, + UnitId = x.UnitId, + UnitWorkId = x.UnitWorkId, + PipelineCode = x.PipelineCode, + SingleName = x.SingleName, + SingleNumber = x.SingleNumber, + MediumId = x.MediumId, + PipingClassId = x.PipingClassId, + DetectionRateId = x.DetectionRateId, + DetectionType = x.DetectionType, + DesignPress = x.DesignPress, + DesignTemperature = x.DesignTemperature, + TestMedium = x.TestMedium, + TestPressure = x.TestPressure, + PressurePipingClassId = x.PressurePipingClassId, + PipeLenth = x.PipeLenth, + LeakMedium = x.LeakMedium, + LeakPressure = x.LeakPressure, + VacuumPressure = x.VacuumPressure, + PCMedium = x.PCMedium, + MaterialId = x.MaterialId, + Remark = x.Remark, + FlowingSection = x.FlowingSection + }).DistinctBy(temp => new + { + temp.PipelineId, + temp.ProjectId, + temp.UnitId, + temp.UnitWorkId, + temp.PipelineCode, + temp.SingleName, + temp.SingleNumber, + temp.MediumId, + temp.PipingClassId, + temp.DetectionRateId, + temp.DetectionType, + temp.DesignPress, + temp.DesignTemperature, + temp.TestMedium, + temp.TestPressure, + temp.PressurePipingClassId, + temp.PipeLenth, + temp.LeakMedium, + temp.LeakPressure, + temp.VacuumPressure, + temp.PCMedium, + temp.MaterialId, + temp.Remark, + temp.FlowingSection + }).ToList(); + for (int i = 0; i < pipelines.Count(); i++) + { + Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); + pipeline.PipelineId = pipelines[i].PipelineId; + pipeline.ProjectId = this.CurrUser.LoginProjectId; + pipeline.UnitId = pipelines[i].UnitId; + pipeline.UnitWorkId = pipelines[i].UnitWorkId; + pipeline.PipelineCode = pipelines[i].PipelineCode; + pipeline.SingleName = pipelines[i].SingleName; + pipeline.SingleNumber = pipelines[i].SingleNumber; + pipeline.MediumId = pipelines[i].MediumId; + pipeline.PipingClassId = pipelines[i].PipingClassId; + pipeline.DetectionRateId = pipelines[i].DetectionRateId; + pipeline.DetectionType = pipelines[i].DetectionType; + pipeline.DesignPress = pipelines[i].DesignPress; + pipeline.DesignTemperature = pipelines[i].DesignTemperature; + pipeline.TestMedium = pipelines[i].TestMedium; + pipeline.TestPressure = pipelines[i].TestPressure; + pipeline.PressurePipingClassId = pipelines[i].PressurePipingClassId; + pipeline.PipeLenth = pipelines[i].PipeLenth; + pipeline.LeakMedium = pipelines[i].LeakMedium; + pipeline.LeakPressure = pipelines[i].LeakPressure; + pipeline.VacuumPressure = pipelines[i].VacuumPressure; + pipeline.PCMedium = pipelines[i].PCMedium; + pipeline.MaterialId = pipelines[i].MaterialId; + pipeline.Remark = pipelines[i].Remark; + pipeline.FlowingSection = pipelines[i].FlowingSection; + + var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId); + if (isExistPipelineCode != null) // 更新管线 + { + pipeline.PipelineId = isExistPipelineCode.PipelineId; + BLL.PipelineService.UpdatePipeline(pipeline); + } + else // 增加管线 + { + pipeline.PipelineId = SQLHelper.GetNewID(); + BLL.PipelineService.AddPipeline(pipeline); + } + } + + + } + void addHJGL_WeldJoints(List PipelineList, string UnitWorkId) + { + var getpipelines = from y in Funs.DB.HJGL_Pipeline where y.UnitWorkId == UnitWorkId select y; + List weldJoints_add = new List(); + + var weldJoints = (from x in PipelineList + select new Model.HJGL_WeldJoint + { + WeldJointCode = x.WeldJointCode, + PipelineCode = x.PipelineCode, + Material1Id = x.Material1Id, + Material2Id = x.Material2Id, + Dia = x.Dia, + DNDia = x.DNDia, + Size = x.Size, + Thickness = x.Thickness, + Specification = x.Specification, + WeldTypeId = x.WeldTypeId, + DetectionTypeId = x.DetectionTypeId, + JointAttribute = x.JointAttribute, + ProjectId = this.CurrUser.LoginProjectId, + IsHotProess = x.IsHotProess, + }).DistinctBy(temp => new + { + temp.WeldJointCode, + temp.PipelineCode, + temp.Material1Id, + temp.Material2Id, + temp.Dia, + temp.DNDia, + temp.Size, + temp.Thickness, + temp.Specification, + temp.WeldTypeId, + temp.DetectionTypeId, + temp.JointAttribute, + temp.ProjectId, + temp.IsHotProess + }).ToList(); + + for (int i = 0; i < weldJoints.Count(); i++) + { + Model.HJGL_WeldJoint weldJoint = new Model.HJGL_WeldJoint(); + weldJoint.PipelineId = getpipelines.Where(x => x.PipelineCode == weldJoints[i].PipelineCode).FirstOrDefault().PipelineId; + weldJoint.WeldJointCode = weldJoints[i].WeldJointCode; + weldJoint.PipelineCode = weldJoints[i].PipelineCode; + weldJoint.Material1Id = weldJoints[i].Material1Id; + weldJoint.Material2Id = weldJoints[i].Material2Id; + weldJoint.Dia = weldJoints[i].Dia; + weldJoint.DNDia = weldJoints[i].DNDia; + weldJoint.Size = weldJoints[i].Size; + weldJoint.Thickness = weldJoints[i].Thickness; + weldJoint.Specification = weldJoints[i].Specification; + weldJoint.WeldTypeId = weldJoints[i].WeldTypeId; + weldJoint.DetectionTypeId = weldJoints[i].DetectionTypeId; + weldJoint.JointAttribute = weldJoints[i].JointAttribute; + weldJoint.ProjectId = weldJoints[i].ProjectId; + weldJoint.IsHotProess = weldJoints[i].IsHotProess; + + var isExistJot = WeldJointService.GetWeldJointsByWeldJointCode(weldJoint.PipelineId, weldJoint.WeldJointCode); + if (isExistJot != null) // 更新焊口 + { + weldJoint.WeldJointId = isExistJot.WeldJointId; + BLL.WeldJointService.UpdateWeldJoint(weldJoint); + } + else // 增加焊口 + { + weldJoint.WeldJointId = SQLHelper.GetNewID(); + weldJoints_add.Add(weldJoint); + //BLL.WeldJointService.AddWeldJoint(weldJoint); + } + + } + if (weldJoints_add.Count > 0) + { + BLL.WeldJointService.AddBulkWeldJoint(weldJoints_add); + + } + } + //public void AddView_HJGL_WeldJoint(List PipelineList) //{ // string unitworkId = Request.Params["UnitWorkId"]; @@ -1530,182 +1168,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage //} #endregion - void addPipelines(List PipelineList, string UnitWorkId) - { - // var getPipeline = from x in Funs.DB.View_HJGL_WeldJoint where x.UnitWorkId == UnitWorkId select x; - var pipelines = (from x in PipelineList - select new Model.HJGL_Pipeline - { - PipelineId = x.PipelineId, - ProjectId = this.CurrUser.LoginProjectId, - UnitId = x.UnitId, - UnitWorkId = x.UnitWorkId, - PipelineCode = x.PipelineCode, - SingleName = x.SingleName, - SingleNumber = x.SingleNumber, - MediumId = x.MediumId, - PipingClassId = x.PipingClassId, - DetectionRateId = x.DetectionRateId, - DetectionType = x.DetectionType, - DesignPress = x.DesignPress, - DesignTemperature = x.DesignTemperature, - TestMedium = x.TestMedium, - TestPressure = x.TestPressure, - PressurePipingClassId = x.PressurePipingClassId, - PipeLenth = x.PipeLenth, - LeakMedium = x.LeakMedium, - LeakPressure = x.LeakPressure, - VacuumPressure = x.VacuumPressure, - PCMedium = x.PCMedium, - MaterialId = x.MaterialId, - Remark = x.Remark, - FlowingSection=x.FlowingSection - }).DistinctBy(temp => new - { - temp.PipelineId, - temp.ProjectId, - temp.UnitId, - temp.UnitWorkId, - temp.PipelineCode, - temp.SingleName, - temp.SingleNumber, - temp.MediumId, - temp.PipingClassId, - temp.DetectionRateId, - temp.DetectionType, - temp.DesignPress, - temp.DesignTemperature, - temp.TestMedium, - temp.TestPressure, - temp.PressurePipingClassId, - temp.PipeLenth, - temp.LeakMedium, - temp.LeakPressure, - temp.VacuumPressure, - temp.PCMedium, - temp.MaterialId, - temp.Remark, - temp.FlowingSection - }).ToList(); - for (int i = 0; i < pipelines.Count(); i++) - { - Model.HJGL_Pipeline pipeline = new Model.HJGL_Pipeline(); - pipeline.PipelineId = pipelines[i].PipelineId; - pipeline.ProjectId = this.CurrUser.LoginProjectId; - pipeline.UnitId = pipelines[i].UnitId; - pipeline.UnitWorkId = pipelines[i].UnitWorkId; - pipeline.PipelineCode = pipelines[i].PipelineCode; - pipeline.SingleName = pipelines[i].SingleName; - pipeline.SingleNumber = pipelines[i].SingleNumber; - pipeline.MediumId = pipelines[i].MediumId; - pipeline.PipingClassId = pipelines[i].PipingClassId; - pipeline.DetectionRateId = pipelines[i].DetectionRateId; - pipeline.DetectionType = pipelines[i].DetectionType; - pipeline.DesignPress = pipelines[i].DesignPress; - pipeline.DesignTemperature = pipelines[i].DesignTemperature; - pipeline.TestMedium = pipelines[i].TestMedium; - pipeline.TestPressure = pipelines[i].TestPressure; - pipeline.PressurePipingClassId = pipelines[i].PressurePipingClassId; - pipeline.PipeLenth = pipelines[i].PipeLenth; - pipeline.LeakMedium = pipelines[i].LeakMedium; - pipeline.LeakPressure = pipelines[i].LeakPressure; - pipeline.VacuumPressure = pipelines[i].VacuumPressure; - pipeline.PCMedium = pipelines[i].PCMedium; - pipeline.MaterialId = pipelines[i].MaterialId; - pipeline.Remark = pipelines[i].Remark; - pipeline.FlowingSection = pipelines[i].FlowingSection; - - var isExistPipelineCode = PipelineService.GetPipelineByCode(pipeline.PipelineCode, pipeline.UnitWorkId); - if (isExistPipelineCode!=null) // 更新管线 - { - pipeline.PipelineId = isExistPipelineCode.PipelineId; - BLL.PipelineService.UpdatePipeline(pipeline); - } - else // 增加管线 - { - pipeline.PipelineId = SQLHelper.GetNewID(); - BLL.PipelineService.AddPipeline(pipeline); - } - } - - - } - void addHJGL_WeldJoints(List PipelineList, string UnitWorkId) - { - var getpipelines= from y in Funs.DB.HJGL_Pipeline where y.UnitWorkId== UnitWorkId select y; - List weldJoints_add = new List(); - - var weldJoints = (from x in PipelineList - select new Model.HJGL_WeldJoint - { - WeldJointCode = x.WeldJointCode, - PipelineCode = x.PipelineCode, - Material1Id = x.Material1Id, - Material2Id = x.Material2Id, - Dia = x.Dia, - DNDia=x.DNDia, - Size = x.Size, - Thickness = x.Thickness, - Specification = x.Specification, - WeldTypeId = x.WeldTypeId, - DetectionTypeId = x.DetectionTypeId, - JointAttribute = x.JointAttribute, - ProjectId = this.CurrUser.LoginProjectId - }).DistinctBy(temp => new - { - temp.WeldJointCode , - temp.PipelineCode , - temp.Material1Id , - temp.Material2Id , - temp.Dia, - temp.DNDia, - temp.Size, - temp.Thickness, - temp.Specification, - temp.WeldTypeId, - temp.DetectionTypeId, - temp.JointAttribute, - temp.ProjectId - }).ToList(); - - for (int i = 0; i < weldJoints.Count(); i++) - { - Model.HJGL_WeldJoint weldJoint = new Model.HJGL_WeldJoint(); - weldJoint.PipelineId = getpipelines.Where(x=>x.PipelineCode== weldJoints[i].PipelineCode).FirstOrDefault().PipelineId; - weldJoint.WeldJointCode = weldJoints[i].WeldJointCode; - weldJoint.PipelineCode = weldJoints[i].PipelineCode; - weldJoint.Material1Id = weldJoints[i].Material1Id; - weldJoint.Material2Id = weldJoints[i].Material2Id; - weldJoint.Dia = weldJoints[i].Dia; - weldJoint.DNDia = weldJoints[i].DNDia; - weldJoint.Size = weldJoints[i].Size; - weldJoint.Thickness = weldJoints[i].Thickness; - weldJoint.Specification = weldJoints[i].Specification; - weldJoint.WeldTypeId = weldJoints[i].WeldTypeId; - weldJoint.DetectionTypeId = weldJoints[i].DetectionTypeId; - weldJoint.JointAttribute = weldJoints[i].JointAttribute; - weldJoint.ProjectId = weldJoints[i].ProjectId; - - var isExistJot = WeldJointService.GetWeldJointsByWeldJointCode(weldJoint.PipelineId, weldJoint.WeldJointCode); - if (isExistJot != null) // 更新焊口 - { - weldJoint.WeldJointId = isExistJot.WeldJointId; - BLL.WeldJointService.UpdateWeldJoint(weldJoint); - } - else // 增加焊口 - { - weldJoint.WeldJointId = SQLHelper.GetNewID(); - weldJoints_add.Add(weldJoint); - //BLL.WeldJointService.AddWeldJoint(weldJoint); - } - - } - if (weldJoints_add.Count > 0) - { - BLL.WeldJointService.AddBulkWeldJoint(weldJoints_add); - - } - } /// /// 恢复版本 diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx index 3f0e943d..1e9f2061 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx @@ -66,7 +66,7 @@ runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="100px" LabelAlign="Right"> @@ -111,7 +111,11 @@ - + + + + @@ -155,11 +159,8 @@ - - - - + + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 9e45ef75..399944b1 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -414,7 +414,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage //{ // joint.IsHotProess = false; //} - //joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue); + joint.IsHotProess = Convert.ToBoolean(drpIsHotProess.SelectedValue); //joint.DesignIsHotProess = Convert.ToBoolean(drpDesignIsHotProess.SelectedValue); joint.Remark = txtRemark.Text.Trim(); joint.SubmitMan = CurrUser.PersonId; diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs index bd6aff10..f09a67cb 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs @@ -248,6 +248,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.DropDownList DropTwoJointType; + /// + /// drpIsHotProess 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsHotProess; + /// /// GroupPanel2 控件。 /// @@ -329,15 +338,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.TextBox txtPreTemperature; - /// - /// drpIsHotProess 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.DropDownList drpIsHotProess; - /// /// txtWpqId 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs index 6ed9864d..9528b728 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointList.aspx.cs @@ -458,28 +458,28 @@ namespace FineUIPro.Web.HJGL.WeldingManage private string GetWeldJointRateByUnitWork(string unitworkid) { string rate = ""; - int ShopNum = 0; - int FieldNum = 0; + int shopNum = 0; + int fieldNum = 0; int AllNum = 0; var db = Funs.DB; var q = from x in db.View_HJGL_WeldJoint where x.UnitWorkId == unitworkid select x; if (q != null && q.Count() > 0) { - ShopNum = (from x in q + shopNum = (from x in q where x.JointAttribute == "预制口" select x ).Count(); - FieldNum = (from x in q + fieldNum = (from x in q where x.JointAttribute == "安装口" select x ).Count(); - ShopSum = ShopNum.ToString(); - FieldSum = FieldSum.ToString(); - AllNum = ShopNum + FieldNum; + ShopSum = shopNum.ToString(); + FieldSum = fieldNum.ToString(); + AllNum = shopNum + fieldNum; if (AllNum > 0) { - var a = (decimal)100 * ShopNum / AllNum; + var a = (decimal)100 * shopNum / AllNum; rate = Math.Round((decimal)a, 1).ToString() + "%"; } @@ -542,27 +542,27 @@ namespace FineUIPro.Web.HJGL.WeldingManage private string GetWeldJointRateByPipelineid(string pipelineid) { string rate = ""; - int ShopNum = 0; - int FieldNum = 0; + int shopNum = 0; + int fieldNum = 0; int AllNum = 0; var db = Funs.DB; var q = from x in db.View_HJGL_WeldJoint where x.PipelineId == pipelineid select x; if (q != null && q.Count() > 0) { - ShopNum = (from x in q + shopNum = (from x in q where x.JointAttribute == "预制口" select x ).Count(); - FieldNum = (from x in q + fieldNum = (from x in q where x.JointAttribute == "安装口" select x ).Count(); - ShopSum = ShopNum.ToString(); - FieldSum = FieldSum.ToString(); - AllNum = ShopNum + FieldNum; + ShopSum = shopNum.ToString(); + FieldSum = fieldNum.ToString(); + AllNum = shopNum + fieldNum; if (AllNum > 0) { - var a = (decimal)100 * ShopNum / AllNum; + var a = (decimal)100 * shopNum / AllNum; rate = Math.Round((decimal)a, 1).ToString() + "%"; }