lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20250731

Browse Source
This commit is contained in:
毕文静
2025-07-31 11:59:31 +08:00
parent 404ab72e55
commit 32c935b3c2
19 changed files with 466 additions and 228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/TestPackage/TestPackageImport.aspx.cs
+4 -3
View File
@@ -217,8 +217,9 @@ namespace FineUIPro.Web.HJGL.TestPackage
{
Model.SGGLDB db = Funs.DB;
//var getPipeline = from x in db.View_HJGL_WeldJoint where x.ProjectId == this.CurrUser.LoginProjectId select x;
var getPipeline = from x in db.HJGL_Pipeline where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId==Request.Params["UnitWorkId"]
var getPipeline = from x in db.HJGL_Pipeline
where x.ProjectId == this.CurrUser.LoginProjectId
&& x.UnitWorkId == Request.Params["UnitWorkId"]
select x;
Model.WBS_UnitWork unitWork = BLL.UnitWorkService.GetUnitWorkByUnitWorkId(Request.Params["UnitWorkId"]);
@@ -265,7 +266,7 @@ namespace FineUIPro.Web.HJGL.TestPackage
if (line != null)
{
var ptpLineList = from x in db.PTP_PipelineList where x.PipelineId == line.PipelineId select x;
if (ptpLineList != null && DrpType.SelectedValue == "0")
if (ptpLineList.Count() > 0 && DrpType.SelectedValue == "0")
{
result.Add("第" + (i + 1).ToString() + "行," + "管线号[" + col2 + "]已试压！" + "|");
}