From 52ea4b81e8d6f2dc4f01c61be7691f5d5128e246 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 10:40:49 +0800 Subject: [PATCH 1/8] 11 --- HJGL/.vs/HJGL/config/applicationhost.config | 2 +- HJGL/.vs/HJGL/v17/.suo | Bin 1281024 -> 1282560 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index b8c8efa..1963de0 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index d295d438d75197e2452d3e7925b54e8f9d561a18..dff1971e9c85b5f92fd0b844a0b29e5f9749e616 100644 GIT binary patch delta 29718 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 N+;6Rvj3@p4zX34i+i?H@ From aa80b143c45b0a3449849699df3cac118f8e8cfc Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 11:10:50 +0800 Subject: [PATCH 2/8] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1282560 -> 1277952 bytes HJGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + HJGL/FineUIPro.Web/Web.config | 2 +- .../WelderManage/AnalysisEdit.aspx | 84 +++++++++ .../WelderManage/AnalysisEdit.aspx.cs | 85 +++++++++ .../AnalysisEdit.aspx.designer.cs | 170 ++++++++++++++++++ .../WelderManage/QualifiedProject.aspx | 7 + .../WelderManage/QualifiedProject.aspx.cs | 10 ++ .../QualifiedProject.aspx.designer.cs | 90 ++++++---- 9 files changed, 420 insertions(+), 36 deletions(-) create mode 100644 HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx create mode 100644 HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs create mode 100644 HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index dff1971e9c85b5f92fd0b844a0b29e5f9749e616..05c5675a09324cf7ecb0509c8c0343fade7303a9 100644 GIT binary patch delta 15957 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 delta 32161 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 diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index ef34884..93618cd 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -240,6 +240,7 @@ + @@ -3425,6 +3426,13 @@ PIPClassEdit.aspx + + AnalysisEdit.aspx + ASPXCodeBehind + + + AnalysisEdit.aspx + QualificationAnalysis.aspx ASPXCodeBehind diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index 9ecdad1..baa8804 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -9,7 +9,7 @@
- + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx new file mode 100644 index 0000000..0d254cf --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -0,0 +1,84 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="AnalysisEdit.aspx.cs" Inherits="FineUIPro.Web.WelderManage.AnalysisEdit" %> + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs new file mode 100644 index 0000000..f25df8c --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -0,0 +1,85 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Web; +using System.Web.UI; +using System.Web.UI.WebControls; + +namespace FineUIPro.Web.WelderManage +{ + public partial class AnalysisEdit : PageBase + { + #region 定义项 + /// + /// 合格项目id + /// + public string WelderQualifiedProjectId + { + get + { + return (string)ViewState["WelderQualifiedProjectId"]; + } + set + { + ViewState["WelderQualifiedProjectId"] = value; + } + } + + /// + /// 焊工id + /// + public string WED_ID + { + get + { + return (string)ViewState["WED_ID"]; + } + set + { + ViewState["WED_ID"] = value; + } + } + #endregion + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); + this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"]; + this.WED_ID = Request.Params["WED_ID"]; + if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId)) + { + var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId); + if (welderQualifiedProject != null) + { + this.WED_ID = welderQualifiedProject.WelderId; + this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; + //if (welderQualifiedProject.LimitDate.HasValue) + //{ + // this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.LimitDate); + //} + this.txtCertificateNo.Text = welderQualifiedProject.CertificateNo; + if (welderQualifiedProject.CheckDate.HasValue) + { + this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.CheckDate); + } + this.txtExamProject.Text = welderQualifiedProject.ExamProject; + txtRemark.Text = welderQualifiedProject.Remark; + drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否"; + } + } + Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID); + if (welder != null) + { + this.lbWedlerName.Text = welder.WelderName; + this.lbWedlerCode.Text = welder.WelderCode; + } + } + } + + protected void btnSave_Click(object sender, EventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs new file mode 100644 index 0000000..bb32de8 --- /dev/null +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs @@ -0,0 +1,170 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.WelderManage +{ + + + public partial class AnalysisEdit + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// lbWedlerName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbWedlerName; + + /// + /// lbWedlerCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbWedlerCode; + + /// + /// txtQualifiedProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label txtQualifiedProjectCode; + + /// + /// drpWeldingMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpWeldingMethod; + + /// + /// txtCertificateNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCertificateNo; + + /// + /// txtCheckDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtCheckDate; + + /// + /// txtExamProject 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtExamProject; + + /// + /// drpIsPass 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpIsPass; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// lbTemp 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Label lbTemp; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + + /// + /// btnClose 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnClose; + } +} diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx index b37aa77..1c8d899 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx @@ -142,10 +142,17 @@ Target="top" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true" Width="600px" Height="420px"> + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs index 3f3cedd..0e133a4 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs @@ -207,6 +207,16 @@ namespace FineUIPro.Web.WelderManage } } + protected void btnMenuAnalysis_Click(object sender, EventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请选择一条记录！", MessageBoxIcon.Warning); + return; + } + PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("AnalysisEdit.aspx?WelderQualifiedProjectId={0}", Grid1.SelectedRowID, "维护 - "))); + } + /// /// 删除 /// diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs index a96bd70..ced92e3 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.WelderManage { - - - public partial class QualifiedProject { - +namespace FineUIPro.Web.WelderManage +{ + + + public partial class QualifiedProject + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// panelLeftRegion 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelLeftRegion; - + /// /// Toolbar4 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar4; - + /// /// drpUnitId 控件。 /// @@ -65,7 +67,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + /// /// Toolbar1 控件。 /// @@ -74,7 +76,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// txtWelderCodeS 控件。 /// @@ -83,7 +85,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWelderCodeS; - + /// /// Toolbar3 控件。 /// @@ -92,7 +94,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar3; - + /// /// txtWelderNameS 控件。 /// @@ -101,7 +103,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.TextBox txtWelderNameS; - + /// /// tvControlItem 控件。 /// @@ -110,7 +112,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Tree tvControlItem; - + /// /// panelCenterRegion 控件。 /// @@ -119,7 +121,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel panelCenterRegion; - + /// /// Grid1 控件。 /// @@ -128,7 +130,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar2 控件。 /// @@ -137,7 +139,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar2; - + /// /// lblCode 控件。 /// @@ -146,7 +148,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lblCode; - + /// /// lblName 控件。 /// @@ -155,7 +157,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label lblName; - + /// /// ToolbarFill1 控件。 /// @@ -164,7 +166,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// fileUpload 控件。 /// @@ -173,7 +175,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.FileUpload fileUpload; - + /// /// btnImport 控件。 /// @@ -182,7 +184,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnImport; - + /// /// btnDownLoad 控件。 /// @@ -191,7 +193,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnDownLoad; - + /// /// btnAdd 控件。 /// @@ -200,7 +202,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnAdd; - + /// /// btnQualificationAnalysis 控件。 /// @@ -209,7 +211,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnQualificationAnalysis; - + /// /// hidFileName 控件。 /// @@ -218,7 +220,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.HiddenField hidFileName; - + /// /// lbWeldType 控件。 /// @@ -227,7 +229,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.WebControls.Label lbWeldType; - + /// /// ToolbarSeparator1 控件。 /// @@ -236,7 +238,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -245,7 +247,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// @@ -254,7 +256,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; - + /// /// Window1 控件。 /// @@ -263,7 +265,16 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; - + + /// + /// Window2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window2; + /// /// Menu1 控件。 /// @@ -272,7 +283,7 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Menu Menu1; - + /// /// btnMenuEdit 控件。 /// @@ -281,7 +292,16 @@ namespace FineUIPro.Web.WelderManage { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.MenuButton btnMenuEdit; - + + /// + /// btnMenuAnalysis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.MenuButton btnMenuAnalysis; + /// /// btnMenuDelete 控件。 /// From 495da7315fe538870263fb76ef4058e0ad39db5d Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 11:19:50 +0800 Subject: [PATCH 3/8] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1277952 -> 1277952 bytes .../WelderManage/AnalysisEdit.aspx | 10 +++++----- .../WelderManage/AnalysisEdit.aspx.cs | 10 +--------- .../AnalysisEdit.aspx.designer.cs | 8 ++++---- 4 files changed, 10 insertions(+), 18 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 05c5675a09324cf7ecb0509c8c0343fade7303a9..67687d2fa24c960c28fdea5bba0e8a709534c808 100644 GIT binary patch delta 6451 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 delta 26745 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 diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx index 0d254cf..e20fad9 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -27,21 +27,21 @@ - + - - + + - - + + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs index f25df8c..7d8e772 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -54,15 +54,7 @@ namespace FineUIPro.Web.WelderManage { this.WED_ID = welderQualifiedProject.WelderId; this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; - //if (welderQualifiedProject.LimitDate.HasValue) - //{ - // this.txtLimitDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.LimitDate); - //} - this.txtCertificateNo.Text = welderQualifiedProject.CertificateNo; - if (welderQualifiedProject.CheckDate.HasValue) - { - this.txtCheckDate.Text = string.Format("{0:yyyy-MM-dd}", welderQualifiedProject.CheckDate); - } + this.txtExamProject.Text = welderQualifiedProject.ExamProject; txtRemark.Text = welderQualifiedProject.Remark; drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否"; diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs index bb32de8..1915e90 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs @@ -78,22 +78,22 @@ namespace FineUIPro.Web.WelderManage protected global::FineUIPro.DropDownList drpWeldingMethod; /// - /// txtCertificateNo 控件。 + /// drpMaterialType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtCertificateNo; + protected global::FineUIPro.DropDownList drpMaterialType; /// - /// txtCheckDate 控件。 + /// drpWeldingLocation 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DatePicker txtCheckDate; + protected global::FineUIPro.DropDownList drpWeldingLocation; /// /// txtExamProject 控件。 From 1239f76aa9318b9553164d542303d19d6eb87da0 Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 12 May 2024 15:49:38 +0800 Subject: [PATCH 4/8] 122121 --- HJGL/.vs/HJGL/config/applicationhost.config | 2 +- HJGL/.vs/HJGL/v17/.suo | Bin 1040896 -> 1040896 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 9292fa5..67d9141 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index b496d7022fd3098ef4a80b6a6d6a3578f8cf1897..ff56d7c4c63932b28df8d7e0b163b16eff2f2d92 100644 GIT binary patch delta 1812 zcmZvdYiv|S6vyYx-rerqS6|zf&n6=&jJ1ND#29hL+R)z$4uDBu#fi32vR`lS7_Jm;dRmK zqAEdJjyD4lSzs-AR}^Sd(w*pOAlJ@V5Nr?)S}x5HuWL_gi{KYMT7c@rkd~|c6^q5h zu;!nm!*7D4pcXv9#AeuyzyS(T+hW)h@D#vwY$1H}(XSCz_M(vTsC258!+RLBs_#dC zA_xExxaAjzb#30O7^vU{u+M@~;J^aq8-WDMDjMNih`CZ*!Z#iEJ&Z9GTO)oP&eSq+ zK!Z2idw5bFH;>C>IGs>PcNT?|LMmA*Y#K-he?p*K*d-tnh^5Z3lE}G8_h48L5(=rE z;tF-b^*DuA!>@vrLdqr;3c&v#g#zlJst$F~q(bW8YL#kYw|$*o$(0x;e%1L*mu7^+ znz|FKB>X)YzJ2;XG1f=EMlv&aUy!OvT;S6jqsV`V%We6z%h(jQ!r51BSe~YqE0Rq- z9Uj!wKxoDHjh!=!)%_YkgUIiWm7#9###leOu*`aKax3xWOnf(`Ob#_tfsFjd$6FN> z&gm$m_daopN-p@~$*sZiNKRs#+4VJhyZzR_`YZN?BeE=-h`HO@Lss|lmF{DciOaPk zo)Y=1B%h45xMy2iU*1E#{tn`KB(`PkGMhapc5jbX&@fhOvMy!+U+Z&;TASmw(x9kn z|4^>7rMj%{Z7cPz`L3W0^--QR_oee>?$XTt+s5k9u!=(+kjE`^sGV|h+i{loblhgLwvc=6);~$+#w^K+w zKR7|upZ?sqSFJPkQp8ZY9J-PcHhh}Zac?)tXd$Kbrxnt464jM+WVDE)y&V@wC#9_m zOXA_~AbR5fnicz!JZ3pJf8a*_ZqLIH8E(26`X$dKai(Ui3~L0ZNP`T1#>T;*TU9e)XvJ-YF3TPTG?h) z7-p^gZ=BTMq~1$CL=kb~>ss@sqxYLARjg&NAfORx0`X9lpowi_B^W=P@ZV(f@ITRn zjkd5Vwn=>P?L47fK1=Q5;^lUFO?@6k-B6ErJ+cK5SByh&dElBmU&oOWP1dfWT(Kt8 zFZZkuAf6jm8DYGu$t)m@*k+%aQ1URq(4cLJLqyQ(-feW~S N2YCAfBfjf*{svrea;X3S delta 1448 zcma)*ZD?Cn7{~8(a&DT}wn?*9nmE(2zQ_t2Ta}@;O{L6k^Ci?5y0&w!UGZhHOR-v+ z6eH{A7}~Wtp?Bh2xs6|4+9O*Lg>FPGIAp;h{V)fjPWNTbSX4Ic{GT>~x#7!!AOG__ z=ea!p=iGbanWlKAX*5#VtZ7;+7$!|4rfGYye-gY2DnZ9o|5egsU!Q-sQuMO}ti~yS zWe%ckf_S-m6)LV_-3{F>s`xsOiZ~*_u4y6AB6f2>*~JiF&()bo^B{Remiu`SW#TgT z-Sa2%CW1+@1uP-n3f&IWSv9MI_x z)skBb*|ygzlWjnCxfkjLY8VG}2MB{8P*aChQDJJeSB2LvHMNS1@IWE2rhXzHix#~$ zSU4yQUAUfIDB24|@CTom(0P|~di^cs*oylNmKEKU*B*3u9S^F@QT090qxp_6LDeOG ziDz9))mjwSjs1Sf#B`q=$`-_zDJc0M;+?$8EInT`3SYqMujmD#tXpi3HJxz3+IVVUEF!RcioOIt=o8cxTs20-%%kOQ>Q)CGd~hVjHwbTH^#~wkBKvj14cA$4~Pr1 z72?w6dhy`g8qs#@ee*->jjc_S{m-8A+Gpe%OLM_z&d{LD&Xf~%tEPU*zxspzt1}z_ zz#f+2xtN8Xl~bQT%mhC>Oa0=LvxBtH_=Z!Nh-A~|A~P>olXT8Kf!Be5VwnL!Tgp!m zg^8X&*~}=z#HZ&r7?F!QFY42JwMVtBMp&m=5kHD=<#(pO6~}?r+^elQ0t{FH2Rg8V VB47h{-~dkG0`8Nox#F3h{sN^p1mOSx From 25ead805f1f06af1d52ff37c2d60ac14479aeedc Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 12 May 2024 15:53:45 +0800 Subject: [PATCH 5/8] 11212121 --- DataBase/版本日志/HJGLDB_2024.05.12.sql | 67 ++++++++++ .../版本日志/BSFDB_2024-05-10.sql | 66 ---------- ...SFDB_2024.05.11View_Pipeline_WeldJoint.sql | 117 ------------------ 3 files changed, 67 insertions(+), 183 deletions(-) delete mode 100644 HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql delete mode 100644 HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql diff --git a/DataBase/版本日志/HJGLDB_2024.05.12.sql b/DataBase/版本日志/HJGLDB_2024.05.12.sql index da44f3e..8974a86 100644 --- a/DataBase/版本日志/HJGLDB_2024.05.12.sql +++ b/DataBase/版本日志/HJGLDB_2024.05.12.sql @@ -77,6 +77,7 @@ CoverWelder.WelderName AS CoverWelderName, pipingClass.PipingClassCode,pip.PIPClassCode, CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, WeldJoint.IsCancel, +WeldJoint.IsPMI, WeldJoint.IsGoldJoint, WeldJoint.WPQId,wps.WPQCode, WeldJoint.DetectionType, @@ -212,4 +213,70 @@ INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex]) VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','ܵӽͷPMIȷϱ','',25) GO +-- PMIί +create table PMI_Delegation +( + Id nvarchar(50) not null primary key, + DelegationNo nvarchar(50) not null, + DelegationDate datetime, + ProjectId nvarchar(50) not null, + InstallationId nvarchar(50), + UnitId nvarchar(50), + DetectionStandard nvarchar(50), + Remark nvarchar(255), + CreatedTime datetime default getdate() +) +go +---- PMIί ϸ +create table PMI_DelegationDetails +( + Id nvarchar(50) not null primary key, + PMIId nvarchar(50) not null, + JointId nvarchar(50) not null, + QualityNo nvarchar(255), + Acceptance nvarchar(255), + Status int not null, + CreatedTime datetime default getdate() +) +go + +-- ߺ Ƿ PMI +alter table Pipeline_WeldJoint add isPMI bit null +update Pipeline_WeldJoint set isPMI=0 +-- PMIίв˵ +insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI','PMI detection management','',21,0,3,NUll,1) +insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) + + +/*******PMIίϸͼ***********/ +CREATE VIEW [dbo].[View_PMI_DelegationDetails] +AS + +SELECT +B.PMIId, +B.JointId, +B.QualityNo, +B.Acceptance, +B.CreatedTime, +B.status, +Pipeline.PipelineCode, +WeldJoint.WeldJointCode, +WeldJoint.Specification, +WeldJoint.Remark, +Pipeline.SingleNumber, +(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL + THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode + ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, -- + (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL + THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code + ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode -- +FROM PMI_Delegation AS A INNER JOIN +PMI_DelegationDetails AS B ON A.Id=B.PMIId +LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId + +GO + + diff --git a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql b/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql deleted file mode 100644 index f6c4b0e..0000000 --- a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql +++ /dev/null @@ -1,66 +0,0 @@ -use HJGLDB_ZJBSF -go -create table PMI_Delegation -( - Id nvarchar(50) not null primary key, - DelegationNo nvarchar(50) not null, - DelegationDate datetime, - ProjectId nvarchar(50) not null, - InstallationId nvarchar(50), - UnitId nvarchar(50), - DetectionStandard nvarchar(50), - Remark nvarchar(255), - CreatedTime datetime default getdate() -) -go -create table PMI_DelegationDetails -( - Id nvarchar(50) not null primary key, - PMIId nvarchar(50) not null, - JointId nvarchar(50) not null, - QualityNo nvarchar(255), - Acceptance nvarchar(255), - Status int not null, - CreatedTime datetime default getdate() -) -go - --- ߺ Ƿ PMI -alter table Pipeline_WeldJoint add isPMI bit null -update Pipeline_WeldJoint set isPMI=0 --- PMIίв˵ -insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI','PMI detection management','',21,0,3,NUll,1) -insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) -insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) - - - -CREATE VIEW [dbo].[View_PMI_DelegationDetails] -AS -/*******Ӳίϸ***********/ -SELECT -B.PMIId, -B.JointId, -B.QualityNo, -B.Acceptance, -B.CreatedTime, -B.status, -Pipeline.PipelineCode, -WeldJoint.WeldJointCode, -WeldJoint.Specification, -WeldJoint.Remark, -Pipeline.SingleNumber, -(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL - THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode - ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, -- - (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL - THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code - ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode -- -FROM PMI_Delegation AS A INNER JOIN -PMI_DelegationDetails AS B ON A.Id=B.PMIId -LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId - -GO - - diff --git a/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql b/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql deleted file mode 100644 index 97535ae..0000000 --- a/HJGL/DataBase/版本日志/BSFDB_2024.05.11View_Pipeline_WeldJoint.sql +++ /dev/null @@ -1,117 +0,0 @@ -USE [HJGLDB_ZJBSF] -GO - -/****** Object: View [dbo].[View_Pipeline_WeldJoint] Script Date: 2024-5-11 14:44:42 ******/ -SET ANSI_NULLS ON -GO - -SET QUOTED_IDENTIFIER ON -GO - - -ALTER VIEW [dbo].[View_Pipeline_WeldJoint] -AS -/************Ϣͼ*****************/ -SELECT WeldJoint.WeldJointId, -WeldJoint.ProjectId, -WeldJoint.PipelineId, -WeldJoint.WeldJointCode, -dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, -WeldJoint.WeldTypeId, -WeldJoint.Material1Id, -WeldJoint.Material2Id, -WeldJoint.ANSISCH, -WeldJoint.Thickness, -WeldJoint.Dia, -WeldJoint.Size, -WeldJoint.JointAttribute, -WeldJoint.JointArea, -WeldJoint.WeldingMethodId, -WeldJoint.IsHotProess, -WeldJoint.WeldingLocationId, -WeldJoint.WeldMatId, -WeldJoint.WeldSilkId, -WeldJoint.GrooveTypeId, -WeldJoint.PipeSegment, -WeldJoint.PipeAssembly1Id, -WeldJoint.PipeAssembly2Id, -WeldJoint.PipeAssemblyCount, -WeldJoint.HeartNo1, -WeldJoint.HeartNo2, -WeldJoint.LastTemp, -WeldJoint.CellTemp, -WeldJoint.PrepareTemp, -WeldJoint.Electricity, -WeldJoint.SystemNumber, -WeldJoint.Remark, -WeldJoint.DoneDin, -WeldJoint.Voltage, -WeldJoint.TestPackageNo, -WeldJoint.WeldingDailyCode, -WeldJoint.WeldingDailyId, -WeldJoint.BackingWelderId, -WeldJoint.CoverWelderId, -WeldJoint.PipingClassId, -WeldJoint.Specification, -WeldJoint.CancelResult, -Project.ProjectCode, -Project.ProjectName, -Pipeline.PipelineCode, -Pipeline.InstallationId, -Pipeline.UnitId, -Pipeline.SingleNumber, -Pipeline.WorkAreaId, -WeldType.WeldTypeCode, -Material1.MaterialCode AS Material1Code, -Material2.MaterialCode AS Material2Code, -WeldingMethod.WeldingMethodCode, -WeldingLocation.WeldingLocationCode, -WeldMat.ConsumablesCode AS WeldMatCode, ---WeldSilk.ConsumablesCode AS WeldSilkCode, -'' AS WeldSilkCode, -GrooveType.GrooveTypeCode, -CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '' ELSE '' END AS Is_hjName, -CASE WHEN WeldJoint.IsHotProess=1 THEN '' ELSE '' END AS IsHotProessStr, -Components1.ComponentsCode AS ComponentsCode1, -Components2.ComponentsCode AS ComponentsCode2, -BackingWelder.WelderCode AS BackingWelderCode, -BackingWelder.WelderName AS BackingWelderName, -CoverWelder.WelderCode AS CoverWelderCode, -CoverWelder.WelderName AS CoverWelderName, -(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL - THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode - ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, -- - (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL - THEN Material1.MaterialCode + '/' + Material2.MaterialCode - ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, -- -pipingClass.PipingClassCode, -CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, -WeldJoint.IsCancel, -WeldJoint.IsPMI, -WeldJoint.IsGoldJoint, -WeldJoint.WPQId,wps.WPQCode, -WeldJoint.DetectionType, -WeldJoint.PageNum -FROM Pipeline_WeldJoint AS WeldJoint -LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId -LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId -LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id -LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id -LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId -LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId -LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId ---LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId -LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId -LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id -LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id -LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId -LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId -LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId -LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId -LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId - - -GO - - From 0b31bc3d75cab2992017217cb06e68c6e1d17909 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 15:56:56 +0800 Subject: [PATCH 6/8] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1277952 -> 1100288 bytes .../WelderManage/AnalysisEdit.aspx | 49 +++++--- .../WelderManage/AnalysisEdit.aspx.cs | 118 +++++++++++++----- .../AnalysisEdit.aspx.designer.cs | 12 +- .../WelderManage/QualifiedProject.aspx | 2 +- .../WeldingReport/JointComprehensive.aspx.cs | 24 ++-- HJGL/FineUIPro.Web/common/mainFullViews.aspx | 12 +- 7 files changed, 142 insertions(+), 75 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 67687d2fa24c960c28fdea5bba0e8a709534c808..bc3837019889fda9b8861ce819ec5e4f15cbb11c 100644 GIT binary patch delta 14066 zcmd^`4_sA6{`c?9Ip^Mc&i%u^7eqzG>y?lQ5fPPj5dqQEOp#hOGa^J%*OUzZM6F)U zEi*FYC{w0JWCt@fgksEGLozdS4P7%cBO)``{JCmsW-8BT_+wVv?moZW-}8E&*K_IZ z%$YNPzBAwNd}q#_lixqmzkE2nVacd$_k7Yy&~Kejni; za4+K7U^18jrh?ytX<+*1r#~mobnE_(DQl0AI^_0u(+lV@N-nV-JG73>yORc!r>ibd z8<~GA3S33QH~#jc$c@)RFhM)yRl#c@0Jwk~bWlvDP6!_XqON`jZJ;k;APzV|XK5{WeF}0F)QyB9PV{+zhgjFA8BG?zPu9T070xaPfj1Zf~0L}1L9B3un_2fe{?q)kE?36>Dk{ALk_m}8J2 zDj$n*9B2fg;KpGbg6mRLaATT?k3zaAJGV6yagqLW5^tz)W^-PBml6^*5mgrBG8xE{ z$@Bz5{XCiLbnSSvz0mdsBs6QgpjE-eR_o1KNE8hS9d1N?UhDNU2t}IsHS1RIWet4b zlH8)rmh_)$^Kq0A>22D)2jkqPO(9!uYmK6{3#dory-}-~$S<^d5%=07yj$Nax1TR^ z{hDS)O}|6VHqDMl4U2G{07SW=2-`F(u7zerD1L34U5K=&z>S){AJ>rpnjP~K%|bHM z-_xuxqe37m7Mc~|1YCPt)5Nt9R{VsPyXakSYacH3C{n~7p+^zsw}!J24hDLu611$s znj-EArJ{$;YFP;D7V24q@Q>i}*6YQs;Sz*Tfx_17YgNSffRx#3$#&Jp!Y|R#sw7u6 zvA%%0_!hdQFPj=9>!_TODFiLrRVP{t05Qz%B)2T9h$kaNEb!(`B%=igFT+%uB-QXoQdlx&Scj$7JtDfdF4 zdHVM;J#`;z5pfbyB18)F-A_ajt9)}?cJqU{dAzx&tTcs&G*{RIcca^KXa&eo0-J>m zTnij5B&f;{EwnLzi5ku#F3}JeikVnN4lihtHQ(*;+GaXPG!axsfdtH;0%?JIJI`z6 zR{dSi95O^75IBlFsy`k0P;t*F9_1rpMDC7^&DF8|Zlthya8y-P{2C&6ZcDa1A=-9P zJ%0L*FC(fV>W`4JI9eQ%uC9RLmH?)Y4heLvLToh~{8T@&7r}&Mo~NQMlkUG`AT_Pg7kvIOo43^!;XNAk z+|ZZW-+jm7piVE%e0KA?^50+hWasz%$XTy{{(!?bZ^88Gsb@vGU73eojkHd0&xVy) zXT1N(q;}U$$1CjThJWUpDCROmZITemKmlf80al;_4cLGkIDiub02gor4+sQ7pdAPX z?Li075rlwFAQW^4VW11}TEk7Iu88wevV4SHJ7MqFK3iLMhG36la zg)PS<&T%Q{e!&&Xanj&<2!3$2

oAw1-=0k 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 delta 11616 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 diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx index e20fad9..4f38110 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -21,47 +21,56 @@ - + - + - - - - - - - - + + + + + + + - - + + - + - - - - + + + - + - - + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs index 7d8e772..d4ead77 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -1,9 +1,11 @@ -using System; +using BLL; +using System; using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header; namespace FineUIPro.Web.WelderManage { @@ -24,21 +26,6 @@ namespace FineUIPro.Web.WelderManage ViewState["WelderQualifiedProjectId"] = value; } } - - ///

- /// 焊工id - /// - public string WED_ID - { - get - { - return (string)ViewState["WED_ID"]; - } - set - { - ViewState["WED_ID"] = value; - } - } #endregion protected void Page_Load(object sender, EventArgs e) { @@ -46,32 +33,103 @@ namespace FineUIPro.Web.WelderManage { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"]; - this.WED_ID = Request.Params["WED_ID"]; + + drpWeldingLocation.DataValueField = "WeldingLocationCode"; + drpWeldingLocation.DataTextField = "WeldingLocationCode"; + drpWeldingLocation.DataSource = (from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x).ToList(); + drpWeldingLocation.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingLocation, ""); + + drpWeldingMethod.DataValueField = "WeldingMethodCode"; + drpWeldingMethod.DataTextField = "WeldingMethodCode"; + drpWeldingMethod.DataSource = (from x in Funs.DB.Base_WeldingMethod orderby x.WeldingMethodCode select x).ToList(); + drpWeldingMethod.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingMethod, ""); + if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId)) { var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId); if (welderQualifiedProject != null) { - this.WED_ID = welderQualifiedProject.WelderId; + string wlederId = welderQualifiedProject.WelderId; this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; - - this.txtExamProject.Text = welderQualifiedProject.ExamProject; - txtRemark.Text = welderQualifiedProject.Remark; - drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否"; + + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId)) + { + drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType)) + { + drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingLocationId)) + { + drpWeldingLocation.SelectedValueArray = welderQualifiedProject.WeldingLocationId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldType)) + { + drpWeldType.SelectedValueArray = welderQualifiedProject.WeldType.Split(','); + } + + if (welderQualifiedProject.ThicknessMax != null) + { + numThicknessMax.Text = welderQualifiedProject.ThicknessMax.Value.ToString(); + } + if (welderQualifiedProject.SizesMin != null) + { + numSizesMin.Text = welderQualifiedProject.SizesMin.Value.ToString(); + } + + Model.Welder_Welder welder = BLL.WelderService.GetWelderById(wlederId); + if (welder != null) + { + this.lbWedlerName.Text = welder.WelderName; + this.lbWedlerCode.Text = welder.WelderCode; + } } } - Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID); - if (welder != null) - { - this.lbWedlerName.Text = welder.WelderName; - this.lbWedlerCode.Text = welder.WelderCode; - } } } protected void btnSave_Click(object sender, EventArgs e) - { - + { + Model.Welder_WelderQualify updateQue = Funs.DB.Welder_WelderQualify.FirstOrDefault(x => x.WelderQualifiedProjectId == this.WelderQualifiedProjectId); + if (!string.IsNullOrEmpty(drpWeldingMethod.SelectedValue)) + { + updateQue.WeldingMethodId = String.Join(",", drpWeldingMethod.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpMaterialType.SelectedValue)) + { + updateQue.MaterialType = String.Join(",", drpMaterialType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldingLocation.SelectedValue)) + { + updateQue.WeldingLocationId = String.Join(",", drpWeldingLocation.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldType.SelectedValue)) + { + updateQue.WeldType = String.Join(",", drpWeldType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(numSizesMin.Text)) + { + updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text); + } + else + { + updateQue.SizesMin = 0; + } + if (!string.IsNullOrEmpty(numThicknessMax.Text)) + { + updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text); + } + else + { + updateQue.ThicknessMax = 0; + } + + Funs.DB.SubmitChanges(); + BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs index 1915e90..ed0ccfc 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs @@ -96,31 +96,31 @@ namespace FineUIPro.Web.WelderManage protected global::FineUIPro.DropDownList drpWeldingLocation; /// - /// txtExamProject 控件。 + /// numThicknessMax 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtExamProject; + protected global::FineUIPro.NumberBox numThicknessMax; /// - /// drpIsPass 控件。 + /// numSizesMin 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpIsPass; + protected global::FineUIPro.NumberBox numSizesMin; /// - /// txtRemark 控件。 + /// drpWeldType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemark; + protected global::FineUIPro.DropDownList drpWeldType; /// /// Toolbar1 控件。 diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx index 1c8d899..1c8c820 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx @@ -144,7 +144,7 @@ Convert.ToDouble(x.Size))); - reportModel.GetRow(rowIndex).GetCell(12).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14); + reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size))); + reportModel.GetRow(rowIndex).GetCell(14).CellStyle.SetFont(cs_content_Font); //打底焊工号 - if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21); - reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(backingWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(21).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23); + reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(backingWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(23).CellStyle.SetFont(cs_content_Font); //盖面焊工号 - if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22); - reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(coverWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(22).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24); + reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(coverWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(24).CellStyle.SetFont(cs_content_Font); } #endregion reportModel.ForceFormulaRecalculation = true; diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx b/HJGL/FineUIPro.Web/common/mainFullViews.aspx index 4dc6da7..49ce1b0 100644 --- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx +++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx @@ -66,10 +66,10 @@
-

  Welders Ranking Report gives you the impression of BSF

+

  Welders Ranking Report gives you the impression of BASF

  welders rank list. (The rank is according to the rejected rates.)

  Each year for the rank can be easily ranked out.

-

  焊工排名报表是所有在BSF从事焊接工作的焊工年度排名

+

  焊工排名报表是所有在BASF从事焊接工作的焊工年度排名

 （排名是根据焊工拍片量及拍片合格率确定的）。

  查询时可选择不同年份查询每年的焊工合格率排名情况。

@@ -161,12 +161,12 @@

  Weld Contractors Report gives the welding quality information

-

  of all the contractors of BSF according to choice the

+

  of all the contractors of BASF according to choice the

  different period and different contractor.

-

  Accumulated rejection rate was calculated from Jan 2006.

-

  该报告提供了所有在BSF从事焊接工作的承包商在不同时期的焊接质量状况。

+

  Accumulated rejection rate was calculated from Jan 2024.

+

  该报告提供了所有在BASF从事焊接工作的承包商在不同时期的焊接质量状况。

  查询时可通过选择不同日期及不同承包商名称查看相关信息。

-

  其中，累计焊接返修率是从2006年1月起计算的。

+

  其中，累计焊接返修率是从2024年1月起计算的。

 From acff7f22d4d4da505a075de9fc78c7abff4aa5db Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 17:04:46 +0800 Subject: [PATCH 7/8] 11 --- CreateModel.bat | 4 +- DataBase/版本日志/HJGLDB_2024.05.12.sql | 61 +++++++------ HJGL/.vs/HJGL/v17/.suo | Bin 1100288 -> 895488 bytes HJGL/BLL/BLL.csproj.user | 2 +- .../Pipeline_WeldJointService.cs | 6 ++ HJGL/FineUIPro.Web/FineUIPro.Web.csproj | 2 +- HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../PMI/PMIDelegationEdit.aspx.cs | 2 +- .../WeldingProcess/PMI/PMIDetectionEntry.aspx | 17 +++- .../common/mainFullViews.aspx.cs | 4 +- HJGL/Model/Model.cs | 86 +++++++++--------- HJGL/Model/Model.csproj.user | 2 +- 12 files changed, 105 insertions(+), 83 deletions(-) diff --git a/CreateModel.bat b/CreateModel.bat index 27ceb4a..2f27853 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo .net̨ @echo. -@call "%VS150%" +@call "%VS100COMNTOOLS%"vsvars32.bat -SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO pause diff --git a/DataBase/版本日志/HJGLDB_2024.05.12.sql b/DataBase/版本日志/HJGLDB_2024.05.12.sql index 8974a86..f0570d5 100644 --- a/DataBase/版本日志/HJGLDB_2024.05.12.sql +++ b/DataBase/版本日志/HJGLDB_2024.05.12.sql @@ -1,3 +1,8 @@ +-- ߺ Ƿ PMI +alter table Pipeline_WeldJoint add isPMI bit NULL +GO +update Pipeline_WeldJoint set isPMI=0 +GO ALTER VIEW [dbo].[View_Pipeline_WeldJoint] AS @@ -202,7 +207,6 @@ FROM Pipeline_WeldJoint AS weldJoint GO - UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','') GO @@ -223,6 +227,7 @@ create table PMI_Delegation InstallationId nvarchar(50), UnitId nvarchar(50), DetectionStandard nvarchar(50), + Tabler nvarchar(50), Remark nvarchar(255), CreatedTime datetime default getdate() ) @@ -240,43 +245,45 @@ create table PMI_DelegationDetails ) go --- ߺ Ƿ PMI -alter table Pipeline_WeldJoint add isPMI bit null -update Pipeline_WeldJoint set isPMI=0 + -- PMIίв˵ insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI','PMI detection management','',21,0,3,NUll,1) -insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) -insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',0,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMIί','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI¼','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +GO /*******PMIίϸͼ***********/ -CREATE VIEW [dbo].[View_PMI_DelegationDetails] + +ALTER VIEW [dbo].[View_PMI_DelegationDetails] AS - +/********ȴϸ********/ SELECT -B.PMIId, -B.JointId, -B.QualityNo, -B.Acceptance, -B.CreatedTime, -B.status, -Pipeline.PipelineCode, +TrustItem.Id, +TrustItem.Acceptance, +TrustItem.CreatedTime, +TrustItem.JointId as WeldJointId, +TrustItem.status, +TrustItem.QualityNo, +TrustItem.PMIId, +Trust.ProjectId, +Trust.DelegationNo, +Trust.DelegationDate, WeldJoint.WeldJointCode, +Pipeline.PipelineCode, WeldJoint.Specification, -WeldJoint.Remark, -Pipeline.SingleNumber, -(CASE WHEN WeldJoint.CoverWelderCode IS NOT NULL AND WeldJoint.BackingWelderCode IS NOT NULL - THEN WeldJoint.CoverWelderCode + '/' + WeldJoint.BackingWelderCode - ELSE (ISNULL(WeldJoint.CoverWelderCode,'') + ISNULL(WeldJoint.BackingWelderCode,'')) END) AS WelderCode, -- - (CASE WHEN WeldJoint.Material1Code IS NOT NULL AND WeldJoint.Material2Code IS NOT NULL - THEN WeldJoint.Material1Code + '/' + WeldJoint.Material2Code - ELSE (ISNULL(WeldJoint.Material1Code,'') + ISNULL(WeldJoint.Material2Code,'')) END) AS MaterialCode -- -FROM PMI_Delegation AS A INNER JOIN -PMI_DelegationDetails AS B ON A.Id=B.PMIId -LEFT JOIN View_Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=B.JointId +Material.MaterialCode, +Pipeline.WorkAreaId +FROM PMI_DelegationDetails AS TrustItem +LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId +LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId - +LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id GO + + + + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index bc3837019889fda9b8861ce819ec5e4f15cbb11c..c6b5c5fec05c4cc7812881134477ee8271ed9f7c 100644 GIT binary patch delta 20675 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 delta 69300 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

)Ij*-Vv$9oN<~ZcK&egY=>j|S3ut20flT_$Q| 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 diff --git a/HJGL/BLL/BLL.csproj.user b/HJGL/BLL/BLL.csproj.user index 07dbd5b..55f44b9 100644 --- a/HJGL/BLL/BLL.csproj.user +++ b/HJGL/BLL/BLL.csproj.user @@ -1,6 +1,6 @@  - ProjectFiles + ShowAllFiles \ No newline at end of file diff --git a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs index 7dd4fd5..9c2ad63 100644 --- a/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs +++ b/HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs @@ -252,6 +252,12 @@ namespace BLL { newWeldJoint.Electricity = weldJoint.Electricity; } + if (weldJoint.IsPMI != null) + { + newWeldJoint.IsPMI = weldJoint.IsPMI; + } + + if (!string.IsNullOrEmpty(weldJoint.Voltage)) { newWeldJoint.Voltage = weldJoint.Voltage; diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj index 8bbf08f..89e031f 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -4473,6 +4473,7 @@ PMIDetectionEntry.aspx + ASPXCodeBehind PMIDetectionEntry.aspx @@ -4910,7 +4911,6 @@ GlobalResourceProxyGenerator Lan.Designer.cs - Designer diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user index f9b03fb..8d0cdf2 100644 --- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -35,7 +35,7 @@ True 0 / - http://localhost:57613/ + http://localhost:13960/ False False diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs index f587eaf..74c1a36 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs @@ -197,7 +197,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId) - + ActiveWindow.GetHideReference()); + + ActiveWindow.GetHidePostBackReference()); } else { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx index 23776b0..de1f1f9 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx @@ -143,16 +143,25 @@ DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px"> - - + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs index 9dcbb69..fba6709 100644 --- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs +++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx.cs @@ -85,12 +85,12 @@ namespace FineUIPro.Web.common string strSql = @"SELECT (WelderName+'（'+WelderCode+'） 焊工证过期，有效期为：'+CONVERT(VARCHAR(100),CertificateValidity,23)) AS QualificationLimit FROM dbo.Welder_Welder - WHERE CertificateValidity<=GETDATE() + WHERE CertificateValidity<=GETDATE() AND IsOnDuty=1 UNION SELECT (WelderName+'（'+WelderCode+'） 焊工证还有：'+convert(nvarchar(6),DATEDIFF(day,getdate(),CertificateValidity))+ '天到期') AS QualificationLimit FROM dbo.Welder_Welder - where DATEADD(m,-1,CertificateValidity)GETDATE()"; + where DATEADD(m,-1,CertificateValidity)GETDATE() AND IsOnDuty=1"; DataTable dt = SQLHelper.GetDataTableRunText(strSql, null); GridWelder.DataSource = dt; GridWelder.DataBind(); diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index c89fb8c..d7b7bc6 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -21300,7 +21300,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] public string ProjectId { get @@ -21477,10 +21477,10 @@ namespace Model private string _Acceptance; - private System.Nullable _CreatedTime; - private int _Status; + private System.Nullable _CreatedTime; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -21495,10 +21495,10 @@ namespace Model partial void OnQualityNoChanged(); partial void OnAcceptanceChanging(string value); partial void OnAcceptanceChanged(); - partial void OnCreatedTimeChanging(System.Nullable value); - partial void OnCreatedTimeChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); + partial void OnCreatedTimeChanging(System.Nullable value); + partial void OnCreatedTimeChanged(); #endregion public PMI_DelegationDetails() @@ -21606,6 +21606,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] + public int Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")] public System.Nullable CreatedTime { @@ -21626,26 +21646,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] - public int Status - { - get - { - return this._Status; - } - set - { - if ((this._Status != value)) - { - this.OnStatusChanging(value); - this.SendPropertyChanging(); - this._Status = value; - this.SendPropertyChanged("Status"); - this.OnStatusChanged(); - } - } - } - public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -37266,8 +37266,6 @@ namespace Model private string _ProjectId; - private System.Nullable _IsPMI; - private string _PipelineCode; private string _PipelineId; @@ -37398,22 +37396,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] - public System.Nullable IsPMI - { - get - { - return this._IsPMI; - } - set - { - if ((this._IsPMI != value)) - { - this._IsPMI = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -39422,6 +39404,8 @@ namespace Model private string _PipingClassCode; + private string _PIPClassCode; + private string _WeldingDate; private System.Nullable _IsCancel; @@ -40530,6 +40514,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")] + public string PIPClassCode + { + get + { + return this._PIPClassCode; + } + set + { + if ((this._PIPClassCode != value)) + { + this._PIPClassCode = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")] public string WeldingDate { diff --git a/HJGL/Model/Model.csproj.user b/HJGL/Model/Model.csproj.user index 07dbd5b..55f44b9 100644 --- a/HJGL/Model/Model.csproj.user +++ b/HJGL/Model/Model.csproj.user @@ -1,6 +1,6 @@  - ProjectFiles + ShowAllFiles \ No newline at end of file From f3fdbebb091a850519ae2f7c24b4badf4bd9eb73 Mon Sep 17 00:00:00 2001 From: liyh Date: Sun, 12 May 2024 17:06:36 +0800 Subject: [PATCH 8/8] 12121 --- HJGL/.vs/HJGL/config/applicationhost.config | 2 +- HJGL/.vs/HJGL/v17/.suo | Bin 895488 -> 895488 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/HJGL/.vs/HJGL/config/applicationhost.config b/HJGL/.vs/HJGL/config/applicationhost.config index 1963de0..8705adb 100644 --- a/HJGL/.vs/HJGL/config/applicationhost.config +++ b/HJGL/.vs/HJGL/config/applicationhost.config @@ -250,7 +250,7 @@ - + diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index c6b5c5fec05c4cc7812881134477ee8271ed9f7c..d319c0fb53b54be03e336b5cd605f81299482b43 100644 GIT binary patch delta 5879 zcmeHLZ)_Ar6rZ=dy}P}(aB$bs(iYotKxtPfk^n*}RvRq}qG$-zBhoDe3WZ+FS(G$# z5nRZH+Jiv`m47MN;Gcl7373cjS^-c*~fnI($ zGjHF%dGqEsZ{F2^W}N@bxL`hz4P(+0fecyK%5FD)=513$VX3IYXpQPrxe|9pqYY|W#y;$EC%b*%=DBa& zhd1eQb*!=pd*%&w&p>mx-2+WS><0!)k}0*-f@K*#`Y462Y&WR?P`a6}b-tAK7Rnw+ ztVS4!>^MSP*sevaLp0E=znn?$U@wTsLfphDH}lq<8VJFGZ|i~154dRXoSSuK$mttC zOQ0R+O4!a6^?6n}-sYnI1jP)jsf#<%<^xL&zS-pioT5byjb?DYH*fPMTPDjs2t&-m zW3ABixuxm6)YK|%47i|}CIu$tzl(1%#M_AX5I-W`M|^F!PxbhZLr zcX$HJKOJAs3a#K~r*b7FbWH*W&|h0z=qsBkf!lO{*C9{6IEWAjPJkRyh~-H#4L?$M z=OR>)iNr%zkZRnqCD`*~TaA>fAmzk|<3Hx^tH_&UulcZ?UHA%px;ETun^}%3OYu`p zmZ3^5DtjXae392HQOaMPgmQ7?@x6?*wUTwZ>>z_#OR{w^Yj9d^?wDNNe@XV;7O|{^ zp{#$sE!~`Qu>~I7sL-NiIm{7Aw3+!oo$Aj9w8+C_4rv{$PK$L1kSulD$BGyON(cFn zGs}@ZUQ&hxT!P;VQL>bVuMacb*E?Wz8Ir3@=s~qRD&zBRoif&POmVUus({<2Nq4l% z=A~H&#TKf_+Sd!N{pnrMEd5{hgIyb79mDqhAm_&x5j>BJSYx}~k6j%ouoZRMX2Aqi z09EY5XuFfuIIZcdF-c&u0(PiP&MByh&}UR6t1Tz53um#2nPP3bBu4!LcJi{^PwmO2 zG%O7ZxfSSuiT9ROBZhOeHu-M+nb+e__!UHLu_q&!}+}k9- zg}SE_y+)!7J}bNdeEUnfx4!~&$fM*nOh)%gg~?k4IPAelmf@reunP2H1}tZ*;w?x7 zJ9Nmb>`OTp7BWY@Eh)lpZKr@`etp+zdqtv>bwyqr+xd>zz9C4l(xK&K5i*A7`K7&* zwg)9WayG^bNt!4JO4S|{qIvsgkyT)X^x0nYzLLzxmGFy$mra$C%7|0QheUn@Da7~G zE1FG&;y@=9njsczAs6d3;ozp;3NBAB3o($<@G{47IW0DJ zia9xi|8&7>If7aL%9_oYAf@82{#TKF^*1@8A2(s2j(VIKRm?lWI*UE=yPO$n&xY|b z&5>Nxdstzb1(NBgn=>6X?zt6P+Z`())p^462)kqk&v>CZ2c-M7=DAf9^uan}Lh~q) z;&i;t?vr|gtvX^K!E&ZS3N0LI2^BvEUp%ZV@L-DkK<#Ulg(gy2@cX~uVf7Hpe>on+ z>Vf$SAvcs;2xp;>7ZKKI5fKU(0XSl=0Q5dsO1uopU6&HM3m`dkWHuC8X;w_7grS3> hONK5Rx?<>YhHf!*tD)NrT{U#Op~o9~LbIM&@(+$ddDH*^ delta 3243 zcmeH}e{f7!6vyv*`*!Va5?OXBN&HA`HVK&|5+RfjKckc=MpGH&5v3vtLP%9!O}bR6 zBzGpa{ihR4cZ?q`d1_I=sj7d_noyHbI;NvjGu1y#O{eJh?k+OZv@^8hk52E-=bm%V zx%a+%&$;)#)h`XyFAc2AAf>*4Y?O&HHX3XMi}n^em5xodf&2;EuF`H;^bB6DRMQFL zt`b31%t@VKu7`alpQ1X+#Y@yaG=jgYCaDim_&znGP%2UAQUUsb^A^UsLUsq!K|b(- ztw8oIgv<%+1&|&J**8Of8DxQ%U|Yh6nbV6tLaQ8zeJ*&aPsj(_}E{)H_|l?yR`w{7oSxFeFWonRN( z4L$*%f<0g_Xa)w@2R;M)K>!>82f-omIXDcCfTQ3TIBsmQo5w+jIBro(k1TTLRyLvB&(H(7(zm9R2a$(D&K9yLrVO@$4B-N(W|X-#_;b?kng&}^U9KiV?&hH$oSzxw5gn>@pYF|D1{dv zaf%(+BD(fs3|n9-aDkz0Ii9fyl(Q<-xngD#ecW)_!Z%#@bVxyu&cwuto%V5yO4wrD ziE^B_Vz7$!W_fHXD`07C5*x#&p*L=oC|vnMrWc= zChL!S9xTP^xeWSZreX9dSmueE6zXFn+`C5c@~{oZGNhCx!OSqvlXe-8*PUIYXEvrtt7g= zNy(4r=+owIAvoQF0SZ;}KFDJFySd$iqA#SZKhViJa@~7X9p4eVy7tD9vfObCvRU+) z`l+TleFxvVdq`PmPy8^^zo5SEW=vA#tLGRKZxh7|J&E-2mH0Pq(x7L|sHnMUOANT} z)M{G%4410Cct3NeTVyQAa$Wfa0bHqDdBa$alH=aAw5*VFHhshOP9d5r;+;Sywy_RY$4@X@CdI) jUJbR$tEpbi?A0t@t%FyydNrF@vwO7&uNLXoqVoR$TqJU;