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

11

This commit is contained in:
李超 2026-04-17 19:53:09 +08:00
parent e789cd5461 01ba82ba06
commit eeae7d2252
31 changed files with 1025 additions and 964 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
DataBase/版本日志/HJGLDB_DS_2026-04-16_bwj.sql Normal file
View File

@ -0,0 +1,3 @@
alter table HJGL_BS_Steel add IsCracking bit
go

20
HJGL_DS/BLL/DropListService.cs
View File

@ -348,19 +348,19 @@
/// <returns></returns>
public static ListItem[] HJGL_GetSteTypeList()
{
ListItem[] list = new ListItem[11];
ListItem[] list = new ListItem[12];
list[0] = new ListItem("低碳钢(FeⅠ)", "FeⅠ");
list[1] = new ListItem("低合金钢(FeⅡ)", "FeⅡ");
list[2] = new ListItem("Cr≥5%铬钼钢、铁素体钢、马氏体钢(FeⅢ)", "FeⅢ");
list[3] = new ListItem("奥氏体钢、奥氏体与铁素体双相钢(FeⅣ)", "FeⅣ");
list[4] = new ListItem("奥氏体钢，奥氏体与铁素体双相钢(FeⅣ无保护气体)", "FeⅣ无保护气体");
list[5] = new ListItem("镍合金(Ni)", "Ni");
list[6] = new ListItem("锆合金(Zr)", "Zr");
list[7] = new ListItem("铝与铝合金(Al)", "Al");
list[8] = new ListItem("钛与钛合金(Ti)", "Ti");
list[9] = new ListItem("铜与铜合金(Cu)", "Cu");
list[10] = new ListItem("其他", "其他");
list[3] = new ListItem("Cr≥5%铬钼钢、铁素体钢、马氏体钢(FeⅢ无保护气体)", "FeⅢ无保护气体");
list[4] = new ListItem("奥氏体钢、奥氏体与铁素体双相钢(FeⅣ)", "FeⅣ");
list[5] = new ListItem("奥氏体钢，奥氏体与铁素体双相钢(FeⅣ无保护气体)", "FeⅣ无保护气体");
list[6] = new ListItem("镍合金(Ni)", "Ni");
list[7] = new ListItem("锆合金(Zr)", "Zr");
list[8] = new ListItem("铝与铝合金(Al)", "Al");
list[9] = new ListItem("钛与钛合金(Ti)", "Ti");
list[10] = new ListItem("铜与铜合金(Cu)", "Cu");
list[11] = new ListItem("其他", "其他");
return list;
}

2
HJGL_DS/BLL/HJGLServer/BaseInfo/HJGL_MaterialService.cs
View File

@ -63,6 +63,7 @@ namespace BLL
newSteel.MaterialGroup = steel.MaterialGroup;
newSteel.HardQuaStandard = steel.HardQuaStandard;
newSteel.IsUse = steel.IsUse;
newSteel.IsCracking = steel.IsCracking;
db.HJGL_BS_Steel.InsertOnSubmit(newSteel);
db.SubmitChanges();
@ -87,6 +88,7 @@ namespace BLL
newSteel.MaterialGroup = steel.MaterialGroup;
newSteel.HardQuaStandard = steel.HardQuaStandard;
newSteel.IsUse = steel.IsUse;
newSteel.IsCracking = steel.IsCracking;
db.SubmitChanges();
}

2
HJGL_DS/FineUIPro.Web/FineUIPro.Web.csproj.user
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<UseIISExpress>true</UseIISExpress>

2
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx
View File

@ -36,7 +36,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left" Layout="VBox">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList>
</Items>

8
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardReportSet.aspx.cs
View File

@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
//this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
//var projects = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue);
//RadioButtonList1.DataTextField = "ProjectCode";
@ -106,7 +106,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
rootProjectNode.EnableClickEvent = true;
rootNode.Nodes.Add(rootProjectNode);
}
if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
{
this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
BindGrid();
}
}
#endregion

2
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx
View File

@ -33,7 +33,7 @@
<f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="300px"
EnableMultiSelect="true" EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList>
</Items>
</f:Toolbar>

3
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestReport.aspx.cs
View File

@ -52,7 +52,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
//this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.tvControlItem.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "项目";
@ -64,6 +64,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
//this.InitTreeMenu();//加载树
//this.tvControlItem.SelectedNodeID = this.CurrUser.LoginProjectId;
//BindGrid();
this.InitTreeMenu();
}
}
#endregion

2
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestResult.aspx
View File

@ -31,7 +31,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar7" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="250px" EnableMultiSelect="true"
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="250px"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList>
</Items>

5
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HardTestResult.aspx.cs
View File

@ -39,7 +39,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
//this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.tvHardTestTrust.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "项目";
@ -48,7 +48,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
rootNode.Expanded = true;
rootNode.EnableClickEvent = true;
this.tvHardTestTrust.Nodes.Add(rootNode);
//this.InitTreeMenu();//加载树
this.InitTreeMenu();//加载树
//this.tvHardTestTrust.SelectedNodeID = "0";
//BindGrid();
CheckBoxField cbf1 = Grid1.FindColumn("IsOK1") as CheckBoxField;
@ -213,6 +213,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
rootUnitNode.Nodes.Add(tn);
}
}
}
#endregion

2
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx
View File

@ -28,7 +28,7 @@
</f:Toolbar>
<f:Toolbar ID="Toolbar6" Position="Top" runat="server" ToolbarAlign="Left">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList>
</Items>

5
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardManageEdit.aspx.cs
View File

