diff --git a/DataBase/版本日志/SGGLDB_V2023-10-27.sql b/DataBase/版本日志/SGGLDB_V2023-10-27.sql new file mode 100644 index 00000000..5356b3f7 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2023-10-27.sql @@ -0,0 +1,57 @@ + +Alter VIEW [dbo].[View_HJGL_Batch_PointBatchItem] +AS +/*************点口明细表*************/ +SELECT PointBatchItem.PointBatchItemId, +PointBatchItem.PointBatchId, +PointBatch.ProjectId, +PointBatch.UnitId, +PointBatch.DetectionTypeId, +PointBatch.PointBatchCode, +Pipeline.UnitWorkId, +PointBatchItem.WeldJointId, +(CASE PointBatchItem.PointState WHEN '1' THEN '点口' WHEN '2' THEN '扩透' END) AS PointState, +(CASE PointBatchItem.IsBuildTrust WHEN 1 THEN '是' ELSE '' END) AS IsBuildTrust, +(CASE WHEN PointBatchItem.IsAudit=1 THEN '是' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '否' + WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit, +PointBatchItem.PointDate,--点口日期 +(CASE PointBatchItem.IsWelderFirst WHEN 1 THEN '是' ELSE '' END) AS IsWelderFirst, +PointBatchItem.RepairDate,--返修日期 +PointBatchItem.RepairRecordId, +PointBatchItem.CutDate,--切除日期 +PointBatchItem.PBackingWelderId,--返修打底焊工 +PointBatchItem.PCoverWelderId,--返修盖面焊工 +UnitWork.UnitWorkCode,--工区号 +WeldJoint.WeldJointCode,--焊口号 +WeldJoint.BackingWelderId AS WelderId, --焊工ID +BackingWelder.WelderCode AS BackingWelderCode, +CoverWelder.WelderCode AS CoverWelderCode, +WeldType.WeldTypeCode, +WeldJoint.JointAttribute, +WeldJoint.JointArea,--焊接区域 +WeldJoint.Size,--实际寸径 +WeldingDaily.WeldingDate,--焊接日期 +WeldJoint.PipelineId, --管线ID +WeldJoint.Material1Id AS Mat, --材质 +WeldJoint.Specification, --规格 +Pipeline.PipelineCode, --管线号 +PipingClass.PipingClassName , --管道等级 +WeldJoint.BackingWelderId, +WeldJoint.CoverWelderId +FROM dbo.HJGL_Batch_PointBatchItem AS PointBatchItem +LEFT JOIN dbo.HJGL_Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId +LEFT JOIN dbo.HJGL_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=PointBatchItem.WeldJointId +LEFT JOIN dbo.HJGL_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN dbo.WBS_UnitWork AS UnitWork ON UnitWork.UnitWorkId=Pipeline.UnitWorkId +LEFT JOIN dbo.HJGL_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId +LEFT JOIN dbo.Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId +LEFT JOIN SitePerson_Person AS BackingWelder ON BackingWelder.PersonId=WeldJoint.BackingWelderId +LEFT JOIN SitePerson_Person AS CoverWelder ON CoverWelder.PersonId=WeldJoint.CoverWelderId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId +LEFT JOIN HJGL_Hard_TrustItem HardTrustItem ON HardTrustItem.WeldJointId=PointBatchItem.WeldJointId +where (WeldJoint.IsHotProess!=1 or (WeldJoint.IsHotProess=1 and HardTrustItem.IsPass=1)) +and BackingWelder.ProjectId=Pipeline.ProjectId and CoverWelder.ProjectId=Pipeline.ProjectId + +go + diff --git a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql index c792a835..38fea7e0 100644 --- a/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql +++ b/DataBase/菜单初始化脚本/1-6合同管理（Menu_PHTGL）.sql @@ -170,25 +170,26 @@ INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOff VALUES ( N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'۸ϵ',30,N'0',N'Menu_PHTGL',0,0,1) GO INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'C8C719BC-450F-43AB-B17F-AB5DECD83E17',N'',10,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'BBA09E69-5017-411C-A516-64D0140AF70E',N'ֽṹԤƹ',20,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'999FCA97-E28A-46FA-9293-0399D1172AC9',N'չܵװ',30,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'DZ',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'838ED633-B375-4937-A4E1-F95FCCF640A0',N'豸װ',40,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'ˮ',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'AD5C7CBB-310D-4D15-9AFF-530BF765F460',N'DZ豸ֳװ',50,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'ůͨ',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'0141B1F4-970A-4C23-B58A-BDF0785CA96E',N'ǰװ',60,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'8A1D2885-2584-44AD-A4DD-ED3F98198C8A',N'ˮůװ',70,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'48216E20-7103-48AB-A12F-237E28605952',N'ȹ',80,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) - VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'ٽʩ',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + VALUES ( N'5EB73242-63F0-402C-A42B-2BCDC0AC2229',N'⹤',90,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) + INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) + VALUES ( N'2A5A325E-C3C2-4412-9F5D-FB9185E9EB9B',N'',100,N'7D8CF5B4-B945-4254-B134-4ABF55255497',N'Menu_PHTGL',0,1,1) GO - INSERT [Sys_Menu] ([MenuId],[MenuName],[SortIndex],[SuperMenu],[MenuType],[IsOffice],[IsEnd],[IsUsed]) VALUES ( N'73B84D49-940A-42DF-AC14-F4C75E10EC39',N'ִͬи',40,N'0',N'Menu_PHTGL',0,0,1) GO diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs index 6e94061e..1f07a600 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs +++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs @@ -167,6 +167,7 @@ namespace BLL PhtglContracttrackprogressService.CreateTemplateByContractTrackId(newtable.Id); } + public static void UpdatePHTGL_ContractTrack(PHTGL_ContractTrack newtable) @@ -329,8 +330,7 @@ namespace BLL responeData.code = 0; responeData.message = "没有数据"; return responeData; - } - + } foreach (var item in modeList) { item.ContractId = contractid; diff --git a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx index 22236e62..638b3307 100644 Binary files a/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx and b/SGGL/FineUIPro.Web/File/Excel/DataIn/合同执行跟踪导入模板.xlsx differ diff --git a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx index 662e10a2..72e88f8b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WPQ/WPQList.aspx @@ -24,7 +24,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx index e357bfc3..eecf129c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx @@ -42,7 +42,7 @@ - @@ -63,11 +63,11 @@ - @@ -104,35 +104,35 @@ + TextAlign="Center" Width="50px" > + TextAlign="Center" Width="80px" > + TextAlign="Center" Width="80px" > + HeaderTextAlign="Center" TextAlign="Center" Width="150px" ExpandUnusedSpace="true"> + HeaderTextAlign="Center" TextAlign="Center" Width="140px" ExpandUnusedSpace="true"> + HeaderTextAlign="Center" TextAlign="Center" Width="120px" ExpandUnusedSpace="true"> + FieldType="Double" HeaderTextAlign="Center" TextAlign="Center" Width="80px" > + FieldType="String" HeaderTextAlign="Center" TextAlign="Center" Width="120px" > - + @@ -157,6 +157,8 @@ DataField="WeldingRodCode" FieldType="String" HeaderTextAlign="Center" TextAlign="Left" Width="120px" ExpandUnusedSpace="true" Hidden="true"> + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs index 4c251b90..c73d1a4a 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/SelectTaskWeldJoint.aspx.cs @@ -1,6 +1,7 @@ using Aspose.Words; using BLL; using Model; +using NPOI.SS.Formula.Functions; using System; using System.Collections.Generic; using System.Data; @@ -621,5 +622,42 @@ namespace FineUIPro.Web.HJGL.WeldingManage }; } + + protected void Grid1_RowCommand(object sender, GridCommandEventArgs e) + { + + if (e.CommandName == "ResetWpq") + { + var weldJointId = e.RowID; + var model = WeldJointService.GetWeldJointByWeldJointId(weldJointId); + if (model != null) + { + model.WPQId = null; + WeldJointService.UpdateWeldJoint(model); + + List wpqList = BLL.WPQListServiceService.GetMatchWPQ(model, this.CurrUser.LoginProjectId, drpUnit.SelectedValue); + if (wpqList != null) + { + Model.HJGL_WeldJoint newJot = new Model.HJGL_WeldJoint(); + Model.WPQ_WPQList wps = BLL.WPQListServiceService.GetWPQById(wpqList.First().WPQId); + + newJot.WPQId = wps.WPQId; + newJot.WeldJointId = model.WeldJointId; + newJot.WeldingRod = wps.WeldingRod; + newJot.WeldingWire = wps.WeldingWire; + newJot.WeldingMethodId = wps.WeldingMethodId; + newJot.GrooveTypeId = wps.GrooveType; + newJot.PreTemperature = wps.PreTemperature; + newJot.IsHotProess = wps.IsHotProess; + newJot.MatchableWPQ = string.Join(",", wpqList.Select(x => x.WPQCode)); + + BLL.WeldJointService.UpdateConWeldJoint(newJot); + } + + BindGrid(); + ShowNotify("焊评已重置！", MessageBoxIcon.Success); + } + } + } } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx index 0829e1cf..f15bdc0f 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReport.aspx @@ -14,7 +14,7 @@ @@ -27,7 +27,7 @@ - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx index b4cf4ae9..905b5a2e 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx @@ -74,13 +74,18 @@ - + + + + + + @@ -96,32 +101,32 @@ + TextAlign="Center" Width="50px"> + TextAlign="Center" Width="180px" ExpandUnusedSpace="true"> + TextAlign="Center" Width="180px"> <%----%> + TextAlign="Center" Width="150px"> @@ -130,7 +135,7 @@ + HeaderTextAlign="Center" TextAlign="Center" Width="150px"> @@ -147,14 +152,14 @@ --%> + TextAlign="Center" Width="100px"> + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs index a2340393..86fb613c 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.cs @@ -1112,5 +1112,77 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage } } #endregion + + #region 批量填充焊工 + /// + /// + /// + /// + /// + protected void btnSaveWelder_Click(object sender, EventArgs e) + { + if (!string.IsNullOrEmpty(drpCanWelder.SelectedValue)) + { + string[] selectedRowId = Grid1.SelectedRowIDArray; + for (int i = 0; i < selectedRowId.Count(); i++) + { + string weldTaskId = selectedRowId[i]; + BLL.WeldTaskService.UpdateWelderTask(weldTaskId, drpCanWelder.SelectedValue); + } + this.BindGrid(null); + drpCanWelder.Items.Clear(); + } + } + + protected void btnSelectWelder_Click(object sender, EventArgs e) + { + GetCanWelderDropDownList(); + } + + /// + /// 获取能焊焊工下拉列表 + /// + /// + private void GetCanWelderDropDownList() + { + drpCanWelder.Items.Clear(); + string[] selectedRowId = Grid1.SelectedRowIDArray; + List canWelder = null; + var taskList = from x in Funs.DB.HJGL_WeldTask where x.ProjectId == this.CurrUser.LoginProjectId select x; + for (int i = 0; i < selectedRowId.Count(); i++) + { + Model.HJGL_WeldTask task = taskList.FirstOrDefault(x => x.WeldTaskId == selectedRowId[i]); + if (!string.IsNullOrEmpty(task.CanWelderId)) + { + List jotCanWelder = task.CanWelderId.Split(',').ToList(); + if (i == 0) + { + canWelder = jotCanWelder; + } + else + { + canWelder = canWelder.Intersect(jotCanWelder).ToList(); + } + } + else + { + canWelder = null; + break; + } + } + + if (canWelder != null) + { + var welder = from x in canWelder + join y in Funs.DB.SitePerson_Person on x equals y.PersonId + select new { WelderId = x, y.WelderCode }; + drpCanWelder.DataValueField = "WelderId"; + drpCanWelder.DataTextField = "WelderCode"; + drpCanWelder.DataSource = welder; + drpCanWelder.DataBind(); + } + } + #endregion + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs index 95f10054..ae1dafab 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldReportEdit.aspx.designer.cs @@ -203,6 +203,33 @@ namespace FineUIPro.Web.WeldingProcess.WeldingManage /// protected global::FineUIPro.Label lbAmount; + /// + /// btnSelectWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSelectWelder; + + /// + /// drpCanWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpCanWelder; + + /// + /// btnSaveWelder 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSaveWelder; + /// /// Grid1 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx index f77d034a..ed344b06 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingManage/WeldTask.aspx @@ -20,7 +20,7 @@ @@ -34,7 +34,7 @@ - @@ -63,7 +63,7 @@ - + @@ -74,7 +74,7 @@ <%-- --%> - + @@ -158,7 +158,7 @@ - -