提交代码

DataBase/版本日志/SGGLDB_V2023-11-21.sql

@@ -0,0 +1,175 @@
+alter table HJGL_WeldJoint add AuditMan2 nvarchar(50) null
+GO
+alter table HJGL_WeldJoint add AuditDate2 datetime null
+GO
+
+
+ALTER VIEW [dbo].[View_HJGL_WeldJoint]
+AS
+SELECT jot.[ProjectId]   --项目Id
+      ,pipe.[UnitWorkId]    --单位工程Id
+	  ,uw.UnitWorkName      --单位工程
+      ,pipe.[UnitId]        --单位Id
+	  ,unit.UnitName        --单位
+      ,jot.[PipelineCode]  --管线号
+	  ,pipe.[SingleNumber]   --单线图号
+	  ,pipe.[SingleName]   --图纸名称
+	  ,pipe.[MediumId]     --介质Id
+	  ,medium.MediumCode
+	  ,medium.MediumName    --介质名称
+	  ,pipe.[PipingClassId]   --管道等级Id
+	  ,pipingClass.PipingClassCode    --管道等级
+	  ,pipe.[DetectionRateId]   --探伤比例Id
+	  ,dr.DetectionRateCode  --探伤比例（例如5，10，20）
+	  ,pipe.DetectionType  --探伤类型Id(可能多个，中间用|分隔)
+	  ,STUFF((SELECT ',' + DetectionTypeCode FROM Base_DetectionType 
+	  WHERE CHARINDEX('|'+LTRIM(DetectionTypeId)+'|','|'+ pipe.DetectionType + '|') > 0 FOR XML PATH('') ), 1, 1, '') AS DetectionTypeStr  --探伤类型（可能多个，中间用,分隔）
+      ,pipe.DesignTemperature   --设计温度℃
+	  ,pipe.DesignPress      --设计压力Mpa(g)
+	  ,pipe.TestMedium        --压力试验介质Id
+	  ,tm.MediumName AS TestMediumName         --压力试验介质
+	  ,pipe.TestPressure          --压力试验压力Mpa(g)
+	  ,pipe.PressurePipingClassId    --压力管道级别Id
+	  ,ppc.PressurePipingClassCode   --压力管道级别
+	  ,pipe.PipeLenth           --管线长度(m)
+	  ,pipe.LeakMedium    --泄露性试验介质Id
+	  ,tm2.MediumName AS LeakMediumName         --泄露性试验介质
+	  ,pipe.LeakPressure     --泄露性试验压力Mpa(g)
+	  ,pipe.PCMedium        --吹洗要求Id
+	  ,pm.PurgeMethodCode     --吹洗要求
+	  ,pipe.VacuumPressure    --真空试验压力Kpa(a)
+	  ,pipe.MaterialId      --材质Id
+	  ,mat.MaterialCode AS PipeMaterialCode    --材质
+	  ,pipe.Remark AS PipeRemark        --备注
+	  ,pipe.FlowingSection as FlowingSection --流水段
+	  ,jot.[WeldJointId]  --焊口Id
+	  ,jot.[WeldJointCode]    --焊口号
+	  ,jot.[Material1Id]    --材质1Id
+	  ,mat1.MaterialCode AS Material1Code   --材质1
+      ,jot.[Material2Id]    --材质2Id
+	  ,mat2.MaterialCode AS Material2Code    --材质2
+	  ,jot.[Dia]    --外径
+	  ,jot.DNDia   --DN公称直径
+	  ,jot.[Size]    --达因
+	  ,jot.[Thickness]    --壁厚
+	  ,jot.[Specification]   --规格
+	  ,jot.[WeldTypeId]    --焊缝类型Id
+	  ,WeldType.WeldTypeCode   --焊缝类型
+	  ,jot.[DetectionTypeId]    --检测类型Id
+	  ,ndt.DetectionTypeCode    --检测类型
+	  ,jot.[Components1Id]     --组件1号Id
+	  ,com1.ComponentsCode AS ComponentsCode1   --组件1号
+      ,jot.[Components2Id]     --组件2号Id
+	  ,com2.ComponentsCode AS ComponentsCode2   --组件2号
+	  ,jot.DesignIsHotProess   --是否热处理
+	  ,CASE jot.DesignIsHotProess WHEN 1 THEN '是' ELSE '否' END AS DesignIsHotProessStr  --是否热处理
+	  ,jot.[WeldingMethodId]   --焊接方法Id
+	  ,WeldingMethod.WeldingMethodCode    --焊接方法
+	  ,jot.WPQId     --WPS的Id
+	  ,wps.WPQCode    --WPS编号
+	  ,jot.[GrooveTypeId]   --坡口类型Id
+	  ,GrooveType.GrooveTypeCode    --坡口类型
+	  ,jot.[WeldingRod]   --焊条Id
+	  ,rod.ConsumablesCode AS WeldingRodCode   --焊条
+	  ,jot.[WeldingWire]   --焊丝Id
+	  ,wire.ConsumablesCode AS WeldingWireCode    --焊丝
+	  ,jot.PreTemperature    --预热温度
+	  ,jot.[JointAttribute]   --焊口属性
+	  ,jot.TwoJointType   --二次焊口新增类型
+	  ,daily.WeldingDate as WeldingDateD
+	  ,CONVERT(VARCHAR(100), daily.WeldingDate, 23) AS WeldingDate    --焊接日期
+	  ,BackingWelder.WelderCode AS BackingWelderCode   --打底焊工
+	  ,CoverWelder.WelderCode AS CoverWelderCode    --盖面焊工
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].[HJGL_HotProess_TrustItem] hpti 
+	  WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(ReportNo,'') FROM [dbo].[HJGL_HotProess_Trust] hpt 
+	  LEFT JOIN [dbo].[HJGL_HotProess_TrustItem] hpti ON hpti.HotProessTrustId=hpt.HotProessTrustId
+	  WHERE hpti.WeldJointId=jot.WeldJointId) END) AS HotProessReportNo   --热处理报告编号
+	  ,(CASE (SELECT TOP 1 IsCompleted FROM [dbo].[HJGL_HotProess_TrustItem] hpti 
+	  WHERE hpti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '完成' WHEN 0 THEN '未完成' ELSE '未热处理' END) AS HotProessResult   --热处理检测结果
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Hard_TrustItem hti 
+	  WHERE hti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(InspectionNum,'') FROM [dbo].HJGL_Hard_Trust ht 
+	  LEFT JOIN [dbo].HJGL_Hard_TrustItem hti ON hti.HardTrustID=ht.HardTrustID
+	  WHERE hti.WeldJointId=jot.WeldJointId) END) AS HardReportNo   --硬度报告编号
+	  ,(CASE (SELECT TOP 1 IsPass FROM [dbo].HJGL_Hard_TrustItem hti 
+	  WHERE hti.WeldJointId=jot.WeldJointId) WHEN 1 THEN '合格' WHEN 0 THEN '不合格' ELSE '待检测' END) AS HardResult   --硬度检测结果
+	  ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_BatchTrustItem bti 
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 TrustBatchCode FROM [dbo].HJGL_Batch_BatchTrust bt 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchId=bt.TrustBatchId
+	  WHERE bti.WeldJointId=jot.WeldJointId) END) AS TrustBatchCode   --委托单编号
+      ,(CASE (SELECT COUNT(*) FROM [dbo].HJGL_Batch_NDEItem ndei 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN 0 THEN '' ELSE (SELECT TOP 1 ISNULL(NDECode,'') FROM [dbo].HJGL_Batch_NDE nde 
+	  LEFT JOIN [dbo].HJGL_Batch_NDEItem ndei ON ndei.NDEID=nde.NDEID
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) END) AS NDECode   --检测单编号
+	  ,(CASE (SELECT TOP 1 CheckResult FROM [dbo].HJGL_Batch_NDEItem ndei 
+	  LEFT JOIN [dbo].HJGL_Batch_BatchTrustItem bti ON bti.TrustBatchItemId=ndei.TrustBatchItemId
+	  WHERE bti.WeldJointId=jot.WeldJointId) WHEN '1' THEN '合格' WHEN '2' THEN '不合格' ELSE '' END) AS CheckResult   --检测结果
+	  ,jot.PipelineId
+      ,jot.[JointArea]
+      ,jot.[WeldingLocationId]
+      ,jot.[HeartNo1]
+      ,jot.[HeartNo2]
+      ,jot.[IsHotProess]
+      ,jot.[WeldingDailyId]
+      ,jot.[BackingWelderId]
+      ,jot.[CoverWelderId]
+	  ,jot.WeldingMode
+	  ,jot.Remark 
+	  ,jot.IsTwoJoint
+	  ,jot.SubmitMan
+	  ,jot.AuditMan
+	  ,jot.AuditMan2
+	  ,jot.AuditDate
+	  ,jot.AuditDate2
+      ,WeldingLocation.WeldingLocationCode
+      ,CASE WHEN jot.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS IsWelding
+      ,CASE WHEN jot.IsHotProess=1 THEN '是' ELSE '否' END AS IsHotProessStr,
+      BackingWelder.PersonName AS BackingWelderName,
+      CoverWelder.PersonName AS CoverWelderName,
+     (CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL
+			THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode
+			ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, --焊工
+		(CASE WHEN mat1.MaterialCode IS NOT NULL AND mat2.MaterialCode IS NOT NULL
+			THEN mat1.MaterialCode + '/' + mat2.MaterialCode
+			ELSE (ISNULL(mat1.MaterialCode,'') + ISNULL(mat2.MaterialCode,'')) END) AS MaterialCode, --材质
+      
+	  daily.WeldingDailyCode,
+	  pointItem.PointBatchId,
+	  point.PointBatchCode,
+	  (CASE WHEN pointItem.PointState='1' THEN '已点口' WHEN pointItem.PointState='2' THEN '已扩透' ELSE '' END) AS IsPoint
+  FROM [dbo].[HJGL_WeldJoint] jot
+LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId=jot.PipelineId
+LEFT JOIN dbo.WBS_UnitWork uw ON uw.UnitWorkId=pipe.UnitWorkId
+LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=pipe.UnitId
+LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId
+LEFT JOIN dbo.Base_DetectionRate dr ON dr.DetectionRateId = pipe.DetectionRateId
+LEFT JOIN Base_TestMedium tm ON tm.TestMediumId=pipe.TestMedium
+LEFT JOIN Base_TestMedium tm2 ON tm2.TestMediumId=pipe.LeakMedium
+LEFT JOIN Base_PurgeMethod pm ON pm.PurgeMethodId=pipe.PCMedium
+LEFT JOIN Base_PressurePipingClass ppc ON ppc.PressurePipingClassId=pipe.PressurePipingClassId
+LEFT JOIN Base_Material AS mat ON mat.MaterialId = pipe.MaterialId
+LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id
+LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id
+LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=jot.WeldingMethodId
+LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=jot.WeldingLocationId
+LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire
+LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod
+LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=jot.GrooveTypeId
+LEFT JOIN Base_Components AS com1 ON com1.ComponentsId = jot.Components1Id
+LEFT JOIN Base_Components AS com2 ON com2.ComponentsId = jot.Components2Id
+LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=jot.BackingWelderId and BackingWelder.ProjectId=jot.ProjectId
+LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=jot.CoverWelderId and CoverWelder.ProjectId=jot.ProjectId
+LEFT JOIN dbo.HJGL_WeldingDaily AS daily ON daily.WeldingDailyId=jot.WeldingDailyId
+LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=pipe.PipingClassId
+LEFT JOIN dbo.Base_Medium medium ON medium.MediumId = pipe.MediumId
+LEFT JOIN dbo.Base_DetectionType ndt ON ndt.DetectionTypeId = jot.DetectionTypeId
+LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = jot.WPQId
+LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.WeldJointId = jot.WeldJointId
+LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId
+
+
+
+GO
+
+

SGGL/BLL/HJGL/WeldingManage/WeldJointService.cs

@@ -246,6 +246,24 @@ namespace BLL
             }
         }
 
