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

update

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDetectionEntry.aspx.cs
+11 -10
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不合格