From f972b10f8da73c52463e854e8b5328998e8db976 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Tue, 8 Apr 2025 14:14:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SGGL/v15/Server/sqlite3/storage.ide-wal | Bin 5524952 -> 5524952 bytes HJGL_DS/.vs/config/applicationhost.config | 4 ++-- .../HeatTreatmentEstimateRecord.aspx.cs | 6 ++--- .../WeldMat/UsingSentMat/UsingMat.aspx.cs | 6 +++-- .../UsingSentMat/UsingMatCheck.aspx.cs | 10 ++++---- .../UsingSentMat/UsingtMatSelect.aspx.cs | 7 +++--- .../common/ProjectSet/SelectWelder.aspx.cs | 22 ++++++++++++++++-- 7 files changed, 38 insertions(+), 17 deletions(-) diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 37c1b4c355c8317be68f732ab82164ffa6a8cc40..a3b4dbf39060de1475cc026a515e9d4b0e9a7149 100644 GIT binary patch delta 363 zcmWN_J1+wP00;2v(b85aPB|PcrH;1VZ~EX+k9u{n)F-fzFdP0DOr}do%m#xdpAJ1XEnC92>=HEK``33YIx z9u1Juh$b{cK?_>ph6inEhZh~_gb!V}>V4cL#stCj5ZzI8cf0$6)X(MCLHza6D16CR zCdnSkY#&Q!j(6{o_L133DL3a&#`U-SCYm(;^jG$oi+(|H>gi(8BPPQ73rkE#^v|4C zG2DN0)^?Ijs?<$A{ZXq3iioF-_Jrf8Z%6s8D8X@+J=qdA(V b1&YxkEzvTqP@Gn2jn-*{HjQjDVJZ9rHwK-U delta 4412 zcmYk93v|s_7RJxL@{*)-Bl40U&o+^2QW_fakPvPjsOPA7W>T%u(dkSvrTVYVDIK(> zrPD?=mQIjYOK3#7#%PJjpo}6EB~@mbWSSTht7FZ#?{}>^cdfnF@9eYB>wnJv&bck? zPuN>vuW6gM>n_?$dut!929j3!|gpSlbb(D_Q zy>xHgN5|+`9jD`Uf=<*A>qm6b&g3sfS)uPJ{Boa9{>R;_6+;Inc0Toy{q`2|`NFOZ zP^x;O-Obm*W5$yI4W7J$F+YOO*4x}M9pFjZ$v41Lc9L&{w=QM;J@BHnz4}lXtA)gFTmTLDD&Z462AS?WWlseYH0sO()b>zpu8SUf@@U0OXcrf_R zT(%trUcH&T2)x%~%+xT%FCE#RudJS>WLA8N!W%!aA}B(su=`{O*p zLcxC+LXHHNVDDsWdV-zH=+6dkETBIR?Eee;n;(8=dt2L@c2Kn z@yFm28+i-(+fZ^^v{JLv$l2iKF{Jaz!N0_>Yl-U#lON!|pGDD`|%aApbz+Xg=J9eF$W z>j1{o$6^1ohqEFqUa6p;*ii)7zdQY}g0sIOTi`_p$ghF_dy@PncyuH?tpQ)^POb&N zl;D{V_---zGw?s{V2rP}q2M)>12=+mV%X_ka7F|h>;vy@X3XXUrGC4WF;(DUCp~S! zQ!bHrgEyTb?*SjaNOpmjpC|7FTN!6qIDo?Mj*$ZrmD*oN4hR2bFbC@iKGus9iUPkr zo&IR>EA#2^4UUas+Zgb~CG^LE83f@%C zm7NF2HL}5X;Kh9za|QgX#bmi7(kGDRjwr_+A%|M-h|{1dEF_E0-*+-zwEa>A{i5v~pzRVb+P)3iE-cdS%444* z=OdGN7l>?MfIhhOe+3Hnk>hd~tOPghB8&81t|142FVvDnhOhebju4ex+d=;eU>~TY z^dl-c$VI;>V?z^J)bPk1GK9`jGnTV~C|9bJ6{1|**6^l!8xvc3ocEONOL*R-b>_<|!tvAP#)cv*>W2{&dR;98a zsW<^?CY?%}ZEYp51LyvSEGf6AgDffMK*~wHq+Hi_vZP%374pa6Bflpf1bQMKWsE$hY8Q|tJHn9>G9k%`lS#}1Iql8H zE$YmqKQ9{lUo@Nr+1GGG^UoQAbIK5wYC~A&eb3aAReEEUl5(=jvK?f3_l?FRWI{5D zn?}|wldQq`O426ZNEKHT8%U~b&gNHoda`isH@{)O>uN?*sBN`s@u zB+`t*h8u&m8G{uYF-1m9Uqc(lJ@8xDzsHS=ryo?nUuR6{{n<9v6)OmYwN{gF`(ZV> zM#X;*oRmoZCIEs{Nj?Ssa}D_%xJxqmA~DP|@EU`U>{H5)jvApES?P8+?*<=!o9CvW zHwJjm?q0FHti15VmerpFx4g^vyV%cI#B_oGZfF`-j36%*>JZci?>k|6p|-yD|4yI$ z;ek#pZ=RM6>kCVPJqqgwdkmHeOM^WQ>kk_MdjggY8weW&dlHrb8w?u)%Y - + @@ -170,7 +170,7 @@ - + diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs index 7fa8b15..ad2e7ab 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingReport/HeatTreatmentEstimateRecord.aspx.cs @@ -232,10 +232,8 @@ namespace FineUIPro.Web.HJGL.WeldingReport sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_jot").ToString()); sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_bw1jot").ToString()); sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_hotjot").ToString()); - sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_Trusthotjot").ToString()); - sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_Inputhotjot").ToString()); - sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_OKhotjot").ToString()); - sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("total_NotOKhotjot").ToString()); + sb.AppendFormat(""); + sb.AppendFormat("{0}", this.Grid1.SummaryData.GetValue("maybe_bw1jot").ToString()); sb.Append(""); sb.Append(""); diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs index 46a3358..12ca7b7 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs @@ -1086,11 +1086,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat } if (weldTypeName == "焊丝" || weldTypeName == "焊条") { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根"; } else { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg"; } if (!string.IsNullOrEmpty(material.StoreMan)) { diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs index ef9590a..aa66c47 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMatCheck.aspx.cs @@ -40,12 +40,12 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat if (type.WeldTypeName == "焊条" || type.WeldTypeName == "焊丝") { unit = "根"; - txtAmount.Text = mat.Amount.Value.ToString("0.##") + "根"; + txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "根"; } else { unit = "公斤"; - txtAmount.Text = mat.Amount.Value.ToString("0.##") + "Kg"; + txtAmount.Text = (mat.Amount.Value + mat.TwoAmount.Value).ToString("0.##") + "Kg"; } string[] weldNames = weld.WeldName.Split('/'); @@ -280,11 +280,13 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat } if (weldTypeName == "焊丝" || weldTypeName == "焊条") { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根"; } else { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg"; } if (!string.IsNullOrEmpty(material.StoreMan)) { diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs index 25a2492..73c5d13 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx.cs @@ -263,13 +263,14 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat } if (weldTypeName == "焊丝" || weldTypeName == "焊条") { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "根" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "根" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0.#") + "根" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "根"; } else { - number = material.Amount.HasValue ? material.Amount.Value.ToString("0.#") + "Kg" : ""; + //number = material.Amount.HasValue && material.Amount > 0 ? material.Amount.Value.ToString("0.#") + "Kg" : material.TwoAmount.HasValue ? material.TwoAmount.Value.ToString("0#") + "Kg" : ""; + number = (material.Amount.Value + material.TwoAmount.Value).ToString("0.#") + "Kg"; } - if (!string.IsNullOrEmpty(material.StoreMan)) { var store = BLL.StoremanInfoService.GetStoremanById(material.StoreMan); diff --git a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs index 5696255..ca377a0 100644 --- a/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs @@ -10,6 +10,23 @@ namespace FineUIPro.Web.common.ProjectSet { public partial class SelectWelder : PageBase { + #region 定义项 + /// + /// 项目id + /// + public string ProjectId + { + get + { + return (string)ViewState["ProjectId"]; + } + set + { + ViewState["ProjectId"] = value; + } + } + #endregion + #region 加载 /// /// 加载页面 @@ -20,6 +37,7 @@ namespace FineUIPro.Web.common.ProjectSet { if (!IsPostBack) { + this.ProjectId = Request.Params["projectId"]; BindGrid(); //InitTreeMenu();//加载树 } @@ -58,7 +76,7 @@ namespace FineUIPro.Web.common.ProjectSet WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId) AND IsOAM=1"; List listStr = new List(); - listStr.Add(new SqlParameter("@ProjectId", Request.Params["projectId"])); + listStr.Add(new SqlParameter("@ProjectId", ProjectId)); if (!string.IsNullOrEmpty(txtWeldCode.Text)) { @@ -122,7 +140,7 @@ namespace FineUIPro.Web.common.ProjectSet { Model.Project_Welder newProjectWelder = new Model.Project_Welder(); newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString(); - newProjectWelder.ProjectId = Request.Params["projectId"]; + newProjectWelder.ProjectId = this.ProjectId; newProjectWelder.IsSelected = true; newProjectWelder.IsApprove = true; newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));