@ -41,12 +41,14 @@ namespace FineUIPro.Web.HJGL.HotHardManage
{
this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
this.HardTestReportId = string.Empty;
this.drpProjectId.DataTextField = "ProjectCode";
this.drpProjectId.DataValueField = "ProjectId";
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
//this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.tvControlItem.Nodes.Clear();
TreeNode rootNode = new TreeNode();
rootNode.Text = "项目";
@ -58,6 +60,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
//this.InitTreeMenu();//加载树
//this.tvControlItem.SelectedNodeID = "0";
//BindGrid();
this.InitTreeMenu();
}
}
#endregion

2
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx
View File

@ -36,7 +36,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server" ToolbarAlign="Left" Layout="VBox">
<Items>
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px" EnableMultiSelect="true"
<f:DropDownList ID="drpProjectId" runat="server" Label="项目" LabelWidth="50px" Width="260px"
EnableEdit="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_SelectedIndexChanged">
</f:DropDownList>
</Items>

7
HJGL_DS/FineUIPro.Web/HJGL/HotHardManage/HotHardSet.aspx.cs
View File

@ -40,7 +40,7 @@ namespace FineUIPro.Web.HJGL.HotHardManage
this.drpProjectId.DataSource = BLL.Base_ProjectService.GetOnProjectListByUserId(this.CurrUser.UserId, "1");
this.drpProjectId.DataBind();
Funs.FineUIPleaseSelect(this.drpProjectId);
//this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
this.drpProjectId.SelectedValue = this.CurrUser.LoginProjectId;
//var projects = BLL.Base_ProjectService.GetProjectListByUserIdAndState(this.CurrUser.UserId, this.drpIsProjectClosed.SelectedValue);
//RadioButtonList1.DataTextField = "ProjectCode";
@ -103,6 +103,11 @@ namespace FineUIPro.Web.HJGL.HotHardManage
rootProjectNode.EnableClickEvent = true;
rootNode.Nodes.Add(rootProjectNode);
}
if (this.drpProjectId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpProjectId.SelectedValue))
{
this.tvControlItem.SelectedNodeID = this.drpProjectId.SelectedValue;
BindGrid();
}
}
#endregion

1002
HJGL_DS/FineUIPro.Web/HJGL/HotProessManage/HotProessManageEdit.aspx.cs
View File

File diff suppressed because it is too large Load Diff

3
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfo.aspx.cs
View File

@ -525,7 +525,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
db.SubmitChanges();
BLL.HJGL_BO_BatchDetailService.DeleteBatchDetail(rowID); //删除批明细
BLL.HJGL_PW_JointInfoService.DeleteJointInfo(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口信息");
var jot = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(rowID);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "删除焊口[" + jot.JOT_JointNo + "]");
}
else
{

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

@ -765,7 +765,7 @@
newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
this.JOT_ID = newJointInfo.JOT_ID;
BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加焊口信息！");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "添加[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
}
catch
{
@ -818,7 +818,7 @@
{
BLL.HJGL_PW_JointInfoService.UpdateJointNoAddG(this.JOT_ID, this.ddlJointAttribute.SelectedValue, Const.Add);
}
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改焊口信息！");
BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, "修改[" + this.txtISONO.Text + "]管线下，焊口[" + newJointInfo.JOT_JointNo + "]！");
}
// 更新排序字段
string strSort = @"UPDATE dbo.HJGL_PW_JointInfo SET

24
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/PointManage.aspx.cs
View File

@ -1344,9 +1344,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,";
}
else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1)
else
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
if (!string.IsNullOrEmpty(joint.STE_ID))
{
//材质有延迟裂纹倾向，热处理合格未满24小时提醒
var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
}
}
}
}
}
@ -1529,9 +1537,17 @@ namespace FineUIPro.Web.HJGL.WeldingManage
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理未合格,";
}
else if ((DateTime.Now - joint.HotResultDate.Value).Days < 1)
else
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
if (!string.IsNullOrEmpty(joint.STE_ID))
{
//材质有延迟裂纹倾向，热处理合格未满24小时提醒
var material = BLL.HJGL_MaterialService.GetSteelBySteID(joint.STE_ID);
if (material.IsCracking == true && (DateTime.Now - joint.HotResultDate.Value).Days < 1)
{
EventArg = EventArg + "焊口" + joint.JOT_JointNo + "热处理合格未满24小时,";
}
}
}
}
}

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

@ -43,7 +43,7 @@
<f:DropDownList ID="drpUnit" Label="单位" runat="server" ShowRedStar="true" Required="true" EnableEdit="true" LabelWidth="80px"
FocusOnPageLoad="true">
</f:DropDownList>
<f:TextBox ID="txtDailyReportNo" Label="日报告号" ShowRedStar="true" Required="true" runat="server" LabelWidth="80px">
<f:TextBox ID="txtDailyReportNo" Label="日报告号" ShowRedStar="true" Required="true" runat="server" Readonly="true" LabelWidth="80px">
</f:TextBox>
</Items>
</f:FormRow>

54
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx
View File

