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

1

This commit is contained in:
高飞 2025-12-15 11:04:54 +08:00
parent 0e3dd2a750
commit 3a0c06a638
12 changed files with 126 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
HJGL_DS/FineUIPro.Web/ErrLog.txt
View File

@ -1 +1,74 @@


错误信息开始=====>
错误类型: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

8
HJGL_DS/FineUIPro.Web/HJGL/DataIn/WeldReportIn.aspx.cs
View File

@ -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))

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx
View File

@ -189,10 +189,10 @@
<f:RenderField HeaderText="焊接方法" ColumnID="WME_Name" DataField="WME_Name" SortField="WME_Name"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="150px">
</f:RenderField>
<f:RenderField HeaderText="焊丝代号" ColumnID="WeldSilk" DataField="WeldSilk" SortField="WeldSilk"
<f:RenderField HeaderText="焊丝牌号" ColumnID="WeldSilk" DataField="WeldSilk" SortField="WeldSilk"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="焊条代号" ColumnID="WeldMat" DataField="WeldMat" SortField="WeldMat"
<f:RenderField HeaderText="焊条牌号" ColumnID="WeldMat" DataField="WeldMat" SortField="WeldMat"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
</f:RenderField>
<f:RenderField HeaderText="是否热处理" ColumnID="IS_Proess" DataField="IS_Proess" SortField="IS_Proess"

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx
View File

@ -121,9 +121,9 @@
</f:FormRow>
<f:FormRow>
<Items>
<f:DropDownList ID="ddlWeldSilk" Label="焊丝" runat="server" EnableEdit="true" LabelWidth="100px">
<f:DropDownList ID="ddlWeldSilk" Label="焊丝牌号" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlWeldMat" Label="焊条" runat="server" EnableEdit="true" LabelWidth="100px">
<f:DropDownList ID="ddlWeldMat" Label="焊条牌号" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="drpIS_Proess" Label="是否热处理" runat="server" LabelWidth="100px"
AutoPostBack="true" OnSelectedIndexChanged="drpIS_Proess_SelectedIndexChanged">

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoEdit.aspx
View File

@ -94,9 +94,9 @@
<f:NumberBox ID="txtPrepareTemp" Label="预热温度" runat="server" LabelWidth="100px" DecimalPrecision="4"
NoNegative="true">
</f:NumberBox>
<f:DropDownList ID="ddlWeldSilk" Label="焊丝" runat="server" EnableEdit="true" LabelWidth="100px">
<f:DropDownList ID="ddlWeldSilk" Label="焊丝牌号" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:DropDownList ID="ddlWeldMat" Label="焊条" runat="server" EnableEdit="true" LabelWidth="100px">
<f:DropDownList ID="ddlWeldMat" Label="焊条牌号" runat="server" EnableEdit="true" LabelWidth="100px">
</f:DropDownList>
<f:TextBox ID="txtElectricity" Label="焊接电流" runat="server" LabelWidth="100px">
</f:TextBox>

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx
View File

@ -147,10 +147,10 @@
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊条" ColumnID="WeldMatCode" DataField="WeldMatCode" SortField="WeldMatCode"
<f:RenderField HeaderText="焊条牌号" ColumnID="WeldMatCode" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="WeldSilkCode" DataField="WeldSilkCode" SortField="WeldSilkCode"
<f:RenderField HeaderText="焊丝牌号" ColumnID="WeldSilkCode" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
</Columns>

8
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx
View File

@ -172,15 +172,15 @@
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField HeaderText="焊条" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<f:RenderField HeaderText="焊条牌号" ColumnID="JOT_WeldMat" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldMat" EnableEdit="true" runat="server">
</f:DropDownList>
</Editor>
</f:RenderField>
<f:RenderField HeaderText="焊丝" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
<f:RenderField HeaderText="焊丝牌号" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor>
<f:DropDownList ID="ddlWeldSilk" EnableEdit="true" runat="server">
</f:DropDownList>

20
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs
View File

@ -338,6 +338,26 @@ namespace FineUIPro.Web.HJGL.WeldingManage
/// <param name="e"></param>
protected void btnSave_Click(object sender, EventArgs e)
{
#region 焊丝焊条牌号不能为空
JArray mergedData = Grid1.GetMergedData();
foreach (JObject mergedRow in mergedData)
{
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();
if (weldSilk == null)
{
ShowNotify("焊丝牌号不能为空！", MessageBoxIcon.Warning);
return;
}
}
#endregion
string eventArg = string.Empty;
List<Model.HJGL_SpRpWeldReportItem> GetWeldReportItem = this.CollectGridJointInfo();
bool isAllD = true; //不合格口是否全为D类口（即焊口号包含D的焊口）

10
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx
View File

@ -18,7 +18,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:TextBox ID="txtCode" runat="server" Label="焊材代号" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
<f:TextBox ID="txtCode" runat="server" Label="焊材牌号" EmptyText="输入查询条件" AutoPostBack="true" OnTextChanged="TextBox_TextChanged"
Width="250px" LabelWidth="80px">
</f:TextBox>
</Items>
@ -27,10 +27,10 @@
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RenderField Width="180px" ColumnID="WMT_MatCode" DataField="WMT_MatCode" FieldType="String"
HeaderText="焊材代号" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatCode">
HeaderText="焊材牌号" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatCode">
</f:RenderField>
<f:RenderField Width="180px" ColumnID="WMT_MatName" DataField="WMT_MatName" FieldType="String"
HeaderText="焊材名称" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatName">
HeaderText="焊材型号" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatName">
</f:RenderField>
<f:RenderField Width="120px" ColumnID="WMT_MatTypeName" DataField="WMT_MatType" FieldType="String"
ExpandUnusedSpace="true" HeaderText="焊材类型" HeaderTextAlign="Center" TextAlign="Left" SortField="WMT_MatType"
@ -62,10 +62,10 @@
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtConsumablesCode" Label="焊材代号" ShowRedStar="true" Required="true"
<f:TextBox ID="txtConsumablesCode" Label="焊材牌号" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtConsumablesName" Label="焊材名称" ShowRedStar="true" Required="true"
<f:TextBox ID="txtConsumablesName" Label="焊材型号" ShowRedStar="true" Required="true"
runat="server" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpConsumablesType" Label="焊材类型" runat="server"

4
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Consumables.aspx.designer.cs generated
View File

@ -2,8 +2,8 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------

2
HJGL_DS/FineUIPro.Web/Web.config
View File

@ -11,7 +11,7 @@
<FineUIPro DebugMode="false" Theme="Cupertino"/>
<appSettings>
<!--连接字符串-->
<add key="ConnectionString" value="Server=.\SQL2022;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<add key="ConnectionString" value="Server=.\MSSQLSERVER01;Database=HJGLDB_DS;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Max Pool Size = 1000;Connect Timeout=1200"/>
<!--系统名称-->
<add key="SystemName" value="诺必达焊接管理系统"/>
<add key="ChartImageHandler" value="storage=file;timeout=20;url=~/Images/;"/>

10
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
View File

@ -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)
{