From ff6c6d3470684bfa4f56e11abf5304236e1dc646 Mon Sep 17 00:00:00 2001 From: jackchenyang <874821510@qq.com> Date: Wed, 22 May 2024 20:36:40 +0800 Subject: [PATCH] test packege --- CreateModel.bat | 4 +- HJGL/.vs/HJGL/v17/.suo | Bin 1045504 -> 1043456 bytes .../TestPackageManageEditService.cs | 3 + .../TestPackageManageItemEdit.aspx | 27 ++- .../TestPackageManageItemEdit.aspx.cs | 120 ++++++++-- ...TestPackageManageItemEdit.aspx.designer.cs | 13 +- HJGL/Model/Model.cs | 214 ++++++++++++------ 7 files changed, 270 insertions(+), 111 deletions(-) diff --git a/CreateModel.bat b/CreateModel.bat index 2f27853..27ceb4a 100644 --- a/CreateModel.bat +++ b/CreateModel.bat @@ -25,9 +25,9 @@ REM -------------- @echo 设置.net控制台环境 @echo. -@call "%VS100COMNTOOLS%"vsvars32.bat +@call "%VS150%" -SqlMetal /views /server:.\SQL2016 /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model +SqlMetal /views /server:. /database:HJGLDB_ZJBSF /code:%Model_ROOT%\Model.cs /namespace:Model @ECHO 完成 pause diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 57b9828e2c8ef36861833b75215bfa5f1e7e9e0f..54269fbce5a30cf462eaca46d3842dc7fd4ccdac 100644 GIT binary patch delta 14983 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 delta 14540 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 + BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Collapsed="false"> @@ -155,20 +155,20 @@ - + - + - + - @@ -230,6 +230,7 @@ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs index d6f8508..4555aa1 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs @@ -5,6 +5,7 @@ using System.Data.SqlClient; using System.Linq; using System.Web.ModelBinding; using BLL; +using Model; using Newtonsoft.Json.Linq; namespace FineUIPro.Web.WeldingProcess.TestPackageManage @@ -172,6 +173,14 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage } this.txtRemark.Text = testPackageManage.Remark; + var items = Funs.DB.PTP_PipelineList.Where(t => t.PTP_ID == testPackageManage.PTP_ID) + .Select(t=>t.WorkAreaId).FirstOrDefault(); + + if (items != null) + { + drpWorkArea.SelectedValue = items; + } + this.BindGrid(); ////鍒濆鍖栭〉闈 this.ShowGridItem(); } @@ -194,22 +203,46 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage /// private void BindGrid() { - string strSql = @"SELECT IsoInfo.ProjectId,IsoInfo.WorkAreaId,WorkArea.WorkAreaCode,IsoInfo.PipelineId,IsoInfo.PipelineCode, - IsoInfo.DesignPressure,IsoInfo.DesignTemperature, WorkArea.InstallationId,IsoInfo.UnitId, - IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber, - IsoInfo.Specification,IsoInfo.PipingClassId,IsoInfo.MainMaterialId,IsoList.PT_PipeId,IsoList.PTP_ID - FROM dbo.Pipeline_Pipeline AS IsoInfo - LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId - LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId - LEFT JOIN dbo.PTP_PipelineList AS IsoList ON IsoList.PipelineId = IsoInfo.PipelineId + string strSql = string.Empty; + if (string.IsNullOrEmpty(this.PTP_ID)) + { + strSql = @"SELECT + IsoInfo.ProjectId,IsoInfo.WorkAreaId,WorkArea.WorkAreaCode,IsoInfo.PipelineId,IsoInfo.PipelineCode, + IsoInfo.DesignPressure,IsoInfo.DesignTemperature, WorkArea.InstallationId,IsoInfo.UnitId, + IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber + FROM dbo.Pipeline_Pipeline AS IsoInfo + LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId + LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId WHERE IsoInfo.ProjectId= @ProjectId AND IsoInfo.UnitId= @UnitId - AND WorkArea.InstallationId= @InstallationId AND (IsoList.PTP_ID IS NULL OR IsoList.PTP_ID = @PTP_ID)"; + AND WorkArea.InstallationId= @InstallationId + AND NOT EXISTS(select 1 from PTP_PipelineList where IsoInfo.PipelineId=PTP_PipelineList.PipelineId and isAll=1) "; + } + else + { + strSql = @"SELECT + IsoInfo.ProjectId,IsoInfo.WorkAreaId,WorkArea.WorkAreaCode,IsoInfo.PipelineId,IsoInfo.PipelineCode, + IsoInfo.DesignPressure,IsoInfo.DesignTemperature, WorkArea.InstallationId,IsoInfo.UnitId, + IsoInfo.TestPressure,IsoInfo.TestTemperature,bs.MediumName,IsoInfo.SingleNumber, + IsoList.isAll,(case when (isnull(IsoList.WeldJonintCode,'')='') then '鍏ㄩ儴' else IsoList.WeldJonintCode end) as WeldJonintCode + FROM dbo.Pipeline_Pipeline AS IsoInfo + LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId + LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId + LEFT JOIN dbo.PTP_PipelineList AS IsoList ON IsoList.PipelineId = IsoInfo.PipelineId and IsoInfo.WorkAreaId=IsoList.WorkAreaId + WHERE IsoInfo.ProjectId= @ProjectId AND IsoInfo.UnitId= @UnitId + AND WorkArea.InstallationId= @InstallationId "; + } List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); + listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue)); listStr.Add(new SqlParameter("@InstallationId", this.drpInstallation.SelectedValue)); + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + strSql += " AND IsoList.PTP_ID=@PTP_ID"; + listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); + } + if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue!=null) { strSql += " AND IsoInfo.WorkAreaId = @WorkAreaId"; @@ -495,15 +528,26 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage BLL.TestPackageManageEditService.AddTestPackage(testPackage); BLL.Sys_LogService.AddLog(BLL.Const.System_3, this.CurrUser.LoginProjectId, this.CurrUser.UserId, Const.TestPackageManageEditMenuId, Const.BtnAdd, this.PTP_ID); } + JArray teamGroupData = Grid1.GetMergedData(); - foreach (var item in listSelects) + foreach (JObject teamGroupRow in teamGroupData) { - Model.PTP_PipelineList newitem = new Model.PTP_PipelineList(); - newitem.PTP_ID = this.PTP_ID; - newitem.PipelineId = item; - BLL.TestPackageManageEditService.AddPipelineList(newitem); + string PipelineId = teamGroupRow["id"].ToString(); + string status = teamGroupRow.Value("status"); + if (listSelects.Contains(PipelineId)) + { + JObject values = teamGroupRow.Value("values"); + string WeldJonintCodes = values.Value("isALL"); + string workAreaId = values.Value("WorkAreaId"); + Model.PTP_PipelineList newitem = new Model.PTP_PipelineList(); + newitem.PTP_ID = this.PTP_ID; + newitem.PipelineId = PipelineId; + newitem.IsAll = WeldJonintCodes=="鍏ㄩ儴" ? true : false; + newitem.WeldJonintCode = WeldJonintCodes; + newitem.WorkAreaId = workAreaId; + BLL.TestPackageManageEditService.AddPipelineList(newitem); + } } - ShowNotify("淇濆瓨鎴愬姛锛", MessageBoxIcon.Success); PageContext.RegisterStartupScript(ActiveWindow.GetWriteBackValueReference(this.PTP_ID) + ActiveWindow.GetHidePostBackReference()); @@ -537,30 +581,54 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage listSelects.Add(rowID); } } + } #endregion #region 缁戝畾鐒婂彛淇℃伅Grid2鍒楄〃 + private void GetInitGrid1Data() { for (int i = 0; i < Grid1.Rows.Count; i++) { string rowID = Grid1.DataKeys[i][0].ToString(); - this.GetDataJointGrid2(rowID); + this.GetBindGrid2Data(rowID); } } - private void GetDataJointGrid2(string PipelineID) + private void GetBindGrid2Data(string PipelineID) { - string sql = @"SELECT WeldJointId,PipelineId,WeldJointCode FROM View_Pipeline_WeldJoint WHERE PipelineId =@PipelineId order by WeldJointCode"; - SqlParameter[] sp = new SqlParameter[] - { - new SqlParameter("@PipelineId",PipelineID) - }; - DataTable dt=SQLHelper.GetDataTableRunText(sql, sp); - this.Grid2.DataSource = dt; + this.Grid2.DataSource = GetDataJointGrid2(PipelineID); this.Grid2.DataBind(); } + private List GetDataJointGrid2(string PipelineID) + { + string[] arr = null; + var tempData=Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId == PipelineID && t.IsAll==false) + .Select(t=>t.WeldJonintCode).FirstOrDefault(); + + if (tempData != null) + { + arr = tempData.Split(','); + } + var query = Funs.DB.View_Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID ) + .OrderBy(t => t.WeldJointCode).AsQueryable(); + if (arr != null) + { + query = query.Where(t => !arr.Contains(t.WeldJointCode)); + } + return query.ToList(); + + } + + + + private Dictionary> GetModifiedDict() + { + Dictionary> modifiedDict = Grid2.GetModifiedDict(); + + return modifiedDict; + } #endregion @@ -629,5 +697,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage this.ShowGridItem(); } #endregion + + } } \ No newline at end of file diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs index dee04ac..924c544 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.designer.cs @@ -429,13 +429,22 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage protected global::FineUIPro.Grid Grid1; /// - /// DropDownBox1 鎺т欢銆 + /// WorkAreaId 鎺т欢銆 /// /// /// 鑷姩鐢熸垚鐨勫瓧娈点 /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 /// - protected global::FineUIPro.DropDownBox DropDownBox1; + protected global::FineUIPro.RenderField WorkAreaId; + + /// + /// txtIsAll 鎺т欢銆 + /// + /// + /// 鑷姩鐢熸垚鐨勫瓧娈点 + /// 鑻ヨ杩涜淇敼锛岃灏嗗瓧娈靛０鏄庝粠璁捐鍣ㄦ枃浠剁Щ鍒颁唬鐮侀殣钘忔枃浠躲 + /// + protected global::FineUIPro.DropDownBox txtIsAll; /// /// Grid2 鎺т欢銆 diff --git a/HJGL/Model/Model.cs b/HJGL/Model/Model.cs index 8ba37d0..a997062 100644 --- a/HJGL/Model/Model.cs +++ b/HJGL/Model/Model.cs @@ -29,10 +29,6 @@ namespace Model #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnCreated(); - partial void OnCreated() - { - this.CommandTimeout = 600; - } partial void InsertAttachFile(AttachFile instance); partial void UpdateAttachFile(AttachFile instance); partial void DeleteAttachFile(AttachFile instance); @@ -22484,12 +22480,12 @@ namespace Model private string _DetectionStandard; - private string _Tabler; - private string _Remark; private System.Nullable _CreatedTime; + private string _Tabler; + #region 鍙墿灞曟ф柟娉曞畾涔 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -22508,12 +22504,12 @@ namespace Model partial void OnUnitIdChanged(); partial void OnDetectionStandardChanging(string value); partial void OnDetectionStandardChanged(); - partial void OnTablerChanging(string value); - partial void OnTablerChanged(); partial void OnRemarkChanging(string value); partial void OnRemarkChanged(); partial void OnCreatedTimeChanging(System.Nullable value); partial void OnCreatedTimeChanged(); + partial void OnTablerChanging(string value); + partial void OnTablerChanged(); #endregion public PMI_Delegation() @@ -22581,7 +22577,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50) NOT NULL", CanBeNull=false)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ProjectId", DbType="NVarChar(50)")] public string ProjectId { get @@ -22661,26 +22657,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] - public string Tabler - { - get - { - return this._Tabler; - } - set - { - if ((this._Tabler != value)) - { - this.OnTablerChanging(value); - this.SendPropertyChanging(); - this._Tabler = value; - this.SendPropertyChanged("Tabler"); - this.OnTablerChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark", DbType="NVarChar(255)")] public string Remark { @@ -22721,6 +22697,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Tabler", DbType="NVarChar(50)")] + public string Tabler + { + get + { + return this._Tabler; + } + set + { + if ((this._Tabler != value)) + { + this.OnTablerChanging(value); + this.SendPropertyChanging(); + this._Tabler = value; + this.SendPropertyChanged("Tabler"); + this.OnTablerChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -22760,10 +22756,10 @@ namespace Model private int _Status; - private System.Nullable _CheckTime; - private string _ReportNo; + private System.Nullable _CheckTime; + private System.Nullable _ReportTime; #region 鍙墿灞曟ф柟娉曞畾涔 @@ -22782,10 +22778,10 @@ namespace Model partial void OnAcceptanceChanged(); partial void OnStatusChanging(int value); partial void OnStatusChanged(); - partial void OnCheckTimeChanging(System.Nullable value); - partial void OnCheckTimeChanged(); partial void OnReportNoChanging(string value); partial void OnReportNoChanged(); + partial void OnCheckTimeChanging(System.Nullable value); + partial void OnCheckTimeChanged(); partial void OnReportTimeChanging(System.Nullable value); partial void OnReportTimeChanged(); #endregion @@ -22895,7 +22891,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int NOT NULL")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="status", Storage="_Status", DbType="Int NOT NULL")] public int Status { get @@ -22915,26 +22911,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] - public System.Nullable CheckTime - { - get - { - return this._CheckTime; - } - set - { - if ((this._CheckTime != value)) - { - this.OnCheckTimeChanging(value); - this.SendPropertyChanging(); - this._CheckTime = value; - this.SendPropertyChanged("CheckTime"); - this.OnCheckTimeChanged(); - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportNo", Storage="_ReportNo", DbType="NVarChar(50)")] public string ReportNo { @@ -22955,6 +22931,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="checkTime", Storage="_CheckTime", DbType="DateTime")] + public System.Nullable CheckTime + { + get + { + return this._CheckTime; + } + set + { + if ((this._CheckTime != value)) + { + this.OnCheckTimeChanging(value); + this.SendPropertyChanging(); + this._CheckTime = value; + this.SendPropertyChanged("CheckTime"); + this.OnCheckTimeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reportTime", Storage="_ReportTime", DbType="DateTime")] public System.Nullable ReportTime { @@ -25380,6 +25376,12 @@ namespace Model private string _PT_DataType; + private string _WorkAreaId; + + private System.Nullable _IsAll; + + private string _WeldJonintCode; + private EntityRef _Pipeline_Pipeline; private EntityRef _PTP_TestPackage; @@ -25396,6 +25398,12 @@ namespace Model partial void OnPipelineIdChanged(); partial void OnPT_DataTypeChanging(string value); partial void OnPT_DataTypeChanged(); + partial void OnWorkAreaIdChanging(string value); + partial void OnWorkAreaIdChanged(); + partial void OnIsAllChanging(System.Nullable value); + partial void OnIsAllChanged(); + partial void OnWeldJonintCodeChanging(string value); + partial void OnWeldJonintCodeChanged(); #endregion public PTP_PipelineList() @@ -25493,6 +25501,66 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")] + public string WorkAreaId + { + get + { + return this._WorkAreaId; + } + set + { + if ((this._WorkAreaId != value)) + { + this.OnWorkAreaIdChanging(value); + this.SendPropertyChanging(); + this._WorkAreaId = value; + this.SendPropertyChanged("WorkAreaId"); + this.OnWorkAreaIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isAll", Storage="_IsAll", DbType="Bit")] + public System.Nullable IsAll + { + get + { + return this._IsAll; + } + set + { + if ((this._IsAll != value)) + { + this.OnIsAllChanging(value); + this.SendPropertyChanging(); + this._IsAll = value; + this.SendPropertyChanged("IsAll"); + this.OnIsAllChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldJonintCode", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + public string WeldJonintCode + { + get + { + return this._WeldJonintCode; + } + set + { + if ((this._WeldJonintCode != value)) + { + this.OnWeldJonintCodeChanging(value); + this.SendPropertyChanging(); + this._WeldJonintCode = value; + this.SendPropertyChanged("WeldJonintCode"); + this.OnWeldJonintCodeChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_PTP_IsoList_PTP_IsoList", Storage="_Pipeline_Pipeline", ThisKey="PipelineId", OtherKey="PipelineId", IsForeignKey=true)] public Pipeline_Pipeline Pipeline_Pipeline { @@ -38595,6 +38663,8 @@ namespace Model private string _ProjectId; + private System.Nullable _IsPMI; + private string _PipelineCode; private string _PipelineId; @@ -38725,6 +38795,22 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="isPMI", Storage="_IsPMI", DbType="Bit")] + public System.Nullable IsPMI + { + get + { + return this._IsPMI; + } + set + { + if ((this._IsPMI != value)) + { + this._IsPMI = value; + } + } + } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PipelineCode", DbType="NVarChar(100)")] public string PipelineCode { @@ -40733,8 +40819,6 @@ namespace Model private string _PipingClassCode; - private string _PIPClassCode; - private string _WeldingDate; private System.Nullable _IsCancel; @@ -41843,22 +41927,6 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PIPClassCode", DbType="NVarChar(50)")] - public string PIPClassCode - { - get - { - return this._PIPClassCode; - } - set - { - if ((this._PIPClassCode != value)) - { - this._PIPClassCode = value; - } - } - } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WeldingDate", DbType="VarChar(100)")] public string WeldingDate { @@ -46255,7 +46323,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="NVarChar(MAX)", UpdateCheck=UpdateCheck.Never)] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WelderIds", DbType="VarChar(1000)")] public string WelderIds { get