shecs
/
Basf_TCC7
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update

This commit is contained in:
jackchenyang 2024-05-13 09:54:07 +08:00
parent c18a3a9bc4
commit c4dc2e0936
10 changed files with 123 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL/.vs/HJGL/v17/.suo
View File

Binary file not shown.

3
HJGL/BLL/WeldingProcess/PMI/PMIDelegation_Service.cs
View File

@ -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);

2
HJGL/FineUIPro.Web/App_GlobalResources/Lan.Designer.cs generated
View File

@ -1231,7 +1231,7 @@ namespace Resources {
}
/// <summary>
/// 查找类似 检测日期 的本地化字符串。
/// 查找类似 委托日期 的本地化字符串。
/// </summary>
internal static string DelegationDate {
get {

2
HJGL/FineUIPro.Web/App_GlobalResources/Lan.resx
View File

@ -2107,7 +2107,7 @@
<value>首页</value>
</data>
<data name="DelegationDate" xml:space="preserve">
<value>检测日期</value>
<value>委托日期</value>
</data>
<data name="DetectionMethod" xml:space="preserve">
<value>检测方法</value>

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx
View File

@ -139,8 +139,8 @@
DataField="MaterialCode" SortField="MaterialCode" FieldType="String" HeaderTextAlign="Center"
TextAlign="Center" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="CreatedTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
<f:RenderField HeaderText="<%$ Resources:Lan,TrustDate %>" ColumnID="DelegationDate"
DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="<%$ Resources:Lan,QualityNo %>" ColumnID="QualityNo" DataField="QualityNo"

3
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
View File

@ -350,7 +350,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.Status = 0;
newTrustItem.CreatedTime = DateTime.Now;
newTrustItem.CheckTime = DateTime.Now;
newTrustItem.ReportTime = DateTime.Now;
newTrustItem.PMIId = this.PMIDelegationId;
listData.Add(newTrustItem);
}

24
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx
View File

@ -95,9 +95,9 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
<f:Label ID="txtTabler" Label="<%$ Resources:Lan,Lister %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
<f:Label ID="txtRemark" Label="<%$ Resources:Lan,Remark %>" runat="server" LabelAlign="Right"
LabelWidth="170px">
</f:Label>
@ -152,20 +152,20 @@
DataField="Acceptance" FieldType="String" TextAlign="Left" Width="150px">
</f:RenderField>
<%-- 检测日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="DelegationDate"
DataField="DelegationDate" SortField="DelegationDate" FieldType="Date" Renderer="Date"
<f:RenderField HeaderText="<%$ Resources:Lan,FilmDate %>" ColumnID="checkTime"
DataField="checkTime" RendererArgument="yyyy-MM-dd" SortField="checkTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DatePicker ID="tbxTrustDate" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
<f:DatePicker ID="tbxTrustDate" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
<%-- 报告日期 --%>
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="CreatedTime"
DataField="CreatedTime" SortField="CreatedTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<f:RenderField HeaderText="<%$ Resources:Lan,ReportDate %>" ColumnID="reportTime"
DataField="reportTime" RendererArgument="yyyy-MM-dd" SortField="reportTime" FieldType="Date" Renderer="Date"
HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DatePicker ID="tbxCreatedTime" DateFormatString="yyyy-MM-dd" Required="true" runat="server">
<f:DatePicker ID="tbxreportTime" Required="true" runat="server">
</f:DatePicker>
</Editor>
</f:RenderField>
@ -183,9 +183,9 @@
DataField="StatusText" SortField="StatusText" FieldType="String" HeaderTextAlign="Center"
TextAlign="Left" Width="100px">
<Editor>
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true" >
<f:DropDownList ID="drpstatus" runat="server" ShowRedStar="true" Required="true">
<f:ListItem Value="合格" Text="合格" />
<f:ListItem Value="不合格" Text="不合格" />
<f:ListItem Value="不合格" Text="不合格" />
</f:DropDownList>
</Editor>
</f:RenderField>

21
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
View File

@ -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<string>("DelegationDate");
if (string.IsNullOrWhiteSpace(DelegationDate))
;
string checkTime = values.Value<string>("checkTime");
if (string.IsNullOrWhiteSpace(checkTime))
onePMIDelegationDetails.CheckTime = null;
else
;
onePMIDelegationDetails.CheckTime = Convert.ToDateTime(checkTime);
//报告日期
string createdTime = values.Value<string>("CreatedTime");
if (string.IsNullOrWhiteSpace(createdTime))
onePMIDelegationDetails.CreatedTime=null;
string reportTime = values.Value<string>("reportTime");
if (string.IsNullOrWhiteSpace(reportTime))
onePMIDelegationDetails.ReportTime = null;
else
onePMIDelegationDetails.CreatedTime=Convert.ToDateTime(createdTime);
onePMIDelegationDetails.ReportTime = Convert.ToDateTime(reportTime);
//报告编号
onePMIDelegationDetails.ReportNo = values.Value<string>("reportNo").ToString();
//是否合格 0合格 1不合格

4
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.designer.cs generated
View File

@ -267,13 +267,13 @@ namespace FineUIPro.Web.WeldingProcess.PMI
protected global::FineUIPro.DatePicker tbxTrustDate;
/// <summary>
/// tbxCreatedTime 控件。
/// tbxreportTime 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DatePicker tbxCreatedTime;
protected global::FineUIPro.DatePicker tbxreportTime;
/// <summary>
/// tbxreportNo 控件。

120
HJGL/Model/Model.cs
View File

@ -21477,12 +21477,14 @@ namespace Model
private string _Acceptance;
private System.Nullable<System.DateTime> _CreatedTime;
private int _Status;
private string _ReportNo;
private System.Nullable<System.DateTime> _CheckTime;
private System.Nullable<System.DateTime> _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<System.DateTime> 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<System.DateTime> value);
partial void OnCheckTimeChanged();
partial void OnReportTimeChanging(System.Nullable<System.DateTime> 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<System.DateTime> 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<System.DateTime> 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<System.DateTime> 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<System.DateTime> _CreatedTime;
private System.Nullable<System.DateTime> _CheckTime;
private System.Nullable<System.DateTime> _ReportTime;
private string _WeldJointId;
@ -40707,6 +40733,8 @@ namespace Model
private System.Nullable<System.DateTime> _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<System.DateTime> CreatedTime
[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
public System.Nullable<System.DateTime> 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<System.DateTime> 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
{