From 0b31bc3d75cab2992017217cb06e68c6e1d17909 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 12 May 2024 15:56:56 +0800 Subject: [PATCH] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1277952 -> 1100288 bytes .../WelderManage/AnalysisEdit.aspx | 49 +++++--- .../WelderManage/AnalysisEdit.aspx.cs | 118 +++++++++++++----- .../AnalysisEdit.aspx.designer.cs | 12 +- .../WelderManage/QualifiedProject.aspx | 2 +- .../WeldingReport/JointComprehensive.aspx.cs | 24 ++-- HJGL/FineUIPro.Web/common/mainFullViews.aspx | 12 +- 7 files changed, 142 insertions(+), 75 deletions(-) diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 67687d2fa24c960c28fdea5bba0e8a709534c808..bc3837019889fda9b8861ce819ec5e4f15cbb11c 100644 GIT binary patch delta 14066 zcmd^`4_sA6{`c?9Ip^Mc&i%u^7eqzG>y?lQ5fPPj5dqQEOp#hOGa^J%*OUzZM6F)U zEi*FYC{w0JWCt@fgksEGLozdS4P7%cBO)``{JCmsW-8BT_+wVv?moZW-}8E&*K_IZ z%$YNPzBAwNd}q#_lixqmzkE2nVacd$_k7Yy&~Kejni; za4+K7U^18jrh?ytX<+*1r#~mobnE_(DQl0AI^_0u(+lV@N-nV-JG73>yORc!r>ibd z8<~GA3S33QH~#jc$c@)RFhM)yRl#c@0Jwk~bWlvDP6!_XqON`jZJ;k;APzV|XK5{WeF}0F)QyB9PV{+zhgjFA8BG?zPu9T070xaPfj1Zf~0L}1L9B3un_2fe{?q)kE?36>Dk{ALk_m}8J2 zDj$n*9B2fg;KpGbg6mRLaATT?k3zaAJGV6yagqLW5^tz)W^-PBml6^*5mgrBG8xE{ z$@Bz5{XCiLbnSSvz0mdsBs6QgpjE-eR_o1KNE8hS9d1N?UhDNU2t}IsHS1RIWet4b zlH8)rmh_)$^Kq0A>22D)2jkqPO(9!uYmK6{3#dory-}-~$S<^d5%=07yj$Nax1TR^ z{hDS)O}|6VHqDMl4U2G{07SW=2-`F(u7zerD1L34U5K=&z>S){AJ>rpnjP~K%|bHM z-_xuxqe37m7Mc~|1YCPt)5Nt9R{VsPyXakSYacH3C{n~7p+^zsw}!J24hDLu611$s znj-EArJ{$;YFP;D7V24q@Q>i}*6YQs;Sz*Tfx_17YgNSffRx#3$#&Jp!Y|R#sw7u6 zvA%%0_!hdQFPj=9>!_TODFiLrRVP{t05Qz%B)2T9h$kaNEb!(`B%=igFT+%uB-QXoQdlx&Scj$7JtDfdF4 zdHVM;J#`;z5pfbyB18)F-A_ajt9)}?cJqU{dAzx&tTcs&G*{RIcca^KXa&eo0-J>m zTnij5B&f;{EwnLzi5ku#F3}JeikVnN4lihtHQ(*;+GaXPG!axsfdtH;0%?JIJI`z6 zR{dSi95O^75IBlFsy`k0P;t*F9_1rpMDC7^&DF8|Zlthya8y-P{2C&6ZcDa1A=-9P zJ%0L*FC(fV>W`4JI9eQ%uC9RLmH?)Y4heLvLToh~{8T@&7r}&Mo~NQMlkUG`AT_Pg7kvIOo43^!;XNAk z+|ZZW-+jm7piVE%e0KA?^50+hWasz%$XTy{{(!?bZ^88Gsb@vGU73eojkHd0&xVy) zXT1N(q;}U$$1CjThJWUpDCROmZITemKmlf80al;_4cLGkIDiub02gor4+sQ7pdAPX z?Li075rlwFAQW^4VW11}TEk7Iu88wevV4SHJ7MqFK3iLMhG36la zg)PS<&T%Q{e!&&Xanj&<2!3$2

oAw1-=0k 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 delta 11616 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 diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx index e20fad9..4f38110 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx @@ -21,47 +21,56 @@ - + - + - - - - - - - - + + + + + + + - - + + - + - - - - + + + - + - - + + + + + + + + + + + + + diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs index 7d8e772..d4ead77 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.cs @@ -1,9 +1,11 @@ -using System; +using BLL; +using System; using System.Collections.Generic; using System.Linq; using System.Web; using System.Web.UI; using System.Web.UI.WebControls; +using static System.Windows.Forms.VisualStyles.VisualStyleElement.Header; namespace FineUIPro.Web.WelderManage { @@ -24,21 +26,6 @@ namespace FineUIPro.Web.WelderManage ViewState["WelderQualifiedProjectId"] = value; } } - - ///

