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

1111

Browse Source
This commit is contained in:
jackchenyang
2024-05-26 08:28:18 +08:00
parent c873aecca8
commit 914f20c238
12 changed files with 548 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs
+21 -14
View File
@@ -139,7 +139,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
}
//url查询
string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}", "编辑 - ");
string window = String.Format($"PMISelectList.aspx?unitId={this.drpUnitId.SelectedValue}&projectId={this.CurrUser.LoginProjectId}&weldJointIds={weldJointIds}&installId={drpInstallationId.SelectedValue}", "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(hdItemsString.ClientID) + Window1.GetShowReference(window));
}
else
@@ -285,19 +285,24 @@ namespace FineUIPro.Web.WeldingProcess.PMI
{
string[] arr = weldJointIds.Split('|');
JArray mergedData = Grid1.GetMergedData();
var result = Funs.DB.View_Pipeline_WeldJoint.Select(t => new View_PMI_DelegationDetails {
WeldJointId= t.WeldJointId,
PipelineCode= t.PipelineCode,
ProjectId= t.ProjectId,
Acceptance="",
QualityNo="",
WeldJointCode=t.WeldJointCode,
Specification=t.Specification,
MaterialCode=t.MaterialCode,
WorkAreaId=t.WorkAreaId,
Status=0,
PMIId=this.PMIDelegationId
}).Where(t => arr.Contains(t.WeldJointId)).ToList();
var result = Funs.DB.View_Pipeline_WeldJoint.Where(t =>t.UnitId==this.drpUnitId.SelectedValue
&& t.InstallationId==this.drpInstallationId.SelectedValue
&&arr.Contains(t.WeldJointId))
.Select(t => new View_PMI_DelegationDetails
{
WeldJointId = t.WeldJointId,
PipelineCode = t.PipelineCode,
ProjectId = t.ProjectId,
Acceptance = "",
QualityNo = "",
WeldJointCode = t.WeldJointCode,
Specification = t.Specification,
MaterialCode = t.MaterialCode,
WorkAreaId = t.WorkAreaId,
Status = 0,
PMIId = this.PMIDelegationId
})
.ToList();
result.ForEach(item =>
{
item.Id = SQLHelper.GetNewID(typeof(PMI_DelegationDetails));
@@ -317,6 +322,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.WeldJointId = values.Value<string>("WeldJointId").ToString();
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
newTrustItem.WeldJointCode = values.Value<string>("WeldJointCode").ToString();
newTrustItem.Specification =HttpUtility.HtmlDecode(values.Value<string>("Specification").ToString());
newTrustItem.MaterialCode = values.Value<string>("MaterialCode").ToString();
@@ -349,6 +355,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI
newTrustItem.JointId = values.Value<string>("WeldJointId").ToString();
newTrustItem.Acceptance = values.Value<string>("Acceptance").ToString();
newTrustItem.QualityNo = values.Value<string>("QualityNo").ToString();
newTrustItem.WorkAreaId = values.Value<string>("WorkAreaId").ToString();
newTrustItem.Status = 0;
newTrustItem.CheckTime = DateTime.Now;
newTrustItem.ReportTime = DateTime.Now;