+        /// <summary>
+        /// 二次焊口施工经理审核
+        /// </summary>
+        /// <param name="jointId"></param>
+        /// <param name="auditMan"></param>
+        /// <param name="auditDate"></param>
+        public static void UpdateJointAudit2(string jointId, string auditMan, DateTime? auditDate)
+        {
+            Model.SGGLDB db = Funs.DB;
+            Model.HJGL_WeldJoint newWeldJoint = db.HJGL_WeldJoint.FirstOrDefault(e => e.WeldJointId == jointId);
+            if (newWeldJoint != null)
+            {
+                newWeldJoint.AuditMan2 = auditMan;
+                newWeldJoint.AuditDate2 = auditDate;
+                db.SubmitChanges();
+            }
+        }
+
         /// <summary>
         /// 根据主键删除焊口信息
         /// </summary>

SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx

@@ -10,6 +10,11 @@
             color: red;
             font-weight: bold;
         }
+
+        .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
     </style>
 </head>
 <body>
@@ -103,10 +108,16 @@
                                          <f:RenderField HeaderText="是否审核" ColumnID="IsAudit" DataField="IsAudit"  FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="90px" Locked="true">
                                         </f:RenderField>
-                                         <f:RenderField HeaderText="审核人" ColumnID="AuditMan" DataField="AuditMan"  FieldType="String" HeaderTextAlign="Center"
+                                         <f:RenderField HeaderText="专工审核人" ColumnID="AuditMan" DataField="AuditMan"  FieldType="String" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="90px" Locked="true">
                                         </f:RenderField>
