提交代码

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs

@@ -277,45 +277,35 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
         protected void btnSave_Click(object sender, EventArgs e)
         {
-            if (CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldJointMenuId, Const.BtnSave))
+            string weldJointCode = string.Empty;
+
+            int joint = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim());
+
+            if (joint != 0)
             {
-                string weldJointCode = string.Empty;
-
-                int joint = Funs.GetNewIntOrZero(this.txtWeldJointCode.Text.Trim());
-
-                if (joint != 0)
+                if (joint < 10)
                 {
-                    if (joint < 10)
-                    {
-                        weldJointCode = "0" + Convert.ToString(joint);
-                    }
-                    else
-                    {
-                        weldJointCode = Convert.ToString(joint);
-                    }
+                    weldJointCode = "0" + Convert.ToString(joint);
                 }
                 else
                 {
-                    weldJointCode = this.txtWeldJointCode.Text;
+                    weldJointCode = Convert.ToString(joint);
                 }
-
-                if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, WeldJointId))
-                {
-                    Alert.ShowInTop("该管线焊口已存在！", MessageBoxIcon.Warning);
-                    return;
-                }
-                else
-                {
-                    SaveData();
-                }
-
             }
             else
             {
-                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
-                return;
+                weldJointCode = this.txtWeldJointCode.Text;
             }
 
+            if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, WeldJointId))
+            {
+                Alert.ShowInTop("该管线焊口已存在！", MessageBoxIcon.Warning);
+                return;
+            }
+            else
+            {
+                SaveData();
+            }
         }
         /// <summary>
         /// 提交数据
@@ -740,7 +730,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         {
             string dn = string.Empty;
             string s = string.Empty;
-            this.txtSize.Text = string.Empty;
+            //this.txtSize.Text = string.Empty;
             this.txtSpecification.Text = string.Empty;
             if (!string.IsNullOrEmpty(this.txtDia.Text.Trim()))
             {
@@ -768,6 +758,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                     this.txtSpecification.Text = "Φ" + dn + "*" + this.txtThickness.Text.Trim();
                 }
             }
+            if (!string.IsNullOrEmpty(this.txtDNDia.Text.Trim()))
+            {
+                dn = this.txtDNDia.Text.Trim();
+                if (!string.IsNullOrEmpty(this.txtThickness.Text.Trim()))
+                {
+                    this.txtSpecification.Text = dn + "*" + this.txtThickness.Text.Trim();
+                }
+            }
         }
         #endregion
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx.cs

@@ -439,7 +439,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                             }
                         }
                         BLL.WeldingDailyService.DeleteWeldingDaily(weldingDailyId);
-                        //BLL.Sys_LogService.AddLog(BLL.Const.System_6, this.CurrUser.LoginProjectId, this.CurrUser.PersonId, Const.HJGL_WeldReportMenuId, Const.BtnDelete, weldingDailyId);
+                        BLL.LogService.AddLog(this.CurrUser.PersonId, "删除焊接日报");
                         ShowNotify("删除成功！", MessageBoxIcon.Success);
                         this.InitTreeMenu();
                         this.BindGrid();