Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New
This commit is contained in:
+217
-133
@@ -11845,7 +11845,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(2000)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ApproveIdea", DbType="NVarChar(200)")]
|
||||
public string ApproveIdea
|
||||
{
|
||||
get
|
||||
@@ -97808,6 +97808,10 @@ namespace Model
|
||||
|
||||
private System.Nullable<System.DateTime> _AuditDate2;
|
||||
|
||||
private string _BackingWelderTeamGroupId;
|
||||
|
||||
private string _CoverWelderTeamGroupId;
|
||||
|
||||
private EntitySet<HJGL_Batch_BatchTrustItem> _HJGL_Batch_BatchTrustItem;
|
||||
|
||||
private EntitySet<HJGL_Batch_PointBatchItem> _HJGL_Batch_PointBatchItem;
|
||||
@@ -97950,6 +97954,10 @@ namespace Model
|
||||
partial void OnAuditMan2Changed();
|
||||
partial void OnAuditDate2Changing(System.Nullable<System.DateTime> value);
|
||||
partial void OnAuditDate2Changed();
|
||||
partial void OnBackingWelderTeamGroupIdChanging(string value);
|
||||
partial void OnBackingWelderTeamGroupIdChanged();
|
||||
partial void OnCoverWelderTeamGroupIdChanging(string value);
|
||||
partial void OnCoverWelderTeamGroupIdChanged();
|
||||
#endregion
|
||||
|
||||
public HJGL_WeldJoint()
|
||||
@@ -98979,6 +98987,46 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupId", DbType="NVarChar(50)")]
|
||||
public string BackingWelderTeamGroupId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._BackingWelderTeamGroupId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._BackingWelderTeamGroupId != value))
|
||||
{
|
||||
this.OnBackingWelderTeamGroupIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._BackingWelderTeamGroupId = value;
|
||||
this.SendPropertyChanged("BackingWelderTeamGroupId");
|
||||
this.OnBackingWelderTeamGroupIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupId", DbType="NVarChar(50)")]
|
||||
public string CoverWelderTeamGroupId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._CoverWelderTeamGroupId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._CoverWelderTeamGroupId != value))
|
||||
{
|
||||
this.OnCoverWelderTeamGroupIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._CoverWelderTeamGroupId = value;
|
||||
this.SendPropertyChanged("CoverWelderTeamGroupId");
|
||||
this.OnCoverWelderTeamGroupIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HJGL_Batch_BatchTrustItem_HJGL_WeldJoint", Storage="_HJGL_Batch_BatchTrustItem", ThisKey="WeldJointId", OtherKey="WeldJointId", DeleteRule="NO ACTION")]
|
||||
public EntitySet<HJGL_Batch_BatchTrustItem> HJGL_Batch_BatchTrustItem
|
||||
{
|
||||
@@ -152113,7 +152161,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(3000)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AttentPerson", DbType="NVarChar(500)")]
|
||||
public string AttentPerson
|
||||
{
|
||||
get
|
||||
@@ -183072,7 +183120,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectDescription", DbType="VarChar(255)")]
|
||||
public string ProjectDescription
|
||||
{
|
||||
get
|
||||
@@ -183192,7 +183240,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(MAX)", UpdateCheck=UpdateCheck.Never)]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CalculationRule", DbType="VarChar(255)")]
|
||||
public string CalculationRule
|
||||
{
|
||||
get
|
||||
@@ -183252,7 +183300,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(100)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ConstructionSubcontractor", DbType="VarChar(50)")]
|
||||
public string ConstructionSubcontractor
|
||||
{
|
||||
get
|
||||
@@ -183636,7 +183684,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,3)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkPackageEstimate", DbType="Decimal(18,2)")]
|
||||
public System.Nullable<decimal> WorkPackageEstimate
|
||||
{
|
||||
get
|
||||
@@ -183941,16 +183989,6 @@ namespace Model
|
||||
|
||||
private string _ProjectId;
|
||||
|
||||
private string _ContractId;
|
||||
|
||||
private string _OrderCode;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderInDate;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderOutDate;
|
||||
|
||||
private string _MaterialRequisitionUnit;
|
||||
|
||||
private System.Nullable<int> _State;
|
||||
|
||||
private string _InvoiceCode;
|
||||
@@ -183979,6 +184017,16 @@ namespace Model
|
||||
|
||||
private string _CreateUser;
|
||||
|
||||
private string _ContractId;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderInDate;
|
||||
|
||||
private string _OrderCode;
|
||||
|
||||
private System.Nullable<System.DateTime> _OrderOutDate;
|
||||
|
||||
private string _MaterialRequisitionUnit;
|
||||
|
||||
#region 可扩展性方法定义
|
||||
partial void OnLoaded();
|
||||
partial void OnValidate(System.Data.Linq.ChangeAction action);
|
||||
@@ -183987,16 +184035,6 @@ namespace Model
|
||||
partial void OnInvoiceIdChanged();
|
||||
partial void OnProjectIdChanging(string value);
|
||||
partial void OnProjectIdChanged();
|
||||
partial void OnContractIdChanging(string value);
|
||||
partial void OnContractIdChanged();
|
||||
partial void OnOrderCodeChanging(string value);
|
||||
partial void OnOrderCodeChanged();
|
||||
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnOrderInDateChanged();
|
||||
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnOrderOutDateChanged();
|
||||
partial void OnMaterialRequisitionUnitChanging(string value);
|
||||
partial void OnMaterialRequisitionUnitChanged();
|
||||
partial void OnStateChanging(System.Nullable<int> value);
|
||||
partial void OnStateChanged();
|
||||
partial void OnInvoiceCodeChanging(string value);
|
||||
@@ -184025,6 +184063,16 @@ namespace Model
|
||||
partial void OnCreateDateChanged();
|
||||
partial void OnCreateUserChanging(string value);
|
||||
partial void OnCreateUserChanged();
|
||||
partial void OnContractIdChanging(string value);
|
||||
partial void OnContractIdChanged();
|
||||
partial void OnOrderInDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnOrderInDateChanged();
|
||||
partial void OnOrderCodeChanging(string value);
|
||||
partial void OnOrderCodeChanged();
|
||||
partial void OnOrderOutDateChanging(System.Nullable<System.DateTime> value);
|
||||
partial void OnOrderOutDateChanged();
|
||||
partial void OnMaterialRequisitionUnitChanging(string value);
|
||||
partial void OnMaterialRequisitionUnitChanged();
|
||||
#endregion
|
||||
|
||||
public PHTGL_Invoice()
|
||||
@@ -184072,106 +184120,6 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
|
||||
public string ContractId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ContractId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ContractId != value))
|
||||
{
|
||||
this.OnContractIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ContractId = value;
|
||||
this.SendPropertyChanged("ContractId");
|
||||
this.OnContractIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
|
||||
public string OrderCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderCode != value))
|
||||
{
|
||||
this.OnOrderCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderCode = value;
|
||||
this.SendPropertyChanged("OrderCode");
|
||||
this.OnOrderCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
|
||||
public System.Nullable<System.DateTime> OrderInDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderInDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderInDate != value))
|
||||
{
|
||||
this.OnOrderInDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderInDate = value;
|
||||
this.SendPropertyChanged("OrderInDate");
|
||||
this.OnOrderInDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
|
||||
public System.Nullable<System.DateTime> OrderOutDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderOutDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderOutDate != value))
|
||||
{
|
||||
this.OnOrderOutDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderOutDate = value;
|
||||
this.SendPropertyChanged("OrderOutDate");
|
||||
this.OnOrderOutDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
|
||||
public string MaterialRequisitionUnit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._MaterialRequisitionUnit;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._MaterialRequisitionUnit != value))
|
||||
{
|
||||
this.OnMaterialRequisitionUnitChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._MaterialRequisitionUnit = value;
|
||||
this.SendPropertyChanged("MaterialRequisitionUnit");
|
||||
this.OnMaterialRequisitionUnitChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_State", DbType="Int")]
|
||||
public System.Nullable<int> State
|
||||
{
|
||||
@@ -184452,6 +184400,106 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractId", DbType="NVarChar(50)")]
|
||||
public string ContractId
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._ContractId;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._ContractId != value))
|
||||
{
|
||||
this.OnContractIdChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._ContractId = value;
|
||||
this.SendPropertyChanged("ContractId");
|
||||
this.OnContractIdChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInDate", DbType="Date")]
|
||||
public System.Nullable<System.DateTime> OrderInDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderInDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderInDate != value))
|
||||
{
|
||||
this.OnOrderInDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderInDate = value;
|
||||
this.SendPropertyChanged("OrderInDate");
|
||||
this.OnOrderInDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderCode", DbType="NVarChar(50)")]
|
||||
public string OrderCode
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderCode;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderCode != value))
|
||||
{
|
||||
this.OnOrderCodeChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderCode = value;
|
||||
this.SendPropertyChanged("OrderCode");
|
||||
this.OnOrderCodeChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderOutDate", DbType="Date")]
|
||||
public System.Nullable<System.DateTime> OrderOutDate
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._OrderOutDate;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._OrderOutDate != value))
|
||||
{
|
||||
this.OnOrderOutDateChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._OrderOutDate = value;
|
||||
this.SendPropertyChanged("OrderOutDate");
|
||||
this.OnOrderOutDateChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialRequisitionUnit", DbType="NVarChar(100)")]
|
||||
public string MaterialRequisitionUnit
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._MaterialRequisitionUnit;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._MaterialRequisitionUnit != value))
|
||||
{
|
||||
this.OnMaterialRequisitionUnitChanging(value);
|
||||
this.SendPropertyChanging();
|
||||
this._MaterialRequisitionUnit = value;
|
||||
this.SendPropertyChanged("MaterialRequisitionUnit");
|
||||
this.OnMaterialRequisitionUnitChanged();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public event PropertyChangingEventHandler PropertyChanging;
|
||||
|
||||
public event PropertyChangedEventHandler PropertyChanged;
|
||||
@@ -277057,6 +277105,10 @@ namespace Model
|
||||
|
||||
private string _CoverWelderCode;
|
||||
|
||||
private string _CoverWelderTeamGroupName;
|
||||
|
||||
private string _BackingWelderTeamGroupName;
|
||||
|
||||
private string _HotProessReportNo;
|
||||
|
||||
private string _HotProessResult;
|
||||
@@ -278333,6 +278385,38 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CoverWelderTeamGroupName", DbType="NVarChar(50)")]
|
||||
public string CoverWelderTeamGroupName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._CoverWelderTeamGroupName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._CoverWelderTeamGroupName != value))
|
||||
{
|
||||
this._CoverWelderTeamGroupName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BackingWelderTeamGroupName", DbType="NVarChar(50)")]
|
||||
public string BackingWelderTeamGroupName
|
||||
{
|
||||
get
|
||||
{
|
||||
return this._BackingWelderTeamGroupName;
|
||||
}
|
||||
set
|
||||
{
|
||||
if ((this._BackingWelderTeamGroupName != value))
|
||||
{
|
||||
this._BackingWelderTeamGroupName = value;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HotProessReportNo", DbType="NVarChar(50)")]
|
||||
public string HotProessReportNo
|
||||
{
|
||||
@@ -296646,7 +296730,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(200)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")]
|
||||
public string Name
|
||||
{
|
||||
get
|
||||
@@ -297223,7 +297307,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
|
||||
public string PackageContent
|
||||
{
|
||||
get
|
||||
@@ -297414,7 +297498,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
|
||||
public string PackageContent
|
||||
{
|
||||
get
|
||||
@@ -302701,7 +302785,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
|
||||
public string PackageContent
|
||||
{
|
||||
get
|
||||
@@ -304173,7 +304257,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(200)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PackageContent", DbType="NVarChar(50)")]
|
||||
public string PackageContent
|
||||
{
|
||||
get
|
||||
@@ -313724,7 +313808,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(1500)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractNo", DbType="NVarChar(500)")]
|
||||
public string ContractNo
|
||||
{
|
||||
get
|
||||
@@ -313744,7 +313828,7 @@ namespace Model
|
||||
}
|
||||
}
|
||||
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(1500)")]
|
||||
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitWorks", DbType="NVarChar(500)")]
|
||||
public string UnitWorks
|
||||
{
|
||||
get
|
||||
|
||||
Reference in New Issue
Block a user