焊口标注后焊口关联管线材质信息等进临时表
This commit is contained in:
@@ -817,6 +817,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
|||||||
if (iso != null)
|
if (iso != null)
|
||||||
{
|
{
|
||||||
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID);
|
var unit = Funs.DB.Base_Unit.FirstOrDefault(x => x.UnitId == iso.BSU_ID);
|
||||||
|
string steelCode = Funs.DB.HJGL_BS_Steel
|
||||||
|
.Where(x => x.STE_ID == iso.STE_ID)
|
||||||
|
.Select(x => x.STE_Code)
|
||||||
|
.FirstOrDefault();
|
||||||
HashSet<string> existingJointNos = new HashSet<string>(
|
HashSet<string> existingJointNos = new HashSet<string>(
|
||||||
Funs.DB.HJGL_PW_JointInfo
|
Funs.DB.HJGL_PW_JointInfo
|
||||||
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.ISO_ID == ISO_ID)
|
.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.ISO_ID == ISO_ID)
|
||||||
@@ -866,6 +870,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
|
|||||||
newDataInTemp.Value1 = unit != null ? unit.UnitCode : null;
|
newDataInTemp.Value1 = unit != null ? unit.UnitCode : null;
|
||||||
newDataInTemp.Value3 = iso.ISO_IsoNo;
|
newDataInTemp.Value3 = iso.ISO_IsoNo;
|
||||||
newDataInTemp.Value4 = jointNo;
|
newDataInTemp.Value4 = jointNo;
|
||||||
|
newDataInTemp.Value5 = steelCode;
|
||||||
|
newDataInTemp.Value12 = iso.Specification;
|
||||||
|
newDataInTemp.Value13 = iso.ISO_Sch.HasValue ? iso.ISO_Sch.Value.ToString() : null;
|
||||||
|
newDataInTemp.Value32 = iso.ISO_Dia.HasValue ? iso.ISO_Dia.Value.ToString() : null;
|
||||||
newDataInTemp.Value46 = item.Value<string>("x");
|
newDataInTemp.Value46 = item.Value<string>("x");
|
||||||
newDataInTemp.Value47 = item.Value<string>("y");
|
newDataInTemp.Value47 = item.Value<string>("y");
|
||||||
newDataInTemp.Value48 = item.Value<string>("x2");
|
newDataInTemp.Value48 = item.Value<string>("x2");
|
||||||
|
|||||||
Reference in New Issue
Block a user