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

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardReport.aspx.cs
+2 -2
View File
@@ -90,8 +90,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
var TrustItemList = (from x in Funs.DB.HJGL_Hard_TrustItem
join y in Funs.DB.HJGL_Hard_Trust on x.HardTrustID equals y.HardTrustID
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HardTrust.aspx.cs
+2 -2
View File
@@ -123,8 +123,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
var ReportList = (from x in Funs.DB.HJGL_HotProess_Report
join y in Funs.DB.HJGL_HotProess_TrustItem on x.HotProessTrustItemId equals y.HotProessTrustItemId
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessReport.aspx.cs
+2 -2
View File
@@ -92,8 +92,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
var TrustItemList = (from x in Funs.DB.HJGL_HotProess_TrustItem
join y in Funs.DB.HJGL_HotProess_Trust on x.HotProessTrustId equals y.HotProessTrustId
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrust.aspx.cs
+4 -4
View File
@@ -125,8 +125,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
//}
//else
//{
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
unitWork1 = (from x in unitWorkList where x.ProjectType == "1" select x).ToList();
unitWork2 = (from x in unitWorkList where x.ProjectType == "2" select x).ToList();
//}
var WeldJointList = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
@@ -608,8 +608,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
{
string varValue = string.Empty;
var projectName = BLL.ProjectService.GetProjectNameByProjectId(this.CurrUser.LoginProjectId);
// var installation = BLL.Project_InstallationService.GetInstallationByInstallationId(hotProessTrust.InstallationId);
var PworkArea = Funs.DB.WBS_UnitWork .FirstOrDefault(x => x.UnitWorkId == hotProessTrust.UnitWorkId);
// var installation = BLL.Project_InstallationService.GetInstallationByInstallationId(hotProessTrust.InstallationId);
var PworkArea = Funs.DB.WBS_UnitWork.FirstOrDefault(x => x.UnitWorkId == hotProessTrust.UnitWorkId);
if (PworkArea != null)
{
//var cel = recordSheet.GetRow(3).CreateCell(1);
SGGL/FineUIPro.Web/HJGL/HotProcessHard/HotProessTrustItemEdit.aspx.cs
+4 -5
View File
@@ -2,7 +2,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Drawing;
using System.Linq;
namespace FineUIPro.Web.HJGL.HotProcessHard
@@ -85,7 +84,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
}
public int pageSize = 20;
public List<TreeNode> TreeNodes=new List<TreeNode>();
public List<TreeNode> TreeNodes = new List<TreeNode>();
#endregion
#region 加载页面
@@ -139,8 +138,8 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
x.PipelineCode,
jointcount = (from y in Funs.DB.HJGL_WeldJoint where y.PipelineId == x.PipelineId && y.IsHotProess == true select y).Count(),
Trustcount = (from z in Funs.DB.HJGL_HotProess_TrustItem join m in Funs.DB.HJGL_WeldJoint on z.WeldJointId equals m.WeldJointId where m.PipelineId == x.PipelineId select z).Count(),
}).ToList().Where(x=>x.jointcount>x.Trustcount).OrderBy(x=>x.PipelineCode);
if (q.Count()>0)
}).ToList().Where(x => x.jointcount > x.Trustcount).OrderBy(x => x.PipelineCode);
if (q.Count() > 0)
{
foreach (var item in q)
{
@@ -185,7 +184,7 @@ namespace FineUIPro.Web.HJGL.HotProcessHard
// newNode.Text = "加载管线...";
// newNode.NodeID = "加载管线...";
// rootNode.Nodes.Add(newNode);
// }
//}
}