feat: 完善材料管理与焊接业务功能

2026-08-06 15:33:11 +08:00
parent e418b60fdb
commit 1de898812e
49 changed files with 2566 additions and 555 deletions
@@ -0,0 +1,211 @@
+using System;
+
+namespace Model
+{
+    /// <summary>
+    /// 焊接日报待审核明细。
+    /// </summary>
+    public class WeldingDailyTempDetailItem
+    {
+        /// <summary>
+        /// 待审核明细ID。
+        /// </summary>
+        public string TempDetailId { get; set; }
+
+        /// <summary>
+        /// 项目ID。
+        /// </summary>
+        public string ProjectId { get; set; }
+
+        /// <summary>
+        /// 单位ID。
+        /// </summary>
+        public string UnitId { get; set; }
+
+        /// <summary>
+        /// 单位工程ID。
+        /// </summary>
+        public string UnitWorkId { get; set; }
+
+        /// <summary>
+        /// 焊口ID。
+        /// </summary>
+        public string WeldJointId { get; set; }
+
+        /// <summary>
+        /// 管线ID。
+        /// </summary>
+        public string PipelineId { get; set; }
+
+        /// <summary>
+        /// 管线编号。
+        /// </summary>
+        public string PipelineCode { get; set; }
+
+        /// <summary>
+        /// 焊口编号。
+        /// </summary>
+        public string WeldJointCode { get; set; }
+
+        /// <summary>
+        /// 焊接日期。
+        /// </summary>
+        public DateTime WeldingDate { get; set; }
+
+        /// <summary>
+        /// 盖面焊工ID。
+        /// </summary>
+        public string CoverWelderId { get; set; }
+
+        /// <summary>
+        /// 盖面焊工编号。
+        /// </summary>
+        public string CoverWelderCode { get; set; }
+
+        /// <summary>
+        /// 打底焊工ID。
+        /// </summary>
+        public string BackingWelderId { get; set; }
+
+        /// <summary>
+        /// 打底焊工编号。
+        /// </summary>
+        public string BackingWelderCode { get; set; }
+
+        /// <summary>
+        /// 焊口属性。
+        /// </summary>
+        public string JointAttribute { get; set; }
+
+        /// <summary>
+        /// 焊接位置ID。
+        /// </summary>
+        public string WeldingLocationId { get; set; }
+
+        /// <summary>
+        /// 焊接位置编号。
+        /// </summary>
+        public string WeldingLocationCode { get; set; }
+
+        /// <summary>
+        /// 焊接模式。
+        /// </summary>
+        public string WeldingMode { get; set; }
+
+        /// <summary>
+        /// 材质1编号。
+        /// </summary>
+        public string Material1Code { get; set; }
+
+        /// <summary>
+        /// 材质2编号。
+        /// </summary>
+        public string Material2Code { get; set; }
+
+        /// <summary>
+        /// 公称直径字符串。
+        /// </summary>
+        public string DNDia { get; set; }
+
+        /// <summary>
+        /// 焊口尺寸。
+        /// </summary>
+        public decimal? Size { get; set; }
+
+        /// <summary>
+        /// 外径。
+        /// </summary>
+        public decimal? Dia { get; set; }
+
+        /// <summary>
+        /// 壁厚。
+        /// </summary>
+        public decimal? Thickness { get; set; }
+
+        /// <summary>
+        /// 焊口类型编号。
+        /// </summary>
+        public string WeldTypeCode { get; set; }
+
+        /// <summary>
+        /// 焊接方法编号。
+        /// </summary>
+        public string WeldingMethodCode { get; set; }
+
+        /// <summary>
+        /// 焊丝编号。
+        /// </summary>
+        public string WeldingWireCode { get; set; }
+
+        /// <summary>
+        /// 焊条编号。
+        /// </summary>
+        public string WeldingRodCode { get; set; }
+
+        /// <summary>
+        /// 提交人ID。
+        /// </summary>
+        public string SubmitPersonId { get; set; }
+
+        /// <summary>
+        /// 提交人姓名。
+        /// </summary>
+        public string SubmitPersonName { get; set; }
+
+        /// <summary>
+        /// 提交时间。
+        /// </summary>
+        public DateTime SubmitDate { get; set; }
+
+        /// <summary>
+        /// 焊前照片地址。
+        /// </summary>
+        public string BeforePhotoUrl { get; set; }
+
+        /// <summary>
+        /// 焊后照片地址。
+        /// </summary>
+        public string AfterPhotoUrl { get; set; }
+
+        /// <summary>
+        /// 明细附件地址。
+        /// </summary>
+        public string AttachUrl { get; set; }
+
+        /// <summary>
+        /// 审核状态：0待审核，1已审核。
+        /// </summary>
+        public int AuditState { get; set; }
+
+        /// <summary>
+        /// 审核人ID。
+        /// </summary>
+        public string AuditMan { get; set; }
+
+        /// <summary>
+        /// 审核时间。
+        /// </summary>
+        public DateTime? AuditDate { get; set; }
+
+        /// <summary>
+        /// 审核备注。
+        /// </summary>
+        public string AuditRemark { get; set; }
+    }
+
+    /// <summary>
+    /// 焊接日报待审核批量操作参数。
+    /// </summary>
+    public class WeldingDailyTempDetailBatchRequest
+    {
+        /// <summary>
+        /// 待审核明细ID集合。
+        /// </summary>
+        public string[] TempDetailIds { get; set; }
+
+        /// <summary>
+        /// 审核人ID，批量删除时无需填写。
+        /// </summary>
+        public string AuditMan { get; set; }
+    }
+}
@@ -32,6 +32,8 @@ namespace Model
        public decimal? MatchNum { get; set; }
        public decimal? MatchRate { get; set; }
        public string MatchRateString { get; set; }