-                                         <f:RenderField HeaderText="审核日期" ColumnID="AuditDate" DataField="AuditDate"  FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
+                                         <f:RenderField HeaderText="专工审核日期" ColumnID="AuditDate" DataField="AuditDate"  FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
+                                            TextAlign="Left" Width="100px" Locked="true">
+                                        </f:RenderField>
+                                        <f:RenderField HeaderText="施工经理审核人" ColumnID="AuditMan2" DataField="AuditMan2"  FieldType="String" HeaderTextAlign="Center"
+                                            TextAlign="Left" Width="90px" Locked="true">
+                                        </f:RenderField>
+                                         <f:RenderField HeaderText="施工经理审核日期" ColumnID="AuditDate2" DataField="AuditDate2"  FieldType="Date" Renderer="Date" HeaderTextAlign="Center"
                                             TextAlign="Left" Width="100px" Locked="true">
                                         </f:RenderField>
                                     </Columns>
@@ -242,10 +253,16 @@
                 runat="server" Text="插入焊口" Icon="TableRowInsert" Hidden="true">
             </f:MenuButton>
             <f:MenuButton ID="btnAudit" OnClick="btnAudit_Click" EnablePostBack="true" 
-                runat="server" ConfirmText="确定通过选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="审核" Icon="TableRowInsert">
+                runat="server" ConfirmText="确定通过选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="专工审核" Icon="TableRowInsert">
             </f:MenuButton>
             <f:MenuButton ID="btnCancelAudit" OnClick="btnCancelAudit_Click" EnablePostBack="true" 
-                runat="server" ConfirmText="确定取消选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="取消审核" Icon="TableRowInsert">
+                runat="server" ConfirmText="确定取消选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="专工取消审核" Icon="TableRowInsert">
+            </f:MenuButton>
+            <f:MenuButton ID="btnAudit2" OnClick="btnAudit2_Click" EnablePostBack="true" 
+                runat="server" ConfirmText="确定通过选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="施工经理审核" Icon="TableRowInsert">
+            </f:MenuButton>
+            <f:MenuButton ID="btnCancelAudit2" OnClick="btnCancelAudit2_Click" EnablePostBack="true" 
+                runat="server" ConfirmText="确定取消选中行(二次焊口设计)的审核？" ConfirmTarget="Top" Text="施工经理取消审核" Icon="TableRowInsert">
             </f:MenuButton>
             <f:MenuButton ID="btnView" OnClick="btnView_Click" EnablePostBack="true" Icon="ApplicationViewIcons"
                 runat="server" Text="查看">

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

