This commit is contained in:
2026-06-11 13:49:22 +08:00
parent 689707bfd1
commit 08cd08c854
4 changed files with 9 additions and 9 deletions
@@ -350,12 +350,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
if (weldMat == null)
{
ShowNotify("焊条牌号不能为空!", MessageBoxIcon.Warning);
return;
}
//var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value<string>("JOT_WeldMat") select x).FirstOrDefault();
//if (weldMat == null)
//{
// ShowNotify("焊条牌号不能为空!", MessageBoxIcon.Warning);
// return;
//}
var weldSilk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊丝") && x.WeldName == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
if (weldSilk == null)
{