新增管道颜色标识导入功能及API控制器

更新了多个服务和页面,增加了导入管道颜色标识数据的功能,并实现了包装管理、车次管理、管道组件和焊口信息的API控制器。修正了文件路径错误,优化了分页和排序逻辑,删除了不再使用的API方法。
This commit is contained in:
2025-10-24 10:04:03 +08:00
parent 55b798135c
commit c23d113eae
55 changed files with 1502 additions and 817 deletions
@@ -353,13 +353,15 @@ namespace BLL
dt.Columns.Add("PipelineCode");
dt.Columns.Add("ManterialCode");
dt.Columns.Add("Specification");
dt.Columns.Add("MaterialColor");
for (int i = 0; i < tb.Rows.Count; i++)
{
var newRows = dt.NewRow();
newRows["PipelineCode"] = tb.Rows[i]["PipelineCode"].ToString();
newRows["ManterialCode"] = getMaterialCodeByPipelineId(tb.Rows[i]["PipelineId"].ToString());
newRows["ManterialCode"] = getMaterialCodeByPipelineId(tb.Rows[i]["PipelineId"].ToString(),out string MaterialColor);
newRows["Specification"] = getSpecificationByPipelineId(tb.Rows[i]["PipelineId"].ToString());
newRows["MaterialColor"] = MaterialColor;
dt.Rows.Add(newRows);
}
@@ -878,18 +880,47 @@ namespace BLL
#region
public static string getMaterialCodeByPipelineId(string pipelineId)
public static string getMaterialCodeByPipelineId(string pipelineId, out string materialColor)
{
string materialCode = string.Empty;
materialColor = string.Empty;
if (!string.IsNullOrEmpty(pipelineId))
{
var weldjoint = (from x in Funs.DB.HJGL_WeldJoint
join y in Funs.DB.Base_Material on x.Material1Id equals y.MaterialId
join z in Funs.DB.Base_Material on x.Material2Id equals z.MaterialId
where x.PipelineId == pipelineId
select new { MaterialCode1 = y.MaterialCode, MaterialCode2 = z.MaterialCode }).FirstOrDefault();
select new
{
MaterialId1 = y.MaterialId,
MaterialCode1 = y.MaterialCode,
MaterialId2 = z.MaterialId,
MaterialCode2 = z.MaterialCode,
x.ProjectId,
}).FirstOrDefault();
if (weldjoint != null)
{
if (!string.IsNullOrEmpty(weldjoint.MaterialId1))
{
var projectSet = Project_SysSetService.GetSysSetBySetId("11", weldjoint.ProjectId);
Model.BaseMaterialcolorOutput queryModel = new Model.BaseMaterialcolorOutput();
queryModel.ProjectId = weldjoint.ProjectId;
queryModel.MaterialId = weldjoint.MaterialId1;
var material1 = BLL.BaseMaterialcolorService.GetListByQueryModle(queryModel).FirstOrDefault();
if (material1 != null)
{
if (projectSet != null && projectSet.SetValue == "1")
{
materialColor = material1.ColorName;
}
else
{
materialColor= material1.ColorCardNo;
}
}
}
if (!string.IsNullOrEmpty(weldjoint.MaterialCode1) && !string.IsNullOrEmpty(weldjoint.MaterialCode2))
{
materialCode = weldjoint.MaterialCode1 + "/" + weldjoint.MaterialCode2;
@@ -908,8 +939,7 @@ namespace BLL
}
}
return materialCode;
}
}
public static string getSpecificationByPipelineId(string pipelineId)
{
string spcificaation = string.Empty;