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

20260609 日报焊条更新

Browse Source
This commit is contained in:
毕文静
2026-06-09 17:50:38 +08:00
parent 6235fe8f3c
commit 689707bfd1
4 changed files with 82 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+13 -12
View File
@@ -1,11 +1,12 @@
using System;
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI;
using BLL;
using Newtonsoft.Json.Linq;
namespace FineUIPro.Web.HJGL.WeldingManage
{
@@ -349,13 +350,13 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values");
//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)
//{
// ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
// return;
//}
var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault();
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)
{
ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
@@ -1256,7 +1257,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// 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();
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)
{
item.JOT_WeldMat = weldMat.WeldId;
@@ -1279,7 +1280,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
// 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();
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)
{
item.JOT_WeldSilk = weldSilk.WeldId;