diff --git a/DataBase/版本日志/SGGLDB_V2025-03-10-001-gaofei.sql b/DataBase/版本日志/SGGLDB_V2025-03-10-001-gaofei.sql new file mode 100644 index 0000000..e5fe734 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2025-03-10-001-gaofei.sql @@ -0,0 +1,19 @@ + +ALTER VIEW [dbo].[View_QuantityManagement_Base] +AS +/****************/ + +select BaseId,C.ProjectId,C.DrawingId,case when a.DrawingNo is not null then a.WorkSection else b.WorkSection end as WorkSection,case when a.DrawingNo is not null then a.DrawingNo else b.ChangeNo end as DrawingNo, + case when a.DrawingName is not null then a.DrawingName else b.ChangeName end as DrawingName,C.State, + case when a.DrawingNo is not null then ca.ProfessionalName else cb.ProfessionalName end as Major, + Part,ProjectContent,Unit,Amount,t.TeamGroupName as WorkTeam + from QuantityManagement_Base C + left join QuantityManagement_Drawing a on a.DrawingId=C.DrawingId + left join Base_CNProfessional ca on ca.CNProfessionalId=a.Major + left join QuantityManagement_Change b on b.ChangeId=C.DrawingId + left join Base_CNProfessional cb on cb.CNProfessionalId=b.Major + left join ProjectData_TeamGroup t on t.TeamGroupId=C.WorkTeam + +GO + + diff --git a/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs b/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs index 7acc392..3ebe106 100644 --- a/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs +++ b/SGGL/BLL/API/CQMS/APIQuantityManagementService.cs @@ -203,6 +203,27 @@ namespace BLL return respone; } + public static Model.ResponeData getWorkSectionAndDrawingName(string drawingId) + { + Model.ResponeData respone = new ResponeData(); + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var q = (from x in db.View_QuantityManagement_Base + where x.DrawingId == drawingId && x.State == BLL.Const.Base_Complete + orderby x.Part + select x).FirstOrDefault(); + BaseInfoItem res = new BaseInfoItem(); + if (q != null) + { + res.BaseInfoId = q.WorkSection; + res.BaseInfoName = q.DrawingName; + } + + respone.data = res; + } + return respone; + } + public static Model.ResponeData getProjectContentList(string drawingId, string part) { Model.ResponeData respone = new ResponeData(); diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index da4f40b..b76ed27 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -1415,6 +1415,12 @@ namespace Model partial void InsertInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance); partial void UpdateInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance); partial void DeleteInformationProject_WorkSummaryReport(InformationProject_WorkSummaryReport instance); + partial void InsertInspect_Inspection(Inspect_Inspection instance); + partial void UpdateInspect_Inspection(Inspect_Inspection instance); + partial void DeleteInspect_Inspection(Inspect_Inspection instance); + partial void InsertInspect_InspectionItem(Inspect_InspectionItem instance); + partial void UpdateInspect_InspectionItem(Inspect_InspectionItem instance); + partial void DeleteInspect_InspectionItem(Inspect_InspectionItem instance); partial void InsertInterFaceLog(InterFaceLog instance); partial void UpdateInterFaceLog(InterFaceLog instance); partial void DeleteInterFaceLog(InterFaceLog instance); @@ -6437,6 +6443,22 @@ namespace Model } } + public System.Data.Linq.Table Inspect_Inspection + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Inspect_InspectionItem + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table InterFaceLog { get @@ -28425,6 +28447,10 @@ namespace Model private EntitySet _InformationProject_WorkSummaryReport; + private EntitySet _Inspect_Inspection; + + private EntitySet _Inspect_InspectionItem; + private EntitySet _Law_LawRegulationIdentify; private EntitySet _License_BreakGround; @@ -28946,6 +28972,8 @@ namespace Model this._InformationProject_ReceiveFileManager = new EntitySet(new Action(this.attach_InformationProject_ReceiveFileManager), new Action(this.detach_InformationProject_ReceiveFileManager)); this._InformationProject_SafetyQuarterlyReport = new EntitySet(new Action(this.attach_InformationProject_SafetyQuarterlyReport), new Action(this.detach_InformationProject_SafetyQuarterlyReport)); this._InformationProject_WorkSummaryReport = new EntitySet(new Action(this.attach_InformationProject_WorkSummaryReport), new Action(this.detach_InformationProject_WorkSummaryReport)); + this._Inspect_Inspection = new EntitySet(new Action(this.attach_Inspect_Inspection), new Action(this.detach_Inspect_Inspection)); + this._Inspect_InspectionItem = new EntitySet(new Action(this.attach_Inspect_InspectionItem), new Action(this.detach_Inspect_InspectionItem)); this._Law_LawRegulationIdentify = new EntitySet(new Action(this.attach_Law_LawRegulationIdentify), new Action(this.detach_Law_LawRegulationIdentify)); this._License_BreakGround = new EntitySet(new Action(this.attach_License_BreakGround), new Action(this.detach_License_BreakGround)); this._License_EquipmentSafetyList = new EntitySet(new Action(this.attach_License_EquipmentSafetyList), new Action(this.detach_License_EquipmentSafetyList)); @@ -32046,6 +32074,32 @@ namespace Model } } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_Inspection_Base_Project", Storage="_Inspect_Inspection", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Inspect_Inspection + { + get + { + return this._Inspect_Inspection; + } + set + { + this._Inspect_Inspection.Assign(value); + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Base_Project", Storage="_Inspect_InspectionItem", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] + public EntitySet Inspect_InspectionItem + { + get + { + return this._Inspect_InspectionItem; + } + set + { + this._Inspect_InspectionItem.Assign(value); + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Law_LawRegulationIdentify_Base_Project", Storage="_Law_LawRegulationIdentify", ThisKey="ProjectId", OtherKey="ProjectId", DeleteRule="NO ACTION")] public EntitySet Law_LawRegulationIdentify { @@ -35814,6 +35868,30 @@ namespace Model entity.Base_Project = null; } + private void attach_Inspect_Inspection(Inspect_Inspection entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Inspect_Inspection(Inspect_Inspection entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + + private void attach_Inspect_InspectionItem(Inspect_InspectionItem entity) + { + this.SendPropertyChanging(); + entity.Base_Project = this; + } + + private void detach_Inspect_InspectionItem(Inspect_InspectionItem entity) + { + this.SendPropertyChanging(); + entity.Base_Project = null; + } + private void attach_Law_LawRegulationIdentify(Law_LawRegulationIdentify entity) { this.SendPropertyChanging(); @@ -191355,6 +191433,10 @@ namespace Model private string _ControlId; + private string _RectifyId; + + private string _RectifyName; + private EntityRef _Base_Unit; private EntityRef _HSSE_Hazard_HazardRegisterTypes; @@ -191451,6 +191533,10 @@ namespace Model partial void OnRisk_LevelChanged(); partial void OnControlIdChanging(string value); partial void OnControlIdChanged(); + partial void OnRectifyIdChanging(string value); + partial void OnRectifyIdChanged(); + partial void OnRectifyNameChanging(string value); + partial void OnRectifyNameChanged(); #endregion public HSSE_Hazard_HazardRegister() @@ -192348,6 +192434,46 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyId", DbType="NVarChar(50)")] + public string RectifyId + { + get + { + return this._RectifyId; + } + set + { + if ((this._RectifyId != value)) + { + this.OnRectifyIdChanging(value); + this.SendPropertyChanging(); + this._RectifyId = value; + this.SendPropertyChanged("RectifyId"); + this.OnRectifyIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyName", DbType="VarChar(255)")] + public string RectifyName + { + get + { + return this._RectifyName; + } + set + { + if ((this._RectifyName != value)) + { + this.OnRectifyNameChanging(value); + this.SendPropertyChanging(); + this._RectifyName = value; + this.SendPropertyChanged("RectifyName"); + this.OnRectifyNameChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HSSE_Hazard_HazardRegister_Base_Unit", Storage="_Base_Unit", ThisKey="ResponsibleUnit", OtherKey="UnitId", IsForeignKey=true)] public Base_Unit Base_Unit { @@ -228653,6 +228779,881 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspect_Inspection")] + public partial class Inspect_Inspection : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InspectionId; + + private string _InspectionCode; + + private string _ProjectId; + + private string _PersonResponsible; + + private System.Nullable _InspectTime; + + private string _Description; + + private string _States; + + private string _InspectMan; + + private string _InspectType; + + private string _InspectItemSetId; + + private string _ProjectStates; + + private string _CreateMan; + + private System.Nullable _CreateTime; + + private EntityRef _Base_Project; + + private EntitySet _Inspect_InspectionItem; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInspectionIdChanging(string value); + partial void OnInspectionIdChanged(); + partial void OnInspectionCodeChanging(string value); + partial void OnInspectionCodeChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnPersonResponsibleChanging(string value); + partial void OnPersonResponsibleChanged(); + partial void OnInspectTimeChanging(System.Nullable value); + partial void OnInspectTimeChanged(); + partial void OnDescriptionChanging(string value); + partial void OnDescriptionChanged(); + partial void OnStatesChanging(string value); + partial void OnStatesChanged(); + partial void OnInspectManChanging(string value); + partial void OnInspectManChanged(); + partial void OnInspectTypeChanging(string value); + partial void OnInspectTypeChanged(); + partial void OnInspectItemSetIdChanging(string value); + partial void OnInspectItemSetIdChanged(); + partial void OnProjectStatesChanging(string value); + partial void OnProjectStatesChanged(); + partial void OnCreateManChanging(string value); + partial void OnCreateManChanged(); + partial void OnCreateTimeChanging(System.Nullable value); + partial void OnCreateTimeChanged(); + #endregion + + public Inspect_Inspection() + { + this._Base_Project = default(EntityRef); + this._Inspect_InspectionItem = new EntitySet(new Action(this.attach_Inspect_InspectionItem), new Action(this.detach_Inspect_InspectionItem)); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InspectionId + { + get + { + return this._InspectionId; + } + set + { + if ((this._InspectionId != value)) + { + this.OnInspectionIdChanging(value); + this.SendPropertyChanging(); + this._InspectionId = value; + this.SendPropertyChanged("InspectionId"); + this.OnInspectionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string InspectionCode + { + get + { + return this._InspectionCode; + } + set + { + if ((this._InspectionCode != value)) + { + this.OnInspectionCodeChanging(value); + this.SendPropertyChanging(); + this._InspectionCode = value; + this.SendPropertyChanged("InspectionCode"); + this.OnInspectionCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonResponsible", DbType="NVarChar(50)")] + public string PersonResponsible + { + get + { + return this._PersonResponsible; + } + set + { + if ((this._PersonResponsible != value)) + { + this.OnPersonResponsibleChanging(value); + this.SendPropertyChanging(); + this._PersonResponsible = value; + this.SendPropertyChanged("PersonResponsible"); + this.OnPersonResponsibleChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectTime", DbType="DateTime")] + public System.Nullable InspectTime + { + get + { + return this._InspectTime; + } + set + { + if ((this._InspectTime != value)) + { + this.OnInspectTimeChanging(value); + this.SendPropertyChanging(); + this._InspectTime = value; + this.SendPropertyChanged("InspectTime"); + this.OnInspectTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Description", DbType="NVarChar(2000)")] + public string Description + { + get + { + return this._Description; + } + set + { + if ((this._Description != value)) + { + this.OnDescriptionChanging(value); + this.SendPropertyChanging(); + this._Description = value; + this.SendPropertyChanged("Description"); + this.OnDescriptionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectMan", DbType="NVarChar(50)")] + public string InspectMan + { + get + { + return this._InspectMan; + } + set + { + if ((this._InspectMan != value)) + { + this.OnInspectManChanging(value); + this.SendPropertyChanging(); + this._InspectMan = value; + this.SendPropertyChanged("InspectMan"); + this.OnInspectManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectType", DbType="Char(1)")] + public string InspectType + { + get + { + return this._InspectType; + } + set + { + if ((this._InspectType != value)) + { + this.OnInspectTypeChanging(value); + this.SendPropertyChanging(); + this._InspectType = value; + this.SendPropertyChanged("InspectType"); + this.OnInspectTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectItemSetId", DbType="NVarChar(50)")] + public string InspectItemSetId + { + get + { + return this._InspectItemSetId; + } + set + { + if ((this._InspectItemSetId != value)) + { + this.OnInspectItemSetIdChanging(value); + this.SendPropertyChanging(); + this._InspectItemSetId = value; + this.SendPropertyChanged("InspectItemSetId"); + this.OnInspectItemSetIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectStates", DbType="Char(1)")] + public string ProjectStates + { + get + { + return this._ProjectStates; + } + set + { + if ((this._ProjectStates != value)) + { + this.OnProjectStatesChanging(value); + this.SendPropertyChanging(); + this._ProjectStates = value; + this.SendPropertyChanged("ProjectStates"); + this.OnProjectStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateMan", DbType="NVarChar(50)")] + public string CreateMan + { + get + { + return this._CreateMan; + } + set + { + if ((this._CreateMan != value)) + { + this.OnCreateManChanging(value); + this.SendPropertyChanging(); + this._CreateMan = value; + this.SendPropertyChanged("CreateMan"); + this.OnCreateManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CreateTime", DbType="DateTime")] + public System.Nullable CreateTime + { + get + { + return this._CreateTime; + } + set + { + if ((this._CreateTime != value)) + { + this.OnCreateTimeChanging(value); + this.SendPropertyChanging(); + this._CreateTime = value; + this.SendPropertyChanged("CreateTime"); + this.OnCreateTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_Inspection_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Inspect_Inspection.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Inspect_Inspection.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Inspect_Inspection", Storage="_Inspect_InspectionItem", ThisKey="InspectionId", OtherKey="InspectionId", DeleteRule="NO ACTION")] + public EntitySet Inspect_InspectionItem + { + get + { + return this._Inspect_InspectionItem; + } + set + { + this._Inspect_InspectionItem.Assign(value); + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + + private void attach_Inspect_InspectionItem(Inspect_InspectionItem entity) + { + this.SendPropertyChanging(); + entity.Inspect_Inspection = this; + } + + private void detach_Inspect_InspectionItem(Inspect_InspectionItem entity) + { + this.SendPropertyChanging(); + entity.Inspect_Inspection = null; + } + } + + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Inspect_InspectionItem")] + public partial class Inspect_InspectionItem : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _InspectionItemId; + + private string _InspectionId; + + private string _InspectionItemCode; + + private string _ProjectId; + + private string _InspectionDescribe; + + private string _PhotoUrl; + + private string _VideoUrl; + + private string _EvaluateResults; + + private System.Nullable _TimeLimited; + + private string _RectificationDescription; + + private string _RectificationResults; + + private string _States; + + private string _CompileMan; + + private System.Nullable _CompileTime; + + private EntityRef _Base_Project; + + private EntityRef _Inspect_Inspection; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnInspectionItemIdChanging(string value); + partial void OnInspectionItemIdChanged(); + partial void OnInspectionIdChanging(string value); + partial void OnInspectionIdChanged(); + partial void OnInspectionItemCodeChanging(string value); + partial void OnInspectionItemCodeChanged(); + partial void OnProjectIdChanging(string value); + partial void OnProjectIdChanged(); + partial void OnInspectionDescribeChanging(string value); + partial void OnInspectionDescribeChanged(); + partial void OnPhotoUrlChanging(string value); + partial void OnPhotoUrlChanged(); + partial void OnVideoUrlChanging(string value); + partial void OnVideoUrlChanged(); + partial void OnEvaluateResultsChanging(string value); + partial void OnEvaluateResultsChanged(); + partial void OnTimeLimitedChanging(System.Nullable value); + partial void OnTimeLimitedChanged(); + partial void OnRectificationDescriptionChanging(string value); + partial void OnRectificationDescriptionChanged(); + partial void OnRectificationResultsChanging(string value); + partial void OnRectificationResultsChanged(); + partial void OnStatesChanging(string value); + partial void OnStatesChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); + partial void OnCompileTimeChanging(System.Nullable value); + partial void OnCompileTimeChanged(); + #endregion + + public Inspect_InspectionItem() + { + this._Base_Project = default(EntityRef); + this._Inspect_Inspection = default(EntityRef); + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionItemId", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string InspectionItemId + { + get + { + return this._InspectionItemId; + } + set + { + if ((this._InspectionItemId != value)) + { + this.OnInspectionItemIdChanging(value); + this.SendPropertyChanging(); + this._InspectionItemId = value; + this.SendPropertyChanged("InspectionItemId"); + this.OnInspectionItemIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + public string InspectionId + { + get + { + return this._InspectionId; + } + set + { + if ((this._InspectionId != value)) + { + if (this._Inspect_Inspection.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnInspectionIdChanging(value); + this.SendPropertyChanging(); + this._InspectionId = value; + this.SendPropertyChanged("InspectionId"); + this.OnInspectionIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionItemCode", DbType="NVarChar(50)")] + public string InspectionItemCode + { + get + { + return this._InspectionItemCode; + } + set + { + if ((this._InspectionItemCode != value)) + { + this.OnInspectionItemCodeChanging(value); + this.SendPropertyChanging(); + this._InspectionItemCode = value; + this.SendPropertyChanged("InspectionItemCode"); + this.OnInspectionItemCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] + public string ProjectId + { + get + { + return this._ProjectId; + } + set + { + if ((this._ProjectId != value)) + { + if (this._Base_Project.HasLoadedOrAssignedValue) + { + throw new System.Data.Linq.ForeignKeyReferenceAlreadyHasValueException(); + } + this.OnProjectIdChanging(value); + this.SendPropertyChanging(); + this._ProjectId = value; + this.SendPropertyChanged("ProjectId"); + this.OnProjectIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionDescribe", DbType="NVarChar(1000)")] + public string InspectionDescribe + { + get + { + return this._InspectionDescribe; + } + set + { + if ((this._InspectionDescribe != value)) + { + this.OnInspectionDescribeChanging(value); + this.SendPropertyChanging(); + this._InspectionDescribe = value; + this.SendPropertyChanged("InspectionDescribe"); + this.OnInspectionDescribeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PhotoUrl", DbType="NVarChar(1000)")] + public string PhotoUrl + { + get + { + return this._PhotoUrl; + } + set + { + if ((this._PhotoUrl != value)) + { + this.OnPhotoUrlChanging(value); + this.SendPropertyChanging(); + this._PhotoUrl = value; + this.SendPropertyChanged("PhotoUrl"); + this.OnPhotoUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_VideoUrl", DbType="NVarChar(1000)")] + public string VideoUrl + { + get + { + return this._VideoUrl; + } + set + { + if ((this._VideoUrl != value)) + { + this.OnVideoUrlChanging(value); + this.SendPropertyChanging(); + this._VideoUrl = value; + this.SendPropertyChanged("VideoUrl"); + this.OnVideoUrlChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EvaluateResults", DbType="NVarChar(20)")] + public string EvaluateResults + { + get + { + return this._EvaluateResults; + } + set + { + if ((this._EvaluateResults != value)) + { + this.OnEvaluateResultsChanging(value); + this.SendPropertyChanging(); + this._EvaluateResults = value; + this.SendPropertyChanged("EvaluateResults"); + this.OnEvaluateResultsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TimeLimited", DbType="DateTime")] + public System.Nullable TimeLimited + { + get + { + return this._TimeLimited; + } + set + { + if ((this._TimeLimited != value)) + { + this.OnTimeLimitedChanging(value); + this.SendPropertyChanging(); + this._TimeLimited = value; + this.SendPropertyChanged("TimeLimited"); + this.OnTimeLimitedChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationDescription", DbType="NVarChar(1000)")] + public string RectificationDescription + { + get + { + return this._RectificationDescription; + } + set + { + if ((this._RectificationDescription != value)) + { + this.OnRectificationDescriptionChanging(value); + this.SendPropertyChanging(); + this._RectificationDescription = value; + this.SendPropertyChanged("RectificationDescription"); + this.OnRectificationDescriptionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectificationResults", DbType="NVarChar(20)")] + public string RectificationResults + { + get + { + return this._RectificationResults; + } + set + { + if ((this._RectificationResults != value)) + { + this.OnRectificationResultsChanging(value); + this.SendPropertyChanging(); + this._RectificationResults = value; + this.SendPropertyChanged("RectificationResults"); + this.OnRectificationResultsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_States", DbType="Char(1)")] + public string States + { + get + { + return this._States; + } + set + { + if ((this._States != value)) + { + this.OnStatesChanging(value); + this.SendPropertyChanging(); + this._States = value; + this.SendPropertyChanged("States"); + this.OnStatesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileMan", DbType="NVarChar(50)")] + public string CompileMan + { + get + { + return this._CompileMan; + } + set + { + if ((this._CompileMan != value)) + { + this.OnCompileManChanging(value); + this.SendPropertyChanging(); + this._CompileMan = value; + this.SendPropertyChanged("CompileMan"); + this.OnCompileManChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CompileTime", DbType="DateTime")] + public System.Nullable CompileTime + { + get + { + return this._CompileTime; + } + set + { + if ((this._CompileTime != value)) + { + this.OnCompileTimeChanging(value); + this.SendPropertyChanging(); + this._CompileTime = value; + this.SendPropertyChanged("CompileTime"); + this.OnCompileTimeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] + public Base_Project Base_Project + { + get + { + return this._Base_Project.Entity; + } + set + { + Base_Project previousValue = this._Base_Project.Entity; + if (((previousValue != value) + || (this._Base_Project.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Base_Project.Entity = null; + previousValue.Inspect_InspectionItem.Remove(this); + } + this._Base_Project.Entity = value; + if ((value != null)) + { + value.Inspect_InspectionItem.Add(this); + this._ProjectId = value.ProjectId; + } + else + { + this._ProjectId = default(string); + } + this.SendPropertyChanged("Base_Project"); + } + } + } + + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Inspect_InspectionItem_Inspect_Inspection", Storage="_Inspect_Inspection", ThisKey="InspectionId", OtherKey="InspectionId", IsForeignKey=true)] + public Inspect_Inspection Inspect_Inspection + { + get + { + return this._Inspect_Inspection.Entity; + } + set + { + Inspect_Inspection previousValue = this._Inspect_Inspection.Entity; + if (((previousValue != value) + || (this._Inspect_Inspection.HasLoadedOrAssignedValue == false))) + { + this.SendPropertyChanging(); + if ((previousValue != null)) + { + this._Inspect_Inspection.Entity = null; + previousValue.Inspect_InspectionItem.Remove(this); + } + this._Inspect_Inspection.Entity = value; + if ((value != null)) + { + value.Inspect_InspectionItem.Add(this); + this._InspectionId = value.InspectionId; + } + else + { + this._InspectionId = default(string); + } + this.SendPropertyChanged("Inspect_Inspection"); + } + } + } + + public event PropertyChangingEventHandler PropertyChanging; + + public event PropertyChangedEventHandler PropertyChanged; + + protected virtual void SendPropertyChanging() + { + if ((this.PropertyChanging != null)) + { + this.PropertyChanging(this, emptyChangingEventArgs); + } + } + + protected virtual void SendPropertyChanged(String propertyName) + { + if ((this.PropertyChanged != null)) + { + this.PropertyChanged(this, new PropertyChangedEventArgs(propertyName)); + } + } + } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.InterFaceLog")] public partial class InterFaceLog : INotifyPropertyChanging, INotifyPropertyChanged { @@ -426868,6 +427869,10 @@ namespace Model private string _RegisterTypesName; + private string _RectifyId; + + private string _RectifyName; + private string _DIC_ID; private string _CCManIds; @@ -427664,6 +428669,38 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyId", DbType="NVarChar(50)")] + public string RectifyId + { + get + { + return this._RectifyId; + } + set + { + if ((this._RectifyId != value)) + { + this._RectifyId = value; + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RectifyName", DbType="VarChar(255)")] + public string RectifyName + { + get + { + return this._RectifyName; + } + set + { + if ((this._RectifyName != value)) + { + this._RectifyName = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DIC_ID", DbType="VarChar(60)")] public string DIC_ID { @@ -455475,6 +456512,8 @@ namespace Model private string _ProjectId; + private string _DrawingId; + private string _WorkSection; private string _DrawingNo; @@ -455531,6 +456570,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingId", DbType="NVarChar(50)")] + public string DrawingId + { + get + { + return this._DrawingId; + } + set + { + if ((this._DrawingId != value)) + { + this._DrawingId = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkSection", DbType="NVarChar(100)")] public string WorkSection { diff --git a/SGGL/WebAPI/Controllers/CQMS/QuantityManagementController.cs b/SGGL/WebAPI/Controllers/CQMS/QuantityManagementController.cs index 51504d7..077a800 100644 --- a/SGGL/WebAPI/Controllers/CQMS/QuantityManagementController.cs +++ b/SGGL/WebAPI/Controllers/CQMS/QuantityManagementController.cs @@ -127,6 +127,24 @@ namespace WebAPI.Controllers } + [HttpGet] + public Model.ResponeData getWorkSectionAndDrawingName(string drawingId) + { + Model.ResponeData respone = new ResponeData(); + try + { + + return APIQuantityManagementService.getWorkSectionAndDrawingName(drawingId); + } + catch (Exception e) + { + respone.code = 0; + respone.message = e.Message; + } + return respone; + + } + [HttpGet] public Model.ResponeData getProjectContentList(string drawingId, string part) {