lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 完善焊接质量检查和材料管理

Browse Source 
补齐焊前专项审核和焊缝外观检测流程，统一质检查询、附件处理与材料明细导出，提升业务数据追溯和组件匹配使用效率。
This commit is contained in:
李鹏飞
2026-08-10 17:58:55 +08:00
parent bd73295ff8
commit 2de696fad2
48 changed files with 2252 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/APIItem/HJGL/HJGL_PreWeldingDailyItem.cs
+10
View File
@@ -108,6 +108,16 @@
/// </summary>
public int welderType { get; set; }
/// <summary>
/// 焊接方法ID；兼容旧版小程序，可不传
/// </summary>
public string WeldingMethodId { get; set; }
/// <summary>
/// 焊缝类型ID；兼容旧版小程序，可不传
/// </summary>
public string WeldTypeId { get; set; }
/// <summary>
/// 焊前附件路径
/// </summary>
SGGL/Model/APIItem/HJGL/PreWeldInspectionItem.cs
+55
View File
@@ -102,6 +102,20 @@ namespace Model
/// </summary>
public class PreWeldMaterialItem
{
/// <summary>
/// 管线材料ID
/// </summary>
public string PipeLineMatId { get; set; }
/// <summary>
/// 焊口侧序号
/// </summary>
public int MaterialSide { get; set; }
/// <summary>
/// 材料主编码
/// </summary>
public string MainCode { get; set; }
/// <summary>
/// 材料编码
@@ -221,6 +235,16 @@ namespace Model
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 专项审核办理人；材料编码或批次不准确时必填
/// </summary>
public string SpecialReviewerId { get; set; }
/// <summary>
/// 两侧材料主编码反馈
/// </summary>
public List<PreWeldCuttingMaterialInput> Materials { get; set; }
}
/// <summary>
@@ -332,6 +356,37 @@ namespace Model
/// 备注
/// </summary>
public string Remark { get; set; }
public int ReviewState { get; set; }
public string ReviewStateText { get; set; }
public string SpecialReviewerId { get; set; }
public string SpecialReviewerName { get; set; }
public string ReviewerId { get; set; }
public string ReviewerName { get; set; }
public DateTime? ReviewTime { get; set; }
public List<PreWeldCuttingMaterialItem> Materials { get; set; }
}
public class PreWeldCuttingMaterialInput
{
public string PipeLineMatId { get; set; }
public int MaterialSide { get; set; }
public string ReportedMainCode { get; set; }
}
public class PreWeldCuttingMaterialItem : PreWeldCuttingMaterialInput
{
public string OriginalMainCode { get; set; }
public bool IsBatchChanged { get; set; }
}
public class PreWeldCuttingCheckReviewInput
{
public string CuttingCheckId { get; set; }
public string ReviewerId { get; set; }
public DateTime? ReviewTime { get; set; }
public string Remark { get; set; }
public List<PreWeldCuttingMaterialInput> Materials { get; set; }
}
/// <summary>
SGGL/Model/APIItem/HJGL/WeldAppearanceCheckItem.cs
+47
View File
@@ -0,0 +1,47 @@
using System;
using System.Collections.Generic;
namespace Model
{
public class WeldAppearanceCheckInput
{
public string AppearanceCheckId { get; set; }
public string ProjectId { get; set; }
public string WeldJointId { get; set; }
public bool IsQualified { get; set; }
public string CheckPerson { get; set; }
public DateTime? CheckTime { get; set; }
public string Remark { get; set; }
public string AttachUrl { get; set; }
public string CreateUser { get; set; }
}
public class WeldAppearanceCheckItem
{
public string AppearanceCheckId { get; set; }
public string ProjectId { get; set; }
public string WeldJointId { get; set; }
public string PipelineCode { get; set; }
public string WeldJointCode { get; set; }
public bool IsQualified { get; set; }
public string QualifiedText { get; set; }
public string CheckPerson { get; set; }
public string CheckPersonName { get; set; }
public DateTime CheckTime { get; set; }
public string Remark { get; set; }
public string AttachUrl { get; set; }
public DateTime CreateTime { get; set; }
}
public class WeldAppearanceJointItem
{
public string WeldJointId { get; set; }
public string ProjectId { get; set; }
public string PipelineCode { get; set; }
public string WeldJointCode { get; set; }
public string WeldTypeCode { get; set; }
public string WeldingMethodCode { get; set; }
public DateTime? WeldingDate { get; set; }
public List<WeldAppearanceCheckItem> History { get; set; }
}
}
SGGL/Model/CLGL/Tw_ArrivalStatisticsOutPut.cs
+1
View File
@@ -19,6 +19,7 @@ namespace Model
public decimal StockNum { get; set; }
public decimal NeedNum { get; set; }
public decimal RealNum { get; set; }
public decimal OutputNum { get; set; }
public decimal MatchRate { get; set; }
public string MatchRateString { get; set; }
}
SGGL/Model/CLGL/Tw_PipeMatMatchOutput.cs
+7 -1
View File
@@ -52,7 +52,7 @@ namespace Model
}
/// <summary>
/// 单位工程下部分已焊接组件的导出汇总。
/// 单位工程下组件导出汇总。
/// </summary>
public class Tw_PartialWeldedComponentOutput
{
@@ -66,6 +66,12 @@ namespace Model
public int TotalWeldJointCount { get; set; }
public int WeldedWeldJointCount { get; set; }
public int UnweldedWeldJointCount { get; set; }
/// <summary>未焊焊口的达因量。</summary>
public decimal? UnweldedDin { get; set; }
/// <summary>组件材料编码，多个编码使用换行分隔。</summary>
public string MaterialCode { get; set; }
/// <summary>与材料编码按顺序对应的组件材料数量。</summary>
public string MaterialQuantity { get; set; }
public decimal? ComponentMatchRate { get; set; }
public string ComponentMatchRateString { get; set; }
}
SGGL/Model/HJGL/HJGLQualityExtensions.cs
+105
View File
@@ -0,0 +1,105 @@
using System;
using System.Data.Linq;
using System.Data.Linq.Mapping;
namespace Model
{
public partial class SGGLDB
{
public Table<HJGL_PreWeldCuttingCheckMaterial> HJGL_PreWeldCuttingCheckMaterial
{
get { return GetTable<HJGL_PreWeldCuttingCheckMaterial>(); }
}
public Table<HJGL_WeldAppearanceCheck> HJGL_WeldAppearanceCheck
{
get { return GetTable<HJGL_WeldAppearanceCheck>(); }
}
}
public partial class HJGL_PreWeldCuttingCheck
{
[Column(DbType = "Int NOT NULL")]
public int ReviewState { get; set; }
[Column(DbType = "NVarChar(50)")]
public string SpecialReviewerId { get; set; }
[Column(DbType = "NVarChar(50)")]
public string ReviewerId { get; set; }
[Column(DbType = "DateTime")]
public DateTime? ReviewTime { get; set; }
}
[Table(Name = "dbo.HJGL_PreWeldCuttingCheckMaterial")]
public class HJGL_PreWeldCuttingCheckMaterial
{
[Column(IsPrimaryKey = true, CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string CuttingCheckMaterialId { get; set; }
[Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string CuttingCheckId { get; set; }
[Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string PipeLineMatId { get; set; }
[Column(DbType = "Int NOT NULL")]
public int MaterialSide { get; set; }
[Column(DbType = "NVarChar(100)")]
public string OriginalMainCode { get; set; }
[Column(DbType = "NVarChar(100)")]
public string ReportedMainCode { get; set; }
[Column(DbType = "Bit NOT NULL")]
public bool IsBatchChanged { get; set; }
}
[Table(Name = "dbo.HJGL_WeldAppearanceCheck")]
public class HJGL_WeldAppearanceCheck
{
[Column(IsPrimaryKey = true, CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string AppearanceCheckId { get; set; }
[Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string ProjectId { get; set; }
[Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string WeldJointId { get; set; }
[Column(DbType = "Bit NOT NULL")]
public bool IsQualified { get; set; }
[Column(CanBeNull = false, DbType = "NVarChar(50) NOT NULL")]
public string CheckPerson { get; set; }
[Column(DbType = "DateTime NOT NULL")]
public DateTime CheckTime { get; set; }
[Column(DbType = "NVarChar(500)")]
public string Remark { get; set; }
[Column(DbType = "NVarChar(50)")]
public string CreateUser { get; set; }
[Column(DbType = "DateTime NOT NULL")]
public DateTime CreateTime { get; set; }
[Column(DbType = "NVarChar(50)")]
public string ModifyUser { get; set; }
[Column(DbType = "DateTime")]
public DateTime? ModifyTime { get; set; }
}
public partial class View_HJGL_WeldJoint
{
[Column(DbType = "Bit")]
public bool? WeldAppearanceIsQualified { get; set; }
[Column(DbType = "NVarChar(10) NOT NULL", CanBeNull = false)]
public string WeldAppearanceResult { get; set; }
}
}
SGGL/Model/Model.csproj
+2
View File
@@ -128,6 +128,7 @@
<Compile Include="APIItem\HSSE\HazardRegisterItem.cs" />
<Compile Include="APIItem\HJGL\HJGL_PreWeldingDailyItem.cs" />
<Compile Include="APIItem\HJGL\PreWeldInspectionItem.cs" />
<Compile Include="APIItem\HJGL\WeldAppearanceCheckItem.cs" />
<Compile Include="APIItem\HJGL\ViewHJGLWeldJointExtend.cs" />
<Compile Include="APIItem\HJGL\HotProcessHardItem.cs" />
<Compile Include="APIItem\HJGL\NDETrustItem.cs" />
@@ -280,6 +281,7 @@
<Compile Include="HSSE\PuPayCraftAmountInput.cs" />
<Compile Include="HSSE\WorkPostStatisticItem.cs" />
<Compile Include="HSSE\HSSE_HazardTemplate.cs" />
<Compile Include="HJGL\HJGLQualityExtensions.cs" />
<Compile Include="Model.cs" />
<Compile Include="ModelProc.cs" />
<Compile Include="Num.cs" />