@ -17,8 +17,8 @@
<f:PageManager ID="PageManager1" AutoSizePanelID="Panel1" runat="server" />
<f:Panel ID="Panel1" runat="server" Margin="5px" BodyPadding="5px" Title="材质" ShowHeader="false" Layout="HBox">
<Items>
<f:Grid ID="Grid1" Title="材质" ShowHeader="false" EnableCollapse="true" PageSize="15"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" Width="760px" EnableColumnLines="true"
<f:Grid ID="Grid1" Title="材质" ShowHeader="false" EnableCollapse="true" PageSize="15" Width="760px"
ShowBorder="true" AllowPaging="true" IsDatabasePaging="true" runat="server" EnableColumnLines="true"
SortField="STE_Code" SortDirection="ASC" OnSort="Grid1_Sort" DataKeyNames="STE_ID" DataIDField="STE_ID" OnPageIndexChange="Grid1_PageIndexChange"
AllowFilters="true" OnFilterChange="Grid1_FilterChange" AllowSorting="true" EnableRowClickEvent="true" OnRowClick="Grid1_RowClick">
<Toolbars>
@ -37,14 +37,14 @@
</f:Toolbar>
</Toolbars>
<Columns>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="60px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center" TextAlign="Center"/>
<f:RenderField Width="140px" ColumnID="STE_Code" DataField="STE_Code" FieldType="String"
HeaderText="材质" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_Code">
</f:RenderField>
<f:RenderField Width="140px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
<f:RenderField Width="100px" ColumnID="STE_Name" DataField="STE_Name" FieldType="String"
HeaderText="材质类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_Name">
</f:RenderField>
<f:TemplateField Width="80px" HeaderText="类别" HeaderTextAlign="Center" TextAlign="Center">
<%-- <f:TemplateField Width="80px" HeaderText="类别" HeaderTextAlign="Center" TextAlign="Center">
<ItemTemplate>
<asp:Label ID="Label1" runat="server" Text='<%# ConvertMaterialType(Eval("MaterialType")) %>'></asp:Label>
</ItemTemplate>
@ -53,24 +53,25 @@
<ItemTemplate>
<asp:Label ID="Label2" runat="server" Text='<%# ConvertMaterialGroup(Eval("MaterialGroup")) %>'></asp:Label>
</ItemTemplate>
</f:TemplateField>
<f:RenderField Width="120px" ColumnID="STE_SteelTypeName" DataField="STE_SteelType" FieldType="String"
ExpandUnusedSpace="true" HeaderText="钢材类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_SteelType"
</f:TemplateField> --%>
<f:RenderField Width="90px" ColumnID="STE_SteelTypeName" DataField="STE_SteelType" FieldType="String"
HeaderText="钢材类型" HeaderTextAlign="Center" TextAlign="Left" SortField="STE_SteelType"
RendererFunction="renderGender">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="HardQuaStandard" DataField="HardQuaStandard" FieldType="String"
HeaderText="硬度合格标准" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="100px" ColumnID="STE_Remark" DataField="STE_Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" ExpandUnusedSpace="true">
</f:RenderField>
<f:RenderField Width="1px" ColumnID="MaterialType" DataField="MaterialType" FieldType="String"
<%-- <f:RenderField Width="1px" ColumnID="MaterialType" DataField="MaterialType" FieldType="String"
HeaderText="类别" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>
<f:RenderField Width="1px" ColumnID="MaterialGroup" DataField="MaterialGroup" FieldType="String"
HeaderText="组别" Hidden="true" HeaderTextAlign="Center" TextAlign="Center">
</f:RenderField>--%>
<f:RenderCheckField Width="140px" ColumnID="IsCracking" DataField="IsCracking" HeaderText="是否有延迟裂纹倾向" ></f:RenderCheckField>
<f:RenderCheckField Width="75px" ColumnID="IsUse" DataField="IsUse" HeaderText="是否使用" ></f:RenderCheckField>
<f:RenderField Width="80px" ColumnID="STE_Remark" DataField="STE_Remark" FieldType="String"
HeaderText="备注" HeaderTextAlign="Center" TextAlign="Left" >
</f:RenderField>
<f:RenderCheckField Width="60px" ColumnID="IsUse" DataField="IsUse" HeaderText="是否使用" ></f:RenderCheckField>
</Columns>
<Listeners>
<f:Listener Event="rowselect" Handler="onGridRowSelect" />
@ -90,30 +91,31 @@
</PageItems>
</f:Grid>
<f:SimpleForm ID="SimpleForm1" runat="server" ShowBorder="true" ShowHeader="false"
LabelWidth="100px" BodyPadding="5px" Width="390px">
LabelWidth="100px" BodyPadding="5px" Width="320px">
<Items>
<f:HiddenField ID="hfFormID" runat="server">
</f:HiddenField>
<f:TextBox ID="txtSte_Code" Label="材质" ShowRedStar="true" Required="true" LabelWidth="110px"
<f:TextBox ID="txtSte_Code" Label="材质" ShowRedStar="true" Required="true" LabelWidth="140px"
runat="server" LabelAlign="right" FocusOnPageLoad="true">
</f:TextBox>
<f:TextBox ID="txtSte_Name" Label="材质类型" ShowRedStar="true" Required="true"
runat="server" LabelWidth="110px" LabelAlign="right">
runat="server" LabelWidth="140px" LabelAlign="right">
</f:TextBox>
<f:DropDownList ID="drpMaterialClass" runat="server" Label="类别"
<%-- <f:DropDownList ID="drpMaterialClass" runat="server" Label="类别"
LabelAlign="Right" AutoPostBack="true" LabelWidth="110px" EnableEdit="true"
OnSelectedIndexChanged="drpMaterialClass_SelectedIndexChanged" >
</f:DropDownList>
<f:DropDownList ID="drpMaterialGroup" runat="server" Label="组别" LabelAlign="Right"
LabelWidth="110px" EnableEdit="true">
</f:DropDownList>
</f:DropDownList>--%>
<f:DropDownList ID="ddlSteType" Label="材质类型" runat="server"
LabelWidth="110px" LabelAlign="right" ShowRedStar="true" Required="true" >
LabelWidth="140px" LabelAlign="right" ShowRedStar="true" Required="true" >
</f:DropDownList>
<f:TextBox ID="txtHardQuaStandard" Label="硬度合格标准" LabelWidth="110px" runat="server" LabelAlign="right" ShowRedStar="true" Required="true" >
<f:TextBox ID="txtHardQuaStandard" Label="硬度合格标准" LabelWidth="140px" runat="server" LabelAlign="right" ShowRedStar="true" Required="true" >
</f:TextBox>
<f:CheckBox ID="cbIsUse" Label="是否使用" runat="server" LabelWidth="110px" LabelAlign="right"/>
<f:TextArea ID="txtRemark" Label="备注" runat="server" LabelWidth="110px" LabelAlign="right" Height="64px">
<f:CheckBox ID="cbIsCracking" Label="是否有延迟裂纹倾向" runat="server" LabelWidth="140px" LabelAlign="right"/>
<f:CheckBox ID="cbIsUse" Label="是否使用" runat="server" LabelWidth="140px" LabelAlign="right"/>
<f:TextArea ID="txtRemark" Label="备注" runat="server" LabelWidth="140px" LabelAlign="right" Height="64px">
</f:TextArea>
</Items>
<Toolbars>
@ -186,8 +188,8 @@
var txtSte_NameClientID = '<%= txtSte_Name.ClientID %>';
var txtHardQuaStandardClientID = '<%= txtHardQuaStandard.ClientID %>';
var txtRemarkClientID = '<%= txtRemark.ClientID %>';
var drpMaterialClassClientID = '<%= drpMaterialClass.ClientID %>';
var drpMaterialGroupClientID = '<%= drpMaterialGroup.ClientID %>';
<%--var drpMaterialClassClientID = '<%= drpMaterialClass.ClientID %>';
var drpMaterialGroupClientID = '<%= drpMaterialGroup.ClientID %>';--%>
function onGridRowSelect(event, rowId) {
var grid = F(gridClientID);
@ -206,8 +208,8 @@
F(txtHardQuaStandardClientID).setValue(rowValue['HardQuaStandard']);
F(txtRemarkClientID).setValue(rowValue['STE_Remark']);
F(drpMaterialClassClientID).setValue(rowValue['MaterialType']);
F(drpMaterialGroupClientID).setValue(rowValue['MaterialGroup']);
//F(drpMaterialClassClientID).setValue(rowValue['MaterialType']);
//F(drpMaterialGroupClientID).setValue(rowValue['MaterialGroup']);
// 更新提交按钮文本
F(btnSaveClientID).setText('提交数据（编辑）');

103
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.cs
View File

@ -41,17 +41,17 @@
this.drpSteType.DataBind();
Funs.FineUIPleaseSelect(this.drpSteType);
this.drpMaterialClass.DataTextField = "MaterialClass";
this.drpMaterialClass.DataValueField = "MaterialClassId";
this.drpMaterialClass.DataSource = BLL.HJGL_MaterialClassService.GetMaterialClassList();
this.drpMaterialClass.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialClass);
//this.drpMaterialClass.DataTextField = "MaterialClass";
//this.drpMaterialClass.DataValueField = "MaterialClassId";
//this.drpMaterialClass.DataSource = BLL.HJGL_MaterialClassService.GetMaterialClassList();
//this.drpMaterialClass.DataBind();
//Funs.FineUIPleaseSelect(this.drpMaterialClass);
this.drpMaterialGroup.DataTextField = "MaterialGroup";
this.drpMaterialGroup.DataValueField = "MaterialGroupId";
this.drpMaterialGroup.DataSource = (from x in Funs.DB.HJGL_BS_MaterialGroup orderby x.MaterialGroupCode select x).ToList();
this.drpMaterialGroup.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialGroup);
//this.drpMaterialGroup.DataTextField = "MaterialGroup";
//this.drpMaterialGroup.DataValueField = "MaterialGroupId";
//this.drpMaterialGroup.DataSource = (from x in Funs.DB.HJGL_BS_MaterialGroup orderby x.MaterialGroupCode select x).ToList();
//this.drpMaterialGroup.DataBind();
//Funs.FineUIPleaseSelect(this.drpMaterialGroup);
// 绑定表格
BindGrid();
}
@ -66,7 +66,7 @@
{
string strSql = @"SELECT Steel.STE_ID,Steel.STE_Code,Steel.STE_Name,Steel.STE_SteelType,Steel.STE_Remark,
Steel.MaterialType,Steel.MaterialGroup,MaterialClas.MaterialClass as MaterialClassName,
MaterialGroup.MaterialGroup as MaterialGroupName,Steel.HardQuaStandard,Steel.IsUse
MaterialGroup.MaterialGroup as MaterialGroupName,Steel.HardQuaStandard,Steel.IsUse,Steel.IsCracking
FROM HJGL_BS_Steel AS Steel
LEFT JOIN HJGL_BS_MaterialClass AS MaterialClas ON Steel.MaterialType=MaterialClas.MaterialClassId
LEFT JOIN HJGL_BS_MaterialGroup AS MaterialGroup ON Steel.MaterialGroup=MaterialGroup.MaterialGroupId
@ -113,7 +113,14 @@
{
cbIsUse.Checked = false;
}
if (q.IsCracking == true)
{
cbIsCracking.Checked = true;
}
else
{
cbIsCracking.Checked = false;
}
}
#region 分页排序
@ -275,8 +282,8 @@
{
this.ddlSteType.SelectedValue = Material.STE_SteelType;
}
this.drpMaterialClass.SelectedValue = Material.MaterialType;
this.drpMaterialGroup.SelectedValue = Material.MaterialGroup;
//this.drpMaterialClass.SelectedValue = Material.MaterialType;
//this.drpMaterialGroup.SelectedValue = Material.MaterialGroup;
this.txtHardQuaStandard.Text = Material.HardQuaStandard;
hfFormID.Text = Id;
this.btnDelete.Enabled = true;
@ -310,14 +317,14 @@
{
steel.STE_SteelType = this.ddlSteType.SelectedValue;
}
if (this.drpMaterialClass.SelectedValue != BLL.Const._Null)
{
steel.MaterialType = this.drpMaterialClass.SelectedValue;
}
if (this.drpMaterialGroup.SelectedValue != BLL.Const._Null)
{
steel.MaterialGroup = this.drpMaterialGroup.SelectedValue;
}
//if (this.drpMaterialClass.SelectedValue != BLL.Const._Null)
//{
// steel.MaterialType = this.drpMaterialClass.SelectedValue;
//}
//if (this.drpMaterialGroup.SelectedValue != BLL.Const._Null)
//{
// steel.MaterialGroup = this.drpMaterialGroup.SelectedValue;
//}
if (cbIsUse.Checked)
{
@ -327,6 +334,14 @@
{
steel.IsUse = false;
}
if (cbIsCracking.Checked)
{
steel.IsCracking = true;
}
else
{
steel.IsCracking = false;
}
if (string.IsNullOrEmpty(strRowID))
{
@ -490,19 +505,19 @@
/// </summary>
/// <param name="WorkStage"></param>
/// <returns></returns>
protected string ConvertMaterialType(object MaterialType)
{
string name = string.Empty;
if (MaterialType != null)
{
var type = BLL.HJGL_MaterialClassService.GetMaterialClassById(MaterialType.ToString());
if (type != null)
{
name =type.MaterialClass;
}
}
return name;
}
//protected string ConvertMaterialType(object MaterialType)
//{
// string name = string.Empty;
// if (MaterialType != null)
// {
// var type = BLL.HJGL_MaterialClassService.GetMaterialClassById(MaterialType.ToString());
// if (type != null)
// {
// name =type.MaterialClass;
// }
// }
// return name;
//}
/// <summary>
/// 获取工作阶段
@ -524,14 +539,14 @@
}
#endregion
protected void drpMaterialClass_SelectedIndexChanged(object sender, EventArgs e)
{
this.drpMaterialGroup.Items.Clear();
this.drpMaterialGroup.DataTextField = "MaterialGroup";
this.drpMaterialGroup.DataValueField = "MaterialGroupId";
this.drpMaterialGroup.DataSource = BLL.HJGL_MaterialGroupService.GetMaterialGroupByMaterialClassId(this.drpMaterialClass.SelectedValue);
this.drpMaterialGroup.DataBind();
Funs.FineUIPleaseSelect(this.drpMaterialGroup);
}
//protected void drpMaterialClass_SelectedIndexChanged(object sender, EventArgs e)
//{
// this.drpMaterialGroup.Items.Clear();
// this.drpMaterialGroup.DataTextField = "MaterialGroup";
// this.drpMaterialGroup.DataValueField = "MaterialGroupId";
// this.drpMaterialGroup.DataSource = BLL.HJGL_MaterialGroupService.GetMaterialGroupByMaterialClassId(this.drpMaterialClass.SelectedValue);
// this.drpMaterialGroup.DataBind();
// Funs.FineUIPleaseSelect(this.drpMaterialGroup);
//}
}
}

