gaofei/HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

20260528 焊口中焊材修改

Browse Source
This commit is contained in:
毕文静
2026-05-28 16:35:27 +08:00
parent c836c25674
commit 5e2a43d578
15 changed files with 782 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+38 -12
View File
@@ -69,15 +69,19 @@ namespace FineUIPro.Web.HJGL.WeldingManage
this.ddlWME_ID.DataSource = BLL.HJGL_WeldingMethodService.GetWeldMethodNameList();
this.ddlWME_ID.DataBind();
///焊条
this.ddlWeldMat.DataTextField = "WMT_MatCode";
this.ddlWeldMat.DataValueField = "WMT_MatCode";
this.ddlWeldMat.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataTextField = "WeldName";
this.ddlWeldMat.DataValueField = "WeldName";
this.ddlWeldMat.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊条")
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("2");
this.ddlWeldMat.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldMat);
///焊丝
this.ddlWeldSilk.DataTextField = "WMT_MatCode";
this.ddlWeldSilk.DataValueField = "WMT_MatCode";
this.ddlWeldSilk.DataSource = BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataTextField = "WeldName";
this.ddlWeldSilk.DataValueField = "WeldName";
this.ddlWeldSilk.DataSource = from x in Funs.DB.View_WeldInfoDropDownLists
where x.WeldTypeName.Contains("焊丝")
select x; //BLL.HJGL_ConsumablesService.GetMaterialList("1");
this.ddlWeldSilk.DataBind();
Funs.FineUIPleaseSelect(this.ddlWeldSilk);
@@ -1241,11 +1245,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
item.WME_Name = weldingMethod.WME_Name;
item.WME_ID = weldingMethod.WME_ID;
}
var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
//var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
//if (weldMat != null)
//{
// item.JOT_WeldMat = weldMat.WMT_ID;
// item.WeldMatCode = weldMat.WMT_MatCode;
//}
//else
//{
// item.JOT_WeldMat = null;
// item.WeldMatCode = null;
//}
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
if (weldMat != null)
{
item.JOT_WeldMat = weldMat.WMT_ID;
item.WeldMatCode = weldMat.WMT_MatCode;
item.JOT_WeldMat = weldMat.WeldId;
item.WeldMatCode = weldMat.WeldName;
}
else
{
@@ -1253,11 +1268,22 @@ namespace FineUIPro.Web.HJGL.WeldingManage
item.WeldMatCode = null;
}
var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
//var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
//if (weldSilk != null)
//{
// item.JOT_WeldSilk = weldSilk.WMT_ID;
// item.WeldSilkCode = weldSilk.WMT_MatCode;
//}
//else
//{
// item.JOT_WeldSilk = null;
// item.WeldSilkCode = null;
//}
var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk != null)
{
item.JOT_WeldSilk = weldSilk.WMT_ID;
item.WeldSilkCode = weldSilk.WMT_MatCode;
item.JOT_WeldSilk = weldSilk.WeldId;
item.WeldSilkCode = weldSilk.WeldName;
}
else
{