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 18:36:54 +08:00
parent 3a0c06a638
commit 7fd2f90fce
5 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -499,10 +499,10 @@ namespace FineUIPro.Web.HJGL.DataIn
{ {
result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n"; result += "第" + (i + 2).ToString() + "行," + "该焊条不存在" + "\n";
} }
else //else
{ //{
result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n"; // result += "第" + (i + 2).ToString() + "行," + "焊条不能为空" + "\n";
} //}
if (!string.IsNullOrEmpty(col14) && weldSilk == null) if (!string.IsNullOrEmpty(col14) && weldSilk == null)
{ {
result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n"; result += "第" + (i + 2).ToString() + "行," + "该焊丝不存在" + "\n";

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

@ -147,12 +147,13 @@
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label> <asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<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"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField> </f:RenderField>
<f:RenderField HeaderText="焊条牌号" ColumnID="WeldMatCode" DataField="WeldMatCode" SortField="WeldMatCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="80px">
</f:RenderField>
</Columns> </Columns>
<Listeners> <Listeners>
<f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" /> <f:Listener Event="beforerowcontextmenu" Handler="onRowContextMenu" />

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

@ -172,13 +172,6 @@
<asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label> <asp:Label ID="Label8" runat="server" Text='<%# ConvertISProess(Eval("JOT_ID")) %>'></asp:Label>
</ItemTemplate> </ItemTemplate>
</f:TemplateField> </f:TemplateField>
<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" <f:RenderField HeaderText="焊丝牌号" ColumnID="JOT_WeldSilk" DataField="WeldSilkCode" SortField="WeldSilkCode"
FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px"> FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px">
<Editor> <Editor>
@ -186,6 +179,14 @@
</f:DropDownList> </f:DropDownList>
</Editor> </Editor>
</f:RenderField> </f:RenderField>
<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="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID" <f:RenderField HeaderText="JOT_ID" ColumnID="JOT_ID" DataField="JOT_ID"
FieldType="String" Hidden="true"></f:RenderField> FieldType="String" Hidden="true"></f:RenderField>
</Columns> </Columns>

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

@ -344,12 +344,12 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{ {
string status = mergedRow.Value<string>("status"); string status = mergedRow.Value<string>("status");
JObject values = mergedRow.Value<JObject>("values"); 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(); //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) //if (weldMat == null)
{ //{
ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning); // ShowNotify("焊条牌号不能为空！", MessageBoxIcon.Warning);
return; // return;
} //}
var weldSilk = (from x in Funs.DB.HJGL_BS_WeldMaterial where x.WMT_MatCode == values.Value<string>("JOT_WeldSilk") select x).FirstOrDefault(); 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) if (weldSilk == null)
{ {

18
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs generated
View File

@ -300,15 +300,6 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::System.Web.UI.WebControls.Label Label8; protected global::System.Web.UI.WebControls.Label Label8;
/// <summary>
/// ddlWeldMat 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldMat;
/// <summary> /// <summary>
/// ddlWeldSilk 控件。 /// ddlWeldSilk 控件。
/// </summary> /// </summary>
@ -318,6 +309,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage {
/// </remarks> /// </remarks>
protected global::FineUIPro.DropDownList ddlWeldSilk; protected global::FineUIPro.DropDownList ddlWeldSilk;
/// <summary>
/// ddlWeldMat 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlWeldMat;
/// <summary> /// <summary>
/// Window1 控件。 /// Window1 控件。
/// </summary> /// </summary>