lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2022-10-25 焊接修改

Browse Source
This commit is contained in:
李鹏飞
2022-10-25 22:30:17 +08:00
parent 75fb02a45c
commit 5fc76eec1a
15 changed files with 632 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx
+14 -2
View File
@@ -112,8 +112,20 @@
</f:FormRow>
<f:FormRow runat="server">
<Items>
<f:TextBox ID="txtJointNOCompleteColor" runat="server" Label="焊口未完成" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="txtJointCompleteColor" runat="server" Label="焊口已完成" LabelWidth="180px"></f:TextBox>
<f:DropDownList ID="drpJointNOCompleteColor" Label="焊口未完成" runat="server"
ShowRedStar="true" Required="true" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
</f:DropDownList>
<f:DropDownList ID="drpJointCompleteColor" Label="焊口已完成" runat="server"
ShowRedStar="true" Required="true" LabelWidth="180px">
<f:ListItem Value="#FF0000" Text="红" />
<f:ListItem Value="#FFFF00" Text="黄" />
<f:ListItem Value="#00FF00" Text="绿" />
</f:DropDownList>
<%--<f:TextBox ID="txtJointNOCompleteColor" runat="server" Label="焊口未完成" LabelWidth="180px"></f:TextBox>
<f:TextBox ID="txtJointCompleteColor" runat="server" Label="焊口已完成" LabelWidth="180px"></f:TextBox>--%>
</Items>
</f:FormRow>
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.cs
+10 -10
View File
@@ -281,23 +281,23 @@ namespace FineUIPro.Web.common.ProjectSet
if (Model_JointNOCompleteColor != null)
{
if (!string.IsNullOrEmpty(this.txtJointNOCompleteColor.Text.Trim()))
if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim()))
{
Model_JointNOCompleteColor.SetValue = this.txtJointNOCompleteColor.Text.Trim();
Model_JointNOCompleteColor.SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim();
BLL.Project_SysSetService.UpdateSet(Model_JointNOCompleteColor);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtJointNOCompleteColor.Text.Trim()))
if (!string.IsNullOrEmpty(this.drpJointNOCompleteColor.SelectedValue.Trim()))
{
Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口未完成",
SetValue = this.txtJointNOCompleteColor.Text.Trim(),
SetValue = this.drpJointNOCompleteColor.SelectedValue.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel);
@@ -307,23 +307,23 @@ namespace FineUIPro.Web.common.ProjectSet
if (Model_JointCompleteColor != null)
{
if (!string.IsNullOrEmpty(this.txtJointCompleteColor.Text.Trim()))
if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim()))
{
Model_JointCompleteColor.SetValue = this.txtJointCompleteColor.Text.Trim();
Model_JointCompleteColor.SetValue = this.drpJointCompleteColor.SelectedValue.Trim();
BLL.Project_SysSetService.UpdateSet(Model_JointCompleteColor);
}
}
else
{
if (!string.IsNullOrEmpty(this.txtJointCompleteColor.Text.Trim()))
if (!string.IsNullOrEmpty(this.drpJointCompleteColor.SelectedValue.Trim()))
{
Model.Project_Sys_Set newModel = new Model.Project_Sys_Set()
{
SetId = SQLHelper.GetNewID(typeof(Model.Project_Sys_Set)),
ProjectId = this.CurrUser.LoginProjectId,
SetName = "焊口已完成",
SetValue = this.txtJointCompleteColor.Text.Trim(),
SetValue = this.drpJointCompleteColor.SelectedValue.Trim(),
};
BLL.Project_SysSetService.AddSet(newModel);
@@ -566,12 +566,12 @@ namespace FineUIPro.Web.common.ProjectSet
Model.Project_Sys_Set Model_JointNOCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口未完成", this.CurrUser.LoginProjectId);
if (Model_JointNOCompleteColor != null)
{
this.txtJointNOCompleteColor.Text = Model_JointNOCompleteColor.SetValue;
this.drpJointNOCompleteColor.SelectedValue = Model_JointNOCompleteColor.SetValue;
}
Model.Project_Sys_Set Model_JointCompleteColor = BLL.Project_SysSetService.GetSysSetBySetName("焊口已完成", this.CurrUser.LoginProjectId);
if (Model_JointCompleteColor != null)
{
this.txtJointCompleteColor.Text = Model_JointCompleteColor.SetValue;
this.drpJointCompleteColor.SelectedValue = Model_JointCompleteColor.SetValue;
}
///质量页面呈现
SGGL/FineUIPro.Web/ProjectData/ProjectSysSet.aspx.designer.cs
Generated
+4 -4
View File
@@ -258,22 +258,22 @@ namespace FineUIPro.Web.common.ProjectSet
protected global::FineUIPro.NumberBox txtPipelineComplete;
/// <summary>
/// txtJointNOCompleteColor 控件。
/// drpJointNOCompleteColor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointNOCompleteColor;
protected global::FineUIPro.DropDownList drpJointNOCompleteColor;
/// <summary>
/// txtJointCompleteColor 控件。
/// drpJointCompleteColor 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.TextBox txtJointCompleteColor;
protected global::FineUIPro.DropDownList drpJointCompleteColor;
/// <summary>
/// GroupPanel1 控件。