From bfa6749202bec8ecd01ee6a29bf2b564993a4b2a Mon Sep 17 00:00:00 2001 From: fly-l <1420031550@qq.com> Date: Mon, 11 Sep 2023 11:40:38 +0800 Subject: [PATCH] 2023-09-11 --- .vs/SGGL_SeDin/v17/.wsuo | Bin 264192 -> 263168 bytes .../WeldingManage/PipelineComponentService.cs | 47 ++++++++------ .../Fastreport/管道焊口检测委托单NoPic.frx | 4 +- SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 1 + .../HJGL/PreDesign/PackagingManage.aspx | 2 +- .../HJGL/PreDesign/PackagingManageEdit.aspx | 49 +++++++++++++-- .../PreDesign/PackagingManageEdit.aspx.cs | 52 ++++++++++------ .../PackagingManageEdit.aspx.designer.cs | 58 +++++++++++++++++- 8 files changed, 164 insertions(+), 49 deletions(-) diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index eac8775749e7676d590f3a9026e92c8ecc36da03..14d066e14a2fc405e4ee562c99c34f380ab1b512 100644 GIT binary patch delta 2366 zcmb`}dr(wW9KdnTvec?~c`mT(A}E`Jit!SuK(`>xLXhlXZx)a&O^p^)6nD)u%O1d~ z?44q>@#vvYCz2*Jc47a4m?i=?{>6ApK6YiDW0B$6m zn*))!Bx!{tCC8Fro7dqP}0Z?v4#8mu`xyGUSoTNToMjo$1!yab1Qy8=2JKgMV{=f=|~Z+N_eQ z_9ZTgmpsHo0#fQj)_|U#=yWvn2WIz|;l@odE}MCU-kIb|UP9|qv|t(h2VDTbSx ztPXQj7KhRcQ>NLKJl)KQ2DMm+QfAnOM}`*Zrc{4SBcW)0Fk$}xIb@qTWc_{8Oq&tW zYtZNDQvZ3}vN+5fRe0R0QHN41b!S?s4mitX235TdIsK|mH>LYkZ7`HxsqE@c)8@SV+1nc#xWR)QOH8JVnvOnG6rLjgK;<(xyVC43Q&mgD8d93<2W3T6HtOu zOvEI3a3W4Z8Om`oCSwXt!BoYHK9$O8sK7K-q6*Vdjngp$XW&eng|jge=ipqNhx2g( zF2qHsffu!?Lp^4p0T*L7F7dOw6mu{amth{}V*xHlBd&lCO<0I4u?UONj3ro#7A%9@ zH-P213M+6mR$>*d!D{%gWp^Fc;CkGE8*vj_(S~+t+>BdrE7syR+>SeNC+@=CxCi%Q z9qz+=Y{30^02}cjHp%=yMCD;Tg3Z{1NAVaQ$5wP8h$rwQp29Xfjc4#Ip2PEa0Wabu zY{$#kflj=FSMeHN#~U*LZ&G;+Z(}Fk!Mk`5UD$>9@c}->NB9_@U^n*QQ+$TK_#9v0 zOYFl}_!|3h0N>y{$XnMN7vA^nejwQ9brt_e*^Ll>!q4~x2k|Rk%pw?G7%;B!^c(-}H>f0SU zYo2qh$8DMF&d>9X_cqL`%PFp#(2!GDUtF8xEhuQn$<1$=kY7|(SXY=^yKRfxvRegL PHZD=CvMd|3qWAs=I)kXf delta 1880 zcmdUvO>7%g5XU{cn{;c|ar_Zth)a^jNpMA^INhXnaonwf%9m*hT(}XZNq}-_Rd!38 z2E0`zK%$4>5i-XLE>#5wx~kG+M0-Kv&|Av^(NihntB6>rqK)~F$%4(7;J|^AexBKR z^TzMZoA=x|I^E^Y<$S*p2m}OZ!1gxrrx>cdjC?LdOe7YQah=pFLDYR@J}F)D)r=I@N5Ed z4u1Wct1h-kbM@~+>>sP&1@Hg1`a!E|X{38r@B&p@J~}RjNQ!iyY#Jh+&TAbmZDA)o zZAcHNT86@x4T%r8IR7R-VjDe(m7@~ajvkFmKl%>oN3kohC2a;a?~5kl(tqNV{__L* z{a8Ym9+ZCLPhv@)iRyf_`x#x19l?#Ydv@Y78U7>SdzD;(kHnt{1-2qo?xR0I$GH}N zT9;3e#ywwTr>jiIxYo0mr_>DF$!XCv&$VQk=Ge)V+vLI&_*UfLf4R9(%PrzNy$|yx zWt3*w=_|9{m*md0X~?S}J^$e$G1QQFWlt(t#}SSRz656 mSBVUM?au}_ia;)SFfd&zVoJ5RDTBHNlN_y diff --git a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs index 64674e24..c0c7e3d1 100644 --- a/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs +++ b/SGGL/BLL/HJGL/WeldingManage/PipelineComponentService.cs @@ -2,6 +2,7 @@ using System.Collections.Generic; using System.Linq; using System.Web.UI.WebControls; +using Model; namespace BLL { @@ -272,17 +273,24 @@ namespace BLL db.SubmitChanges(); } } + /// /// 获取已经验收的预制组件 /// - /// + /// + /// + /// /// - public static List GetAcceptedPipelineComponent(string projectid) + public static List GetAcceptedPipelineComponent(string projectId, string pipelineCode, + string pipelineComponentCode,string flowingSection) { Model.SGGLDB db = Funs.DB; var q = (from x in db.HJGL_Pipeline_Component join y in db.HJGL_Pipeline on x.PipelineId equals y.PipelineId - where y.ProjectId.Contains(projectid) && x.State.Equals(state_1) + where y.ProjectId.Contains(projectId) && x.State.Equals(state_1) && + (string.IsNullOrEmpty(pipelineCode) || y.PipelineCode.Contains(pipelineCode)) && + (string.IsNullOrEmpty(pipelineComponentCode) || x.PipelineComponentCode.Contains(pipelineComponentCode)) && + (string.IsNullOrEmpty(flowingSection) || y.FlowingSection.Contains(flowingSection)) select x).ToList(); return q; @@ -297,22 +305,23 @@ namespace BLL return q; } - /// - /// 管线下拉框 - /// - /// 下拉框名字 - /// 是否显示请选择 - public static void InitPipelineDownList(FineUIPro.DropDownList dropName,string projectid, bool isShowPlease) - { - dropName.DataValueField = "PipelineComponentId"; - dropName.DataTextField = "PipelineComponentCode"; - dropName.DataSource = GetAcceptedPipelineComponent(projectid); - dropName.DataBind(); - if (isShowPlease) - { - Funs.FineUIPleaseSelect(dropName); - } - } + ///// + ///// 管线下拉框 + ///// + ///// 下拉框名字 + ///// 是否显示请选择 + //public static void InitPipelineDownList(FineUIPro.DropDownList dropName,string projectid, string pipelineCode, + // string pipelineComponentCode, bool isShowPlease) + //{ + // dropName.DataValueField = "PipelineComponentId"; + // dropName.DataTextField = "PipelineComponentCode"; + // dropName.DataSource = GetAcceptedPipelineComponent(projectid, pipelineCode, pipelineComponentCode); + // dropName.DataBind(); + // if (isShowPlease) + // { + // Funs.FineUIPleaseSelect(dropName); + // } + //} public static void InitMainItemDownList(FineUIPro.DropDownList dropName, bool isShowPlease) { dropName.DataValueField = "Value"; diff --git a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx index 59c3cb35..65753ae2 100644 --- a/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx +++ b/SGGL/FineUIPro.Web/File/Fastreport/管道焊口检测委托单NoPic.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -89,7 +89,7 @@ namespace FastReport } - + diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index a2b4a81c..1fdb7299 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -10443,6 +10443,7 @@ EPSummaryReport.aspx + ASPXCodeBehind EPSummaryReport.aspx diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index 366a9b74..1b52865d 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -92,7 +92,7 @@