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

feat(hjgl): 完善焊接任务与质量管理流程

Browse Source
This commit is contained in:
李鹏飞
2026-08-19 17:13:33 +08:00
parent 08792e0dc8
commit 679e9f6cec
68 changed files with 2481 additions and 1170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/APIItem/HJGL/HJGL_PreWeldingDailyItem.cs
+10
View File
@@ -118,6 +118,16 @@
/// </summary>
public string WeldTypeId { get; set; }
/// <summary>
/// 焊丝ID；兼容旧版小程序，可不传
/// </summary>
public string WeldingWire { get; set; }
/// <summary>
/// 焊条ID；兼容旧版小程序，可不传
/// </summary>
public string WeldingRod { get; set; }
/// <summary>
/// 焊前附件路径
/// </summary>
SGGL/Model/APIItem/HJGL/PreWeldInspectionItem.cs
+10 -90
View File
@@ -181,6 +181,11 @@ namespace Model
/// </summary>
public string GrooveForm { get; set; }
/// <summary>
/// 坡口加工类型
/// </summary>
public string GrooveProcessType { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
@@ -287,6 +292,11 @@ namespace Model
/// </summary>
public string GrooveForm { get; set; }
/// <summary>
/// 坡口加工类型
/// </summary>
public string GrooveProcessType { get; set; }
/// <summary>
/// 坡口角度
/// </summary>
@@ -409,31 +419,6 @@ namespace Model
/// </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>
@@ -444,26 +429,6 @@ namespace Model
/// </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>
@@ -535,51 +500,6 @@ namespace Model
/// </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>
SGGL/Model/APIItem/HJGL/WeldAppearanceCheckItem.cs
+13
View File
@@ -14,11 +14,18 @@ namespace Model
public string Remark { get; set; }
public string AttachUrl { get; set; }
public string CreateUser { get; set; }
public decimal? WeldReinforcement { get; set; }
public decimal? WeldHeight { get; set; }
public decimal? WeldWidth { get; set; }
public string SurfaceDefect { get; set; }
public decimal? PreheatTemperature { get; set; }
public decimal? InterpassTemperature { get; set; }
}
public class WeldAppearanceCheckItem
{
public string AppearanceCheckId { get; set; }
public string CheckCode { get; set; }
public string ProjectId { get; set; }
public string WeldJointId { get; set; }
public string PipelineCode { get; set; }
@@ -31,6 +38,12 @@ namespace Model
public string Remark { get; set; }
public string AttachUrl { get; set; }
public DateTime CreateTime { get; set; }
public decimal? WeldReinforcement { get; set; }
public decimal? WeldHeight { get; set; }
public decimal? WeldWidth { get; set; }
public string SurfaceDefect { get; set; }
public decimal? PreheatTemperature { get; set; }
public decimal? InterpassTemperature { get; set; }
}
public class WeldAppearanceJointItem
SGGL/Model/APIItem/HJGL/WeldTaskItem.cs
+53
View File
@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
namespace Model
{
public class WeldTaskListItem
{
public string ProjectId { get; set; }
public string TaskCode { get; set; }
public string UnitWorkId { get; set; }
public string UnitWorkName { get; set; }
public string UnitId { get; set; }
public string UnitName { get; set; }
public DateTime? TaskDate { get; set; }
public string SerialNumber { get; set; }
public string TeamGroupId { get; set; }
public string TeamGroupName { get; set; }
public int WeldJointCount { get; set; }
}
public class WeldTaskJointItem
{
public string WeldTaskId { get; set; }
public string WeldJointId { get; set; }
public string PipelineId { get; set; }
public string PipelineCode { get; set; }
public string WeldJointCode { get; set; }
public string JointAttribute { get; set; }
public string WeldingMode { get; set; }
/// <summary>
/// 焊接类型
/// </summary>
public string WeldTypeCode { get; set; }
/// <summary>
/// 达因
/// </summary>
public decimal? Size { get; set; }
public string CoverWelderId { get; set; }
public string BackingWelderId { get; set; }
}
public class WeldTaskDetailItem : WeldTaskListItem
{
public List<WeldTaskJointItem> Joints { get; set; }
}
public class WeldTaskGenerateRequest
{
public string ProjectId { get; set; }
public string TaskCode { get; set; }
public string PersonId { get; set; }
}
}
SGGL/Model/APIItem/HJGL/WeldingDailyTempDetailItem.cs
+27
View File
@@ -127,21 +127,41 @@ namespace Model
/// </summary>
public string WeldTypeCode { get; set; }
/// <summary>
/// 焊缝类型ID。
/// </summary>
public string WeldTypeId { get; set; }
/// <summary>
/// 焊接方法编号。
/// </summary>
public string WeldingMethodCode { get; set; }
/// <summary>
/// 焊接方法ID。
/// </summary>
public string WeldingMethodId { get; set; }
/// <summary>
/// 焊丝编号。
/// </summary>
public string WeldingWireCode { get; set; }
/// <summary>
/// 焊丝ID。
/// </summary>
public string WeldingWire { get; set; }
/// <summary>
/// 焊条编号。
/// </summary>
public string WeldingRodCode { get; set; }
/// <summary>
/// 焊条ID。
/// </summary>
public string WeldingRod { get; set; }
/// <summary>
/// 提交人ID。
/// </summary>
@@ -191,6 +211,13 @@ namespace Model
/// 审核备注。
/// </summary>
public string AuditRemark { get; set; }
public string TeamAuditMan { get; set; }
public string TeamAuditManName { get; set; }
public DateTime? TeamAuditDate { get; set; }
public string ProfessionalAuditMan { get; set; }
public string ProfessionalAuditManName { get; set; }
public DateTime? ProfessionalAuditDate { get; set; }
public string AuditStateText { get; set; }
}
/// <summary>
SGGL/Model/APIItem/UserItem.cs
+16
View File
@@ -75,6 +75,22 @@
set;
}
/// <summary>
/// 班组ID
/// </summary>
public string TeamGroupId
{
get;
set;
}
/// <summary>
/// 班组名称
/// </summary>
public string TeamGroupName
{
get;
set;
}
/// <summary>
/// 当前项目ID
/// </summary>
public string LoginProjectId