feat(hjgl): 完善焊前检查和防腐检查流程

焊前检查需要同时覆盖下料、组对和防腐检查,并支持移动端查询与保存。
扩展焊前检查模型、服务和页面字段,补充检查结果、不合格原因、整改要求、
附件和防腐检查记录,便于按焊口和材料追溯检查过程。
This commit is contained in:
2026-07-07 10:40:21 +08:00
parent 02b524b895
commit bb6615ebb0
57 changed files with 5035 additions and 2057 deletions
+734 -10
View File
@@ -1,4 +1,5 @@
using System;
using System;
using System.Collections.Generic;
namespace Model
{
@@ -7,30 +8,77 @@ namespace Model
/// </summary>
public class PreWeldJointItem
{
/// <summary>
/// 焊口ID
/// </summary>
public string WeldJointId { get; set; }
/// <summary>
/// 焊口编号
/// </summary>
public string WeldJointCode { get; set; }
/// <summary>
/// 管线ID
/// </summary>
public string PipelineId { get; set; }
/// <summary>
/// 管线编号
/// </summary>
public string PipelineCode { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 防腐代码字典ID
/// </summary>
public string PaintId { get; set; }
/// <summary>
/// 防腐代码
/// </summary>
public string PaintCode { get; set; }
/// <summary>
/// 坡口类型ID
/// </summary>
public string GrooveTypeId { get; set; }
/// <summary>
/// 坡口类型编码
/// </summary>
public string GrooveTypeCode { get; set; }
/// <summary>
/// 坡口类型名称
/// </summary>
public string GrooveTypeName { get; set; }
/// <summary>
/// 坡口加工类型
/// </summary>
public string GrooveProcessType { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
public decimal? GrooveAngle { get; set; }
/// <summary>
/// 组对间隙
/// </summary>
public decimal? FitupGap { get; set; }
/// <summary>
/// 错边量
/// </summary>
public decimal? Misalignment { get; set; }
/// <summary>
@@ -42,85 +90,761 @@ namespace Model
/// 组对抽检附件路径
/// </summary>
public string FitupAttachUrl1 { get; set; }
/// <summary>
/// 焊前抽检材料信息
/// </summary>
public List<PreWeldMaterialItem> preWeldMaterialItems { get; set; }
}
/// <summary>
/// 下料抽检保存参数
/// 焊前抽检材料信息
/// </summary>
public class PreWeldMaterialItem
{
/// <summary>
/// 材料编码
/// </summary>
public string MaterialCode { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 材料规格
/// </summary>
public string MaterialSpec { get; set; }
/// <summary>
/// 材质
/// </summary>
public string MaterialMade { get; set; }
/// <summary>
/// 材料定义
/// </summary>
public string MaterialDef { get; set; }
/// <summary>
/// 材料单位
/// </summary>
public string MaterialUnit { get; set; }
/// <summary>
/// 炉号
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 批号
/// </summary>
public string BatchNo { get; set; }
}
/// <summary>
/// 下料抽检保存入参
/// </summary>
public class PreWeldCuttingCheckInput
{
/// <summary>
/// 下料检查记录ID;为空时新增,不为空时修改对应记录
/// </summary>
public string CuttingCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 焊口ID
/// </summary>
public string WeldJointId { get; set; }
/// <summary>
/// 下料长度
/// </summary>
public decimal? CuttingLength { get; set; }
/// <summary>
/// 坡口形式
/// </summary>
public string GrooveForm { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
public decimal? GrooveAngle { get; set; }
/// <summary>
/// 材料编码批次是否准确
/// </summary>
public bool IsMaterialCodeBatchNoAccurate { get; set; }
/// <summary>
/// 材料数量是否准确
/// </summary>
public bool IsMaterialQuantityAccurate { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
/// <summary>
/// 下料抽检返回实体
/// </summary>
public class PreWeldCuttingCheckItem
{
/// <summary>
/// 下料检查记录ID
/// </summary>
public string CuttingCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 焊口ID
/// </summary>
public string WeldJointId { get; set; }
public string PipelineCode { get; set; }
/// <summary>
/// 焊口编号
/// </summary>
public string WeldJointCode { get; set; }
public bool IsMaterialCodeBatchNoAccurate { get; set; }
/// <summary>
/// 管线编号
/// </summary>
public string PipelineCode { get; set; }
public bool IsMaterialQuantityAccurate { get; set; }
/// <summary>
/// 下料长度
/// </summary>
public decimal? CuttingLength { get; set; }
/// <summary>
/// 坡口形式
/// </summary>
public string GrooveForm { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
public decimal? GrooveAngle { get; set; }
/// <summary>
/// 是否合格
/// </summary>
public bool IsQualified { get; set; }
/// <summary>
/// 材料编码批次是否准确
/// </summary>
public bool IsMaterialCodeBatchNoAccurate { get; set; }
/// <summary>
/// 材料数量是否准确
/// </summary>
public bool IsMaterialQuantityAccurate { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查人姓名
/// </summary>
public string CheckPersonName { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
/// <summary>
/// 组对抽检保存参
/// 组对抽检保存
/// </summary>
public class PreWeldFitupCheckInput
{
/// <summary>
/// 组对检查记录ID;为空时新增,不为空时修改对应记录
/// </summary>
public string FitupCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 焊口ID
/// </summary>
public string WeldJointId { get; set; }
/// <summary>
/// 坡口类型ID
/// </summary>
public string GrooveTypeId { get; set; }
/// <summary>
/// 坡口类型名称
/// </summary>
public string GrooveTypeName { get; set; }
/// <summary>
/// 坡口类型编码
/// </summary>
public string GrooveTypeCode { get; set; }
/// <summary>
/// 坡口加工类型
/// </summary>
public string GrooveProcessType { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
public decimal? GrooveAngle { get; set; }
/// <summary>
/// 组对间隙
/// </summary>
public decimal? FitupGap { get; set; }
/// <summary>
/// 错边量
/// </summary>
public decimal? Misalignment { get; set; }
/// <summary>
/// 焊缝余高
/// </summary>
public decimal? WeldReinforcement { get; set; }
/// <summary>
/// 焊缝高度
/// </summary>
public decimal? WeldHeight { get; set; }
/// <summary>
/// 焊缝宽度
/// </summary>
public decimal? WeldWidth { get; set; }
/// <summary>
/// 表面缺陷
/// </summary>
public string SurfaceDefect { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
/// <summary>
/// 组对抽检返回实体
/// </summary>
public class PreWeldFitupCheckItem
{
/// <summary>
/// 组对检查记录ID
/// </summary>
public string FitupCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 焊口ID
/// </summary>
public string WeldJointId { get; set; }
public string PipelineCode { get; set; }
/// <summary>
/// 焊口编号
/// </summary>
public string WeldJointCode { get; set; }
public string GrooveTypeId { get; set; }
/// <summary>
/// 管线编号
/// </summary>
public string PipelineCode { get; set; }
/// <summary>
/// 坡口类型编码
/// </summary>
public string GrooveTypeCode { get; set; }
/// <summary>
/// 坡口类型ID
/// </summary>
public string GrooveTypeId { get; set; }
/// <summary>
/// 坡口类型名称
/// </summary>
public string GrooveTypeName { get; set; }
/// <summary>
/// 焊缝余高
/// </summary>
public decimal? WeldReinforcement { get; set; }
/// <summary>
/// 焊缝高度
/// </summary>
public decimal? WeldHeight { get; set; }
/// <summary>
/// 焊缝宽度
/// </summary>
public decimal? WeldWidth { get; set; }
/// <summary>
/// 表面缺陷
/// </summary>
public string SurfaceDefect { get; set; }
/// <summary>
/// 坡口加工类型
/// </summary>
public string GrooveProcessType { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
public decimal? GrooveAngle { get; set; }
/// <summary>
/// 组对间隙
/// </summary>
public decimal? FitupGap { get; set; }
/// <summary>
/// 错边量
/// </summary>
public decimal? Misalignment { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查人姓名
/// </summary>
public string CheckPersonName { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
}
/// <summary>
/// 防腐检查保存入参
/// </summary>
public class AntiCorrosionCheckRecordInput
{
/// <summary>
/// 防腐检查记录ID
/// </summary>
public string AntiCorrosionCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 材料主数据ID
/// </summary>
public string MaterialId { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string MaterialCode { get; set; }
/// <summary>
/// 防腐等级
/// </summary>
public string AnticorrosionLevel { get; set; }
/// <summary>
/// 防腐代码字典ID
/// </summary>
public string PaintId { get; set; }
/// <summary>
/// 膜厚
/// </summary>
public decimal? FilmThickness { get; set; }
/// <summary>
/// 喷砂信息
/// </summary>
public string SandBlasting { get; set; }
/// <summary>
/// 除锈喷砂信息
/// </summary>
public string RustSandBlasting { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
}
/// <summary>
/// 防腐检查返回实体
/// </summary>
public class AntiCorrosionCheckRecordItem
{
/// <summary>
/// 防腐检查记录ID
/// </summary>
public string AntiCorrosionCheckId { get; set; }
/// <summary>
/// 项目ID
/// </summary>
public string ProjectId { get; set; }
/// <summary>
/// 单位工程ID
/// </summary>
public string UnitWorkId { get; set; }
/// <summary>
/// 材料主数据ID
/// </summary>
public string MaterialId { get; set; }
/// <summary>
/// 材料编码
/// </summary>
public string MaterialCode { get; set; }
/// <summary>
/// 材料名称
/// </summary>
public string MaterialName { get; set; }
/// <summary>
/// 材料规格
/// </summary>
public string MaterialSpec { get; set; }
/// <summary>
/// 材质
/// </summary>
public string MaterialMade { get; set; }
/// <summary>
/// 材料定义
/// </summary>
public string MaterialDef { get; set; }
/// <summary>
/// 材料单位
/// </summary>
public string MaterialUnit { get; set; }
/// <summary>
/// 炉批号
/// </summary>
public string HeatNo { get; set; }
/// <summary>
/// 批次号
/// </summary>
public string BatchNo { get; set; }
/// <summary>
/// 材料编码库代码
/// </summary>
public string Code { get; set; }
/// <summary>
/// 防腐等级
/// </summary>
public string AnticorrosionLevel { get; set; }
/// <summary>
/// 防腐代码字典ID
/// </summary>
public string PaintId { get; set; }
/// <summary>
/// 涂漆代码
/// </summary>
public string PaintCode { get; set; }
/// <summary>
/// 底漆
/// </summary>
public string Primer { get; set; }
/// <summary>
/// 中间漆
/// </summary>
public string IntermediatePaint { get; set; }
/// <summary>
/// 面漆
/// </summary>
public string Topcoat { get; set; }
/// <summary>
/// 颜色编码
/// </summary>
public string ColorCode { get; set; }
/// <summary>
/// 膜厚
/// </summary>
public decimal? FilmThickness { get; set; }
/// <summary>
/// 喷砂信息
/// </summary>
public string SandBlasting { get; set; }
/// <summary>
/// 除锈喷砂信息
/// </summary>
public string RustSandBlasting { get; set; }
/// <summary>
/// 检查结果
/// </summary>
public string CheckResult { get; set; }
/// <summary>
/// 检查人ID
/// </summary>
public string CheckPerson { get; set; }
/// <summary>
/// 检查人姓名
/// </summary>
public string CheckPersonName { get; set; }
/// <summary>
/// 检查时间
/// </summary>
public DateTime? CheckTime { get; set; }
/// <summary>
/// 不合格原因
/// </summary>
public string UnqualifiedReason { get; set; }
/// <summary>
/// 整改要求
/// </summary>
public string RectifyRequirement { get; set; }
/// <summary>
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 创建人ID
/// </summary>
public string CreateUser { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime? CreateTime { get; set; }
/// <summary>
/// 附件路径
/// </summary>
public string AttachUrl1 { get; set; }
}
}
@@ -1,7 +1,7 @@
namespace Model
{
public partial class View_HJGL_WeldJoint
{
{
/// <summary>
/// 焊前附件路径
/// </summary>
@@ -11,5 +11,14 @@ namespace Model
/// 焊后附件路径
/// </summary>
public string PostWeldAttachUrl { get; set; }
/// <summary>
/// 防腐等级代码
/// </summary>
public string PaintCode { get; set; }
/// <summary>
/// 防腐等级字典ID
/// </summary>
public string PaintId { get; set; }
}
}