diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo
index e77852d..2b77100 100644
Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ
diff --git a/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
index 1ce0380..c0b41bd 100644
--- a/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
+++ b/HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
@@ -36,7 +36,8 @@ namespace BLL
newItem.Status = 0;
newItem.PMIId = string.Empty;
newItem.WorkAreaId = jotInfo.WorkAreaId;
- newItem.CreatedTime = DateTime.Now;
+ newItem.CheckTime = DateTime.Now;
+ newItem.ReportTime= DateTime.Now;
newItem.DelegationDate= DateTime.Now;
newItem.DelegationNo = string.Empty;
returnViewMatch.Add(newItem);
diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
index d59c98f..cd767c0 100644
--- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
+++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs
@@ -1231,7 +1231,7 @@ namespace Resources {
}
///
- /// 查找类似 检测日期 的本地化字符串。
+ /// 查找类似 委托日期 的本地化字符串。
///
internal static string DelegationDate {
get {
diff --git a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
index a1589a9..3608b8d 100644
--- a/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
+++ b/HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
@@ -2107,7 +2107,7 @@
首页
- 检测日期
+ 委托日期
检测方法
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
index 5e21a51..3b1f1cb 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
@@ -139,8 +139,8 @@
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px">
-
("Acceptance").ToString();
newTrustItem.QualityNo = values.Value("QualityNo").ToString();
newTrustItem.Status = 0;
- newTrustItem.CreatedTime = DateTime.Now;
+ newTrustItem.CheckTime = DateTime.Now;
+ newTrustItem.ReportTime = DateTime.Now;
newTrustItem.PMIId = this.PMIDelegationId;
listData.Add(newTrustItem);
}
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
index f60120b..cc846cc 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
@@ -95,9 +95,9 @@
-
-
+
+
@@ -152,20 +152,20 @@
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
<%-- 检测日期 --%>
-
-
+
<%-- 报告日期 --%>
-
+
-
+
@@ -183,9 +183,9 @@
DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
-
+
-
+
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
index b073d35..025f486 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
@@ -197,12 +197,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
private void PageInfoLoad()
{
this.SimpleForm1.Reset(); ///重置所有字段
+
var pageInfo = (from x in Funs.DB.PMI_Delegation
join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId
join n in Funs.DB.Project_Installation on x.InstallationId equals n.InstallationId
join u in Funs.DB.Sys_User on x.DetectionStandard equals u.UserId into u1 //左连接查询
from u in u1.DefaultIfEmpty()
- where x.Id == hdPMIId.Text
+ where x.Id == this.PMIID
select new
{
DelegationNo = x.DelegationNo,
@@ -221,7 +222,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
this.txtInstallationName.Text = pageInfo[0].InstallationName;
this.txtUnitName.Text = pageInfo[0].UnitName;
this.txtDetectionMethod.Text = pageInfo[0].DetectionMethod;
- this.txtTabler.Text = pageInfo[0].Tabler;
+ this.txtTabler.Text = BLL.Sys_UserService.GetUserNameByUserId(pageInfo[0].Tabler);
this.txtRemark.Text = pageInfo[0].Remark;
this.txtDetectionStandard.Text = pageInfo[0].DetectionStandard;
}
@@ -349,17 +350,17 @@ namespace FineUIPro.Web.WeldingProcess.PMI
if (onePMIDelegationDetails == null)
continue;
//检测日期(缺失)
- string DelegationDate = values.Value("DelegationDate");
- if (string.IsNullOrWhiteSpace(DelegationDate))
- ;
+ string checkTime = values.Value("checkTime");
+ if (string.IsNullOrWhiteSpace(checkTime))
+ onePMIDelegationDetails.CheckTime = null;
else
- ;
+ onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
//报告日期
- string createdTime = values.Value("CreatedTime");
- if (string.IsNullOrWhiteSpace(createdTime))
- onePMIDelegationDetails.CreatedTime=null;
+ string reportTime = values.Value("reportTime");
+ if (string.IsNullOrWhiteSpace(reportTime))
+ onePMIDelegationDetails.ReportTime = null;
else
- onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime);
+ onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
//报告编号
onePMIDelegationDetails.ReportNo = values.Value("reportNo").ToString();
//是否合格 0合格 1不合格
diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
index 285256e..b013712 100644
--- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
+++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs
@@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
protected global::FineUIPro.DatePicker tbxTrustDate;
///
- /// tbxCreatedTime 控件。
+ /// tbxreportTime 控件。
///
///
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
///
- protected global::FineUIPro.DatePicker tbxCreatedTime;
+ protected global::FineUIPro.DatePicker tbxreportTime;
///
/// tbxreportNo 控件。
diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs
index 3ec74be..9050676 100644
--- a/HJGL/Model/Model.cs
+++ b/HJGL/Model/Model.cs
@@ -21477,12 +21477,14 @@ namespace Model
private string _Acceptance;
- private System.Nullable _CreatedTime;
-
private int _Status;
private string _ReportNo;
+ private System.Nullable _CheckTime;
+
+ private System.Nullable _ReportTime;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21497,12 +21499,14 @@ 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 OnReportNoChanging(string value);
partial void OnReportNoChanged();
+ partial void OnCheckTimeChanging(System.Nullable value);
+ partial void OnCheckTimeChanged();
+ partial void OnReportTimeChanging(System.Nullable value);
+ partial void OnReportTimeChanged();
#endregion
public PMI_DelegationDetails()
@@ -21610,26 +21614,6 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
- public System.Nullable CreatedTime
- {
- get
- {
- return this._CreatedTime;
- }
- set
- {
- if ((this._CreatedTime != value))
- {
- this.OnCreatedTimeChanging(value);
- this.SendPropertyChanging();
- this._CreatedTime = value;
- this.SendPropertyChanged("CreatedTime");
- this.OnCreatedTimeChanged();
- }
- }
- }
-
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
public int Status
{
@@ -21670,6 +21654,46 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+ public System.Nullable CheckTime
+ {
+ get
+ {
+ return this._CheckTime;
+ }
+ set
+ {
+ if ((this._CheckTime != value))
+ {
+ this.OnCheckTimeChanging(value);
+ this.SendPropertyChanging();
+ this._CheckTime = value;
+ this.SendPropertyChanged("CheckTime");
+ this.OnCheckTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
+ public System.Nullable ReportTime
+ {
+ get
+ {
+ return this._ReportTime;
+ }
+ set
+ {
+ if ((this._ReportTime != value))
+ {
+ this.OnReportTimeChanging(value);
+ this.SendPropertyChanging();
+ this._ReportTime = value;
+ this.SendPropertyChanged("ReportTime");
+ this.OnReportTimeChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -40691,7 +40715,9 @@ namespace Model
private string _Acceptance;
- private System.Nullable _CreatedTime;
+ private System.Nullable _CheckTime;
+
+ private System.Nullable _ReportTime;
private string _WeldJointId;
@@ -40707,6 +40733,8 @@ namespace Model
private System.Nullable _DelegationDate;
+ private string _ReportNo;
+
private string _WeldJointCode;
private string _PipelineCode;
@@ -40753,18 +40781,34 @@ namespace Model
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreatedTime", DbType="DateTime")]
- public System.Nullable CreatedTime
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
+ public System.Nullable CheckTime
{
get
{
- return this._CreatedTime;
+ return this._CheckTime;
}
set
{
- if ((this._CreatedTime != value))
+ if ((this._CheckTime != value))
{
- this._CreatedTime = value;
+ this._CheckTime = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
+ public System.Nullable ReportTime
+ {
+ get
+ {
+ return this._ReportTime;
+ }
+ set
+ {
+ if ((this._ReportTime != value))
+ {
+ this._ReportTime = value;
}
}
}
@@ -40881,6 +40925,22 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
+ public string ReportNo
+ {
+ get
+ {
+ return this._ReportNo;
+ }
+ set
+ {
+ if ((this._ReportNo != value))
+ {
+ this._ReportNo = value;
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJointCode", DbType="NVarChar(50)")]
public string WeldJointCode
{