diff --git a/HJGL_DS/FineUIPro.Web/ErrLog.txt b/HJGL_DS/FineUIPro.Web/ErrLog.txt
index 5f28270..ca5ee40 100644
--- a/HJGL_DS/FineUIPro.Web/ErrLog.txt
+++ b/HJGL_DS/FineUIPro.Web/ErrLog.txt
@@ -1 +1,74 @@
-
\ No newline at end of file
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+ 在 FineUIPro.Web.HJGL.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 45
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/13/2025 16:42:58
+出错文件:http://localhost:60961/HJGL/WeldingManage/WeldReportEdit.aspx
+IP地址:::1
+
+出错时间:12/13/2025 16:42:58
+
+出错时间:12/13/2025 16:42:58
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+ 在 FineUIPro.Web.HJGL.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 45
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/15/2025 08:50:35
+出错文件:http://localhost:60961/HJGL/WeldingManage/WeldReportEdit.aspx
+IP地址:::1
+
+出错时间:12/15/2025 08:50:35
+
+出错时间:12/15/2025 08:50:35
+
+
+错误信息开始=====>
+错误类型:NullReferenceException
+错误信息:未将对象引用设置到对象的实例。
+错误堆栈:
+ 在 FineUIPro.Web.HJGL.WeldingManage.WeldReportEdit.Page_Load(Object sender, EventArgs e) 位置 D:\工作\鼎盛\HJGL_DS\HJGL_DS\FineUIPro.Web\HJGL\WeldingManage\WeldReportEdit.aspx.cs:行号 45
+ 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e)
+ 在 System.EventHandler.Invoke(Object sender, EventArgs e)
+ 在 System.Web.UI.Control.OnLoad(EventArgs e)
+ 在 System.Web.UI.Control.LoadRecursive()
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/15/2025 09:57:23
+出错文件:http://localhost:60961/HJGL/WeldingManage/WeldReportEdit.aspx
+IP地址:::1
+
+出错时间:12/15/2025 09:57:23
+
+
+错误信息开始=====>
+错误类型:HttpException
+错误信息:服务器无法在发送 HTTP 标头之后设置内容类型。
+错误堆栈:
+ 在 System.Web.HttpResponse.set_ContentType(String value)
+ 在 (HttpResponse , String )
+ 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq()
+ 在 (hZzEMoBFowQHNetYNlTaFyfiuHiLc )
+ 在 hZzEMoBFowQHNetYNlTaFyfiuHiLc.hXMADyGEgDdbFxdyPzsZtZEjxqkq(Object , EventArgs )
+ 在 System.Web.UI.Page.OnPreRenderComplete(EventArgs e)
+ 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint)
+出错时间:12/15/2025 10:15:48
+出错文件:http://localhost:60961/HJGL/DataIn/WeldReportIn.aspx
+IP地址:::1
+操作人员:管理员
+
+出错时间:12/15/2025 10:15:48
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
index a89ff2c..07f6a4c 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
@@ -499,10 +499,18 @@ namespace FineUIPro.Web.HJGL.DataIn
{
result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n";
}
+ else
+ {
+ result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n";
+ }
if (!string.IsNullOrEmpty(col14) && weldSilk == null)
{
result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n";
}
+ else
+ {
+ result += "第" + (i + 2).ToString() + "行," + "焊丝不能为空" + "\n";
+ }
if (joint != null)
{
if (!string.IsNullOrEmpty(joint.DReportID))
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
index df1db9f..45f5f84 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
@@ -189,10 +189,10 @@
-
-
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
index 84e1496..6fbff90 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
@@ -94,9 +94,9 @@
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
index 107aa9f..68d2c76 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
@@ -147,10 +147,10 @@
-
-
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
index f6a3f82..f958720 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
@@ -172,15 +172,15 @@
-
+
-
+
diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
index fa64f0e..a47e997 100644
--- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
@@ -338,6 +338,26 @@ namespace FineUIPro.Web.HJGL.WeldingManage
///
protected void btnSave_Click(object sender, EventArgs e)
{
+ #region 焊丝焊条牌号不能为空
+ JArray mergedData = Grid1.GetMergedData();
+ foreach (JObject mergedRow in mergedData)
+ {
+ string status = mergedRow.Value("status");
+ JObject values = mergedRow.Value("values");
+ var weldMat = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value("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("JOT_WeldSilk") select x).FirstOrDefault();
+ if (weldSilk == null)
+ {
+ ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
+ return;
+ }
+ }
+ #endregion
string eventArg = string.Empty;
List GetWeldReportItem = this.CollectGridJointInfo();
bool isAllD = true; //不合格口是否全为D类口（即焊口号包含D的焊口）
diff --git a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx
index 7f0e571..02a550f 100644
--- a/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx
+++ b/HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx
@@ -18,7 +18,7 @@
-
@@ -27,10 +27,10 @@
+ HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatCode">
+ HeaderText="焊材型号" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatName">
-
-
// 此代码由工具生成。
//
-// 对此文件的更改可能会导致不正确的行为，并且如果
-// 重新生成代码，这些更改将会丢失。
+// 对此文件的更改可能导致不正确的行为，如果
+// 重新生成代码，则所做更改将丢失。
//
//------------------------------------------------------------------------------
diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config
index 5c46a5b..e233efb 100644
--- a/HJGL_DS/FineUIPro.Web/Web.config
+++ b/HJGL_DS/FineUIPro.Web/Web.config
@@ -11,7 +11,7 @@
-
+
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index 379e7e9..e3028f3 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
@@ -99,12 +99,10 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
}
if (CurrUser.Account != Const.Gly && CurrUser.RoleId != BLL.Const.StoreManRole)
{
- strSql += " AND CHARINDEX(UsingPlan.ProjectId,@ProjectIds)>0";
- //listStr.Add(new SqlParameter("@UsingUnit", CurrUser.UnitId));
- listStr.Add(new SqlParameter("@ProjectIds", projectIds));
-
- //strSql += " AND UsingPlan.UsingUnit = @UsingUnit";
- //listStr.Add(new SqlParameter("@UsingUnit", CurrUser.UnitId));
+ //strSql += " AND CHARINDEX(UsingPlan.ProjectId,@ProjectIds)>0";
+ //listStr.Add(new SqlParameter("@ProjectIds", projectIds));
+ strSql += " AND UsingPlan.InPutMan=@CurrUserId";
+ listStr.Add(new SqlParameter("@CurrUserId", this.CurrUser.UserId));
}
if (CurrUser.RoleId == BLL.Const.StoreManRole)
{