51
HJGL_DS/FineUIPro.Web/HJGLServer/BaseInfo/Material.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.HJGLServer.BaseInfo {
namespace FineUIPro.Web.HJGLServer.BaseInfo
{
public partial class Material {
public partial class Material
{
/// <summary>
/// form1 控件。
@ -84,24 +86,6 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.DropDownList drpSteType;
/// <summary>
/// Label1 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label1;
/// <summary>
/// Label2 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::System.Web.UI.WebControls.Label Label2;
/// <summary>
/// ToolbarSeparator1 控件。
/// </summary>
@ -165,24 +149,6 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtSte_Name;
/// <summary>
/// drpMaterialClass 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterialClass;
/// <summary>
/// drpMaterialGroup 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpMaterialGroup;
/// <summary>
/// ddlSteType 控件。
/// </summary>
@ -201,6 +167,15 @@ namespace FineUIPro.Web.HJGLServer.BaseInfo {
/// </remarks>
protected global::FineUIPro.TextBox txtHardQuaStandard;
/// <summary>
/// cbIsCracking 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.CheckBox cbIsCracking;
/// <summary>
/// cbIsUse 控件。
/// </summary>

1
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx
View File

@ -19,6 +19,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar2" Position="Top" runat="server">
<Items>
<f:Label ID="lblWED_ID" runat="server" Hidden="true"></f:Label>
<f:TextBox ID="txtName" runat="server" Label="焊材牌号" EmptyText="输入查询条件" AutoPostBack="true"
OnTextChanged="TextBox_TextChanged" Width="250px" LabelWidth="80px" LabelAlign="Right">
</f:TextBox>

47
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs
View File

@ -1,9 +1,12 @@
using System;
using BLL;
using FineUIPro.Web.Welder;
using Model;
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using BLL;
using System.Web.DynamicData;
namespace FineUIPro.Web.WeldMat.UsingPlan
{
@ -31,6 +34,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
if (!IsPostBack)
{
this.ProjectId = Request.Params["projectId"];
this.lblWED_ID.Text = Request.Params["wed_Id"];
ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
this.drpWeldType.DataTextField = "WeldTypeName";
@ -49,14 +53,42 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
/// </summary>
private void BindGrid()
{
string strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
string strSql = string.Empty;
bool isQua = false;
if (!string.IsNullOrEmpty(this.lblWED_ID.Text.Trim()))
{
var qualifiedProject = BLL.HJGL_WelderQualifiedProjectService.GetWelderQualifiedProjectByWedId(this.lblWED_ID.Text.Trim());
if (qualifiedProject.Count > 0)
{
//当材质类型为FeⅢ并且资质后面三个数中间的为11时可领用FeⅢ无保护气体焊丝
qualifiedProject = qualifiedProject.Where(e => e.MaterialType.Contains("FeⅢ") && e.QualifiedProjectCode.Contains("/11/")).ToList();
if (qualifiedProject.Count > 0)
{
isQua = true;
}
}
}
if (isQua)
{
strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
WeldType.WeldTypeName,WeldType.WeldUnit
FROM dbo.Weld_WeldInfo weld
LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId
WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
//and (select (SUM(ISNULL(stockIn.Amount,0))-SUM(ISNULL(stockIn.UsingAmount,0))) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
List<SqlParameter> listStr = new List<SqlParameter>();
and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
}
else
{
strSql = @"SELECT weld.WeldId, weld.WeldCode, weld.WeldName, weld.WeldSpec,weld.WeldTypeId,weld.SteelType,
WeldType.WeldTypeName,WeldType.WeldUnit
FROM dbo.Weld_WeldInfo weld
LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId
WHERE 1 = 1 and (weld.IsLock is null or weld.IsLock=0)
and weld.SteelType != 'FeⅢ无保护气体'
and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0";
}
List<SqlParameter> listStr = new List<SqlParameter>();
//listStr.Add(new SqlParameter("@ProjectId", this.ProjectId));
listStr.Add(new SqlParameter("@UnitStoreId", Request.Params["unitStoreId"]));
if (drpWeldType.SelectedValue != BLL.Const._Null)
@ -74,7 +106,6 @@ and (select SUM(ISNULL(stockIn.Amount,0)) from Weld_StockIn stockIn where UnitSt
strSql += " AND weld.WeldCode LIKE @WeldCode";
listStr.Add(new SqlParameter("@WeldCode", "%" + this.txtCode.Text.Trim() + "%"));
}
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);

15
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.designer.cs generated
View File

@ -7,10 +7,12 @@
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.WeldMat.UsingPlan {
namespace FineUIPro.Web.WeldMat.UsingPlan
{
public partial class ShowPlanWeld {
public partial class ShowPlanWeld
{
/// <summary>
/// Head1 控件。
@ -66,6 +68,15 @@ namespace FineUIPro.Web.WeldMat.UsingPlan {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar2;
/// <summary>
/// lblWED_ID 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblWED_ID;
/// <summary>
/// txtName 控件。
/// </summary>

7
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs
View File

@ -579,7 +579,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
return;
}
string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, "编辑 - ");
if (string.IsNullOrEmpty(this.hdUsingMan1.Text.Trim()))
{
Alert.ShowInTop("请选择领料人！", MessageBoxIcon.Warning);
return;
}
string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}&wed_Id={2}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, hdUsingMan1.Text.Trim(), "编辑 - ");
PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
}

1
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx
View File

@ -31,6 +31,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar3" Position="Top" ToolbarAlign="Right" runat="server">
<Items>
<f:Label ID="lblProjectId" runat="server" Hidden="true"></f:Label>
<f:TextBox ID="txtWeldCode" runat="server" Label="焊工号" EmptyText="请输入焊工号"
AutoPostBack="true" OnTextChanged="TextBox_TextChanged"></f:TextBox>
<f:TextBox ID="txtWeldName" runat="server" Label="姓名" EmptyText="请输入焊工姓名"

31
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.cs
View File

@ -14,17 +14,17 @@ namespace FineUIPro.Web.common.ProjectSet
/// <summary>
/// 项目id
/// </summary>
public string ProjectId
{
get
{
return (string)ViewState["ProjectId"];
}
set
{
ViewState["ProjectId"] = value;
}
}
//public string ProjectId
//{
// get
// {
// return (string)ViewState["ProjectId"];
// }
// set
// {
// ViewState["ProjectId"] = value;
// }
//}
#endregion
#region 加载
@ -37,7 +37,8 @@ namespace FineUIPro.Web.common.ProjectSet
{
if (!IsPostBack)
{
this.ProjectId = Request.Params["projectId"];
this.lblProjectId.Text = Request.Params["projectId"];
//this.ProjectId = Request.Params["projectId"];
BindGrid();
//InitTreeMenu();//加载树
}
@ -76,7 +77,7 @@ namespace FineUIPro.Web.common.ProjectSet
WHERE WED_ID NOT IN(SELECT WED_ID FROM Project_Welder WHERE ProjectId =@ProjectId)
AND IsOAM=1";
List<SqlParameter> listStr = new List<SqlParameter>();
listStr.Add(new SqlParameter("@ProjectId", ProjectId));
listStr.Add(new SqlParameter("@ProjectId", this.lblProjectId.Text.Trim()));
if (!string.IsNullOrEmpty(txtWeldCode.Text))
{
@ -91,7 +92,7 @@ namespace FineUIPro.Web.common.ProjectSet
SqlParameter[] parameter = listStr.ToArray();
DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
tb = GetFilteredTable(Grid1.FilteredData, tb);
//tb = GetFilteredTable(Grid1.FilteredData, tb);
Grid1.DataSource = tb;
Grid1.DataBind();
}
@ -140,7 +141,7 @@ namespace FineUIPro.Web.common.ProjectSet
{
Model.Project_Welder newProjectWelder = new Model.Project_Welder();
newProjectWelder.WED_ID = Grid1.DataKeys[i][0].ToString();
newProjectWelder.ProjectId = this.ProjectId;
newProjectWelder.ProjectId = this.lblProjectId.Text.Trim(); //this.ProjectId;
newProjectWelder.IsSelected = true;
newProjectWelder.IsApprove = true;
newProjectWelder.ProjectWelderId = SQLHelper.GetNewID(typeof(Model.Project_Welder));

19
HJGL_DS/FineUIPro.Web/common/ProjectSet/SelectWelder.aspx.designer.cs generated
View File

@ -2,15 +2,17 @@
// <自动生成>
// 此代码由工具生成。
//
// 对此文件的更改可能会导致不正确的行为，并且如果
// 重新生成代码，这些更改将会丢失。
// 对此文件的更改可能导致不正确的行为，如果
// 重新生成代码，则所做更改将丢失。
// </自动生成>
//------------------------------------------------------------------------------
namespace FineUIPro.Web.common.ProjectSet {
namespace FineUIPro.Web.common.ProjectSet
{
public partial class SelectWelder {
public partial class SelectWelder
{
/// <summary>
/// form1 控件。
@ -66,6 +68,15 @@ namespace FineUIPro.Web.common.ProjectSet {
/// </remarks>
protected global::FineUIPro.Toolbar Toolbar3;
/// <summary>
/// lblProjectId 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblProjectId;
/// <summary>
/// txtWeldCode 控件。
/// </summary>

442
HJGL_DS/Model/Model.cs
View File

@ -24850,6 +24850,8 @@ namespace Model
private System.Nullable<bool> _IsUse;
private System.Nullable<bool> _IsCracking;
private EntitySet<HJGL_BO_Batch> _HJGL_BO_Batch;
private EntitySet<HJGL_BS_MaterialCompare> _HJGL_BS_MaterialCompare;
@ -24894,6 +24896,8 @@ namespace Model
partial void OnHardQuaStandardChanged();
partial void OnIsUseChanging(System.Nullable<bool> value);
partial void OnIsUseChanged();
partial void OnIsCrackingChanging(System.Nullable<bool> value);
partial void OnIsCrackingChanged();
#endregion
public HJGL_BS_Steel()
@ -25092,6 +25096,26 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsCracking", DbType="Bit")]
public System.Nullable<bool> IsCracking
{
get
{
return this._IsCracking;
}
set
{
if ((this._IsCracking != value))
{
this.OnIsCrackingChanging(value);
this.SendPropertyChanging();
this._IsCracking = value;
this.SendPropertyChanged("IsCracking");
this.OnIsCrackingChanged();
}
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_BO_Batch_HJGL_BS_Steel", Storage="_HJGL_BO_Batch", ThisKey="STE_ID", OtherKey="STE_ID", DeleteRule="NO ACTION")]
public EntitySet<HJGL_BO_Batch> HJGL_BO_Batch
{
@ -131749,8 +131773,6 @@ namespace Model
private EntityRef<Base_Project> _Base_Project;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -131772,7 +131794,6 @@ namespace Model
public Weld_ProjectPlan()
{
this._Base_Project = default(EntityRef<Base_Project>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -131831,10 +131852,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -131938,40 +131955,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_ProjectPlan.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_ProjectPlan.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -132225,8 +132208,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -132275,7 +132256,6 @@ namespace Model
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingMat = default(EntityRef<Weld_UsingMat>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -132354,10 +132334,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -132795,40 +132771,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_RecycleMat.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_RecycleMat.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -132892,8 +132834,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -132934,7 +132874,6 @@ namespace Model
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingMat = default(EntityRef<Weld_UsingMat>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -133013,10 +132952,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -133374,40 +133309,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_RecycleMatTop.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_RecycleMatTop.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -134328,8 +134229,6 @@ namespace Model
private System.Nullable<decimal> _Weight;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -134346,7 +134245,6 @@ namespace Model
public Weld_StockInit()
{
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -134381,10 +134279,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -134434,40 +134328,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_StockInit.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_StockInit.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -135378,8 +135238,6 @@ namespace Model
private EntityRef<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -135435,7 +135293,6 @@ namespace Model
this._Base_Project = default(EntityRef<Base_Project>);
this._Weld_Storeman = default(EntityRef<Weld_Storeman>);
this._Weld_UsingPlan = default(EntityRef<Weld_UsingPlan>);
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -135514,10 +135371,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -136003,40 +135856,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_UsingMat.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_UsingMat.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -136146,8 +135965,6 @@ namespace Model
private EntitySet<Weld_UsingMat> _Weld_UsingMat;
private EntityRef<Weld_WeldInfo> _Weld_WeldInfo;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@ -136211,7 +136028,6 @@ namespace Model
this._Weld_RecycleMat = new EntitySet<Weld_RecycleMat>(new Action<Weld_RecycleMat>(this.attach_Weld_RecycleMat), new Action<Weld_RecycleMat>(this.detach_Weld_RecycleMat));
this._Weld_RecycleMatTop = new EntitySet<Weld_RecycleMatTop>(new Action<Weld_RecycleMatTop>(this.attach_Weld_RecycleMatTop), new Action<Weld_RecycleMatTop>(this.detach_Weld_RecycleMatTop));
this._Weld_UsingMat = new EntitySet<Weld_UsingMat>(new Action<Weld_UsingMat>(this.attach_Weld_UsingMat), new Action<Weld_UsingMat>(this.detach_Weld_UsingMat));
this._Weld_WeldInfo = default(EntityRef<Weld_WeldInfo>);
OnCreated();
}
@ -136246,10 +136062,6 @@ namespace Model
{
if ((this._WeldId != value))
{
if (this._Weld_WeldInfo.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnWeldIdChanging(value);
this.SendPropertyChanging();
this._WeldId = value;
@ -136778,40 +136590,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_WeldInfo", ThisKey="WeldId", OtherKey="WeldId", IsForeignKey=true)]
public Weld_WeldInfo Weld_WeldInfo
{
get
{
return this._Weld_WeldInfo.Entity;
}
set
{
Weld_WeldInfo previousValue = this._Weld_WeldInfo.Entity;
if (((previousValue != value)
|| (this._Weld_WeldInfo.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Weld_WeldInfo.Entity = null;
previousValue.Weld_UsingPlan.Remove(this);
}
this._Weld_WeldInfo.Entity = value;
if ((value != null))
{
value.Weld_UsingPlan.Add(this);
this._WeldId = value.WeldId;
}
else
{
this._WeldId = default(string);
}
this.SendPropertyChanged("Weld_WeldInfo");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@ -137101,7 +136879,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")]
public string SteelType
{
get
@ -137482,18 +137260,6 @@ namespace Model
private System.Nullable<bool> _IsLock;
private EntitySet<Weld_ProjectPlan> _Weld_ProjectPlan;
private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
private EntitySet<Weld_RecycleMatTop> _Weld_RecycleMatTop;
private EntitySet<Weld_StockInit> _Weld_StockInit;
private EntitySet<Weld_UsingMat> _Weld_UsingMat;
private EntitySet<Weld_UsingPlan> _Weld_UsingPlan;
private EntityRef<Weld_WeldType> _Weld_WeldType;
#region 可扩展性方法定义
@ -137526,12 +137292,6 @@ namespace Model
public Weld_WeldInfo()
{
this._Weld_ProjectPlan = new EntitySet<Weld_ProjectPlan>(new Action<Weld_ProjectPlan>(this.attach_Weld_ProjectPlan), new Action<Weld_ProjectPlan>(this.detach_Weld_ProjectPlan));
this._Weld_RecycleMat = new EntitySet<Weld_RecycleMat>(new Action<Weld_RecycleMat>(this.attach_Weld_RecycleMat), new Action<Weld_RecycleMat>(this.detach_Weld_RecycleMat));
this._Weld_RecycleMatTop = new EntitySet<Weld_RecycleMatTop>(new Action<Weld_RecycleMatTop>(this.attach_Weld_RecycleMatTop), new Action<Weld_RecycleMatTop>(this.detach_Weld_RecycleMatTop));
this._Weld_StockInit = new EntitySet<Weld_StockInit>(new Action<Weld_StockInit>(this.attach_Weld_StockInit), new Action<Weld_StockInit>(this.detach_Weld_StockInit));
this._Weld_UsingMat = new EntitySet<Weld_UsingMat>(new Action<Weld_UsingMat>(this.attach_Weld_UsingMat), new Action<Weld_UsingMat>(this.detach_Weld_UsingMat));
this._Weld_UsingPlan = new EntitySet<Weld_UsingPlan>(new Action<Weld_UsingPlan>(this.attach_Weld_UsingPlan), new Action<Weld_UsingPlan>(this.detach_Weld_UsingPlan));
this._Weld_WeldType = default(EntityRef<Weld_WeldType>);
OnCreated();
}
@ -137680,7 +137440,7 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(10)")]
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SteelType", DbType="NVarChar(50)")]
public string SteelType
{
get
@ -137760,84 +137520,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_ProjectPlan_Weld_WeldInfo", Storage="_Weld_ProjectPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_ProjectPlan> Weld_ProjectPlan
{
get
{
return this._Weld_ProjectPlan;
}
set
{
this._Weld_ProjectPlan.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_WeldInfo", Storage="_Weld_RecycleMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_RecycleMat> Weld_RecycleMat
{
get
{
return this._Weld_RecycleMat;
}
set
{
this._Weld_RecycleMat.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMatTop_Weld_WeldInfo", Storage="_Weld_RecycleMatTop", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_RecycleMatTop> Weld_RecycleMatTop
{
get
{
return this._Weld_RecycleMatTop;
}
set
{
this._Weld_RecycleMatTop.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_StockInit_Weld_WeldInfo", Storage="_Weld_StockInit", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_StockInit> Weld_StockInit
{
get
{
return this._Weld_StockInit;
}
set
{
this._Weld_StockInit.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingMat_Weld_WeldInfo", Storage="_Weld_UsingMat", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_UsingMat> Weld_UsingMat
{
get
{
return this._Weld_UsingMat;
}
set
{
this._Weld_UsingMat.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_UsingPlan_Weld_WeldInfo", Storage="_Weld_UsingPlan", ThisKey="WeldId", OtherKey="WeldId", DeleteRule="NO ACTION")]
public EntitySet<Weld_UsingPlan> Weld_UsingPlan
{
get
{
return this._Weld_UsingPlan;
}
set
{
this._Weld_UsingPlan.Assign(value);
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_WeldInfo_Weld_WeldType", Storage="_Weld_WeldType", ThisKey="WeldTypeId", OtherKey="WeldTypeId", IsForeignKey=true)]
public Weld_WeldType Weld_WeldType
{
@ -137891,78 +137573,6 @@ namespace Model
this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
private void attach_Weld_ProjectPlan(Weld_ProjectPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_ProjectPlan(Weld_ProjectPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_RecycleMat(Weld_RecycleMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_RecycleMat(Weld_RecycleMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_RecycleMatTop(Weld_RecycleMatTop entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_RecycleMatTop(Weld_RecycleMatTop entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_StockInit(Weld_StockInit entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_StockInit(Weld_StockInit entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_UsingMat(Weld_UsingMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_UsingMat(Weld_UsingMat entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
private void attach_Weld_UsingPlan(Weld_UsingPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = this;
}
private void detach_Weld_UsingPlan(Weld_UsingPlan entity)
{
this.SendPropertyChanging();
entity.Weld_WeldInfo = null;
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Weld_WeldType")]

2
HJGL_DS/WebAPI/WebAPI.csproj.user
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>