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

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
@@ -1,5 +1,4 @@
using Model;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -145,11 +144,11 @@ namespace BLL
/// <param name="DN"></param>
/// <param name="sch"></param>
/// <returns></returns>
public static decimal? GetThicknessByDNDia(int DN,string sch)
public static decimal? GetThicknessByDNDia(int DN, string sch)
{
decimal result = 0;
var q = GetDNCompareByDN(DN);
if (q!=null)
if (q != null)
{
var diaProperty = q.GetType().GetProperty(sch);
diaProperty = (diaProperty == null ? q.GetType().GetProperty(sch.Replace("Sch", "SCH")) : diaProperty);
@@ -1,10 +1,8 @@
using FineUIPro;
using Model;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace BLL
@@ -26,7 +24,7 @@ namespace BLL
}
private static IQueryable<Model.BaseMaterialcolorOutput> GetByQueryModle(Model.BaseMaterialcolorOutput table)
{
var q = from x in Funs.DB.Base_MaterialColor
var q = from x in Funs.DB.Base_MaterialColor
join y in Funs.DB.Base_Material on x.MaterialId equals y.MaterialId into yy
from y in yy.DefaultIfEmpty()
select new BaseMaterialcolorOutput
@@ -39,7 +37,7 @@ namespace BLL
ColorName = x.ColorName,
ColorCardNo = x.ColorCardNo,
RGB = x.RGB,
Remark= x.Remark,
Remark = x.Remark,
};
if (table == null)
@@ -150,7 +148,7 @@ namespace BLL
{
MaterialColorId = newtable.MaterialColorId,
UnitId = newtable.UnitId,
ProjectId= newtable.ProjectId,
ProjectId = newtable.ProjectId,
MaterialId = newtable.MaterialId,
ColorName = newtable.ColorName,
ColorCardNo = newtable.ColorCardNo,
@@ -111,5 +111,5 @@
[ExcelColumnName("类型")]
public string MaterialName { get; set; }
}
}