+        public decimal? ComponentMatchRate { get; set; }
+        public string ComponentMatchRateString { get; set; }
        public int? PipeLineSortIndex { get; set; }

    }
@@ -48,4 +50,23 @@ namespace Model
        public decimal? MatchRate { get; set; }
        public string MatchRateString { get; set; }
    }
+
+    /// <summary>
+    /// 单位工程下部分已焊接组件的导出汇总。
+    /// </summary>
+    public class Tw_PartialWeldedComponentOutput
+    {
+        public string UnitWorkId { get; set; }
+        public string UnitWorkName { get; set; }
+        public string PipelineId { get; set; }
+        public string PipelineCode { get; set; }
+        public string PrefabricatedComponents { get; set; }
+        public string PipeArea { get; set; }
+        public string PipeAreaText { get; set; }
+        public int TotalWeldJointCount { get; set; }
+        public int WeldedWeldJointCount { get; set; }
+        public int UnweldedWeldJointCount { get; set; }
+        public decimal? ComponentMatchRate { get; set; }
+        public string ComponentMatchRateString { get; set; }
+    }
 }
@@ -101668,6 +101668,8 @@ namespace Model
 		
 		private string _Code;
 		
+		private string _DesignInstitute;
+
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntitySet<HJGL_PipeLineMat> _HJGL_PipeLineMat;
@@ -101698,6 +101700,8 @@ namespace Model
    partial void OnBatchNoChanged();
    partial void OnCodeChanging(string value);
    partial void OnCodeChanged();
+    partial void OnDesignInstituteChanging(string value);
+    partial void OnDesignInstituteChanged();
    #endregion
 		
 		public HJGL_MaterialCodeLib()
@@ -101931,6 +101935,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DesignInstitute", DbType="NVarChar(200)")]
+		public string DesignInstitute
+		{
+			get
+			{
+				return this._DesignInstitute;
+			}
+			set
+			{
+				if ((this._DesignInstitute != value))
+				{
+					this.OnDesignInstituteChanging(value);
+					this.SendPropertyChanging();
+					this._DesignInstitute = value;
+					this.SendPropertyChanged("DesignInstitute");
+					this.OnDesignInstituteChanged();
+				}
+			}
+		}
+
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_MaterialCodeLib_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -106844,6 +106868,8 @@ namespace Model
 		private string _WeldJointId;
 		
 		private string _MaterialCode2;
+
+		private string _PipeArea;
 		
 		private EntityRef<HJGL_MaterialCodeLib> _HJGL_MaterialCodeLib;
 		
@@ -106869,6 +106895,8 @@ namespace Model
    partial void OnWeldJointIdChanged();
    partial void OnMaterialCode2Changing(string value);
    partial void OnMaterialCode2Changed();
+    partial void OnPipeAreaChanging(string value);
+    partial void OnPipeAreaChanged();
    #endregion
 		
 		public HJGL_PipeLineMat()
@@ -107045,6 +107073,26 @@ namespace Model
 				}
 			}
 		}
+
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeArea", DbType="NChar(1)")]
+		public string PipeArea
+		{
+			get
+			{
+				return this._PipeArea;
+			}
+			set
+			{
+				if ((this._PipeArea != value))
+				{
+					this.OnPipeAreaChanging(value);
+					this.SendPropertyChanging();
+					this._PipeArea = value;
+					this.SendPropertyChanged("PipeArea");
+					this.OnPipeAreaChanged();
+				}
+			}
+		}
 		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_PipeLineMat_HJGL_MaterialCodeLib", Storage="_HJGL_MaterialCodeLib", ThisKey="MaterialCode", OtherKey="MaterialCode", IsForeignKey=true)]
 		public HJGL_MaterialCodeLib HJGL_MaterialCodeLib
@@ -105,6 +105,7 @@
    <Compile Include="APIItem\HJGL\TestPackageApprove.cs" />
    <Compile Include="APIItem\HJGL\TestPackageItem.cs" />
    <Compile Include="APIItem\HJGL\WelderPerformanceItem.cs" />
+    <Compile Include="APIItem\HJGL\WeldingDailyTempDetailItem.cs" />
    <Compile Include="APIItem\HSSEItem.cs" />
    <Compile Include="APIItem\HSSE\ChartAnalysisItem.cs" />
    <Compile Include="APIItem\HSSE\CheckSpecialDetailItem.cs" />