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/common/mainMenu_HJGL.aspx.cs
+63 -57
View File
@@ -111,7 +111,7 @@ namespace FineUIPro.Web
{
return BLL.HJGL_WeldingReportService.GetPipeRate_finished(this.CurrUser.LoginProjectId);
}
}
public decimal PipeRate2
{
@@ -119,7 +119,7 @@ namespace FineUIPro.Web
{
return BLL.HJGL_WeldingReportService.GetPipeRate_unfinished(this.CurrUser.LoginProjectId);
}
}
#endregion
#region 项目焊接工程量统计
@@ -199,7 +199,7 @@ namespace FineUIPro.Web
////当日焊接
getNowJotList = (from x in getFinishedJotList
join y in getWeldReportMain on x.WeldingDailyId equals y.WeldingDailyId
where y.WeldingDate.Value.Year== DateTime.Now.Year && y.WeldingDate.Value.Month == DateTime.Now.Month && y.WeldingDate.Value.Day == DateTime.Now.Day
where y.WeldingDate.Value.Year == DateTime.Now.Year && y.WeldingDate.Value.Month == DateTime.Now.Month && y.WeldingDate.Value.Day == DateTime.Now.Day
select x).ToList();
////焊接检测单明细
@@ -213,20 +213,20 @@ namespace FineUIPro.Web
ProjectId = line.ProjectId,
ID = x.NDEItemID,
UnitId = line.UnitId, ///重定义单位
UnitName=z.UnitName,
UnitName = z.UnitName,
WorkAreaId = line.UnitId, /// 重定义区域
MaterialId = line.UnitWorkId, ///重定义材质
CHT_TotalFilm = x.TotalFilm,
CHT_PassFilm = x.PassFilm,
Specification = z.Specification,
WeldTypeCode=z.WeldTypeCode,
JointAttribute=z.JointAttribute,
UnitWorkName=z.UnitWorkName,
MaterialCode=z.MaterialCode
WeldTypeCode = z.WeldTypeCode,
JointAttribute = z.JointAttribute,
UnitWorkName = z.UnitWorkName,
MaterialCode = z.MaterialCode
}).ToList();
////总焊工
getAllWelderList = from x in Funs.DB.SitePerson_Person
where x.ProjectId == this.ProjectId && x.WorkPostId=="19B8F2A9-28D3-4F20-867A-1B2237C2E228"
where x.ProjectId == this.ProjectId && x.WorkPostId == "19B8F2A9-28D3-4F20-867A-1B2237C2E228"
select x;
this.getrate(this.ProjectId, unitId);
@@ -235,8 +235,8 @@ namespace FineUIPro.Web
getecharts04();
getecharts05();
getecharts06();
this.divWelderEfficacyNum.InnerText = BLL.HJGL_WeldingReportService.GetWelderEfficacy(this.CurrUser .LoginProjectId).ToString() ;
if (PipeRate1 + PipeRate2==0)
this.divWelderEfficacyNum.InnerText = BLL.HJGL_WeldingReportService.GetWelderEfficacy(this.CurrUser.LoginProjectId).ToString();
if (PipeRate1 + PipeRate2 == 0)
{
this.echarts02Value.InnerText = "0";
}
@@ -255,11 +255,11 @@ namespace FineUIPro.Web
this.GCRate2 = 0;
this.XCRate1 = 0;
this.XCRate2 = 0;
decimal allGC = 0;
decimal allXC = 0;
var getWelds = Funs.DB.HJGL_WeldJoint.Where(x => x.ProjectId == projectId);
if (!string.IsNullOrEmpty(this.CurrUser.UnitId) )
if (!string.IsNullOrEmpty(this.CurrUser.UnitId))
{
//getWelds = from x in getWelds
// join y in Funs.DB.HJGL_Pipeline on x.PipelineId equals y.PipelineId
@@ -270,22 +270,22 @@ namespace FineUIPro.Web
{
decimal allDy = getWelds.Sum(x => x.Size ?? 0); //项目总达因数
if (getWelds.Where(x => x.JointAttribute == "预制口").Count()>0)
if (getWelds.Where(x => x.JointAttribute == "预制口").Count() > 0)
{
allGC = getWelds.Where(x => x.JointAttribute == "预制口").Sum(x => x.Size ?? 0);
allGC = getWelds.Where(x => x.JointAttribute == "预制口").Sum(x => x.Size ?? 0);
}
if (getWelds.Where(x => x.JointAttribute == "安装口") .Count() > 0)
if (getWelds.Where(x => x.JointAttribute == "安装口").Count() > 0)
{
allXC = getWelds.Where(x => x.JointAttribute == "安装口").Sum(x => x.Size ?? 0);
}
var getWeldsOk = getWelds.Where(x => x.WeldingDailyId != null);
if (getWeldsOk.Count()>0)
if (getWeldsOk.Count() > 0)
{
var GCModel = getWeldsOk.Where(x => x.JointAttribute == "预制口");
if (GCModel.Count() > 0)
{
GCRate1 = GCModel.Sum(x => x.Size ?? 0);
// PipeRate1 = GCRate1;
// PipeRate1 = GCRate1;
}
var XCModel = getWeldsOk.Where(x => x.JointAttribute == "安装口");
@@ -297,7 +297,7 @@ namespace FineUIPro.Web
}
GCRate2 = allGC - GCRate1;
XCRate2 = allXC - XCRate1;
// PipeRate2 = allDy - PipeRate1;
// PipeRate2 = allDy - PipeRate1;
}
@@ -415,9 +415,10 @@ namespace FineUIPro.Web
//// 按单位
List<string> type01List = new List<string>();
List<double> count011List = new List<double>();
var tb_type01 = getCH_CheckItemList.GroupBy(x => x.UnitName).Select(x => new {
UnitName=x.Key,
Current_pass_film=x.Sum(m => m.CHT_PassFilm) ??0,
var tb_type01 = getCH_CheckItemList.GroupBy(x => x.UnitName).Select(x => new
{
UnitName = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
});
foreach (var item in tb_type01)
@@ -441,7 +442,8 @@ namespace FineUIPro.Web
///按单位工程
List<string> type02List = new List<string>();
List<double> count021List = new List<double>();
var tb_type02 = getCH_CheckItemList.GroupBy(x => x.UnitWorkName).Select(x => new {
var tb_type02 = getCH_CheckItemList.GroupBy(x => x.UnitWorkName).Select(x => new
{
UnitWorkName = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
@@ -468,7 +470,8 @@ namespace FineUIPro.Web
///按材质类别
List<string> type03List = new List<string>();
List<double> count031List = new List<double>();
var tb_type03 = getCH_CheckItemList.GroupBy(x => x.MaterialCode).Select(x => new {
var tb_type03 = getCH_CheckItemList.GroupBy(x => x.MaterialCode).Select(x => new
{
MaterialCode = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
@@ -493,7 +496,8 @@ namespace FineUIPro.Web
//焊缝规格
List<string> type04List = new List<string>();
List<double> count041List = new List<double>();
var tb_type04 = getCH_CheckItemList.GroupBy(x => x.Specification).Select(x => new {
var tb_type04 = getCH_CheckItemList.GroupBy(x => x.Specification).Select(x => new
{
Specification = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
@@ -518,7 +522,8 @@ namespace FineUIPro.Web
//焊缝类型
List<string> type05List = new List<string>();
List<double> count051List = new List<double>();
var tb_type05 = getCH_CheckItemList.GroupBy(x => x.WeldTypeCode).Select(x => new {
var tb_type05 = getCH_CheckItemList.GroupBy(x => x.WeldTypeCode).Select(x => new
{
WeldTypeCode = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
@@ -543,7 +548,8 @@ namespace FineUIPro.Web
//焊缝属性
List<string> type06List = new List<string>();
List<double> count061List = new List<double>();
var tb_type06 = getCH_CheckItemList.GroupBy(x => x.JointAttribute).Select(x => new {
var tb_type06 = getCH_CheckItemList.GroupBy(x => x.JointAttribute).Select(x => new
{
JointAttribute = x.Key,
Current_pass_film = x.Sum(m => m.CHT_PassFilm) ?? 0,
Cht_totalfilm = x.Sum(m => m.CHT_TotalFilm) ?? 0
@@ -580,16 +586,16 @@ namespace FineUIPro.Web
protected string E05_Values04;
protected void getecharts05()
{
E05_Type01="[]";
E05_Values01="[]";
E05_Type02 = "[]";
E05_Values02 = "[]";
E05_Type03 = "[]";
E05_Values03 = "[]";
E05_Type04 = "[]";
E05_Values04 = "[]";
E05_Type01 = "[]";
E05_Values01 = "[]";
E05_Type02 = "[]";
E05_Values02 = "[]";
E05_Type03 = "[]";
E05_Values03 = "[]";
E05_Type04 = "[]";
E05_Values04 = "[]";
var alllist = from x in Funs.DB.HJGL_Batch_NDEItem
var alllist = from x in Funs.DB.HJGL_Batch_NDEItem
join y in Funs.DB.HJGL_Batch_NDE on x.NDEID equals y.NDEID
join z in Funs.DB.View_Batch_NDEItem on x.NDEID equals z.NDEID
join m in Funs.DB.View_HJGL_Pipeline on z.PipelineCode equals m.PipelineCode
@@ -696,20 +702,20 @@ namespace FineUIPro.Web
E06_Values02 = "[]";
E06_Type03 = "[]";
E06_Values03 = "[]";
decimal TotalDin=0;
var allwelderEfficacy= from x in Funs.DB.SitePerson_Person
join y in Funs.DB.HJGL_WeldJoint on x.PersonId equals y.CoverWelderId
join z in Funs.DB.HJGL_WeldingDaily on y.WeldingDailyId equals z.WeldingDailyId
join m in Funs.DB.HJGL_Pipeline on y.PipelineId equals m.PipelineId
where x.WorkPostId == "19B8F2A9-28D3-4F20-867A-1B2237C2E228"
group new { x,y,z,m} by new {x.UnitId,z.UnitWorkId,m.MaterialId ,y.Size} into tt
select new
{
Size =(tt.Sum(x=>x.y.Size)==null)?0: tt.Sum(x => x.y.Size),
UnitId = tt.Key.UnitId,
MaterialId = tt.Key.MaterialId,
UnitWorkId=tt.Key.UnitWorkId,
};
decimal TotalDin = 0;
var allwelderEfficacy = from x in Funs.DB.SitePerson_Person
join y in Funs.DB.HJGL_WeldJoint on x.PersonId equals y.CoverWelderId
join z in Funs.DB.HJGL_WeldingDaily on y.WeldingDailyId equals z.WeldingDailyId
join m in Funs.DB.HJGL_Pipeline on y.PipelineId equals m.PipelineId
where x.WorkPostId == "19B8F2A9-28D3-4F20-867A-1B2237C2E228"
group new { x, y, z, m } by new { x.UnitId, z.UnitWorkId, m.MaterialId, y.Size } into tt
select new
{
Size = (tt.Sum(x => x.y.Size) == null) ? 0 : tt.Sum(x => x.y.Size),
UnitId = tt.Key.UnitId,
MaterialId = tt.Key.MaterialId,
UnitWorkId = tt.Key.UnitWorkId,
};
//// 按单位
List<string> type01List = new List<string>();
@@ -722,7 +728,7 @@ namespace FineUIPro.Web
where x.UnitId == itemUnit.UnitId
select x;
TotalDin = getUJots.Sum(x => x.Size) ?? 0;
count011List.Add(TotalDin);
}
if (type01List.Count() > 0)
@@ -755,10 +761,10 @@ namespace FineUIPro.Web
///按材质类别
List<string> type03List = new List<string>();
List<decimal> count031List = new List<decimal>();
var getMaterials =( from x in Funs.DB.Base_Material
join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
where y.ProjectId == this.ProjectId
select x).ToList().Distinct();
var getMaterials = (from x in Funs.DB.Base_Material
join y in Funs.DB.HJGL_Pipeline on x.MaterialId equals y.MaterialId
where y.ProjectId == this.ProjectId
select x).ToList().Distinct();
var q = (from x in getMaterials
join y in allwelderEfficacy on x.MaterialId equals y.MaterialId
group new { x, y } by new { x.MaterialCode, y.Size } into g
@@ -771,8 +777,8 @@ namespace FineUIPro.Web
new
{
MaterialCode = x.Key,
TotalDin=x.Sum(m=>m.TotalDin)
}) ;
TotalDin = x.Sum(m => m.TotalDin)
});
foreach (var itemMaterial in q)
{
string code = itemMaterial.MaterialCode;