This commit is contained in:
2026-05-26 18:07:18 +08:00
parent e8c005a792
commit 6d31a20782
10 changed files with 68 additions and 33 deletions
@@ -37,7 +37,8 @@
MaterialDef = codeLib.MaterialDef,
PipeGrade = codeLib.PipeGrade,
MaterialUnit = codeLib.MaterialUnit,
ProjectId = codeLib.ProjectId
ProjectId = codeLib.ProjectId,
Code = codeLib.Code
};
db.HJGL_MaterialCodeLib.InsertOnSubmit(newCodeLib);
db.SubmitChanges();
@@ -66,6 +67,7 @@
newCodeLib.MaterialDef = codeLib.MaterialDef;
newCodeLib.PipeGrade = codeLib.PipeGrade;
newCodeLib.MaterialUnit = codeLib.MaterialUnit;
newCodeLib.Code = codeLib.Code;
db.SubmitChanges();
}
}
@@ -94,24 +96,30 @@
{
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
{
var materialCodes = (from x in db.HJGL_MaterialCodeLib select x.MaterialCode + "_" + x.HeatNo + "_" + x.BatchNo).Distinct().ToList();
var materialCodes = from x in db.HJGL_MaterialCodeLib select x.MaterialCode;
var ls = from x in list
where !materialCodes.Contains(x.MaterialCode + "_" + x.HeatNo + "_" + x.BatchNo)
where !materialCodes.Contains(x.MaterialCode + "-" + x.HeatNo + "-" + x.BatchNo)
select x;
List<string> codes = new List<string>();
List<Model.HJGL_MaterialCodeLib> details = new List<Model.HJGL_MaterialCodeLib>();
foreach (var item in ls)
{
Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib
if (!codes.Contains(item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo))
{
MaterialCode = item.MaterialCode,
HeatNo = item.HeatNo,
BatchNo = item.BatchNo,
MaterialName = item.MaterialName,
MaterialSpec = item.MaterialSpec,
MaterialUnit = item.MaterialUnit,
MaterialDef = item.MaterialDef,
};
details.Add(table);
Model.HJGL_MaterialCodeLib table = new Model.HJGL_MaterialCodeLib
{
MaterialCode = item.MaterialCode + "-" + item.HeatNo + "-" + item.BatchNo,
HeatNo = item.HeatNo,
BatchNo = item.BatchNo,
MaterialName = item.MaterialName,
MaterialSpec = item.MaterialSpec,
MaterialUnit = item.MaterialUnit,
MaterialDef = item.MaterialDef,
Code = item.MaterialCode
};
details.Add(table);
codes.Add(table.MaterialCode);
}
}
db.HJGL_MaterialCodeLib.InsertAllOnSubmit(details);