112

HJGL/BLL/Common/ProjectSet/Welder_TeamGroupService.cs

@@ -108,7 +108,12 @@ namespace BLL
         /// <returns></returns>
         public static ListItem[] GetAllTeamGroupList(string projectId, string unitId)
         {
-            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId && x.UnitId == unitId orderby x.TeamGroupName select x).ToList();
+            var q = (from x in Funs.DB.Welder_TeamGroup where x.ProjectId==projectId  orderby x.TeamGroupName select x).ToList();
+            if (!string.IsNullOrEmpty(unitId))
+            {
+                q = q.Where(x => x.UnitId == unitId).ToList();
+            }
+            
             ListItem[] lis = new ListItem[q.Count()];
 
             for (int i = 0; i < q.Count(); i++)

HJGL/BLL/WeldingProcess/WeldingManage/Pipeline_WeldJointService.cs

@@ -98,6 +98,7 @@ namespace BLL
                 SystemNumber = weldJoint.SystemNumber,
                 Remark = weldJoint.Remark,
                 IsGoldJoint = weldJoint.IsGoldJoint,
+                IsPMI=weldJoint.IsPMI,
                 WPQId = weldJoint.WPQId,
                 DetectionType = weldJoint.DetectionType,
                 PageNum = weldJoint.PageNum,

HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataIn.aspx.cs

@@ -354,6 +354,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
                             newDataInTemp.Value35 = ds.Tables[0].Rows[i][34].ToString().Trim();
                             newDataInTemp.Value36 = ds.Tables[0].Rows[i][35].ToString().Trim();
                             newDataInTemp.Value37 = ds.Tables[0].Rows[i][36].ToString().Trim();
+                            newDataInTemp.Value38 = ds.Tables[0].Rows[i][37].ToString().Trim();
 
                             BLL.DataInTempService.AddDataInTemp(newDataInTemp);
                         }
@@ -1542,10 +1543,24 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
                             }
                         }
 
-                        //if (!string.IsNullOrEmpty(tempData.Value22) && !string.IsNullOrEmpty(tempData.Value23))
+                        if (!string.IsNullOrEmpty(tempData.Value38))
-                        //{
+                        {
-                        //    weldJoint.Specification = "Φ" + tempData.Value22 + "*" + tempData.Value23;
+                            if (tempData.Value38 == "是")
-                        //}
+                            {
+                                weldJoint.IsPMI = true;
+                            }
+                            else if (tempData.Value38 == "否")
+                            {
+                                weldJoint.IsPMI = false;
+                            }
+                        }
+                        else
+                        {
+                            if (jot != null && jot.IsPMI != null)
+                            {
+                                weldJoint.IsPMI = jot.IsPMI;
+                            }
+                        }
 
                         if (string.IsNullOrEmpty(errInfo)) // 所有信息正确的话 这插入管线焊口
                         {

HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx

@@ -155,6 +155,8 @@
             </f:FormRow>
             <f:FormRow>
                 <Items>
+                    <f:TextBox ID="txtValue38" Label="是否PMI检测" runat="server" LabelWidth="120px">
+                     </f:TextBox>
                     <f:TextBox ID="txtValue35" Label="WPS编号" runat="server" LabelWidth="120px">
                     </f:TextBox>
                 </Items>

HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.cs

@@ -74,7 +74,7 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
                     this.txtValue35.Text = dataInTemp.Value35;
                     this.txtValue36.Text = dataInTemp.Value36;
                     this.txtValue37.Text = dataInTemp.Value37;
-                    //this.txtValue38.Text = dataInTemp.Value38;
+                    this.txtValue38.Text = dataInTemp.Value38;
                     this.lbErrCout.Text = dataInTemp.ToopValue;                   
                 }
             }
@@ -541,19 +541,18 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
                     }
                 }
 
