diff --git a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user index 6e29203..e3436b8 100644 --- a/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user +++ b/HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user @@ -2,7 +2,7 @@ true - Debug|Any CPU + Release|Any CPU diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index 57adb0b..a4d73b1 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -350,12 +350,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage { string status = mergedRow.Value("status"); JObject values = mergedRow.Value("values"); - var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldTypeName.Contains("焊条") && x.WeldName == values.Value("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("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("JOT_WeldSilk") select x).FirstOrDefault(); if (weldSilk == null) { diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 557f12f..3c98f31 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -67,7 +67,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index ef14066..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,7 +1,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile true