2023-10-27

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

@@ -1,5 +1,6 @@
 using BLL;
 using MiniExcelLibs;
+using NPOI.SS.Formula.Functions;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -123,7 +124,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 foreach (var item in p)
                 {
                     TreeNode newNode = new TreeNode();
-                    newNode.Text = item.WeldingDailyCode;
+                    newNode.Text = item.WeldingDailyCode+"("+BLL.UnitService.getUnitNamesUnitIds(item.UnitId)+")";
                     newNode.NodeID = item.WeldingDailyId;
                     newNode.EnableClickEvent = true;
                     newNode.CommandName = "WeldingDaily";
@@ -191,7 +192,8 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 string strSql = @"SELECT WeldingDailyId,WeldJointId,PipelineCode,WeldJointCode,
                                          BackingWelderCode,CoverWelderCode,Material1Code,Material2Code,
                                          Dia,DNDia,Thickness,WeldTypeCode,WeldingMethodCode,WeldingWireCode,WeldingMode,
-	                                     WeldingRodCode,Size
+	                                     WeldingRodCode,Size,JointAttribute
+
                                   FROM dbo.View_HJGL_WeldJoint
                                    WHERE WeldingDailyId=@WeldingDailyId";
                 List<SqlParameter> listStr = new List<SqlParameter>();
@@ -542,5 +544,24 @@ namespace FineUIPro.Web.HJGL.WeldingManage
 
             }
         }
+
+        protected void btnMenuDeleteDetail_Click(object sender, EventArgs e)
+        {
+            if (!string .IsNullOrEmpty(Grid1.SelectedRowID))
+            {
+              string errlog=  BLL.WeldingDailyService.DeleteWeldingDailyItemByweldJointId(Grid1.SelectedRowID);
+                if (string.IsNullOrEmpty(errlog) )
+                {
+                    BindGrid();
+                    ShowNotify("删除明细成功",MessageBoxIcon.Success);
+                }
+                else
+                {
+                    ShowNotify(errlog, MessageBoxIcon.Error);
+                }
+            }
+
+            
+        }
     }
 }