From e68058041793d2b452d108fcb8b8d56b2b152c54 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Tue, 22 Oct 2024 21:13:56 +0800 Subject: [PATCH] 1 --- .vs/Basf_TCC7/v17/.wsuo | Bin 124416 -> 124416 bytes .vs/Basf_TCC7/v17/DocumentLayout.json | 4 - HJGL/.vs/HJGL/v17/.suo | Bin 1635328 -> 1367552 bytes HJGL/BLL/Common/Const.cs | 4 + .../App_GlobalResources/Lan.Designer.cs | 9 + .../App_GlobalResources/Lan.en-US.resx | 4 + .../App_GlobalResources/Lan.resx | 3 + .../App_GlobalResources/Lan.zh-CN.resx | 3 + .../Excel/HJGL_DataOut/管道追溯表.xlsx | Bin 12403 -> 12437 bytes .../File/Excel/PMI委托导入模版.xlsx | Bin 0 -> 9804 bytes HJGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + HJGL/FineUIPro.Web/Global.asax.cs | 4 + .../CheckManage/RepairAndExpand.aspx.cs | 10 +- .../CheckManage/RepairNotice.aspx.cs | 110 +- .../WeldingProcess/PMI/ImportError.aspx | 36 + .../WeldingProcess/PMI/ImportError.aspx.cs | 29 + .../PMI/ImportError.aspx.designer.cs | 53 + .../WeldingProcess/PMI/PMIDelegation.aspx | 14 +- .../WeldingProcess/PMI/PMIDelegation.aspx.cs | 404 ++++++ .../PMI/PMIDelegation.aspx.designer.cs | 45 + .../TestPackageManageAudit.aspx.cs | 457 +++---- .../TestPackageManageEdit.aspx | 2 +- .../TrustManage/TrustBatchManage.aspx.cs | 3 +- .../WeldingReport/PipelineTraceList.aspx.cs | 31 +- HJGL/Model/Model.cs | 1178 ++++++++++++++++- 25 files changed, 2099 insertions(+), 312 deletions(-) create mode 100644 HJGL/FineUIPro.Web/File/Excel/PMI委托导入模版.xlsx create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.cs create mode 100644 HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.designer.cs diff --git a/.vs/Basf_TCC7/v17/.wsuo b/.vs/Basf_TCC7/v17/.wsuo index 60614da8f4e6bf76b52dd6b636f83dee81021bd2..22f98023668eab9f984760026607a5dfce05a430 100644 GIT binary patch delta 1376 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 Ge*Xc26WrMV diff --git a/HJGL/BLL/Common/Const.cs b/HJGL/BLL/Common/Const.cs index 05d1ef1..59b5c98 100644 --- a/HJGL/BLL/Common/Const.cs +++ b/HJGL/BLL/Common/Const.cs @@ -222,6 +222,10 @@ namespace BLL /// 试压包导入模版文件原始的虚拟路径 /// public const string HJGL_TestTemplateUrl = "File\\Excel\\试压包导入模版.xlsx"; + /// + /// PMI委托导入模版 + /// + public const string HJGL_PMITemplateUrl = "File\\Excel\\PMI委托导入模版.xlsx"; /// /// PDMS导入模版文件原始的虚拟路径 diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs index ff85a82..d708d80 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs @@ -2391,6 +2391,15 @@ namespace Resources { } } + /// + /// 查找类似 导入 的本地化字符串。 + /// + internal static string Import { + get { + return ResourceManager.GetString("Import", resourceCulture); + } + } + /// /// 查找类似 寸径 的本地化字符串。 /// diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx index 0995089..89314a1 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.en-US.resx @@ -2769,4 +2769,8 @@ Home Page 首页 + + Import + 导入 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx index 4110d2d..71f2b22 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx @@ -2139,4 +2139,7 @@ 返修扩探追踪清单 + + 导入 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx index 3938dba..6768fed 100644 --- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx +++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.zh-CN.resx @@ -2106,4 +2106,7 @@ 首页 + + 导入 + \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/File/Excel/HJGL_DataOut/管道追溯表.xlsx b/HJGL/FineUIPro.Web/File/Excel/HJGL_DataOut/管道追溯表.xlsx index e9eb296901cdfe62dec2074395c59ea3b024a22c..8908c51fec699f8099be49611fa28a71eee9829b 100644 GIT binary patch delta 4891 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 Sfk6NO7x7{H8S8)22k?KAxz|zv literal 0 HcmV?d00001 diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 4aa5056..47d7b19 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1279,6 +1279,7 @@ + @@ -5483,6 +5484,13 @@ DataInEdit.aspx + + ImportError.aspx + ASPXCodeBehind + + + ImportError.aspx + PMIDelegation.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/Global.asax.cs b/HJGL/FineUIPro.Web/Global.asax.cs index 3cb1659..17afa2d 100644 --- a/HJGL/FineUIPro.Web/Global.asax.cs +++ b/HJGL/FineUIPro.Web/Global.asax.cs @@ -297,6 +297,10 @@ { var wpsList = from x in Funs.DB.WPQ_WPQList where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x; var welderList = from x in Funs.DB.Welder_ProjectWelder where x.ProjectId == ((Model.Sys_User)Session["CurrUser"]).LoginProjectId select x; + if (wpsList==null) + { + return; + } foreach (var wps in wpsList) { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs index 8b81d26..1e81e7a 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairAndExpand.aspx.cs @@ -33,7 +33,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage if (!string.IsNullOrEmpty(repairRecordId)) { this.txtPipeCode.Text = jot.PipelineCode; - txtWeldJointCode.Text = jot.WeldJointCode; + txtWeldJointCode.Text = jot.WeldJointCode+repairRecord.RepairMark; txtWelder.Text = jot.BackingWelderCode; txtRepairLocation.Text = repairRecord.RepairLocation; txtJudgeGrade.Text = ndeItem.JudgeGrade; @@ -657,11 +657,11 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage //} db.Repair_RepairRecord.DeleteOnSubmit(repair); db.SubmitChanges(); - if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R")) - { - Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId); + //if (joint.WeldJointCode.Contains("P") || joint.WeldJointCode.Contains("S") || joint.WeldJointCode.Contains("R")) + //{ + // Pipeline_WeldJointService.DeleteWeldJointById(joint.WeldJointId); - } + //} this.InitTreeMenu();//加载树 Alert.ShowInTop("删除成功!", MessageBoxIcon.Success); } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs index ef251cc..d415f68 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/CheckManage/RepairNotice.aspx.cs @@ -212,61 +212,61 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage // 回写焊口号 - var weldJoint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId); - //joint.WeldJointCode = newJointCode; - //joint.OldWeldJointCode = q.WeldJointCode; - //Funs.DB.SubmitChanges(); - Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint - { - WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), - ProjectId = weldJoint.ProjectId, - PipelineId = weldJoint.PipelineId, - WeldJointCode = newJointCode, - WeldTypeId = weldJoint.WeldTypeId, - Material1Id = weldJoint.Material1Id, - Material2Id = weldJoint.Material2Id, - Thickness = weldJoint.Thickness, - Dia = weldJoint.Dia, - Size = weldJoint.Size, - JointAttribute = weldJoint.JointAttribute, - JointArea = weldJoint.JointArea, - WeldingMethodId = weldJoint.WeldingMethodId, - IsHotProess = weldJoint.IsHotProess, - WeldingLocationId = weldJoint.WeldingLocationId, - WeldMatId = weldJoint.WeldMatId, - WeldSilkId = weldJoint.WeldSilkId, - GrooveTypeId = weldJoint.GrooveTypeId, - PipeSegment = weldJoint.PipeSegment, - PipeAssembly1Id = weldJoint.PipeAssembly1Id, - PipeAssembly2Id = weldJoint.PipeAssembly2Id, - PipeAssemblyCount = weldJoint.PipeAssemblyCount, - HeartNo1 = weldJoint.HeartNo1, - HeartNo2 = weldJoint.HeartNo2, - LastTemp = weldJoint.LastTemp, - CellTemp = weldJoint.CellTemp, - PrepareTemp = weldJoint.PrepareTemp, - Electricity = weldJoint.Electricity, - Voltage = weldJoint.Voltage, - TestPackageNo = weldJoint.TestPackageNo, - WeldingDailyCode = weldJoint.WeldingDailyCode, - BackingWelderId = weldJoint.BackingWelderId, - CoverWelderId = weldJoint.CoverWelderId, - WeldingDailyId = weldJoint.WeldingDailyId, - PipingClassId = weldJoint.PipingClassId, - Specification = weldJoint.Specification, - DoneDin = weldJoint.DoneDin, - SystemNumber = weldJoint.SystemNumber, - Remark = weldJoint.Remark, - IsGoldJoint = weldJoint.IsGoldJoint, - IsPMI = weldJoint.IsPMI, - WPQId = weldJoint.WPQId, - DetectionType = weldJoint.DetectionType, - PageNum = weldJoint.PageNum, - ANSISCH = weldJoint.ANSISCH, - OldWeldJointCode = weldJoint.OldWeldJointCode, + /*var joint = BLL.Pipeline_WeldJointService.GetWeldJointByWeldJointId(q.WeldJointId); + joint.WeldJointCode = newJointCode; + joint.OldWeldJointCode = q.WeldJointCode; + Funs.DB.SubmitChanges();*/ + // Model.Pipeline_WeldJoint newWeldJoint = new Model.Pipeline_WeldJoint + // { + // WeldJointId = SQLHelper.GetNewID(typeof(Model.Pipeline_WeldJoint)), + // ProjectId = weldJoint.ProjectId, + // PipelineId = weldJoint.PipelineId, + // WeldJointCode = newJointCode, + // WeldTypeId = weldJoint.WeldTypeId, + // Material1Id = weldJoint.Material1Id, + // Material2Id = weldJoint.Material2Id, + // Thickness = weldJoint.Thickness, + // Dia = weldJoint.Dia, + // Size = weldJoint.Size, + // JointAttribute = weldJoint.JointAttribute, + // JointArea = weldJoint.JointArea, + // WeldingMethodId = weldJoint.WeldingMethodId, + // IsHotProess = weldJoint.IsHotProess, + // WeldingLocationId = weldJoint.WeldingLocationId, + // WeldMatId = weldJoint.WeldMatId, + // WeldSilkId = weldJoint.WeldSilkId, + // GrooveTypeId = weldJoint.GrooveTypeId, + // PipeSegment = weldJoint.PipeSegment, + // PipeAssembly1Id = weldJoint.PipeAssembly1Id, + // PipeAssembly2Id = weldJoint.PipeAssembly2Id, + // PipeAssemblyCount = weldJoint.PipeAssemblyCount, + // HeartNo1 = weldJoint.HeartNo1, + // HeartNo2 = weldJoint.HeartNo2, + // LastTemp = weldJoint.LastTemp, + // CellTemp = weldJoint.CellTemp, + // PrepareTemp = weldJoint.PrepareTemp, + // Electricity = weldJoint.Electricity, + // Voltage = weldJoint.Voltage, + // TestPackageNo = weldJoint.TestPackageNo, + // WeldingDailyCode = weldJoint.WeldingDailyCode, + // BackingWelderId = weldJoint.BackingWelderId, + // CoverWelderId = weldJoint.CoverWelderId, + // WeldingDailyId = weldJoint.WeldingDailyId, + // PipingClassId = weldJoint.PipingClassId, + // Specification = weldJoint.Specification, + // DoneDin = weldJoint.DoneDin, + // SystemNumber = weldJoint.SystemNumber, + // Remark = weldJoint.Remark, + // IsGoldJoint = weldJoint.IsGoldJoint, + // IsPMI = weldJoint.IsPMI, + // WPQId = weldJoint.WPQId, + // DetectionType = weldJoint.DetectionType, + // PageNum = weldJoint.PageNum, + // ANSISCH = weldJoint.ANSISCH, + // OldWeldJointCode = weldJoint.OldWeldJointCode, - }; - string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint); + // }; + //string WeldJointId= BLL.Pipeline_WeldJointService.AddWeldJointRef(newWeldJoint); newItem.ProjectId = q.ProjectId; newItem.UnitId = q.UnitId; @@ -274,7 +274,7 @@ namespace FineUIPro.Web.WeldingProcess.CheckManage newItem.WorkAreaId = q.WorkAreaId; newItem.NoticeDate = DateTime.Now; newItem.NDEItemID = ndeItemId; - newItem.WeldJointId = WeldJointId; + newItem.WeldJointId = q.WeldJointId; newItem.DetectionTypeId = q.DetectionTypeId; newItem.WelderId = q.BackingWelderId; newItem.RepairLocation = q.RepairLocation; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx new file mode 100644 index 0000000..308de6e --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx @@ -0,0 +1,36 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="ImportError.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.ImportError" %> + + + + + + + PMI导入错误日志 + + +
+ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.cs new file mode 100644 index 0000000..52c9d25 --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.cs @@ -0,0 +1,29 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + public partial class ImportError : PageBase + { + string batchNo = string.Empty; + protected void Page_Load(object sender, EventArgs e) + { + this.batchNo = Request.Params["batchNo"]; + if (!IsPostBack) + { + BindGrid(); + } + } + void BindGrid() + { + var list = Funs.DB.PMI_ImportErrorLog.Where(t => t.BatchNo == batchNo).OrderBy(t => t.RowId).ToList(); + this.Grid1.DataSource = list; + this.Grid1.DataBind(); + } + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.designer.cs new file mode 100644 index 0000000..0a4118b --- /dev/null +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/ImportError.aspx.designer.cs @@ -0,0 +1,53 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为,如果 +// 重新生成代码,则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WeldingProcess.PMI +{ + + + public partial class ImportError + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// lablRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lablRemark; + } +} diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx index 1b487af..a8c5898 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx @@ -38,8 +38,17 @@ + + + + + + + - +