@@ -267,9 +267,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                                      WeldingMethodCode,WeldingWireCode,WeldingRodCode,WeldingDate,WeldingDailyCode,
                                      BackingWelderCode,CoverWelderCode,MediumCode ,PreTemperature,JointArea,WPQCode,Remark,
                                      (CASE WHEN AuditDate IS NOT NULL THEN '已审核' ELSE '未审核' END) AS IsAudit,
-									 subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate
+									 subMan.PersonName AS SubmitMan,auditMan.PersonName AS AuditMan,AuditDate,auditMan2.PersonName AS AuditMan2,AuditDate2
 							  FROM View_HJGL_WeldJoint 
 							  LEFT JOIN dbo.Person_Persons auditMan ON auditMan.PersonId=View_HJGL_WeldJoint.AuditMan
+                              LEFT JOIN dbo.Person_Persons auditMan2 ON auditMan2.PersonId=View_HJGL_WeldJoint.AuditMan2
 							  LEFT JOIN dbo.Person_Persons subMan ON subMan.PersonId=View_HJGL_WeldJoint.SubmitMan
                               WHERE IsTwoJoint = 1";
             List<SqlParameter> listStr = new List<SqlParameter> { };
@@ -548,6 +549,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
 
+        protected void btnAudit2_Click(object sender, EventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                    return;
+                }
+                string[] weldJointIdList = Grid1.SelectedRowIDArray;
+                foreach (string jot in weldJointIdList)
+                {
+                    BLL.WeldJointService.UpdateJointAudit2(jot, CurrUser.PersonId, DateTime.Now);
+                }
+                ShowNotify("所选口审核成功！", MessageBoxIcon.Success);
+                BindGrid();
+                //string weldJointIdList = string.Join("|", Grid1.SelectedRowIDArray);
+                //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TwoJointAudit.aspx?WeldJointIdList={0}", Grid1.SelectedRowID, "维护 - ")));
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
+
         protected void btnCancelAudit_Click(object sender, EventArgs e)
         {
             if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
@@ -573,6 +599,31 @@ namespace FineUIPro.Web.HJGL.WeldingManage
             }
         }
 
+        protected void btnCancelAudit2_Click(object sender, EventArgs e)
+        {
+            if (BLL.CommonService.GetAllButtonPowerList(this.CurrUser.LoginProjectId, this.CurrUser.PersonId, BLL.Const.HJGL_JotTwoDesignMenuId, BLL.Const.BtnAuditing))
+            {
+                if (Grid1.SelectedRowIndexArray.Length == 0)
+                {
+                    Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning);
+                    return;
+                }
+                string[] weldJointIdList = Grid1.SelectedRowIDArray;
+                foreach (string jot in weldJointIdList)
+                {
+                    BLL.WeldJointService.UpdateJointAudit2(jot, null, null);
+                }
+                ShowNotify("已取消所选口的审核！", MessageBoxIcon.Success);
+                BindGrid();
+                //string weldJointIdList = string.Join("|", Grid1.SelectedRowIDArray);
+                //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("TwoJointAudit.aspx?WeldJointIdList={0}", Grid1.SelectedRowID, "维护 - ")));
+            }
+            else
+            {
+                ShowNotify("您没有这个权限，请与管理员联系！", MessageBoxIcon.Warning);
+            }
+        }
+
         /// <summary>
         /// 焊口信息插入
         /// </summary>

