diff --git a/.vs/SGGL_SeDin/v17/.wsuo b/.vs/SGGL_SeDin/v17/.wsuo index 8a1ade31..286ad1ec 100644 Binary files a/.vs/SGGL_SeDin/v17/.wsuo and b/.vs/SGGL_SeDin/v17/.wsuo differ diff --git a/DataBase/版本日志/SGGLDB_V2023-09-27.sql b/DataBase/版本日志/SGGLDB_V2023-09-27.sql new file mode 100644 index 00000000..deda119e --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-09-27.sql @@ -0,0 +1,7 @@ +alter table dbo.PHTGL_Quantity + add SerialNumber nvarchar(50) +go + +exec sp_addextendedproperty 'MS_Description', N'', 'SCHEMA', 'dbo', 'TABLE', 'PHTGL_Quantity', 'COLUMN', + 'SerialNumber' +go diff --git a/SGGL/BLL/Common/Funs.cs b/SGGL/BLL/Common/Funs.cs index 0b7c7911..b017a205 100644 --- a/SGGL/BLL/Common/Funs.cs +++ b/SGGL/BLL/Common/Funs.cs @@ -1396,6 +1396,8 @@ namespace BLL client.Timeout = -1; var request = new RestRequest(Method.GET); request.AddHeader("token", Token); + request.AddHeader("ClientId", SysConstSetService.ClientId); + request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1)); IRestResponse response = client.Execute(request); Console.WriteLine(response.Content); return response.Content; @@ -1409,7 +1411,7 @@ namespace BLL var request = new RestRequest(Method.POST); request.AddHeader("token", Token); request.AddHeader("ClientId", SysConstSetService.ClientId); - request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal)+1)); + request.AddHeader("OperationCode", Baseurl.Substring(Baseurl.LastIndexOf("/", StringComparison.Ordinal) + 1)); if (!string.IsNullOrEmpty(JsonBody)) { request.AddJsonBody(JsonBody); diff --git a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs index 1ca3d30d..0e6a5cd1 100644 --- a/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs +++ b/SGGL/BLL/PHTGL/BillOfQuantities/PhtglQuantityService.cs @@ -38,7 +38,8 @@ namespace BLL WorkContent = newtable.WorkContent, Remarks = newtable.Remarks, IsTemplate = newtable.IsTemplate, - ParentId = newtable.ParentId + ParentId = newtable.ParentId, + SerialNumber = newtable.SerialNumber }; Funs.DB.PHTGL_Quantity.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -68,7 +69,8 @@ namespace BLL WorkContent = newtable.WorkContent, Remarks = newtable.Remarks, IsTemplate = false, - ParentId = parentId + ParentId = parentId, + SerialNumber = newtable.SerialNumber }; Funs.DB.PHTGL_Quantity.InsertOnSubmit(table); Funs.DB.SubmitChanges(); @@ -96,6 +98,7 @@ namespace BLL table.Remarks = newtable.Remarks; table.IsTemplate = newtable.IsTemplate; table.ParentId = newtable.ParentId; + table.SerialNumber = newtable.SerialNumber; Funs.DB.SubmitChanges(); } } @@ -278,34 +281,37 @@ namespace BLL public static List GetPHTGL_QuantityByModle(PHTGL_Quantity table) { var q = from x in Funs.DB.PHTGL_Quantity - where - (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && - (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) && - (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) && - (string.IsNullOrEmpty(table.SubItemProject) || - x.SubItemProject.Contains(table.SubItemProject)) && - (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) && - (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) && - (string.IsNullOrEmpty(table.ProjectDescription) || - x.ProjectDescription.Contains(table.ProjectDescription)) && - (string.IsNullOrEmpty(table.UnitOfMeasurement) || - x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) && - (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) && - (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) || - x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) && - (string.IsNullOrEmpty(table.MainMaterialCost) || - x.MainMaterialCost.Contains(table.MainMaterialCost)) && - (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) && - (string.IsNullOrEmpty(table.CalculationRule) || - x.CalculationRule.Contains(table.CalculationRule)) && - (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) && - (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) && - x.IsTemplate == table.IsTemplate && - (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId)) - select x - ; + where + (string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) && + (string.IsNullOrEmpty(table.Major) || x.Major.Contains(table.Major)) && + (string.IsNullOrEmpty(table.SubProject) || x.SubProject.Contains(table.SubProject)) && + (string.IsNullOrEmpty(table.SubItemProject) || + x.SubItemProject.Contains(table.SubItemProject)) && + (string.IsNullOrEmpty(table.ProjectCode) || x.ProjectCode.Contains(table.ProjectCode)) && + (string.IsNullOrEmpty(table.ProjectName) || x.ProjectName.Contains(table.ProjectName)) && + (string.IsNullOrEmpty(table.ProjectDescription) || + x.ProjectDescription.Contains(table.ProjectDescription)) && + (string.IsNullOrEmpty(table.UnitOfMeasurement) || + x.UnitOfMeasurement.Contains(table.UnitOfMeasurement)) && + (string.IsNullOrEmpty(table.Quantity) || x.Quantity.Contains(table.Quantity)) && + (string.IsNullOrEmpty(table.TotalCostFixedComprehensiveUnitPrice) || + x.TotalCostFixedComprehensiveUnitPrice.Contains(table.TotalCostFixedComprehensiveUnitPrice)) && + (string.IsNullOrEmpty(table.MainMaterialCost) || + x.MainMaterialCost.Contains(table.MainMaterialCost)) && + (string.IsNullOrEmpty(table.TotalPrice) || x.TotalPrice.Contains(table.TotalPrice)) && + (string.IsNullOrEmpty(table.CalculationRule) || + x.CalculationRule.Contains(table.CalculationRule)) && + (string.IsNullOrEmpty(table.WorkContent) || x.WorkContent.Contains(table.WorkContent)) && + (string.IsNullOrEmpty(table.Remarks) || x.Remarks.Contains(table.Remarks)) && + x.IsTemplate == table.IsTemplate && + (string.IsNullOrEmpty(table.ParentId) || x.ParentId.Contains(table.ParentId)) + + select new { x ,IntSerialNumber= Funs.GetNewIntOrZero(x.SerialNumber.Replace(".", "")) + } - return q.ToList(); + ; + var model = q.ToList().OrderBy(x => x.IntSerialNumber).Select(itemx => itemx.x).ToList(); + return model; } /// 获取分页列表 @@ -324,6 +330,7 @@ namespace BLL select new { x.Id, + x.SerialNumber, x.Major, x.SubProject, x.SubItemProject, @@ -348,7 +355,7 @@ namespace BLL public class PHTGL_QuantityDtoIn { - [ExcelColumnIndex("A")] public string Major { get; set; } + [ExcelColumnIndex("A")] public string SerialNumber { get; set; } [ExcelColumnIndex("B")] public string SubProject { get; set; } [ExcelColumnIndex("C")] public string SubItemProject { get; set; } diff --git a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx index 1b52865d..3ac2eeed 100644 --- a/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx +++ b/SGGL/FineUIPro.Web/HJGL/PreDesign/PackagingManage.aspx @@ -62,7 +62,7 @@ - + + + @@ -185,6 +189,10 @@ EnableMaximize="true" Target="Top" EnableResize="false" runat="server" IsModal="true" Width="1200px" Height="620px" OnClose="Window1_Close"> + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs index 399944b1..e0c37828 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.cs @@ -1,4 +1,5 @@ using BLL; +using FineUIPro.Web.HSSE.Meeting; using System; using System.Collections.Generic; using System.Linq; @@ -22,7 +23,18 @@ namespace FineUIPro.Web.HJGL.WeldingManage ViewState["PipelineId"] = value; } } - + public string WeldJointId + { + get + { + return (string)ViewState["WeldJointId"]; + } + set + { + ViewState["WeldJointId"] = value; + } + } + protected void Page_Load(object sender, EventArgs e) { @@ -52,7 +64,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage this.drpDetectionTypeId.DataTextField = "DetectionTypeCode"; //Funs.FineUIPleaseSelect(this.drpDetectionTypeId); string flag = Request.Params["flag"]; - string weldJointId = Request.Params["WeldJointId"]; + WeldJointId = Request.Params["WeldJointId"]; string isTwoJoint = Request.Params["IsTwoJoint"]; @@ -66,9 +78,9 @@ namespace FineUIPro.Web.HJGL.WeldingManage GroupPanel2.Hidden = true; IsReadOnly(false); } - if (!string.IsNullOrEmpty(weldJointId)) + if (!string.IsNullOrEmpty(WeldJointId)) { - Model.HJGL_WeldJoint joint = BLL.WeldJointService.GetWeldJointByWeldJointId(weldJointId); + Model.HJGL_WeldJoint joint = BLL.WeldJointService.GetWeldJointByWeldJointId(WeldJointId); Model.WPQ_WPQList list = BLL.WPQListServiceService.GetWPQById(joint.WPQId); this.txtWpqId.Text = joint.WPQId; @@ -82,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage } if (Request.Params["Type"] == "add") //插入焊口 { - var baseWeldJoints = BLL.WeldJointService.GetBaseWeldJointsByWeldJointId(weldJointId); + var baseWeldJoints = BLL.WeldJointService.GetBaseWeldJointsByWeldJointId(WeldJointId); this.txtWeldJointCode.Text = joint.WeldJointCode + "Z-" + (baseWeldJoints.Count + 1).ToString(); } else @@ -287,7 +299,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage weldJointCode = this.txtWeldJointCode.Text; } - if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, Request.Params["WeldJointId"])) + if (BLL.WeldJointService.IsExistWeldJointCode(weldJointCode, this.PipelineId, WeldJointId)) { Alert.ShowInTop("该管线焊口已存在！", MessageBoxIcon.Warning); return; @@ -318,7 +330,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage return; } Model.HJGL_WeldJoint joint = new Model.HJGL_WeldJoint(); - string weldJointId = Request.Params["WeldJointId"]; + string weldJointId = WeldJointId; joint.PipelineId = this.PipelineId; joint.PipelineCode = txtPipelineCode.Text.Trim(); joint.ProjectId = this.CurrUser.LoginProjectId; @@ -435,6 +447,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage string newId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldJoint)); joint.WeldJointId = newId; joint.BaseWeldJointId = weldJointId; + WeldJointId = joint.WeldJointId; BLL.WeldJointService.AddWeldJoint(joint); } } @@ -442,6 +455,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage { string newId = SQLHelper.GetNewID(typeof(Model.HJGL_WeldJoint)); joint.WeldJointId = newId; + WeldJointId = joint.WeldJointId; if (Request.Params["IsTwoJoint"] == "1") { joint.IsTwoJoint = true; @@ -854,5 +868,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage // } // } //} + + protected void btnAttachUrl_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(this.WeldJointId)) + { + SaveData(); + } + PageContext.RegisterStartupScript(WindowAtt.GetShowReference(String.Format("~/AttachFile/webuploader.aspx?toKeyId={0}&path=FileUpload/WeldJoint&menuId={1}", WeldJointId, BLL.Const.HJGL_WeldJointMenuId))); + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs index f09a67cb..fb4c5f4b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldJointEdit.aspx.designer.cs @@ -50,6 +50,15 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// protected global::FineUIPro.Toolbar Toolbar1; + /// + /// btnAttachUrl 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnAttachUrl; + /// /// btnSave 控件。 /// @@ -382,5 +391,14 @@ namespace FineUIPro.Web.HJGL.WeldingManage /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Window Window1; + + /// + /// WindowAtt 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window WindowAtt; } } diff --git a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx index 3d6a3813..a09ceb99 100644 --- a/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/BillOfQuantities/TemQuantityList.aspx @@ -34,7 +34,7 @@ @@ -66,7 +66,9 @@ - + + diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 1961cba2..cc805fcb 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -11708,7 +11708,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 @@ -151035,7 +151035,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 @@ -182430,7 +182430,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 WorkPackageEstimate { get @@ -182899,6 +182899,8 @@ namespace Model private string _ParentId; + private string _SerialNumber; + #region 可扩展性方法定义 partial void OnLoaded(); partial void OnValidate(System.Data.Linq.ChangeAction action); @@ -182937,6 +182939,8 @@ namespace Model partial void OnIsTemplateChanged(); partial void OnParentIdChanging(string value); partial void OnParentIdChanged(); + partial void OnSerialNumberChanging(string value); + partial void OnSerialNumberChanged(); #endregion public PHTGL_Quantity() @@ -183284,6 +183288,26 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SerialNumber", DbType="NVarChar(50)")] + public string SerialNumber + { + get + { + return this._SerialNumber; + } + set + { + if ((this._SerialNumber != value)) + { + this.OnSerialNumberChanging(value); + this.SendPropertyChanging(); + this._SerialNumber = value; + this.SendPropertyChanged("SerialNumber"); + this.OnSerialNumberChanged(); + } + } + } + public event PropertyChangingEventHandler PropertyChanging; public event PropertyChangedEventHandler PropertyChanged; @@ -292128,7 +292152,7 @@ namespace Model } } - [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(50)")] + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Name", DbType="NVarChar(81)")] public string Name { get