From 4daaeb8ce1b197320cda941bc68d6a6f2238e6d7 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Sun, 12 Mar 2023 09:12:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A0=B7=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseInfo/CompanyModelEdit.aspx.cs | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/SGGL/FineUIPro.Web/BaseInfo/CompanyModelEdit.aspx.cs b/SGGL/FineUIPro.Web/BaseInfo/CompanyModelEdit.aspx.cs index 1a521e94..d94731a1 100644 --- a/SGGL/FineUIPro.Web/BaseInfo/CompanyModelEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/BaseInfo/CompanyModelEdit.aspx.cs @@ -27,7 +27,7 @@ namespace FineUIPro.Web.BaseInfo { this.btnSave.Hidden = true; } - CompanyModelKindService.InitCompanyModelKindDownList(this.drpCompanyModelKindId,true); + CompanyModelKindService.InitCompanyModelKindDownList(this.drpCompanyModelKindId, true); this.drpCompanyModelKindId.SelectedValue = BLL.Const._Null; if (!string.IsNullOrEmpty(id)) { @@ -106,6 +106,18 @@ namespace FineUIPro.Web.BaseInfo this.hdId.Text = newCompanyModel.CompanyModelId; } BLL.CompanyModelService.AddCompanyModel(newCompanyModel); + var projects = from x in Funs.DB.Base_Project select x; + foreach (var item in projects) + { + Model.Model_QualityModel newQualityModel = new Model.Model_QualityModel(); + newQualityModel.ProjectId = item.ProjectId; + newQualityModel.CompanyModelId = newCompanyModel.CompanyModelId; + newQualityModel.Remark = this.txtRemark.Text.Trim(); + newQualityModel.QualityModelId = SQLHelper.GetNewID(); + newQualityModel.CompileMan = this.CurrUser.PersonId; + newQualityModel.CompileDate = DateTime.Now; + BLL.QualityModelService.AddQualityModel(newQualityModel); + } } ShowNotify("保存成功！", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); From 563fec140cbe0863c42c7c71f4876435a0759375 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Sun, 12 Mar 2023 09:41:19 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx | 2 +- SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx | 2 +- SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx | 2 +- SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx index f3479577..ffa9d465 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditSportDataCheck.aspx @@ -49,7 +49,7 @@ + > diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx index bdc5ae14..c58ee848 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditSpotCheck.aspx @@ -49,7 +49,7 @@ + > diff --git a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx index fd23779a..e158fa7e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Check/EditTechnicalContactList.aspx @@ -44,7 +44,7 @@ + > diff --git a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx index 80f6acac..de1b597e 100644 --- a/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx +++ b/SGGL/FineUIPro.Web/CQMS/Unqualified/EditWorkContact.aspx @@ -45,7 +45,7 @@ + > From 643ef1ceb8d01564854ea5e3c77b0006c7ad4492 Mon Sep 17 00:00:00 2001 From: gaofei <181547018@qq.com> Date: Mon, 13 Mar 2023 10:12:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=A5=96=E7=BD=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DataBase/版本日志/SGGLDB_V2023-03-13.sql | 2 + .../RewardAndPunish/RewardAndPunishService.cs | 2 + .../RewardAndPunish/RewardAndPunish.aspx.cs | 2 +- .../RewardAndPunish/RewardAndPunishEdit.aspx | 2 +- .../RewardAndPunishEdit.aspx.cs | 5 +++ .../RewardAndPunishView.aspx.cs | 4 ++ SGGL/Model/Model.cs | 42 +++++++++++++++---- 7 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 DataBase/版本日志/SGGLDB_V2023-03-13.sql diff --git a/DataBase/版本日志/SGGLDB_V2023-03-13.sql b/DataBase/版本日志/SGGLDB_V2023-03-13.sql new file mode 100644 index 00000000..78b703c8 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-03-13.sql @@ -0,0 +1,2 @@ +alter table RewardAndPunish_RewardAndPunish add RewardAndPunishDecision nvarchar(200) null +GO \ No newline at end of file diff --git a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishService.cs b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishService.cs index de8f22c4..06f513fb 100644 --- a/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishService.cs +++ b/SGGL/BLL/CQMS/RewardAndPunish/RewardAndPunishService.cs @@ -38,6 +38,7 @@ namespace BLL Type = RewardAndPunish.Type, RewardAndPunishTypeId = RewardAndPunish.RewardAndPunishTypeId, RewardAndPunishBasis = RewardAndPunish.RewardAndPunishBasis, + RewardAndPunishDecision = RewardAndPunish.RewardAndPunishDecision, State = RewardAndPunish.State, CompileMan = RewardAndPunish.CompileMan, CompileDate = RewardAndPunish.CompileDate, @@ -61,6 +62,7 @@ namespace BLL newRewardAndPunish.Type = RewardAndPunish.Type; newRewardAndPunish.RewardAndPunishTypeId = RewardAndPunish.RewardAndPunishTypeId; newRewardAndPunish.RewardAndPunishBasis = RewardAndPunish.RewardAndPunishBasis; + newRewardAndPunish.RewardAndPunishDecision = RewardAndPunish.RewardAndPunishDecision; newRewardAndPunish.State = RewardAndPunish.State; db.SubmitChanges(); diff --git a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs index 3338a71e..fcf26166 100644 --- a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunish.aspx.cs @@ -51,7 +51,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish protected DataTable insklistData() { - string strSql = @"SELECT ins.*,un.UnitName,u.PersonName as CompileManName,case ins.Type when '1' then '奖励' else '处罚' end as TypeStr,case ins.Type when '1' then rt.RewardCause else pt.PunishCause end as Cause,case ins.Type when '1' then rt.RewardDecision else pt.PunishDecision end as Decision" + string strSql = @"SELECT ins.*,un.UnitName,u.PersonName as CompileManName,case ins.Type when '1' then '奖励' else '处罚' end as TypeStr,case ins.Type when '1' then rt.RewardCause else pt.PunishCause end as Cause,ins.RewardAndPunishDecision as Decision" + @" FROM RewardAndPunish_RewardAndPunish ins" + @" left join Base_Unit un on un.UnitId = ins.UnitId" + @" left join Base_RewardType rt on rt.RewardTypeId = ins.RewardAndPunishTypeId" diff --git a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx index 4819bb15..48acbe5c 100644 --- a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx +++ b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx @@ -64,7 +64,7 @@ - diff --git a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs index e3b3fa45..c443c07f 100644 --- a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishEdit.aspx.cs @@ -80,6 +80,10 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish drpRewardAndPunishType.SelectedValue = RewardAndPunish.RewardAndPunishTypeId; drpRewardAndPunishType_SelectedIndexChanged(null, null); } + if (!string.IsNullOrEmpty(RewardAndPunish.RewardAndPunishDecision)) + { + this.txtRewardAndPunishDecision.Text = RewardAndPunish.RewardAndPunishDecision; + } gvApprove.DataSource = BLL.RewardAndPunishApproveService.getListData(this.RewardAndPunishId); gvApprove.DataBind(); if (!string.IsNullOrEmpty(RewardAndPunish.State)) @@ -295,6 +299,7 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish RewardAndPunish.Type = this.rblType.SelectedValue; RewardAndPunish.RewardAndPunishTypeId = this.drpRewardAndPunishType.SelectedValue; RewardAndPunish.RewardAndPunishBasis = this.txtRewardAndPunishBasis.Text.Trim(); + RewardAndPunish.RewardAndPunishDecision = this.txtRewardAndPunishDecision.Text.Trim(); if (saveType == "submit") { RewardAndPunish.State = this.drpHandleType.SelectedValue; diff --git a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishView.aspx.cs b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishView.aspx.cs index 849cbb2d..b58d3e07 100644 --- a/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishView.aspx.cs +++ b/SGGL/FineUIPro.Web/CQMS/RewardAndPunish/RewardAndPunishView.aspx.cs @@ -76,6 +76,10 @@ namespace FineUIPro.Web.CQMS.RewardAndPunish drpRewardAndPunishType.SelectedValue = RewardAndPunish.RewardAndPunishTypeId; drpRewardAndPunishType_SelectedIndexChanged(null, null); } + if (!string.IsNullOrEmpty(RewardAndPunish.RewardAndPunishDecision)) + { + this.txtRewardAndPunishDecision.Text = RewardAndPunish.RewardAndPunishDecision; + } gvApprove.DataSource = BLL.RewardAndPunishApproveService.getListData(this.RewardAndPunishId); gvApprove.DataBind(); } diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 3b9bca82..1300d94f 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -73878,7 +73878,7 @@ namespace Model OnCreated(); } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] public string MaterialCode { get @@ -73982,7 +73982,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(3000)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialDef", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] public string MaterialDef { get @@ -78572,7 +78572,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(15)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] public string MaterialCode { get @@ -82920,7 +82920,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] public string CanWelderCode { get @@ -122289,7 +122289,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialName", DbType="NVarChar(100)")] public string MaterialName { get @@ -122309,7 +122309,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SpecificationAndModel", DbType="NVarChar(200)")] public string SpecificationAndModel { get @@ -122329,7 +122329,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_MaterialCode", DbType="NVarChar(100)")] public string MaterialCode { get @@ -122349,7 +122349,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Material", DbType="NVarChar(100)")] public string Material { get @@ -181173,6 +181173,8 @@ namespace Model private System.Nullable _CompileDate; + private string _RewardAndPunishDecision; + private EntityRef _Base_Project; private EntitySet _RewardAndPunish_RewardAndPunishApprove; @@ -181201,6 +181203,8 @@ namespace Model partial void OnCompileManChanged(); partial void OnCompileDateChanging(System.Nullable value); partial void OnCompileDateChanged(); + partial void OnRewardAndPunishDecisionChanging(string value); + partial void OnRewardAndPunishDecisionChanged(); #endregion public RewardAndPunish_RewardAndPunish() @@ -181414,6 +181418,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RewardAndPunishDecision", DbType="NVarChar(100)")] + public string RewardAndPunishDecision + { + get + { + return this._RewardAndPunishDecision; + } + set + { + if ((this._RewardAndPunishDecision != value)) + { + this.OnRewardAndPunishDecisionChanging(value); + this.SendPropertyChanging(); + this._RewardAndPunishDecision = value; + this.SendPropertyChanged("RewardAndPunishDecision"); + this.OnRewardAndPunishDecisionChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_RewardAndPunish_RewardAndPunish_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -235851,7 +235875,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(200)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CanWelderCode", DbType="NVarChar(1000)")] public string CanWelderCode { get