diff --git a/DataBase/版本日志/SGGLDB_V2022-12-03.sql b/DataBase/版本日志/SGGLDB_V2022-12-03.sql new file mode 100644 index 00000000..bdbb789f --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-12-03.sql @@ -0,0 +1,2 @@ +alter table WPQ_WPQList add CompileMan nvarchar(50) null +GO \ No newline at end of file diff --git a/SGGL/BLL/HJGL/WPQ/WPQListService.cs b/SGGL/BLL/HJGL/WPQ/WPQListService.cs index 19ea3f3d..1942fdda 100644 --- a/SGGL/BLL/HJGL/WPQ/WPQListService.cs +++ b/SGGL/BLL/HJGL/WPQ/WPQListService.cs @@ -31,6 +31,7 @@ namespace BLL newWPQ.WPQCode = WPQ.WPQCode; newWPQ.ProjectId = WPQ.ProjectId; newWPQ.UnitId = WPQ.UnitId; + newWPQ.CompileMan = WPQ.CompileMan; newWPQ.CompileDate = WPQ.CompileDate; newWPQ.MaterialId1 = WPQ.MaterialId1; newWPQ.MaterialId2 = WPQ.MaterialId2; diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs index ee97b46b..8145cb96 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQEdit.aspx.cs @@ -225,6 +225,11 @@ namespace FineUIPro.Web.HJGL.WPQ Alert.ShowInTop("焊丝、焊条不能同时为空！", MessageBoxIcon.Warning); return; } + if (this.rblIsAgree.SelectedValue == "false" && (this.drpPerson.SelectedValue == BLL.Const._Null || string.IsNullOrEmpty(this.drpPerson.SelectedValue))) + { + Alert.ShowInTop("请选择办理人！", MessageBoxIcon.Warning); + return; + } string id = SaveData(BLL.Const.BtnSubmit); ShowNotify("提交成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); @@ -352,7 +357,7 @@ namespace FineUIPro.Web.HJGL.WPQ { string newId = SQLHelper.GetNewID(typeof(Model.WPQ_WPQList)); wpq.WPQId = newId; - + wpq.CompileMan = this.CurrUser.PersonId; if (type == BLL.Const.BtnSubmit) { if (this.drpPerson.SelectedValue == BLL.Const._Null) @@ -506,18 +511,14 @@ namespace FineUIPro.Web.HJGL.WPQ Model.WPQ_WPQList wpq = BLL.WPQListServiceService.GetWPQById(WPQId); if (wpq != null) { - Model.WPQ_WPQListFlowOperate flowOperate = Funs.DB.WPQ_WPQListFlowOperate.FirstOrDefault(x => x.WPQId == WPQId && x.OperateName == "施工单位编制"); - if (flowOperate != null) + Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(wpq.CompileMan); + if (user != null) { - Model.Person_Persons user = BLL.Person_PersonsService.GetPerson_PersonsById(flowOperate.OperateManId); - if (user != null) - { - ListItem[] list = new ListItem[1]; - list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString()); - drpPerson.DataSource = list; - drpPerson.DataBind(); - drpPerson.SelectedValue = user.PersonId; - } + ListItem[] list = new ListItem[1]; + list[0] = new ListItem(user.PersonName ?? "", user.PersonId.ToString()); + drpPerson.DataSource = list; + drpPerson.DataBind(); + drpPerson.SelectedValue = user.PersonId; } } } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index e20c2dae..c314cc7b 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -347,6 +347,12 @@ namespace Model partial void InsertCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void UpdateCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); partial void DeleteCheck_TechnicalContactListApprove(Check_TechnicalContactListApprove instance); + partial void InsertCommon_FileManage(Common_FileManage instance); + partial void UpdateCommon_FileManage(Common_FileManage instance); + partial void DeleteCommon_FileManage(Common_FileManage instance); + partial void InsertCommon_FileManageType(Common_FileManageType instance); + partial void UpdateCommon_FileManageType(Common_FileManageType instance); + partial void DeleteCommon_FileManageType(Common_FileManageType instance); partial void InsertCostGoods_CostManage(CostGoods_CostManage instance); partial void UpdateCostGoods_CostManage(CostGoods_CostManage instance); partial void DeleteCostGoods_CostManage(CostGoods_CostManage instance); @@ -2286,6 +2292,22 @@ namespace Model } } + public System.Data.Linq.Table Common_FileManage + { + get + { + return this.GetTable(); + } + } + + public System.Data.Linq.Table Common_FileManageType + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table CostGoods_CostManage { get @@ -50000,6 +50022,394 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Common_FileManage")] + public partial class Common_FileManage : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private int _FileId; + + private string _FileCode; + + private string _FileName; + + private string _FileSize; + + private string _FileType; + + private System.Data.Linq.Binary _FileContent; + + private string _BigType; + + private string _SmallType; + + private string _FileCreate; + + private System.Nullable _FileDate; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnFileIdChanging(int value); + partial void OnFileIdChanged(); + partial void OnFileCodeChanging(string value); + partial void OnFileCodeChanged(); + partial void OnFileNameChanging(string value); + partial void OnFileNameChanged(); + partial void OnFileSizeChanging(string value); + partial void OnFileSizeChanged(); + partial void OnFileTypeChanging(string value); + partial void OnFileTypeChanged(); + partial void OnFileContentChanging(System.Data.Linq.Binary value); + partial void OnFileContentChanged(); + partial void OnBigTypeChanging(string value); + partial void OnBigTypeChanged(); + partial void OnSmallTypeChanging(string value); + partial void OnSmallTypeChanged(); + partial void OnFileCreateChanging(string value); + partial void OnFileCreateChanged(); + partial void OnFileDateChanging(System.Nullable value); + partial void OnFileDateChanged(); + #endregion + + public Common_FileManage() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileId", AutoSync=AutoSync.OnInsert, DbType="Int NOT NULL IDENTITY", IsPrimaryKey=true, IsDbGenerated=true)] + public int FileId + { + get + { + return this._FileId; + } + set + { + if ((this._FileId != value)) + { + this.OnFileIdChanging(value); + this.SendPropertyChanging(); + this._FileId = value; + this.SendPropertyChanged("FileId"); + this.OnFileIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50)")] + public string FileCode + { + get + { + return this._FileCode; + } + set + { + if ((this._FileCode != value)) + { + this.OnFileCodeChanging(value); + this.SendPropertyChanging(); + this._FileCode = value; + this.SendPropertyChanged("FileCode"); + this.OnFileCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileName", DbType="NVarChar(100)")] + public string FileName + { + get + { + return this._FileName; + } + set + { + if ((this._FileName != value)) + { + this.OnFileNameChanging(value); + this.SendPropertyChanging(); + this._FileName = value; + this.SendPropertyChanged("FileName"); + this.OnFileNameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileSize", DbType="NVarChar(50)")] + public string FileSize + { + get + { + return this._FileSize; + } + set + { + if ((this._FileSize != value)) + { + this.OnFileSizeChanging(value); + this.SendPropertyChanging(); + this._FileSize = value; + this.SendPropertyChanged("FileSize"); + this.OnFileSizeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")] + public string FileType + { + get + { + return this._FileType; + } + set + { + if ((this._FileType != value)) + { + this.OnFileTypeChanging(value); + this.SendPropertyChanging(); + this._FileType = value; + this.SendPropertyChanged("FileType"); + this.OnFileTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileContent", DbType="Image", CanBeNull=true, UpdateCheck=UpdateCheck.Never)] + public System.Data.Linq.Binary FileContent + { + get + { + return this._FileContent; + } + set + { + if ((this._FileContent != value)) + { + this.OnFileContentChanging(value); + this.SendPropertyChanging(); + this._FileContent = value; + this.SendPropertyChanged("FileContent"); + this.OnFileContentChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BigType", DbType="NVarChar(50)")] + public string BigType + { + get + { + return this._BigType; + } + set + { + if ((this._BigType != value)) + { + this.OnBigTypeChanging(value); + this.SendPropertyChanging(); + this._BigType = value; + this.SendPropertyChanged("BigType"); + this.OnBigTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SmallType", DbType="NVarChar(50)")] + public string SmallType + { + get + { + return this._SmallType; + } + set + { + if ((this._SmallType != value)) + { + this.OnSmallTypeChanging(value); + this.SendPropertyChanging(); + this._SmallType = value; + this.SendPropertyChanged("SmallType"); + this.OnSmallTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCreate", DbType="NVarChar(50)")] + public string FileCreate + { + get + { + return this._FileCreate; + } + set + { + if ((this._FileCreate != value)) + { + this.OnFileCreateChanging(value); + this.SendPropertyChanging(); + this._FileCreate = value; + this.SendPropertyChanged("FileCreate"); + this.OnFileCreateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileDate", DbType="DateTime")] + public System.Nullable FileDate + { + get + { + return this._FileDate; + } + set + { + if ((this._FileDate != value)) + { + this.OnFileDateChanging(value); + this.SendPropertyChanging(); + this._FileDate = value; + this.SendPropertyChanged("FileDate"); + this.OnFileDateChanged(); + } + } + } + + 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.Common_FileManageType")] + public partial class Common_FileManageType : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _FileCode; + + private string _FileType; + + private System.Nullable _SortIndex; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnFileCodeChanging(string value); + partial void OnFileCodeChanged(); + partial void OnFileTypeChanging(string value); + partial void OnFileTypeChanged(); + partial void OnSortIndexChanging(System.Nullable value); + partial void OnSortIndexChanged(); + #endregion + + public Common_FileManageType() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string FileCode + { + get + { + return this._FileCode; + } + set + { + if ((this._FileCode != value)) + { + this.OnFileCodeChanging(value); + this.SendPropertyChanging(); + this._FileCode = value; + this.SendPropertyChanged("FileCode"); + this.OnFileCodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_FileType", DbType="NVarChar(50)")] + public string FileType + { + get + { + return this._FileType; + } + set + { + if ((this._FileType != value)) + { + this.OnFileTypeChanging(value); + this.SendPropertyChanging(); + this._FileType = value; + this.SendPropertyChanged("FileType"); + this.OnFileTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SortIndex", DbType="Int")] + public System.Nullable SortIndex + { + get + { + return this._SortIndex; + } + set + { + if ((this._SortIndex != value)) + { + this.OnSortIndexChanging(value); + this.SendPropertyChanging(); + this._SortIndex = value; + this.SendPropertyChanged("SortIndex"); + this.OnSortIndexChanged(); + } + } + } + + 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.CostGoods_CostManage")] public partial class CostGoods_CostManage : INotifyPropertyChanging, INotifyPropertyChanged { @@ -70769,7 +71179,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(30)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(300)")] public string MaterialName { get @@ -70789,7 +71199,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(20)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialSpec", DbType="NVarChar(300)")] public string MaterialSpec { get @@ -70809,7 +71219,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialMade", DbType="NVarChar(300)")] public string MaterialMade { get @@ -70829,7 +71239,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(300)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")] public string MaterialDef { get @@ -70849,7 +71259,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipeGrade", DbType="NVarChar(300)")] public string PipeGrade { get @@ -70869,7 +71279,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(10)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialUnit", DbType="NVarChar(300)")] public string MaterialUnit { get @@ -71191,7 +71601,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(1000)")] public string SpecificationAndModel { get @@ -234458,6 +234868,8 @@ namespace Model private string _ProjectId; + private string _CompileMan; + private EntitySet _HJGL_WeldJoint; private EntityRef _Base_Material; @@ -234566,6 +234978,8 @@ namespace Model partial void OnProtectionGasIdChanged(); partial void OnProjectIdChanging(string value); partial void OnProjectIdChanged(); + partial void OnCompileManChanging(string value); + partial void OnCompileManChanged(); #endregion public WPQ_WPQList() @@ -235500,6 +235914,26 @@ namespace Model } } + [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.AssociationAttribute(Name="FK_HJGL_WeldJoint_WPQ_WPQList", Storage="_HJGL_WeldJoint", ThisKey="WPQId", OtherKey="WPQId", DeleteRule="NO ACTION")] public EntitySet HJGL_WeldJoint {