- /// 焊工id - /// - public string WED_ID - { - get - { - return (string)ViewState["WED_ID"]; - } - set - { - ViewState["WED_ID"] = value; - } - } #endregion protected void Page_Load(object sender, EventArgs e) { @@ -46,32 +33,103 @@ namespace FineUIPro.Web.WelderManage { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); this.WelderQualifiedProjectId = Request.Params["WelderQualifiedProjectId"]; - this.WED_ID = Request.Params["WED_ID"]; + + drpWeldingLocation.DataValueField = "WeldingLocationCode"; + drpWeldingLocation.DataTextField = "WeldingLocationCode"; + drpWeldingLocation.DataSource = (from x in Funs.DB.Base_WeldingLocation orderby x.WeldingLocationCode select x).ToList(); + drpWeldingLocation.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingLocation, ""); + + drpWeldingMethod.DataValueField = "WeldingMethodCode"; + drpWeldingMethod.DataTextField = "WeldingMethodCode"; + drpWeldingMethod.DataSource = (from x in Funs.DB.Base_WeldingMethod orderby x.WeldingMethodCode select x).ToList(); + drpWeldingMethod.DataBind(); + Funs.FineUIPleaseSelect(drpWeldingMethod, ""); + if (!string.IsNullOrEmpty(this.WelderQualifiedProjectId)) { var welderQualifiedProject = BLL.WelderQualifiedService.GetWelderQualifiedProjectById(this.WelderQualifiedProjectId); if (welderQualifiedProject != null) { - this.WED_ID = welderQualifiedProject.WelderId; + string wlederId = welderQualifiedProject.WelderId; this.txtQualifiedProjectCode.Text = welderQualifiedProject.QualifiedProjectCode; - - this.txtExamProject.Text = welderQualifiedProject.ExamProject; - txtRemark.Text = welderQualifiedProject.Remark; - drpIsPass.SelectedValue = welderQualifiedProject.IsPass == true ? "是" : "否"; + + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingMethodId)) + { + drpWeldingMethod.SelectedValueArray = welderQualifiedProject.WeldingMethodId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.MaterialType)) + { + drpMaterialType.SelectedValueArray = welderQualifiedProject.MaterialType.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldingLocationId)) + { + drpWeldingLocation.SelectedValueArray = welderQualifiedProject.WeldingLocationId.Split(','); + } + if (!string.IsNullOrEmpty(welderQualifiedProject.WeldType)) + { + drpWeldType.SelectedValueArray = welderQualifiedProject.WeldType.Split(','); + } + + if (welderQualifiedProject.ThicknessMax != null) + { + numThicknessMax.Text = welderQualifiedProject.ThicknessMax.Value.ToString(); + } + if (welderQualifiedProject.SizesMin != null) + { + numSizesMin.Text = welderQualifiedProject.SizesMin.Value.ToString(); + } + + Model.Welder_Welder welder = BLL.WelderService.GetWelderById(wlederId); + if (welder != null) + { + this.lbWedlerName.Text = welder.WelderName; + this.lbWedlerCode.Text = welder.WelderCode; + } } } - Model.Welder_Welder welder = BLL.WelderService.GetWelderById(this.WED_ID); - if (welder != null) - { - this.lbWedlerName.Text = welder.WelderName; - this.lbWedlerCode.Text = welder.WelderCode; - } } } protected void btnSave_Click(object sender, EventArgs e) - { - + { + Model.Welder_WelderQualify updateQue = Funs.DB.Welder_WelderQualify.FirstOrDefault(x => x.WelderQualifiedProjectId == this.WelderQualifiedProjectId); + if (!string.IsNullOrEmpty(drpWeldingMethod.SelectedValue)) + { + updateQue.WeldingMethodId = String.Join(",", drpWeldingMethod.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpMaterialType.SelectedValue)) + { + updateQue.MaterialType = String.Join(",", drpMaterialType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldingLocation.SelectedValue)) + { + updateQue.WeldingLocationId = String.Join(",", drpWeldingLocation.SelectedValueArray); + } + if (!string.IsNullOrEmpty(drpWeldType.SelectedValue)) + { + updateQue.WeldType = String.Join(",", drpWeldType.SelectedValueArray); + } + if (!string.IsNullOrEmpty(numSizesMin.Text)) + { + updateQue.SizesMin = Convert.ToInt32(numSizesMin.Text); + } + else + { + updateQue.SizesMin = 0; + } + if (!string.IsNullOrEmpty(numThicknessMax.Text)) + { + updateQue.ThicknessMax = Convert.ToInt32(numThicknessMax.Text); + } + else + { + updateQue.ThicknessMax = 0; + } + + Funs.DB.SubmitChanges(); + BLL.Sys_LogService.AddLog(Const.System_1, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.Welder_QualifiedProjectMenuId, Const.BtnModify, this.WelderQualifiedProjectId); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); } } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs index 1915e90..ed0ccfc 100644 --- a/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WelderManage/AnalysisEdit.aspx.designer.cs @@ -96,31 +96,31 @@ namespace FineUIPro.Web.WelderManage protected global::FineUIPro.DropDownList drpWeldingLocation; /// - /// txtExamProject 控件。 + /// numThicknessMax 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtExamProject; + protected global::FineUIPro.NumberBox numThicknessMax; /// - /// drpIsPass 控件。 + /// numSizesMin 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpIsPass; + protected global::FineUIPro.NumberBox numSizesMin; /// - /// txtRemark 控件。 + /// drpWeldType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtRemark; + protected global::FineUIPro.DropDownList drpWeldType; /// /// Toolbar1 控件。 diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx index 1c8d899..1c8c820 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx @@ -144,7 +144,7 @@ Convert.ToDouble(x.Size))); - reportModel.GetRow(rowIndex).GetCell(12).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(14) == null) reportModel.GetRow(rowIndex).CreateCell(14); + reportModel.GetRow(rowIndex).GetCell(14).SetCellValue(jotNum.Sum(x => Convert.ToDouble(x.Size))); + reportModel.GetRow(rowIndex).GetCell(14).CellStyle.SetFont(cs_content_Font); //打底焊工号 - if (reportModel.GetRow(rowIndex).GetCell(21) == null) reportModel.GetRow(rowIndex).CreateCell(21); - reportModel.GetRow(rowIndex).GetCell(21).SetCellValue(backingWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(21).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(23) == null) reportModel.GetRow(rowIndex).CreateCell(23); + reportModel.GetRow(rowIndex).GetCell(23).SetCellValue(backingWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(23).CellStyle.SetFont(cs_content_Font); //盖面焊工号 - if (reportModel.GetRow(rowIndex).GetCell(22) == null) reportModel.GetRow(rowIndex).CreateCell(22); - reportModel.GetRow(rowIndex).GetCell(22).SetCellValue(coverWelder.Count().ToString()); - reportModel.GetRow(rowIndex).GetCell(22).CellStyle.SetFont(cs_content_Font); + if (reportModel.GetRow(rowIndex).GetCell(24) == null) reportModel.GetRow(rowIndex).CreateCell(24); + reportModel.GetRow(rowIndex).GetCell(24).SetCellValue(coverWelder.Count().ToString()); + reportModel.GetRow(rowIndex).GetCell(24).CellStyle.SetFont(cs_content_Font); } #endregion reportModel.ForceFormulaRecalculation = true; diff --git a/HJGL/FineUIPro.Web/common/mainFullViews.aspx b/HJGL/FineUIPro.Web/common/mainFullViews.aspx index 4dc6da7..49ce1b0 100644 --- a/HJGL/FineUIPro.Web/common/mainFullViews.aspx +++ b/HJGL/FineUIPro.Web/common/mainFullViews.aspx @@ -66,10 +66,10 @@
-

  Welders Ranking Report gives you the impression of BSF

+

  Welders Ranking Report gives you the impression of BASF

  welders rank list. (The rank is according to the rejected rates.)

  Each year for the rank can be easily ranked out.

-

  焊工排名报表是所有在BSF从事焊接工作的焊工年度排名

+

  焊工排名报表是所有在BASF从事焊接工作的焊工年度排名

 （排名是根据焊工拍片量及拍片合格率确定的）。

  查询时可选择不同年份查询每年的焊工合格率排名情况。

@@ -161,12 +161,12 @@

  Weld Contractors Report gives the welding quality information

-

  of all the contractors of BSF according to choice the

+

  of all the contractors of BASF according to choice the

  different period and different contractor.

-

  Accumulated rejection rate was calculated from Jan 2006.

-

  该报告提供了所有在BSF从事焊接工作的承包商在不同时期的焊接质量状况。

+

  Accumulated rejection rate was calculated from Jan 2024.

+

  该报告提供了所有在BASF从事焊接工作的承包商在不同时期的焊接质量状况。

  查询时可通过选择不同日期及不同承包商名称查看相关信息。

-

  其中，累计焊接返修率是从2006年1月起计算的。

+

  其中，累计焊接返修率是从2024年1月起计算的。