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

1

This commit is contained in:
高飞 2025-09-25 11:35:56 +08:00
parent 4efd159b3b
commit fdb1641d07
3 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
HJGL_DS/FineUIPro.Web/HJGL/DataIn/JointIn.aspx.cs
View File

@ -870,7 +870,7 @@ namespace FineUIPro.Web.HJGL.DataIn
newJointInfo.JOT_JointNo = col2; newJointInfo.JOT_JointNo = col2;
if (col8 == "固定") if (col8 == "固定")
{ {
if (!newJointInfo.JOT_JointNo.Contains("G")) if (newJointInfo.JOT_JointNo.Last() != 'G')
{ {
newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G"; newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
} }

7
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/JointInfoBatchEdit.aspx.cs
View File

@ -371,6 +371,13 @@
{ {
try try
{ {
if (this.ddlJointAttribute.SelectedValue == "固定")
{
if (newJointInfo.JOT_JointNo.Last() != 'G')
{
newJointInfo.JOT_JointNo = newJointInfo.JOT_JointNo + "G";
}
}
newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo)); newJointInfo.JOT_ID = SQLHelper.GetNewID(typeof(Model.HJGL_PW_JointInfo));
BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo); BLL.HJGL_PW_JointInfoService.AddJointInfo(newJointInfo);

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

@ -406,14 +406,14 @@
this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute; this.ddlJointAttribute.SelectedValue = jointInfo.JOT_JointAttribute;
if (this.ddlJointAttribute.SelectedValue == "固定") if (this.ddlJointAttribute.SelectedValue == "固定")
{ {
if (!this.txtJointNo.Text.Trim().Contains("G")) if (this.txtJointNo.Text.Trim().Last() != 'G')
{ {
this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G"; this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
} }
} }
else else
{ {
if (this.txtJointNo.Text.Trim().Contains("G")) if (this.txtJointNo.Text.Trim().Last() == 'G')
{ {
this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", ""); this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G", "");
} }
@ -1235,14 +1235,14 @@
{ {
if (this.ddlJointAttribute.SelectedValue == "固定") if (this.ddlJointAttribute.SelectedValue == "固定")
{ {
if (!this.txtJointNo.Text.Trim().Contains("G")) if (this.txtJointNo.Text.Trim().Last() != 'G')
{ {
this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G"; this.txtJointNo.Text = this.txtJointNo.Text.Trim() + "G";
} }
} }
else else
{ {
if (this.txtJointNo.Text.Trim().Contains("G")) if (this.txtJointNo.Text.Trim().Last() == 'G')
{ {
this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G",""); this.txtJointNo.Text = this.txtJointNo.Text.Trim().Replace("G","");
} }