SGGL/FineUIPro.Web/HJGL/WeldingManage/JotTwoDesign.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HJGL.WeldingManage
+namespace FineUIPro.Web.HJGL.WeldingManage {
-{
+    
-
+    
-
+    public partial class JotTwoDesign {
-    public partial class JotTwoDesign
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-
+        
         /// <summary>
         /// panelLeftRegion 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelLeftRegion;
-
+        
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-
+        
         /// <summary>
         /// txtPipelineCode 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
-
+        
         /// <summary>
         /// hdUnitWorkId 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdUnitWorkId;
-
+        
         /// <summary>
         /// tvControlItem 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Tree tvControlItem;
-
+        
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-
+        
         /// <summary>
         /// Toolbar3 控件。
         /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar3;
-
+        
         /// <summary>
         /// txtWeldJointCode 控件。
         /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWeldJointCode;
-
+        
         /// <summary>
         /// ckIsAudit 控件。
         /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.CheckBox ckIsAudit;
-
+        
         /// <summary>
         /// lbSize 控件。
         /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbSize;
-
+        
         /// <summary>
         /// DropTwoJointType 控件。
         /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList DropTwoJointType;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+        
         /// <summary>
         /// btnSelectColumn 控件。
         /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSelectColumn;
-
+        
         /// <summary>
         /// btnNew 控件。
         /// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnNew;
-
+        
         /// <summary>
         /// btnBatchAdd 控件。
         /// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnBatchAdd;
-
+        
         /// <summary>
         /// btnAutoInput 控件。
         /// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAutoInput;
-
+        
         /// <summary>
         /// btnOut2 控件。
         /// </summary>
@@ -202,7 +200,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnOut2;
-
+        
         /// <summary>
         /// btnPrint 控件。
         /// </summary>
@@ -211,7 +209,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnPrint;
-
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -220,7 +218,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-
+        
         /// <summary>
         /// ToolbarSeparator1 控件。
         /// </summary>
@@ -229,7 +227,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1;
-
+        
         /// <summary>
         /// ToolbarText1 控件。
         /// </summary>
@@ -238,7 +236,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarText ToolbarText1;
-
+        
         /// <summary>
         /// ddlPageSize 控件。
         /// </summary>
@@ -247,7 +245,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
-
+        
         /// <summary>
         /// Window1 控件。
         /// </summary>
@@ -256,7 +254,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window1;
-
+        
         /// <summary>
         /// Window2 控件。
         /// </summary>
@@ -265,7 +263,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window2;
-
+        
         /// <summary>
         /// Window3 控件。
         /// </summary>
@@ -274,7 +272,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window3;
-
+        
         /// <summary>
         /// Window4 控件。
         /// </summary>
@@ -283,7 +281,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window Window4;
-
+        
         /// <summary>
         /// Menu1 控件。
         /// </summary>
@@ -292,7 +290,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Menu Menu1;
-
+        
         /// <summary>
         /// btnMenuEdit 控件。
         /// </summary>
@@ -301,7 +299,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuEdit;
-
+        
         /// <summary>
         /// btnMenuInsert 控件。
         /// </summary>
@@ -310,7 +308,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnMenuInsert;
-
+        
         /// <summary>
         /// btnAudit 控件。
         /// </summary>
@@ -319,7 +317,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnAudit;
-
+        
         /// <summary>
         /// btnCancelAudit 控件。
         /// </summary>
@@ -328,7 +326,25 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnCancelAudit;
-
+        
+        /// <summary>
+        /// btnAudit2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnAudit2;
+        
+        /// <summary>
+        /// btnCancelAudit2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.MenuButton btnCancelAudit2;
+        
         /// <summary>
         /// btnView 控件。
         /// </summary>
@@ -337,7 +353,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.MenuButton btnView;
-
+        
         /// <summary>
         /// btnMenuDelete 控件。
         /// </summary>

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx

@@ -153,6 +153,13 @@
                                 <f:RenderField HeaderText="焊口属性" ColumnID="JointAttribute" 
                                     DataField="JointAttribute" SortField="JointAttribute" FieldType="String" HeaderTextAlign="Center"
                                     TextAlign="Center" Width="100px">
+                                    <Editor>
+                                        <f:DropDownList ID="drpJointAttribute2" EnableEdit="true" Required="true" runat="server"
+                                            ShowRedStar="true">
+                                            <f:ListItem Text="预制口" Value="预制口" />
+                                            <f:ListItem Text="安装口" Value="安装口" />
+                                        </f:DropDownList>
+                                    </Editor>
                                 </f:RenderField>
                                 <f:RenderField HeaderText="焊接类型" ColumnID="WeldTypeCode" Hidden="true"
                                     DataField="WeldTypeCode" SortField="WeldTypeCode" FieldType="String" HeaderTextAlign="Center"

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

@@ -206,7 +206,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                            && x.WeldingDailyId == null/*|| x.WeldingDailyId == this.WeldingDailyId*/)
 
                                     select x).ToList();
-                weldJointIds= weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x=>x.TaskDate).First()).ToList();
+                weldJointIds = weldJointIds.GroupBy(x => x.WeldJointId, (key, group) => group.OrderByDescending(x => x.TaskDate).First()).ToList();
                 task = weldJointIds;
                 //foreach (var weldJointId in weldJointIds)
                 //{
@@ -214,7 +214,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 //}
                 if (drpJointAttribute.SelectedValue != Const._Null)
                 {
-                    task = task.Where(x=>x.JointAttribute== drpJointAttribute.SelectedValue).ToList();
+                    task = task.Where(x => x.JointAttribute == drpJointAttribute.SelectedValue).ToList();
                 }
 
                 if (drpUnit.SelectedValue != Const._Null)
@@ -255,7 +255,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             }
 
             task = task.OrderBy(x => x.PipelineCode).ThenBy(x => x.WeldJointNum).ToList();
-            Grid1.RecordCount = task.Count; 
+            Grid1.RecordCount = task.Count;
             Grid1.DataSource = task;
             Grid1.DataBind();
 
@@ -488,7 +488,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             string eventArg = string.Empty;
             // 焊工资质判断
             // CheckWelderQualification(weldJointView);
-            
+
             if (eventArg == string.Empty) //焊工焊接的所有焊口资质都符合要求）
             {
                 if (!string.IsNullOrEmpty(this.WeldingDailyId))
@@ -519,10 +519,11 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
 
                         if (newWeldJoint != null)
                         {
+                            newWeldJoint.JointAttribute = values.Value<string>("JointAttribute");
                             var coverWelderCode = (from x in Funs.DB.SitePerson_Person
-                                where x.ProjectId == CurrUser.LoginProjectId &&
+                                                   where x.ProjectId == CurrUser.LoginProjectId &&
-                                      x.WelderCode == values.Value<string>("CoverWelderCode")
+                                                         x.WelderCode == values.Value<string>("CoverWelderCode")
-                                select x).FirstOrDefault();
+                                                   select x).FirstOrDefault();
                             if (coverWelderCode != null)
                             {
                                 t.CoverWelderId = coverWelderCode.PersonId;
@@ -530,9 +531,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                             }
 
                             var backingWelderCode = (from x in Funs.DB.SitePerson_Person
-                                where x.ProjectId == CurrUser.LoginProjectId &&
+                                                     where x.ProjectId == CurrUser.LoginProjectId &&
-                                      x.WelderCode == values.Value<string>("BackingWelderCode")
+                                                           x.WelderCode == values.Value<string>("BackingWelderCode")
-                                select x).FirstOrDefault();
+                                                     select x).FirstOrDefault();
                             if (backingWelderCode != null)
                             {
                                 t.BackingWelderId = backingWelderCode.PersonId;
@@ -563,8 +564,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         foreach (string row in Grid1.SelectedRowIDArray)
                         {
                             var t = BLL.WeldTaskService.GetWeldTaskById(row);
+                            var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
                             errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
-                                t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
+                                newWeldJoint.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
                         }
                     }
                     else
