From e2564851159f1744aecacd4368245c535247d34b Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Sun, 12 May 2024 15:28:06 +0800 Subject: [PATCH] 111 --- HJGL/.vs/HJGL/v17/.suo | Bin 844288 -> 858624 bytes .../WeldingProcess/PMI/PMIDelegation.aspx | 8 +-- .../WeldingProcess/PMI/PMIDelegation.aspx.cs | 9 +-- .../PMI/PMIDelegation.aspx.designer.cs | 4 +- .../WeldingProcess/PMI/PMIDelegationEdit.aspx | 6 +- .../PMI/PMIDelegationEdit.aspx.cs | 8 +-- .../WeldingProcess/PMI/PMISelectList.aspx.cs | 57 ++++++++++++------ 7 files changed, 56 insertions(+), 36 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index c930b2704fd416f99e7f10bc786b88c917d9c6ec..ce5bfdca749caa08e12d4333366526f8b5e0e4e5 100644 GIT binary patch delta 17598 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 delta 14842 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 diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx index 59e7343..f900181 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx @@ -3,7 +3,7 @@ - 热处理委托及数据录入 + PMI处理委托 @@ -12,7 +12,7 @@ @@ -179,8 +179,8 @@ - diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs index e8d8c56..b173156 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace FineUIPro.Web.WeldingProcess.PMI { @@ -280,8 +281,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI { this.SetTextTemp(); string window = String.Format("PMIDelegationEdit.aspx", string.Empty, "新增 - ") ; - PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId) - + Window1.GetShowReference(window)); + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.PMIDelegationId) + + Window2.GetShowReference(window)); } else { @@ -303,8 +304,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI if (trustManage != null) { string window = String.Format("PMIDelegationEdit.aspx?PMIDelegationId={0}", this.PMIDelegationId, "编辑 - "); - PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.PMIDelegationId) - + Window1.GetShowReference(window)); + PageContext.RegisterStartupScript(Window2.GetSaveStateReference(this.PMIDelegationId) + + Window2.GetShowReference(window)); } else { diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs index 688c98f..59cf686 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegation.aspx.designer.cs @@ -303,12 +303,12 @@ namespace FineUIPro.Web.WeldingProcess.PMI protected global::FineUIPro.DropDownList ddlPageSize; /// - /// Window1 控件。 + /// Window2 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改,请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Window Window1; + protected global::FineUIPro.Window Window2; } } diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx index a31a5ac..138bc7c 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx @@ -4,7 +4,7 @@ - 编辑热处理委托及数据录入 + 编辑PMI处理委托 @@ -14,8 +14,8 @@ + Layout="VBox" ShowHeader="false" BodyPadding="5px" IconFont="PlusCircle" Title="<%$ Resources:Lan,PMIDelegationTrust %>" + TitleToolTip="<%$ Resources:Lan,PMIDelegationTrust %>" AutoScroll="true"> diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs index e418624..51470fe 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMIDelegationEdit.aspx.cs @@ -196,7 +196,8 @@ namespace FineUIPro.Web.WeldingProcess.PMI } ShowNotify(Resources.Lan.SaveSuccessfully, MessageBoxIcon.Success); - PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId)); + PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PMIDelegationId) + + ActiveWindow.GetHideReference()); } else { @@ -326,10 +327,7 @@ namespace FineUIPro.Web.WeldingProcess.PMI var item = GetHotProessTrustItem.FirstOrDefault(x => x.WeldJointId == rowID); if (item != null) { - if (string.IsNullOrEmpty(this.PMIDelegationId)) //新增记录可直接删除 - { - GetHotProessTrustItem.Remove(item); - } + GetHotProessTrustItem.Remove(item); } } BindGrid(GetHotProessTrustItem); diff --git a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs index a2e1580..1693b43 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/PMI/PMISelectList.aspx.cs @@ -120,31 +120,52 @@ namespace FineUIPro.Web.WeldingProcess.PMI /// private void BindGrid() { - string sql = @"SELECT WeldJointId,ProjectId,PipelineId,WeldJointCode,WPQCode,DetectionType, - convert(int,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJointNo, - dbo.Fun_GetParseString(WeldJointCode) AS PreJotNo, - PipingClassCode,PipeSegment,JointAttribute,PageNum, - ComponentsCode1,ComponentsCode2,Is_hjName,IsHotProessStr,Material1Code,Material2Code, - WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode, - WeldingMethodCode,WeldSilkId,WeldMatCode,WeldingDate,WeldingDailyCode,DoneDin, - BackingWelderCode,CoverWelderCode,SystemNumber,TestPackageNo,Remark, - MaterialCode,WeldingDate, - (CASE WHEN IsCancel=1 THEN '是' ELSE '否' END) AS IsCancel,isPMI - FROM View_Pipeline_WeldJoint WHERE isPMI=1 "; + var listData = (from a in Funs.DB.PMI_Delegation.AsQueryable() + join + b in Funs.DB.PMI_DelegationDetails.AsQueryable() on + a.Id equals b.PMIId + select b.JointId + ).Distinct().ToList(); - List paramsList = new List(); + // string sql = @"SELECT WeldJointId,ProjectId,PipelineId,WeldJointCode,WPQCode,DetectionType, + // convert(int,dbo.Fun_GetParseInt(WeldJointCode)) AS ConvertJointNo, + //dbo.Fun_GetParseString(WeldJointCode) AS PreJotNo, + // PipingClassCode,PipeSegment,JointAttribute,PageNum, + // ComponentsCode1,ComponentsCode2,Is_hjName,IsHotProessStr,Material1Code,Material2Code, + // WeldTypeCode,Specification,HeartNo1,HeartNo2,Size,Dia,Thickness,GrooveTypeCode, + // WeldingMethodCode,WeldSilkId,WeldMatCode,WeldingDate,WeldingDailyCode,DoneDin, + // BackingWelderCode,CoverWelderCode,SystemNumber,TestPackageNo,Remark, + // MaterialCode,WeldingDate, + // (CASE WHEN IsCancel=1 THEN '是' ELSE '否' END) AS IsCancel,isPMI + // FROM View_Pipeline_WeldJoint WHERE isPMI=1 "; + + + // List paramsList = new List(); + // if (!string.IsNullOrEmpty(this.txtJointNo.Text)) + // { + // sql += @" and WeldJointCode=@WeldJointCode"; + // paramsList.Add(new SqlParameter("@WeldJointCode", txtJointNo.Text.Trim())); + // } + // if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) + // { + // sql += @" and PipelineId=@PipelineId "; + // paramsList.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + // } + // var dt = SQLHelper.GetDataTableRunText(sql, paramsList.ToArray()); + var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.IsPMI == true); + if (listData.Count > 0) + { + query = query.Where(t => !listData.Contains(t.WeldJointId)); + } if (!string.IsNullOrEmpty(this.txtJointNo.Text)) { - sql += @" and WeldJointCode=@WeldJointCode"; - paramsList.Add(new SqlParameter("@WeldJointCode", txtJointNo.Text.Trim())); + query = query.Where(t => t.WeldJointCode == this.txtJointNo.Text); } if (!string.IsNullOrEmpty(this.tvControlItem.SelectedNodeID)) { - sql += @" and PipelineId=@PipelineId "; - paramsList.Add(new SqlParameter("@PipelineId", this.tvControlItem.SelectedNodeID)); + query = query.Where(t => t.PipelineId == this.tvControlItem.SelectedNodeID); } - var dt = SQLHelper.GetDataTableRunText(sql, paramsList.ToArray()); - Grid1.DataSource = dt; + Grid1.DataSource = query.ToList(); Grid1.DataBind(); } #endregion