-
+                if (dataInTemp.Value38 != this.txtValue38.Text.Trim())
-                //if (dataInTemp.Value38 != this.txtValue38.Text.Trim())
+                {
-                //{
+                    var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null));
-                //    var tempValue38 = allDataInTemp.Where(x => x.Value38 == dataInTemp.Value38 || (x.Value38 == null && dataInTemp.Value38 == null));
+                    if (tempValue38 != null)
-                //    if (tempValue38 != null)
+                    {
-                //    {
+                        foreach (var item in tempValue38)
-                //        foreach (var item in tempValue38)
+                        {
-                //        {
+                            item.Value38 = this.txtValue38.Text.Trim();
-                //            item.Value38 = this.txtValue38.Text.Trim();
+                            Funs.DB.SubmitChanges();
-                //            Funs.DB.SubmitChanges();
+                        }
-                //        }
+                    }
-                //    }
+                }
-                //}
             }
             else
             {
@@ -597,8 +596,8 @@ namespace FineUIPro.Web.WeldingProcess.DataIn
                 newDataInTemp.Value34 = this.txtValue34.Text.Trim();
                 newDataInTemp.Value35 = this.txtValue35.Text.Trim();
                 newDataInTemp.Value36 = this.txtValue36.Text.Trim();
-                //newDataInTemp.Value37 = this.txtValue37.Text.Trim();
+                newDataInTemp.Value37 = this.txtValue37.Text.Trim();
-                //newDataInTemp.Value38 = this.txtValue38.Text.Trim();
+                newDataInTemp.Value38 = this.txtValue38.Text.Trim();
 
                 if (!string.IsNullOrEmpty(this.TempId))
                 {

HJGL/FineUIPro.Web/WeldingProcess/DataIn/DataInEdit.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.DataIn {
+namespace FineUIPro.Web.WeldingProcess.DataIn
+{
 
 
-    public partial class DataInEdit {
+    public partial class DataInEdit
+    {
 
         /// <summary>
         /// form1 控件。
@@ -408,6 +410,15 @@ namespace FineUIPro.Web.WeldingProcess.DataIn {
         /// </remarks>
         protected global::FineUIPro.TextBox txtValue37;
 
+        /// <summary>
+        /// txtValue38 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtValue38;
+
         /// <summary>
         /// txtValue35 控件。
         /// </summary>

HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/GetWdldingDailyItem.ashx.cs

@@ -30,7 +30,7 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                     viewWeldlines[i].WeldTypeCode,
                     viewWeldlines[i].JointAttribute,
                     viewWeldlines[i].WeldingLocationCode,
-                    viewWeldlines[i].DoneDin,
+                    viewWeldlines[i].Size,
                     viewWeldlines[i].Dia,
                     viewWeldlines[i].Thickness,
                     viewWeldlines[i].WeldingMethodCode,

HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/WeldReport.aspx

@@ -163,7 +163,7 @@
                     columnMenu: false,
                     columnResizing: false,
                     cls: 'gridinrowexpander',
-                    fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'DoneDin', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'],
+                    fields: ['Num', 'PipelineCode', 'WeldJointCode', 'BackingWelderCode', 'CoverWelderCode', 'WeldTypeCode', 'JointAttribute', 'WeldingLocationCode', 'Size', 'Dia', 'Thickness', 'WeldingMethodCode', 'Material1Code', 'Material2Code', 'ComponentsCode1', 'ComponentsCode2', 'HeartNo1', 'HeartNo2', 'WeldSilkCode', 'WeldMatCode', 'PipeSegment', 'WPQCode'],
                     columns: [{
                         text: '序号', field: 'Num', width: 50
                     }, {
@@ -181,7 +181,7 @@
                     }, {
                         text: '焊接位置', field: 'WeldingLocationCode', width: 80
                     }, {
-                        text: '管径', field: 'DoneDin', width: 65
+                        text: '管径', field: 'Size', width: 65
                     }, {
                         text: '外径', field: 'Dia', width: 65
                     }, {

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

@@ -1019,15 +1019,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         }
                         else
                         {
-                            d.Material1Id = steel.MaterialId;
+                            if ((!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id)
-                            //if (!string.IsNullOrEmpty(d.Material1Id) && d.Material1Id != steel.MaterialId)
+                                || (!string.IsNullOrEmpty(d.Material2Id) && steel.MaterialId != d.Material2Id))
-                            //{
+                            {
-                            //    errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
+                                errorInfos += (i + 2) + "行,材质1[" + ds.Tables[0].Rows[i]["材质1"].ToString() + "]验证不一至；";
-                            //}
+                            }
-                            //else
+                            else
-                            //{
+                            {
-                            //    d.Material1Id = steel.MaterialId;
+                                d.Material1Id = steel.MaterialId;
-                            //}
+                            }
                         }
                     }
 
@@ -1040,18 +1040,19 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         }
                         else
                         {
-                            d.Material2Id = steel.MaterialId;
+                            if ((!string.IsNullOrEmpty(d.Material2Id) &&  steel.MaterialId!=d.Material2Id)
-                            //if (!string.IsNullOrEmpty(d.Material2Id) && d.Material2Id != steel.MaterialId)
+                                || (!string.IsNullOrEmpty(d.Material1Id) && steel.MaterialId != d.Material1Id))
-                            //{
+                            {
-                            //    errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
+                                errorInfos += (i + 2) + "行,材质2[" + ds.Tables[0].Rows[i]["材质2"].ToString() + "]验证不一至；";
-                            //}
+                            }
-                            //else
+                            else
-                            //{
+                            {
-                            //    d.Material2Id = steel.MaterialId;
+                                d.Material2Id = steel.MaterialId;
-                            //}
+                            }
                         }
                     }
 
+
                     if (ds.Tables[0].Rows[i]["组件1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["组件1"].ToString()))
                     {
                         var com = componentss.FirstOrDefault(x => x.ComponentsCode == ds.Tables[0].Rows[i]["组件1"].ToString());
@@ -1061,7 +1062,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         }
                         else
                         {
-                            if (!string.IsNullOrEmpty(d.PipeAssembly1Id) && d.PipeAssembly1Id != com.ComponentsId)
+                            if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
+                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
+
                             {
                                 errorInfos += (i + 2) + "行,组件1[" + ds.Tables[0].Rows[i]["组件1"].ToString() + "]验证不一至；";
                             }
@@ -1081,7 +1084,8 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
                         }
                         else
                         {
-                            if (!string.IsNullOrEmpty(d.PipeAssembly2Id) && d.PipeAssembly2Id != com.ComponentsId)
+                            if ((!string.IsNullOrEmpty(d.PipeAssembly1Id) && com.ComponentsId != d.PipeAssembly1Id)
+                                || (!string.IsNullOrEmpty(d.PipeAssembly2Id) && com.ComponentsId != d.PipeAssembly2Id))
                             {
                                 errorInfos += (i + 2) + "行,组件2[" + ds.Tables[0].Rows[i]["组件2"].ToString() + "]验证不一至；";
                             }
@@ -1094,27 +1098,28 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage
 
                     if (ds.Tables[0].Rows[i]["炉批号1"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号1"].ToString()))
                     {
-                        d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
+                        if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo1)
-                        //if (!string.IsNullOrEmpty(d.HeartNo1) && d.HeartNo1 != ds.Tables[0].Rows[i]["炉批号1"].ToString())
+                            || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号1"].ToString() != d.HeartNo2))
-                        //{
+                        {
-                        //    errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；";
+                            errorInfos += (i + 2) + "行,炉批号1[" + ds.Tables[0].Rows[i]["炉批号1"].ToString() + "]验证不一至；";
-                        //}
+                        }
-                        //else
+                        else
-                        //{
+                        {
-                        //    d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
+                            d.HeartNo1 = ds.Tables[0].Rows[i]["炉批号1"].ToString();
-                        //}
+                        }
                     }
+
                     if (ds.Tables[0].Rows[i]["炉批号2"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["炉批号2"].ToString()))
                     {
-                        d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
+                        if ((!string.IsNullOrEmpty(d.HeartNo1) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo1)
-                        //if (!string.IsNullOrEmpty(d.HeartNo2) && d.HeartNo2 != ds.Tables[0].Rows[i]["炉批号2"].ToString())
+                           || (!string.IsNullOrEmpty(d.HeartNo2) && ds.Tables[0].Rows[i]["炉批号2"].ToString() != d.HeartNo2))
-                        //{
+                        {
-                        //    errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
+                            errorInfos += (i + 2) + "行,炉批号2[" + ds.Tables[0].Rows[i]["炉批号2"].ToString() + "]验证不一至；";
-                        //}
+                        }
-                        //else
+                        else
-                        //{
+                        {
-                        //    d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
+                            d.HeartNo2 = ds.Tables[0].Rows[i]["炉批号2"].ToString();
-                        //}
+                        }
                     }
 
                     //if (ds.Tables[0].Rows[i]["焊丝"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊丝"].ToString()))

HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx

@@ -28,17 +28,20 @@
                     <f:Toolbar ID="Toolbar1" Position="Top" runat="server" ToolbarAlign="Left">
                         <Items>
                             <f:DropDownList ID="drpInstallation" runat="server" Label="<%$ Resources:Lan,InstallationCode %>" AutoPostBack="true"
-                                LabelAlign="Right" Width="240px" OnSelectedIndexChanged="drpInstallation_OnSelectedIndexChanged">
+                                LabelAlign="Right" Width="180px" LabelWidth="80px" OnSelectedIndexChanged="drpInstallation_OnSelectedIndexChanged">
                             </f:DropDownList>
                             <f:DropDownList ID="drpWorkAreaId" runat="server" Label="<%$ Resources:Lan,Area %>" 
-                                LabelAlign="Right" Width="240px" >
+                                LabelAlign="Right" Width="180px" LabelWidth="80px" >
                             </f:DropDownList>
                            
-                            <f:DropDownList ID="drpUnit" runat="server" Label="施工单位" LabelAlign="Right" Width="240px" EmptyText="请选择施工单位"
+                            <f:DropDownList ID="drpUnit" runat="server" Label="施工单位" LabelAlign="Right" Width="220px" EmptyText="请选择施工单位"
                                 LabelWidth="90px">
                             </f:DropDownList>
+                            <f:DropDownList ID="drpTeamGroup" runat="server" Label="班组" EnableCheckBoxSelect="true" EnableMultiSelect="true"
+                                LabelAlign="Right" Width="240px" LabelWidth="80px">
+                            </f:DropDownList>
                             <f:DatePicker runat="server" Label="焊接日期" ID="txtStarTime" LabelAlign="Right"
-                                LabelWidth="100px" Width="220px">
+                                LabelWidth="90px" Width="210px">
                             </f:DatePicker>
                             <f:Label ID="Label1" runat="server" Text="<%$ Resources:Lan,To %>">
                             </f:Label>

HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.cs

@@ -1,7 +1,6 @@
 using BLL;
 using NPOI.XSSF.UserModel;
 using NPOI.SS.UserModel;
-using NPOI.HSSF.Util;
 
 using System;
 using System.Collections.Generic;
@@ -10,13 +9,9 @@ using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using Newtonsoft.Json.Linq;
-using NPOI.HSSF.UserModel;
-using NPOI.SS.Util;
-using NPOI.SS.Formula.Functions;
-using NPOI.OpenXmlFormats.Wordprocessing;
-using System.Web.UI.WebControls;
 using BorderStyle = NPOI.SS.UserModel.BorderStyle;
-using System.Data.Linq;
+
+
 
 namespace FineUIPro.Web.WeldingProcess.WeldingReport
 {
@@ -36,6 +31,12 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
                 BLL.Project_InstallationService.InitInstallationDropDownList(drpInstallation, true, CurrUser.LoginProjectId, Resources.Lan.PleaseSelect);
                 BLL.Base_UnitService.InitProjectUnitDropDownList(this.drpUnit, true, CurrUser.LoginProjectId, Const.UnitType_5, Resources.Lan.PleaseSelect);
                 Funs.FineUIPleaseSelect(drpWorkAreaId, Resources.Lan.PleaseSelect);
+                var teamGroup = BLL.Welder_TeamGroupService.GetAllTeamGroupList(CurrUser.LoginProjectId, "");
+                drpTeamGroup.DataValueField = "Value";
+                drpTeamGroup.DataTextField = "Text";
+                drpTeamGroup.DataSource = teamGroup;
+                drpTeamGroup.DataBind();
+                Funs.FineUIPleaseSelect(drpTeamGroup, "");
             }
         }
 
@@ -70,7 +71,9 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
 	                           left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId
 	                           left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId
 	                           LEFT JOIN dbo.Base_DetectionRate rate ON rate.DetectionRateId = pipeline.DetectionRateId
-	                           WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId";
+	                           LEFT JOIN dbo.Welder_ProjectWelder pcw ON pcw.WelderId = weldJoint.CoverWelderId AND pcw.ProjectId=weldJoint.ProjectId
+							   LEFT JOIN dbo.Welder_ProjectWelder pfw ON pfw.WelderId = weldJoint.BackingWelderId AND pfw.ProjectId=weldJoint.ProjectId
+                               WHERE weldJoint.WeldingDailyId IS NOT NULL AND weldJoint.ProjectId=@projectId";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
             listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId));
@@ -97,11 +100,13 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport
                 strSql += " AND pipeline.UnitId = @UnitId";
                 listStr.Add(new SqlParameter("@UnitId", drpUnit.SelectedValue));
             }
-            //if (this.drpWelder.SelectedValue!=Const._Null)
+            if (this.drpTeamGroup.SelectedValueArray.Length>0)
-            //{
+            {
-            //    strSql += " AND (weldJoint.CoverWelderId=@WelderId OR weldJoint.BackingWelderId=@WelderId)";
+                string[] teamGroupList = drpTeamGroup.SelectedValueArray;
-            //    listStr.Add(new SqlParameter("@WelderId", drpWelder.SelectedValue));
+                string teamGroups = string.Join(",", teamGroupList);
-            //}
+                strSql += " AND (CHARINDEX(pcw.TeamGroupId,@TeamGroupId)>0 OR CHARINDEX(pfw.TeamGroupId,@TeamGroupId)>0) ";
+                listStr.Add(new SqlParameter("@TeamGroupId", teamGroups));
+            }
             if (txtStarTime.Text != "")
             {
                 strSql += " AND weldingDaily.WeldingDate> = @WeldingStartDate";

HJGL/FineUIPro.Web/WeldingProcess/WeldingReport/WeldDailyExport.aspx.designer.cs

@@ -7,10 +7,12 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.WeldingProcess.WeldingReport {
+namespace FineUIPro.Web.WeldingProcess.WeldingReport
+{
 
 
-    public partial class WeldDailyExport {
+    public partial class WeldDailyExport
+    {
 
         /// <summary>
         /// form1 控件。
@@ -84,6 +86,15 @@ namespace FineUIPro.Web.WeldingProcess.WeldingReport {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpUnit;
 
+        /// <summary>
+        /// drpTeamGroup 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpTeamGroup;
+
         /// <summary>
         /// txtStarTime 控件。
         /// </summary>

HJGL/Model/Model.cs

@@ -22553,7 +22553,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
 		public string ProjectId
 		{
 			get
@@ -22732,10 +22732,10 @@ namespace Model
 		
 		private int _Status;
 		
-		private string _ReportNo;
-		
 		private System.Nullable<System.DateTime> _CheckTime;
 		
+		private string _ReportNo;
+		
 		private System.Nullable<System.DateTime> _ReportTime;
 		
     #region 可扩展性方法定义
@@ -22754,10 +22754,10 @@ namespace Model
     partial void OnAcceptanceChanged();
     partial void OnStatusChanging(int value);
     partial void OnStatusChanged();
-    partial void OnReportNoChanging(string value);
-    partial void OnReportNoChanged();
     partial void OnCheckTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnCheckTimeChanged();
+    partial void OnReportNoChanging(string value);
+    partial void OnReportNoChanged();
     partial void OnReportTimeChanging(System.Nullable<System.DateTime> value);
     partial void OnReportTimeChanged();
     #endregion
@@ -22867,7 +22867,7 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")]
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")]
 		public int Status
 		{
 			get
@@ -22887,26 +22887,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
-		public string ReportNo
-		{
-			get
-			{
-				return this._ReportNo;
-			}
-			set
-			{
-				if ((this._ReportNo != value))
-				{
-					this.OnReportNoChanging(value);
-					this.SendPropertyChanging();
-					this._ReportNo = value;
-					this.SendPropertyChanged("ReportNo");
-					this.OnReportNoChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> CheckTime
 		{
@@ -22927,6 +22907,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")]
+		public string ReportNo
+		{
+			get
+			{
+				return this._ReportNo;
+			}
+			set
+			{
+				if ((this._ReportNo != value))
+				{
+					this.OnReportNoChanging(value);
+					this.SendPropertyChanging();
+					this._ReportNo = value;
+					this.SendPropertyChanged("ReportNo");
+					this.OnReportNoChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")]
 		public System.Nullable<System.DateTime> ReportTime
 		{
@@ -38567,8 +38567,6 @@ namespace Model
 		
 		private string _ProjectId;
 		
-		private System.Nullable<bool> _IsPMI;
-		
 		private string _PipelineCode;
 		
 		private string _PipelineId;
@@ -38699,22 +38697,6 @@ namespace Model
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")]
-		public System.Nullable<bool> IsPMI
-		{
-			get
-			{
-				return this._IsPMI;
-			}
-			set
-			{
-				if ((this._IsPMI != value))
-				{
-					this._IsPMI = value;
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")]
 		public string PipelineCode
 		{
@@ -40723,6 +40705,8 @@ namespace Model
 		
 		private string _PipingClassCode;
 		
+		private string _PIPClassCode;
+		
 		private string _WeldingDate;
 		
 		private System.Nullable<bool> _IsCancel;
@@ -41831,6 +41815,22 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")]
+		public string PIPClassCode
+		{
+			get
+			{
+				return this._PIPClassCode;
+			}
+			set
+			{
+				if ((this._PIPClassCode != value))
+				{
+					this._PIPClassCode = value;
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")]
 		public string WeldingDate
 		{

HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql

@@ -0,0 +1,312 @@
+-- 管线焊工 增加是否 PMI处理
+alter table Pipeline_WeldJoint add isPMI bit NULL
+GO
+update Pipeline_WeldJoint set isPMI=0 
+GO
+
+ALTER VIEW [dbo].[View_Pipeline_WeldJoint]
+AS
+/************焊口信息视图*****************/
+SELECT WeldJoint.WeldJointId, 
+WeldJoint.ProjectId, 
+WeldJoint.PipelineId, 
+WeldJoint.WeldJointCode, 
+dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint,
+WeldJoint.WeldTypeId, 
+WeldJoint.Material1Id, 
+WeldJoint.Material2Id, 
+WeldJoint.ANSISCH,
+WeldJoint.Thickness, 
+WeldJoint.Dia, 
+WeldJoint.Size, 
+WeldJoint.JointAttribute,
+WeldJoint.JointArea, 
+WeldJoint.WeldingMethodId, 
+WeldJoint.IsHotProess, 
+WeldJoint.WeldingLocationId, 
+WeldJoint.WeldMatId, 
+WeldJoint.WeldSilkId,
+WeldJoint.GrooveTypeId, 
+WeldJoint.PipeSegment, 
+WeldJoint.PipeAssembly1Id, 
+WeldJoint.PipeAssembly2Id, 
+WeldJoint.PipeAssemblyCount, 
+WeldJoint.HeartNo1, 
+WeldJoint.HeartNo2, 
+WeldJoint.LastTemp, 
+WeldJoint.CellTemp, 
+WeldJoint.PrepareTemp, 
+WeldJoint.Electricity, 
+WeldJoint.SystemNumber, 
+WeldJoint.Remark, 
+WeldJoint.DoneDin,
+WeldJoint.Voltage, 
+WeldJoint.TestPackageNo, 
+WeldJoint.WeldingDailyCode, 
+WeldJoint.WeldingDailyId,
+WeldJoint.BackingWelderId, 
+WeldJoint.CoverWelderId,
+WeldJoint.PipingClassId,
+WeldJoint.Specification,
+WeldJoint.CancelResult,
+Project.ProjectCode,
+Project.ProjectName,
+Pipeline.PipelineCode,
+Pipeline.InstallationId,
+Pipeline.UnitId,
+Pipeline.SingleNumber,
+Pipeline.WorkAreaId,
+WeldType.WeldTypeCode,
+Material1.MaterialCode AS Material1Code,
+Material2.MaterialCode AS Material2Code,
+WeldingMethod.WeldingMethodCode,
+WeldingLocation.WeldingLocationCode,
+WeldMat.ConsumablesCode AS WeldMatCode,
+--WeldSilk.ConsumablesCode AS WeldSilkCode,
+'' AS WeldSilkCode,
+GrooveType.GrooveTypeCode,
+CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '否' ELSE '是' END AS Is_hjName,
+CASE WHEN WeldJoint.IsHotProess=1 THEN '是' ELSE '否' END AS IsHotProessStr,
+Components1.ComponentsCode AS ComponentsCode1,
+Components2.ComponentsCode AS ComponentsCode2,
+BackingWelder.WelderCode AS BackingWelderCode,
+BackingWelder.WelderName AS BackingWelderName,
+CoverWelder.WelderCode AS CoverWelderCode,
+CoverWelder.WelderName 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 Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL
+			THEN Material1.MaterialCode + '/' + Material2.MaterialCode
+			ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, --材质
+pipingClass.PipingClassCode,pip.PIPClassCode,
+CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate,
+WeldJoint.IsCancel,
+WeldJoint.IsPMI,
+WeldJoint.IsGoldJoint,
+WeldJoint.WPQId,wps.WPQCode,
+WeldJoint.DetectionType,
+WeldJoint.PageNum
+FROM Pipeline_WeldJoint AS WeldJoint
+LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId
+LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId
+LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId
+LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id
+LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id
+LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId
+LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId
+LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId
+--LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId
+LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId
+LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id
+LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id
+LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId
+LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId
+LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId
+LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId
+LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId
+LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId
+
+
+
+GO
+
+
+
+
+ALTER PROC [dbo].[sp_rpt_JointComprehensive]
+            @projectId NVARCHAR(50),
+			@workAreaId NVARCHAR(50)=NULL, 
+ 			@pipelineIds NVARCHAR(MAX) = NULL
+ 			
+AS 
+/**********焊口综合信息**********/
+SELECT 
+    weldJoint.WeldJointId,
+	weldJoint.ProjectId,
+	WorkArea.WorkAreaId,
+	WorkArea.WorkAreaCode,
+	weldJoint.SystemNumber,
+	weldJoint.TestPackageNo,
+	pipeline.SingleNumber,
+	pipeline.PipelineCode,
+	pipeline.DrawingsNum,
+	pipingClass.PipingClassCode,pip.PIPClassCode,
+	weldJoint.PageNum,
+	weldJoint.PipeSegment,--所属管段
+	weldJoint.WeldJointCode,
+	weldType.WeldTypeCode,
+	weldJoint.JointAttribute,
+	wl.WeldingLocationCode,
+	weldJoint.Dia,
+	weldJoint.Thickness,--壁厚
+	weldJoint.HeartNo1,
+	weldJoint.HeartNo2,
+	com1.ComponentsName AS PipeAssembly1,
+	com2.ComponentsName AS PipeAssembly2,
+	--material.MaterialCode,
+	mat1.MaterialCode AS MaterialCode1,
+	mat2.MaterialCode AS MaterialCode2,
+	cw.WelderCode AS CoverWelderCode,
+	fw.WelderCode AS BackingWelderCode,
+	WeldMethod.WeldingMethodName,	
+	medium.MediumName,
+	weldingDaily.WeldingDate,
+	weldingDaily.WeldingDailyCode,
+	trust.TrustBatchCode,
+	--TrustBatchCode.DetectionRateCode,
+	--TrustBatchCode.AcceptLevel,
+	(CASE WHEN weldJoint.IsHotProess=1 THEN '是' ELSE '否' END) AS IsHotProess,
+	 null as TrustBatchCode,
+	 null as DetectionRateCode,
+	null as AcceptLevel,
+	nde.NDEDate AS CHT_CHECKDATE,
+	ndeItem.NDEReportNo,
+	CAST(CAST(ISNULL(weldJoint.Size,0) AS REAL) AS NVARCHAR(8)) AS JOT_Size,
+	WeldMaterialMat.ConsumablesCode  AS WMT_MatCode,
+	WeldMaterialMat.ConsumablesName AS WMT_Matname,
+	weldJoint.WeldSilkId,
+	--WeldMaterialSilk.ConsumablesCode AS hsCode,
+	--WeldMaterialSilk.ConsumablesName AS hsname,
+	--WeldMaterialSilk.UserFlux,
+	weldJoint.Specification,
+	wps.WPQCode,ndttype.DetectionTypeCode,NULL AS HotReportCode,
+	(CASE WHEN (PointBatchItem.PointState='1' OR PointBatchItem.PointState='2') 
+	 THEN (CASE WHEN PointBatchItem.IsWelderFirst=1 THEN '是首三口' ELSE '是' END) ELSE  '否' END) AS if_dk
+FROM Pipeline_WeldJoint AS weldJoint
+	LEFT JOIN Pipeline_Pipeline AS pipeline ON pipeline.PipelineId = weldJoint.PipelineId	
+	LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId = pipeline.WorkAreaId
+	LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = weldJoint.Material1Id
+	LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = weldJoint.Material2Id
+	LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = weldJoint.WeldingMethodId	
+	LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = weldJoint.WeldTypeId
+	LEFT JOIN dbo.Base_WeldingLocation wl ON wl.WeldingLocationId = weldJoint.WeldingLocationId
+	LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId
+	LEFT JOIN Base_Components com1 ON com1.ComponentsId=weldJoint.PipeAssembly1Id
+	LEFT JOIN Base_Components com2 ON com2.ComponentsId=weldJoint.PipeAssembly2Id
+	LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId
+    LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId
+	LEFT JOIN Pipeline_WeldingDaily AS weldingDaily ON weldingDaily.WeldingDailyId = weldJoint.WeldingDailyId
+	LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = weldJoint.WPQId
+	left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId
+	left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId
+	LEFT JOIN Base_Consumables AS WeldMaterialMat ON WeldMaterialMat.ConsumablesId =weldJoint.WeldMatId
+	--LEFT JOIN Base_Consumables AS WeldMaterialSilk ON WeldMaterialSilk.ConsumablesId =weldJoint.WeldSilkId
+	LEFT JOIN Batch_PointBatchItem AS PointBatchItem ON PointBatchItem.WeldJointId =weldJoint.WeldJointId
+	LEFT JOIN dbo.Batch_PointBatch point ON point.PointBatchId = PointBatchItem.PointBatchId
+	LEFT JOIN dbo.Base_DetectionType ndttype ON ndttype.DetectionTypeId = point.DetectionTypeId	
+	LEFT JOIN dbo.Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = PointBatchItem.PointBatchItemId
+	LEFT JOIN dbo.Batch_BatchTrust trust ON trust.TrustBatchId = trustItem.TrustBatchId
+	LEFT JOIN dbo.Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId
+	LEFT JOIN dbo.Batch_NDE nde ON nde.NDEID = ndeItem.NDEID
+
+ WHERE weldJoint.ProjectId=@projectId
+  AND(pipeline.WorkAreaId=@workAreaId OR @workAreaId IS NULL)
+  AND (CHARINDEX(weldJoint.PipelineId,@pipelineIds)>0 or @pipelineIds IS NULl)
+ --AND(pipeline.PipelineCode=@pipelineCode OR @pipelineCode IS NULl)
+
+ GO
+
+UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','')
+GO
+
+UPDATE dbo.Template_Files SET SortIndex=SortIndex+1 where SortIndex>24
+GO
+
+INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex])
+VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','管道焊接接头PMI检测比例确认表','',25)
+GO
+
+-- PMI处理委托
+create table PMI_Delegation
+(
+	Id nvarchar(50) not null primary key,
+	DelegationNo nvarchar(50) not null,
+	DelegationDate datetime,
+	ProjectId nvarchar(50) not null,
+	InstallationId nvarchar(50),
+	UnitId  nvarchar(50),
+	DetectionStandard nvarchar(50),
+	Tabler nvarchar(50),
+	Remark nvarchar(255),
+	CreatedTime datetime default getdate()
+)
+go
+---- PMI处理委托 明细
+create table PMI_DelegationDetails
+(
+	Id nvarchar(50) not null primary key,
+	PMIId nvarchar(50) not null,
+	JointId nvarchar(50) not null,
+	QualityNo nvarchar(255),
+	Acceptance nvarchar(255),
+	Status int not null,
+	CreatedTime datetime default getdate()
+)
+go
+
+
+-- 插入PMI委托菜单
+insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI检测管理','PMI detection management','',21,0,3,NUll,1)
+insert into Sys_Menu values(NEWID(),'PMI委托','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+insert into Sys_Menu values(NEWID(),'PMI检测录入','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1)
+GO
+
+
+/*******PMI委托明细视图***********/ 
+
+USE [HJGLDB_ZJBSF]
+GO
+
+/****** Object:  View [dbo].[View_PMI_DelegationDetails]    Script Date: 2024-5-13 9:06:44 ******/
+SET ANSI_NULLS ON
+GO
+
+SET QUOTED_IDENTIFIER ON
+GO
+
+
+
+
+-- 增加报告编号
+ALTER TABLE dbo.PMI_DelegationDetails ADD reportNo  NVARCHAR(50)
+-- 增加报告日期
+ALTER TABLE dbo.PMI_DelegationDetails ADD reportTime  datetime
+GO
+
+
+ALTER VIEW [dbo].[View_PMI_DelegationDetails]
+AS
+/********PMI处理明细********/
+SELECT 
+TrustItem.Id,
+TrustItem.Acceptance, 
+TrustItem.checkTime, 
+TrustItem.reportTime,
+TrustItem.JointId as WeldJointId, 
+TrustItem.status, 
+TrustItem.QualityNo, 
+TrustItem.PMIId, 
+Trust.ProjectId,
+Trust.DelegationNo,
+Trust.DelegationDate,
+ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo,
+WeldJoint.WeldJointCode,
+Pipeline.PipelineCode,
+WeldJoint.Specification,
+Material.MaterialCode,
+Pipeline.WorkAreaId
+FROM PMI_DelegationDetails AS TrustItem
+LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId
+LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId
+LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId
+LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id
+GO
+
+
+
+
+
+
+
+