@@ -574,8 +576,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                             if (Grid1.SelectedRowIDArray.Contains(Grid1.Rows[i].RowID))
                             {
                                 var t = BLL.WeldTaskService.GetWeldTaskById(Grid1.Rows[i].RowID);
+                                var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
                                 errlog += InsertWeldingDailyItem(t.WeldJointId, t.CoverWelderId, t.BackingWelderId,
-                                    t.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
+                                    newWeldJoint.JointAttribute, newWeldingDaily.WeldingDate, batchCondition, true);
                             }
                             else
                             {
@@ -674,7 +677,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                 {
                     ChanggeState();
                 });
-                 
+
                 if (string.IsNullOrEmpty(errlog))
                 {
                     ShowNotify("保存成功！", MessageBoxIcon.Success);
@@ -1051,7 +1054,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         {
             if (!string.IsNullOrEmpty(this.WeldingDailyId))
             {
-                List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);               
+                List<Model.SpWeldingDailyItem> GetWeldingDailyItem = BLL.WeldingDailyService.GetWeldingDailyItem(this.WeldingDailyId);
                 this.BindGrid(GetWeldingDailyItem);  // 初始化页面
             }
             else
@@ -1066,7 +1069,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
             {
                 foreach (var rowId in Grid1.SelectedRowIDArray)
                 {
-                        
+
                     var t = BLL.WeldTaskService.GetWeldTaskById(rowId);
                     var newWeldJoint = BLL.WeldJointService.GetWeldJointByWeldJointId(t.WeldJointId);
 
@@ -1084,39 +1087,39 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
 
                 }*/
             }
-            
+
         }
         protected void Grid1_RowDataBound(object sender, GridRowEventArgs e)
         {
             DataRowView row = e.DataItem as DataRowView;
-            var id= row["WeldJointId"].ToString();
+            var id = row["WeldJointId"].ToString();
             var hotProesssItem = Funs.DB.HJGL_HotProess_TrustItem.FirstOrDefault(x => x.WeldJointId == id);
             if (hotProesssItem != null)   //已生成热处理委托，不能编辑或删除
             {
-                 e.RowSelectable = false;
+                e.RowSelectable = false;
                 // Grid1.DeleteRow(e.RowID);
-              //  Grid1.DeleteRow(e.RowID);
+                //  Grid1.DeleteRow(e.RowID);
             }
             var pointBatchItem = Funs.DB.HJGL_Batch_PointBatchItem.FirstOrDefault(x => x.WeldJointId == id && x.PointState != null);
             if (pointBatchItem != null)   //已生成委托，不能编辑或删除
             {
-                  e.RowSelectable = false;
+                e.RowSelectable = false;
+                // Grid1.DeleteRow(e.RowID);
                 // Grid1.DeleteRow(e.RowID);
-               // Grid1.DeleteRow(e.RowID);
             }
-                //for (int i = 0; i < this.Grid1.Rows.Count; i++)
+            //for (int i = 0; i < this.Grid1.Rows.Count; i++)
-                //{
+            //{
-                //    var hotProesssItem = Funs.DB.HJGL_HotProess_TrustItem.FirstOrDefault(x => x.WeldJointId == this.Grid1.Rows[i].DataKeys[1].ToString());
+            //    var hotProesssItem = Funs.DB.HJGL_HotProess_TrustItem.FirstOrDefault(x => x.WeldJointId == this.Grid1.Rows[i].DataKeys[1].ToString());
-                //    if (hotProesssItem != null)   //已生成热处理委托，不能编辑或删除
+            //    if (hotProesssItem != null)   //已生成热处理委托，不能编辑或删除
-                //    {
+            //    {
-                //        Grid1.Rows[i].RowSelectable = false;
+            //        Grid1.Rows[i].RowSelectable = false;
-                //    }
+            //    }
-                //    var pointBatchItem = Funs.DB.HJGL_Batch_PointBatchItem.FirstOrDefault(x => x.WeldJointId == this.Grid1.Rows[i].DataKeys[1].ToString() && x.PointState != null);
+            //    var pointBatchItem = Funs.DB.HJGL_Batch_PointBatchItem.FirstOrDefault(x => x.WeldJointId == this.Grid1.Rows[i].DataKeys[1].ToString() && x.PointState != null);
-                //    if (pointBatchItem != null)   //已生成委托，不能编辑或删除
+            //    if (pointBatchItem != null)   //已生成委托，不能编辑或删除
-                //    {
+            //    {
-                //        Grid1.Rows[i].RowSelectable = false;
+            //        Grid1.Rows[i].RowSelectable = false;
-                //    }
+            //    }
-                //}
+            //}
         }
 
         #region 分页选择下拉改变事件
@@ -1156,7 +1159,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue);
                 }
                 this.BindGrid(null);
-                drpCanWelder.Items.Clear(); 
+                drpCanWelder.Items.Clear();
             }
         }
 

SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs

