diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index a012f2f..17c6f2c 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql b/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql
index 0fe3dc5..8af3c83 100644
--- a/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql
+++ b/HJGL/DataBase/版本日志/BSFDB_2024-05-10.sql
@@ -5,6 +5,7 @@ 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),
@@ -19,6 +20,7 @@ create table PMI_DelegationDetails
JointId nvarchar(50) not null,
QualityNo nvarchar(255),
Acceptance nvarchar(255),
+ Status int not null,
CreatedTime datetime default getdate()
)
go
diff --git a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
index c72257e..50dbbd6 100644
--- a/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/HJGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -396,6 +396,7 @@
+
@@ -4453,6 +4454,13 @@
PMIDelegation.aspx
+
+ PMIDelegationEdit.aspx
+ ASPXCodeBehind
+
+
+ PMIDelegationEdit.aspx
+
AItemEndCheck.aspx
ASPXCodeBehind
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
index 11562bd..9df6bfa 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs
@@ -384,7 +384,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
#endregion
#endregion
- #region 右键编辑热处理报告
+ #region 右键编辑
///
/// 热处理报告
///
@@ -394,7 +394,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{
if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.HotProessTrustMenuId, Const.BtnSave))
{
- PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("HotProessReport.aspx?HotProessTrustItemId={0}", this.Grid1.SelectedRowID, "编辑热处理报告 - ")));
+ PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("PMIDelegationEdit.aspx?Id={0}", this.Grid1.SelectedRowID, "编辑PMI处理报告 - ")));
}
else
{
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
new file mode 100644
index 0000000..df49dbd
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx
@@ -0,0 +1,16 @@
+<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="PMIDelegationEdit.aspx.cs" Inherits="FineUIPro.Web.WeldingProcess.PMI.PMIDelegationEdit" %>
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
new file mode 100644
index 0000000..5a0e2d7
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
@@ -0,0 +1,17 @@
+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 PMIDelegationEdit : System.Web.UI.Page
+ {
+ protected void Page_Load(object sender, EventArgs e)
+ {
+
+ }
+ }
+}
\ No newline at end of file
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs
new file mode 100644
index 0000000..e801022
--- /dev/null
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.designer.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// <自动生成>
+// 此代码由工具生成。
+//
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
+//
+//------------------------------------------------------------------------------
+
+namespace FineUIPro.Web.WeldingProcess.PMI
+{
+
+
+ public partial class PMIDelegationEdit
+ {
+
+ ///
+ /// form1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::System.Web.UI.HtmlControls.HtmlForm form1;
+ }
+}
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index 31fa6d6..88e224c 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -21471,6 +21471,8 @@ namespace Model
private System.Nullable _CreatedTime;
+ private int _Status;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21487,6 +21489,8 @@ namespace Model
partial void OnAcceptanceChanged();
partial void OnCreatedTimeChanging(System.Nullable value);
partial void OnCreatedTimeChanged();
+ partial void OnStatusChanging(int value);
+ partial void OnStatusChanged();
#endregion
public PMI_DelegationDetails()
@@ -21614,6 +21618,26 @@ 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;