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
SGGL/Model/CLGL/AntiCorrosionTrustDetailOutput.cs
+1
View File
@@ -17,6 +17,7 @@ namespace Model
public string IntermediatePaint { get; set; }
public string Topcoat { get; set; }
public string ColorCode { get; set; }
public bool IsPostWeld { get; set; }
public string Remark { get; set; }
}
}
SGGL/Model/CLGL/AntiCorrosionTrustOutput.cs
+5 -1
View File
@@ -11,7 +11,11 @@ namespace Model
public string ConstructionPart { get; set; }
public string ConstructionProfessional { get; set; }
public string TrustCode { get; set; }
public string OutputMasterId { get; set; }
public string WeldTaskCode { get; set; }
public string HotProessTrustId { get; set; }
public string TeamGroupId { get; set; }
public string TeamGroupName { get; set; }
// 仅供旧打印模板兼容，数据库不再保留出库单关联。
public string OutputMasterCode { get; set; }
public DateTime? DemandDate { get; set; }
public DateTime? CompleteDate { get; set; }
SGGL/Model/Model.BusinessExtensions.cs
+165
View File
@@ -0,0 +1,165 @@
using System;
using System.Data.Linq.Mapping;
namespace Model
{
/// <summary>
/// 业务扩展字段独立于自动生成模型，避免后续刷新模型时丢失手工映射。
/// </summary>
public partial class HJGL_WeldTask
{
private string _BusinessTeamGroupId;
[Column(Name = "TeamGroupId", Storage = "_BusinessTeamGroupId", DbType = "NVarChar(50)")]
public string TeamGroupId
{
get { return _BusinessTeamGroupId; }
set
{
if (_BusinessTeamGroupId == value) return;
SendPropertyChanging();
_BusinessTeamGroupId = value;
SendPropertyChanged("TeamGroupId");
}
}
}
public partial class Tw_AntiCorrosionTrust
{
private string _BusinessWeldTaskCode;
private string _BusinessHotProessTrustId;
[Column(Name = "WeldTaskCode", Storage = "_BusinessWeldTaskCode", DbType = "NVarChar(200)")]
public string WeldTaskCode
{
get { return _BusinessWeldTaskCode; }
set
{
if (_BusinessWeldTaskCode == value) return;
SendPropertyChanging();
_BusinessWeldTaskCode = value;
SendPropertyChanged("WeldTaskCode");
}
}
[Column(Name = "HotProessTrustId", Storage = "_BusinessHotProessTrustId", DbType = "NVarChar(50)")]
public string HotProessTrustId
{
get { return _BusinessHotProessTrustId; }
set
{
if (_BusinessHotProessTrustId == value) return;
SendPropertyChanging();
_BusinessHotProessTrustId = value;
SendPropertyChanged("HotProessTrustId");
}
}
}
public partial class Tw_AntiCorrosionTrustDetail
{
private bool _BusinessIsPostWeld;
[Column(Name = "IsPostWeld", Storage = "_BusinessIsPostWeld", DbType = "Bit NOT NULL", CanBeNull = false)]
public bool IsPostWeld
{
get { return _BusinessIsPostWeld; }
set
{
if (_BusinessIsPostWeld == value) return;
SendPropertyChanging();
_BusinessIsPostWeld = value;
SendPropertyChanged("IsPostWeld");
}
}
}
public partial class HJGL_PreWeldCuttingCheck
{
private string _BusinessGrooveProcessType;
[Column(Name = "GrooveProcessType", Storage = "_BusinessGrooveProcessType", DbType = "NVarChar(100)")]
public string GrooveProcessType
{
get { return _BusinessGrooveProcessType; }
set
{
if (_BusinessGrooveProcessType == value) return;
SendPropertyChanging();
_BusinessGrooveProcessType = value;
SendPropertyChanged("GrooveProcessType");
}
}
}
public partial class HJGL_WeldAppearanceCheck
{
private decimal? _BusinessWeldReinforcement;
private decimal? _BusinessWeldHeight;
private decimal? _BusinessWeldWidth;
private string _BusinessSurfaceDefect;
private decimal? _BusinessPreheatTemperature;
private decimal? _BusinessInterpassTemperature;
private string _BusinessCheckCode;
[Column(Name = "WeldReinforcement", Storage = "_BusinessWeldReinforcement", DbType = "Decimal(18,2)")]
public decimal? WeldReinforcement { get { return _BusinessWeldReinforcement; } set { SetBusinessValue(ref _BusinessWeldReinforcement, value, "WeldReinforcement"); } }
[Column(Name = "WeldHeight", Storage = "_BusinessWeldHeight", DbType = "Decimal(18,2)")]
public decimal? WeldHeight { get { return _BusinessWeldHeight; } set { SetBusinessValue(ref _BusinessWeldHeight, value, "WeldHeight"); } }
[Column(Name = "WeldWidth", Storage = "_BusinessWeldWidth", DbType = "Decimal(18,2)")]
public decimal? WeldWidth { get { return _BusinessWeldWidth; } set { SetBusinessValue(ref _BusinessWeldWidth, value, "WeldWidth"); } }
[Column(Name = "SurfaceDefect", Storage = "_BusinessSurfaceDefect", DbType = "NVarChar(500)")]
public string SurfaceDefect { get { return _BusinessSurfaceDefect; } set { SetBusinessValue(ref _BusinessSurfaceDefect, value, "SurfaceDefect"); } }
[Column(Name = "PreheatTemperature", Storage = "_BusinessPreheatTemperature", DbType = "Decimal(18,2)")]
public decimal? PreheatTemperature { get { return _BusinessPreheatTemperature; } set { SetBusinessValue(ref _BusinessPreheatTemperature, value, "PreheatTemperature"); } }
[Column(Name = "InterpassTemperature", Storage = "_BusinessInterpassTemperature", DbType = "Decimal(18,2)")]
public decimal? InterpassTemperature { get { return _BusinessInterpassTemperature; } set { SetBusinessValue(ref _BusinessInterpassTemperature, value, "InterpassTemperature"); } }
[Column(Name = "CheckCode", Storage = "_BusinessCheckCode", DbType = "NVarChar(200)")]
public string CheckCode { get { return _BusinessCheckCode; } set { SetBusinessValue(ref _BusinessCheckCode, value, "CheckCode"); } }
private void SetBusinessValue<T>(ref T field, T value, string propertyName)
{
if (Equals(field, value)) return;
SendPropertyChanging();
field = value;
SendPropertyChanged(propertyName);
}
}
public partial class HJGL_WeldingDailyTempDetail
{
private string _BusinessTeamAuditMan;
private DateTime? _BusinessTeamAuditDate;
private string _BusinessProfessionalAuditMan;
private DateTime? _BusinessProfessionalAuditDate;
private string _BusinessWeldingMethodId;
private string _BusinessWeldTypeId;
private string _BusinessWeldingWire;
private string _BusinessWeldingRod;
[Column(Name = "TeamAuditMan", Storage = "_BusinessTeamAuditMan", DbType = "NVarChar(50)")]
public string TeamAuditMan { get { return _BusinessTeamAuditMan; } set { SetAuditValue(ref _BusinessTeamAuditMan, value, "TeamAuditMan"); } }
[Column(Name = "TeamAuditDate", Storage = "_BusinessTeamAuditDate", DbType = "DateTime")]
public DateTime? TeamAuditDate { get { return _BusinessTeamAuditDate; } set { SetAuditValue(ref _BusinessTeamAuditDate, value, "TeamAuditDate"); } }
[Column(Name = "ProfessionalAuditMan", Storage = "_BusinessProfessionalAuditMan", DbType = "NVarChar(50)")]
public string ProfessionalAuditMan { get { return _BusinessProfessionalAuditMan; } set { SetAuditValue(ref _BusinessProfessionalAuditMan, value, "ProfessionalAuditMan"); } }
[Column(Name = "ProfessionalAuditDate", Storage = "_BusinessProfessionalAuditDate", DbType = "DateTime")]
public DateTime? ProfessionalAuditDate { get { return _BusinessProfessionalAuditDate; } set { SetAuditValue(ref _BusinessProfessionalAuditDate, value, "ProfessionalAuditDate"); } }
[Column(Name = "WeldingMethodId", Storage = "_BusinessWeldingMethodId", DbType = "NVarChar(50)")]
public string WeldingMethodId { get { return _BusinessWeldingMethodId; } set { SetAuditValue(ref _BusinessWeldingMethodId, value, "WeldingMethodId"); } }
[Column(Name = "WeldTypeId", Storage = "_BusinessWeldTypeId", DbType = "NVarChar(50)")]
public string WeldTypeId { get { return _BusinessWeldTypeId; } set { SetAuditValue(ref _BusinessWeldTypeId, value, "WeldTypeId"); } }
[Column(Name = "WeldingWire", Storage = "_BusinessWeldingWire", DbType = "NVarChar(50)")]
public string WeldingWire { get { return _BusinessWeldingWire; } set { SetAuditValue(ref _BusinessWeldingWire, value, "WeldingWire"); } }
[Column(Name = "WeldingRod", Storage = "_BusinessWeldingRod", DbType = "NVarChar(50)")]
public string WeldingRod { get { return _BusinessWeldingRod; } set { SetAuditValue(ref _BusinessWeldingRod, value, "WeldingRod"); } }
private void SetAuditValue<T>(ref T field, T value, string propertyName)
{
if (Equals(field, value)) return;
SendPropertyChanging();
field = value;
SendPropertyChanged(propertyName);
}
}
}
SGGL/Model/Model.cs
-260
View File
@@ -21516,8 +21516,6 @@ namespace Model
private EntitySet<HJGL_WeldJoint> _HJGL_WeldJoint;
private EntitySet<HJGL_PreWeldFitupCheck> _HJGL_PreWeldFitupCheck;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -21535,7 +21533,6 @@ namespace Model
public Base_GrooveType()
{
this._HJGL_WeldJoint = new EntitySet<HJGL_WeldJoint>(new Action<HJGL_WeldJoint>(this.attach_HJGL_WeldJoint), new Action<HJGL_WeldJoint>(this.detach_HJGL_WeldJoint));
this._HJGL_PreWeldFitupCheck = new EntitySet<HJGL_PreWeldFitupCheck>(new Action<HJGL_PreWeldFitupCheck>(this.attach_HJGL_PreWeldFitupCheck), new Action<HJGL_PreWeldFitupCheck>(this.detach_HJGL_PreWeldFitupCheck));
OnCreated();
}
@@ -21632,19 +21629,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PreWeldFitupCheck_GrooveType", Storage="_HJGL_PreWeldFitupCheck", ThisKey="GrooveTypeId", OtherKey="GrooveTypeId", DeleteRule="NO ACTION")]
public EntitySet<HJGL_PreWeldFitupCheck> HJGL_PreWeldFitupCheck
{
get
{
return this._HJGL_PreWeldFitupCheck;
}
set
{
this._HJGL_PreWeldFitupCheck.Assign(value);
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -21677,17 +21661,6 @@ namespace Model
entity.Base_GrooveType = null;
}
private void attach_HJGL_PreWeldFitupCheck(HJGL_PreWeldFitupCheck entity)
{
this.SendPropertyChanging();
entity.Base_GrooveType = this;
}
private void detach_HJGL_PreWeldFitupCheck(HJGL_PreWeldFitupCheck entity)
{
this.SendPropertyChanging();
entity.Base_GrooveType = null;
}
}
[global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Base_HSSEStandardListType")]
@@ -107989,12 +107962,6 @@ namespace Model
private string _WeldJointId;
private string _GrooveTypeId;
private string _GrooveProcessType;
private System.Nullable<decimal> _GrooveAngle;
private System.Nullable<decimal> _FitupGap;
private System.Nullable<decimal> _Misalignment;
@@ -108009,22 +107976,12 @@ namespace Model
private string _Remark;
private System.Nullable<decimal> _WeldReinforcement;
private System.Nullable<decimal> _WeldHeight;
private System.Nullable<decimal> _WeldWidth;
private string _SurfaceDefect;
private string _CheckResult;
private string _UnqualifiedReason;
private string _RectifyRequirement;
private EntityRef<Base_GrooveType> _Base_GrooveType;
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -108035,12 +107992,6 @@ namespace Model
partial void OnProjectIdChanged();
partial void OnWeldJointIdChanging(string value);
partial void OnWeldJointIdChanged();
partial void OnGrooveTypeIdChanging(string value);
partial void OnGrooveTypeIdChanged();
partial void OnGrooveProcessTypeChanging(string value);
partial void OnGrooveProcessTypeChanged();
partial void OnGrooveAngleChanging(System.Nullable<decimal> value);
partial void OnGrooveAngleChanged();
partial void OnFitupGapChanging(System.Nullable<decimal> value);
partial void OnFitupGapChanged();
partial void OnMisalignmentChanging(System.Nullable<decimal> value);
@@ -108055,14 +108006,6 @@ namespace Model
partial void OnCreateTimeChanged();
partial void OnRemarkChanging(string value);
partial void OnRemarkChanged();
partial void OnWeldReinforcementChanging(System.Nullable<decimal> value);
partial void OnWeldReinforcementChanged();
partial void OnWeldHeightChanging(System.Nullable<decimal> value);
partial void OnWeldHeightChanged();
partial void OnWeldWidthChanging(System.Nullable<decimal> value);
partial void OnWeldWidthChanged();
partial void OnSurfaceDefectChanging(string value);
partial void OnSurfaceDefectChanged();
partial void OnCheckResultChanging(string value);
partial void OnCheckResultChanged();
partial void OnUnqualifiedReasonChanging(string value);
@@ -108073,7 +108016,6 @@ namespace Model
public HJGL_PreWeldFitupCheck()
{
this._Base_GrooveType = default(EntityRef<Base_GrooveType>);
OnCreated();
}
@@ -108137,70 +108079,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveTypeId", DbType="NVarChar(50)")]
public string GrooveTypeId
{
get
{
return this._GrooveTypeId;
}
set
{
if ((this._GrooveTypeId != value))
{
if (this._Base_GrooveType.HasLoadedOrAssignedValue)
{
throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException();
}
this.OnGrooveTypeIdChanging(value);
this.SendPropertyChanging();
this._GrooveTypeId = value;
this.SendPropertyChanged("GrooveTypeId");
this.OnGrooveTypeIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveProcessType", DbType="NVarChar(100)")]
public string GrooveProcessType
{
get
{
return this._GrooveProcessType;
}
set
{
if ((this._GrooveProcessType != value))
{
this.OnGrooveProcessTypeChanging(value);
this.SendPropertyChanging();
this._GrooveProcessType = value;
this.SendPropertyChanged("GrooveProcessType");
this.OnGrooveProcessTypeChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GrooveAngle", DbType="Decimal(18,2)")]
public System.Nullable<decimal> GrooveAngle
{
get
{
return this._GrooveAngle;
}
set
{
if ((this._GrooveAngle != value))
{
this.OnGrooveAngleChanging(value);
this.SendPropertyChanging();
this._GrooveAngle = value;
this.SendPropertyChanged("GrooveAngle");
this.OnGrooveAngleChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FitupGap", DbType="Decimal(18,2)")]
public System.Nullable<decimal> FitupGap
{
@@ -108341,86 +108219,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldReinforcement", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WeldReinforcement
{
get
{
return this._WeldReinforcement;
}
set
{
if ((this._WeldReinforcement != value))
{
this.OnWeldReinforcementChanging(value);
this.SendPropertyChanging();
this._WeldReinforcement = value;
this.SendPropertyChanged("WeldReinforcement");
this.OnWeldReinforcementChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldHeight", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WeldHeight
{
get
{
return this._WeldHeight;
}
set
{
if ((this._WeldHeight != value))
{
this.OnWeldHeightChanging(value);
this.SendPropertyChanging();
this._WeldHeight = value;
this.SendPropertyChanged("WeldHeight");
this.OnWeldHeightChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldWidth", DbType="Decimal(18,2)")]
public System.Nullable<decimal> WeldWidth
{
get
{
return this._WeldWidth;
}
set
{
if ((this._WeldWidth != value))
{
this.OnWeldWidthChanging(value);
this.SendPropertyChanging();
this._WeldWidth = value;
this.SendPropertyChanged("WeldWidth");
this.OnWeldWidthChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SurfaceDefect", DbType="NVarChar(500)")]
public string SurfaceDefect
{
get
{
return this._SurfaceDefect;
}
set
{
if ((this._SurfaceDefect != value))
{
this.OnSurfaceDefectChanging(value);
this.SendPropertyChanging();
this._SurfaceDefect = value;
this.SendPropertyChanged("SurfaceDefect");
this.OnSurfaceDefectChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckResult", DbType="NVarChar(20)")]
public string CheckResult
{
@@ -108481,40 +108279,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PreWeldFitupCheck_GrooveType", Storage="_Base_GrooveType", ThisKey="GrooveTypeId", OtherKey="GrooveTypeId", IsForeignKey=true)]
public Base_GrooveType Base_GrooveType
{
get
{
return this._Base_GrooveType.Entity;
}
set
{
Base_GrooveType previousValue = this._Base_GrooveType.Entity;
if (((previousValue != value)
|| (this._Base_GrooveType.HasLoadedOrAssignedValue == false)))
{
this.SendPropertyChanging();
if ((previousValue != null))
{
this._Base_GrooveType.Entity = null;
previousValue.HJGL_PreWeldFitupCheck.Remove(this);
}
this._Base_GrooveType.Entity = value;
if ((value != null))
{
value.HJGL_PreWeldFitupCheck.Add(this);
this._GrooveTypeId = value.GrooveTypeId;
}
else
{
this._GrooveTypeId = default(string);
}
this.SendPropertyChanged("Base_GrooveType");
}
}
}
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -279112,8 +278876,6 @@ namespace Model
private string _TrustCode;
private string _OutputMasterId;
private System.Nullable<System.DateTime> _DemandDate;
private System.Nullable<System.DateTime> _CompleteDate;
@@ -279140,8 +278902,6 @@ namespace Model
partial void OnConstructionProfessionalChanged();
partial void OnTrustCodeChanging(string value);
partial void OnTrustCodeChanged();
partial void OnOutputMasterIdChanging(string value);
partial void OnOutputMasterIdChanged();
partial void OnDemandDateChanging(System.Nullable<System.DateTime> value);
partial void OnDemandDateChanged();
partial void OnCompleteDateChanging(System.Nullable<System.DateTime> value);
@@ -279279,26 +279039,6 @@ namespace Model
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutputMasterId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
public string OutputMasterId
{
get
{
return this._OutputMasterId;
}
set
{
if ((this._OutputMasterId != value))
{
this.OnOutputMasterIdChanging(value);
this.SendPropertyChanging();
this._OutputMasterId = value;
this.SendPropertyChanged("OutputMasterId");
this.OnOutputMasterIdChanged();
}
}
}
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DemandDate", DbType="DateTime")]
public System.Nullable<System.DateTime> DemandDate
{
SGGL/Model/Model.csproj
+3 -1
View File
@@ -106,6 +106,7 @@
<Compile Include="APIItem\HJGL\TestPackageItem.cs" />
<Compile Include="APIItem\HJGL\WelderPerformanceItem.cs" />
<Compile Include="APIItem\HJGL\WeldingDailyTempDetailItem.cs" />
<Compile Include="APIItem\HJGL\WeldTaskItem.cs" />
<Compile Include="APIItem\HSSEItem.cs" />
<Compile Include="APIItem\HSSE\ChartAnalysisItem.cs" />
<Compile Include="APIItem\HSSE\CheckSpecialDetailItem.cs" />
@@ -282,6 +283,7 @@
<Compile Include="HSSE\WorkPostStatisticItem.cs" />
<Compile Include="HSSE\HSSE_HazardTemplate.cs" />
<Compile Include="Model.cs" />
<Compile Include="Model.BusinessExtensions.cs" />
<Compile Include="ModelProc.cs" />
<Compile Include="Num.cs" />
<Compile Include="PHTGL\ApproveManModel.cs" />
@@ -340,4 +342,4 @@
<Target Name="AfterBuild">
</Target>
-->
</Project>
</Project>