@@ -7,13 +7,11 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.WeldingManage
+namespace FineUIPro.Web.WeldingProcess.WeldingManage {
-{
+    
-
+    
-
+    public partial class WeldReportEdit {
-    public partial class WeldReportEdit
+        
-    {
-
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -22,7 +20,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-
+        
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -31,7 +29,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-
+        
         /// <summary>
         /// Panel1 控件。
         /// </summary>
@@ -40,7 +38,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel Panel1;
-
+        
         /// <summary>
         /// panelCenterRegion 控件。
         /// </summary>
@@ -49,7 +47,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Panel panelCenterRegion;
-
+        
         /// <summary>
         /// Toolbar2 控件。
         /// </summary>
@@ -58,7 +56,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar2;
-
+        
         /// <summary>
         /// hdItemsString 控件。
         /// </summary>
@@ -67,7 +65,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdItemsString;
-
+        
         /// <summary>
         /// hdTablerId 控件。
         /// </summary>
@@ -76,7 +74,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdTablerId;
-
+        
         /// <summary>
         /// drpJointAttribute 控件。
         /// </summary>
@@ -85,7 +83,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpJointAttribute;
-
+        
         /// <summary>
         /// txtPipelineCode 控件。
         /// </summary>
@@ -94,7 +92,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPipelineCode;
-
+        
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -103,7 +101,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-
+        
         /// <summary>
         /// btnSave 控件。
         /// </summary>
@@ -112,7 +110,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSave;
-
+        
         /// <summary>
         /// btnAccept 控件。
         /// </summary>
@@ -121,7 +119,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAccept;
-
+        
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -130,7 +128,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-
+        
         /// <summary>
         /// txtWeldingDailyCode 控件。
         /// </summary>
@@ -139,7 +137,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtWeldingDailyCode;
-
+        
         /// <summary>
         /// drpUnit 控件。
         /// </summary>
@@ -148,7 +146,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
-
+        
         /// <summary>
         /// drpUnitWork 控件。
         /// </summary>
@@ -157,7 +155,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnitWork;
-
+        
         /// <summary>
         /// txtWeldingDate 控件。
         /// </summary>
@@ -166,7 +164,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtWeldingDate;
-
+        
         /// <summary>
         /// txtTabler 控件。
         /// </summary>
@@ -175,7 +173,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtTabler;
-
+        
         /// <summary>
         /// txtTableDate 控件。
         /// </summary>
@@ -184,7 +182,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DatePicker txtTableDate;
-
+        
         /// <summary>
         /// txtRemark 控件。
         /// </summary>
@@ -193,7 +191,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtRemark;
-
+        
         /// <summary>
         /// lbAmount 控件。
         /// </summary>
@@ -202,7 +200,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbAmount;
-
+        
         /// <summary>
         /// btnSelectWelder 控件。
         /// </summary>
@@ -211,7 +209,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSelectWelder;
-
+        
         /// <summary>
         /// drpCanWelder 控件。
         /// </summary>
@@ -220,7 +218,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCanWelder;
-
+        
         /// <summary>
         /// btnSaveWelder 控件。
         /// </summary>
@@ -229,7 +227,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnSaveWelder;
-
+        
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -238,7 +236,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-
+        
         /// <summary>
         /// lbPipeArea 控件。
         /// </summary>
@@ -247,7 +245,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.WebControls.Label lbPipeArea;
-
+        
         /// <summary>
         /// drpCoverWelderId 控件。
         /// </summary>
@@ -256,7 +254,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpCoverWelderId;
-
+        
         /// <summary>
         /// drpBackingWelderId 控件。
         /// </summary>
@@ -265,5 +263,14 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList drpBackingWelderId;
+        
+        /// <summary>
+        /// drpJointAttribute2 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpJointAttribute2;
     }
 }

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

@@ -480,7 +480,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage
                 string canWeldingRodName = string.Empty;
                 string canWeldingWireName = string.Empty;
                 var projectWelder = from x in Funs.DB.SitePerson_Person
-                                    where x.ProjectId == jot.ProjectId && x.States == Const.State_1
+                                    where x.ProjectId == jot.ProjectId
                                           && x.UnitId == unitId && x.WorkPostId == Const.WorkPost_Welder
                                           && x.WelderCode != null && x.WelderCode != ""
                                     select x;

SGGL/Model/Model.cs

@@ -39527,10 +39527,10 @@ namespace Model
 		
 		private string _SaveHandleMan;
 		
-		private string _WorkPackageName;
-		
 		private string _WorkPackageId;
 		
+		private string _WorkPackageName;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Person_Persons> _Person_Persons;
@@ -39587,10 +39587,10 @@ namespace Model
     partial void OnProposeUnitIdChanged();
     partial void OnSaveHandleManChanging(string value);
     partial void OnSaveHandleManChanged();
-    partial void OnWorkPackageNameChanging(string value);
-    partial void OnWorkPackageNameChanged();
     partial void OnWorkPackageIdChanging(string value);
     partial void OnWorkPackageIdChanged();
+    partial void OnWorkPackageNameChanging(string value);
+    partial void OnWorkPackageNameChanged();
     #endregion
 		
 		public Check_CheckControl()
@@ -40069,26 +40069,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
-		public string WorkPackageName
-		{
-			get
-			{
-				return this._WorkPackageName;
-			}
-			set
-			{
-				if ((this._WorkPackageName != value))
-				{
-					this.OnWorkPackageNameChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageName = value;
-					this.SendPropertyChanged("WorkPackageName");
-					this.OnWorkPackageNameChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
 		public string WorkPackageId
 		{
@@ -40109,6 +40089,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
+		public string WorkPackageName
+		{
+			get
+			{
+				return this._WorkPackageName;
+			}
+			set
+			{
+				if ((this._WorkPackageName != value))
+				{
+					this.OnWorkPackageNameChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageName = value;
+					this.SendPropertyChanged("WorkPackageName");
+					this.OnWorkPackageNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckControl_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -97548,6 +97548,10 @@ namespace Model
 		
 		private string _DNDia;
 		
+		private string _AuditMan2;
+		
+		private System.Nullable<System.DateTime> _AuditDate2;
+		
 		private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
 		
 		private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
@@ -97686,6 +97690,10 @@ namespace Model
     partial void OnTwoJointTypeChanged();
     partial void OnDNDiaChanging(string value);
     partial void OnDNDiaChanged();
+    partial void OnAuditMan2Changing(string value);
+    partial void OnAuditMan2Changed();
+    partial void OnAuditDate2Changing(System.Nullable<System.DateTime> value);
+    partial void OnAuditDate2Changed();
     #endregion
 		
 		public HJGL_WeldJoint()
@@ -98675,6 +98683,46 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan2", DbType="NVarChar(50)")]
+		public string AuditMan2
+		{
+			get
+			{
+				return this._AuditMan2;
+			}
+			set
+			{
+				if ((this._AuditMan2 != value))
+				{
+					this.OnAuditMan2Changing(value);
+					this.SendPropertyChanging();
+					this._AuditMan2 = value;
+					this.SendPropertyChanged("AuditMan2");
+					this.OnAuditMan2Changed();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate2", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate2
+		{
+			get
+			{
+				return this._AuditDate2;
+			}
+			set
+			{
+				if ((this._AuditDate2 != value))
+				{
+					this.OnAuditDate2Changing(value);
+					this.SendPropertyChanging();
+					this._AuditDate2 = value;
+					this.SendPropertyChanged("AuditDate2");
+					this.OnAuditDate2Changed();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
 		public EntitySet<HJGL_Batch_BatchTrustItem> HJGL_Batch_BatchTrustItem
 		{
@@ -100759,10 +100807,10 @@ namespace Model
 		
 		private string _HazardValue;
 		
-		private string _WorkPackageName;
-		
 		private string _WorkPackageId;
 		
+		private string _WorkPackageName;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<HSSE_Hazard_HazardRegisterTypes> _HSSE_Hazard_HazardRegisterTypes;
@@ -100863,10 +100911,10 @@ namespace Model
     partial void OnRegisterTypes4IdChanged();
     partial void OnHazardValueChanging(string value);
     partial void OnHazardValueChanged();
-    partial void OnWorkPackageNameChanging(string value);
-    partial void OnWorkPackageNameChanged();
     partial void OnWorkPackageIdChanging(string value);
     partial void OnWorkPackageIdChanged();
+    partial void OnWorkPackageNameChanging(string value);
+    partial void OnWorkPackageNameChanged();
     #endregion
 		
 		public HSSE_Hazard_HazardRegister()
@@ -101804,26 +101852,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
-		public string WorkPackageName
-		{
-			get
-			{
-				return this._WorkPackageName;
-			}
-			set
-			{
-				if ((this._WorkPackageName != value))
-				{
-					this.OnWorkPackageNameChanging(value);
-					this.SendPropertyChanging();
-					this._WorkPackageName = value;
-					this.SendPropertyChanged("WorkPackageName");
-					this.OnWorkPackageNameChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageId", DbType="NVarChar(2000)")]
 		public string WorkPackageId
 		{
@@ -101844,6 +101872,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageName", DbType="NVarChar(2000)")]
+		public string WorkPackageName
+		{
+			get
+			{
+				return this._WorkPackageName;
+			}
+			set
+			{
+				if ((this._WorkPackageName != value))
+				{
+					this.OnWorkPackageNameChanging(value);
+					this.SendPropertyChanging();
+					this._WorkPackageName = value;
+					this.SendPropertyChanged("WorkPackageName");
+					this.OnWorkPackageNameChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
@@ -182212,7 +182260,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string ProjectDescription
 		{
 			get
@@ -182332,7 +182380,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
 		public string CalculationRule
 		{
 			get
@@ -182392,7 +182440,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
 		public string ConstructionSubcontractor
 		{
 			get
@@ -273630,8 +273678,12 @@ namespace Model
 		
 		private string _AuditMan;
 		
+		private string _AuditMan2;
+		
 		private System.Nullable<System.DateTime> _AuditDate;
 		
+		private System.Nullable<System.DateTime> _AuditDate2;
+		
 		private string _WeldingLocationCode;
 		
 		private string _IsWelding;
@@ -275162,6 +275214,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditMan2", DbType="NVarChar(50)")]
+		public string AuditMan2
+		{
+			get
+			{
+				return this._AuditMan2;
+			}
+			set
+			{
+				if ((this._AuditMan2 != value))
+				{
+					this._AuditMan2 = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate", DbType="DateTime")]
 		public System.Nullable<System.DateTime> AuditDate
 		{
@@ -275178,6 +275246,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AuditDate2", DbType="DateTime")]
+		public System.Nullable<System.DateTime> AuditDate2
+		{
+			get
+			{
+				return this._AuditDate2;
+			}
+			set
+			{
+				if ((this._AuditDate2 != value))
+				{
+					this._AuditDate2 = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingLocationCode", DbType="NVarChar(50)")]
 		public string WeldingLocationCode
 		{