From 886e6924fa93d5c638ecf72621df2329989a5e14 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 30 Apr 2026 12:04:30 +0800 Subject: [PATCH 01/11] 1 --- SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs index 3444ae27..0b8eb134 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs @@ -242,6 +242,11 @@ namespace FineUIPro.Web.DCGL.ServerCheck this.btnSaveUp.Hidden = false; } } + + if (proType == "1") + { + this.btnSaveUp.Hidden = true; + } } } #endregion From 574a25aa050751adeef5e2b053bf3ec4e508bf0b Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 30 Apr 2026 12:21:15 +0800 Subject: [PATCH 02/11] 1 --- SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs index 0b8eb134..3c4e351a 100644 --- a/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/DCGL/ServerCheck/CheckRectifyEdit.aspx.cs @@ -81,6 +81,11 @@ namespace FineUIPro.Web.DCGL.ServerCheck //} } } + + if (proType == "1") + { + this.btnSaveUp.Hidden = true; + } } } From aa587acbdcdabca2c9b99714e8a91f08aa4fac37 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Wed, 6 May 2026 20:32:35 +0800 Subject: [PATCH 03/11] 1 --- SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx index 8714caf3..ef90ff9f 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx @@ -55,6 +55,9 @@ + + + From fdb5ec508d141bdeabd7ec5e85bed12b8146ddd6 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sat, 9 May 2026 17:35:03 +0800 Subject: [PATCH 04/11] =?UTF-8?q?=E5=BE=85=E5=8A=9E=E8=A1=A5=E5=85=85?= =?UTF-8?q?=E9=9B=86=E5=9B=A2=E7=9D=A3=E6=9F=A5=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...2026-05-09-xiaj（Sp_Project_GetToDoItems）.sql | 403 +++++++++++++++++ ...26-05-09-xiaj（Sp_WorkBench_GetToDoItems）.sql | 420 ++++++++++++++++++ 2 files changed, 823 insertions(+) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_Project_GetToDoItems）.sql create mode 100644 DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_WorkBench_GetToDoItems）.sql diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_Project_GetToDoItems）.sql b/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_Project_GetToDoItems）.sql new file mode 100644 index 00000000..d83bb6ac --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_Project_GetToDoItems）.sql @@ -0,0 +1,403 @@ + +/****** Object: StoredProcedure [dbo].[Sp_Project_GetToDoItems] Script Date: 2026-5-9 16:07:48 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + + + + +--ȡǰ˴ +ALTER PROCEDURE [dbo].[Sp_Project_GetToDoItems] + @projectId NVARCHAR(50)=NULL, + @userId NVARCHAR(200)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,(case when len(register.RegisterDef)>15 then LEFT(register.RegisterDef,15)+'...' else register.RegisterDef end)AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +) +UNION ALL + +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲȷ' AS MenuName + ,(case when len(register.RegisterDef)>15 then LEFT(register.RegisterDef,15)+'...' else register.RegisterDef end) AS Content + ,UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'../HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE register.ProjectId=@projectId AND +register.states = '2' AND register.CheckManId =@userId + +UNION ALL +SELECT CheckControlCode AS DataId + ,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId + ,'Ѳ' AS MenuName + ,checkControl.QuestionDef AS Content + ,UserId + ,users.UserName + ,checkControl.CheckDate AS DataTime + ,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr + ,'../CQMS/Check/ChecklistEdit.aspx?ToDo=ToDo&CheckControlCode='+checkControl.CheckControlCode AS PCUrl +FROM Check_CheckControl AS checkControl +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE checkControl.ProjectId=@projectId AND +checkControl.State != '7' AND checkControl.CheckControlCode IN (select CheckControlCode from Check_CheckControlApprove approve where approve.ApproveType!='S' AND approve.ApproveMan=@userId AND approve.ApproveDate IS NULL ) + +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼ' AS MenuName + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl +FROM GJSX +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE GJSX.ProjectId=@projectId AND +GJSX.State != 0 AND (((select count(*) from GJSX_detail detail where detail.Progress_user=@userId AND detail.GJSXID=GJSX.GJSXID)=0 +AND (select count(*) from GJSX_Process process where process.UserId=@userId AND process.GJSXID=GJSX.GJSXID)>0) +OR (GJSX.User_Acceptance LIKE '%'+@userId+'%' AND (select count(*) from GJSX_detail detail where detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process where process.GJSXID=GJSX.GJSXID)) +) + +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼر' AS MenuName + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'../PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID AS PCUrl +FROM GJSX +LEFT JOIN Project_ProjectUser AS projectUser ON projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project AS project ON project.ProjectId =projectUser.ProjectId +WHERE GJSX.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +GJSX.State = 3 AND GJSX.ProgressStatus=1 AND (GJSX.UserID = @userId OR GJSX.User_ReceiveID = @userId ) + +--UNION ALL +--SELECT InspectionEquipmentId AS DataId +-- ,'6c2c1e5e-1812-4e1c-a683-7125518e28c7' AS MenuId +-- ,'豸ϱȷ' AS MenuName +-- ,Equipment.InspectionName AS Content +-- ,UserId +-- ,users.UserName +-- ,Equipment.InspectionDate AS DataTime +-- ,CONVERT(varchar(100),Equipment.InspectionDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionEquipmentEdit.aspx?ToDo=ToDo&InspectionEquipmentId='+Equipment.InspectionEquipmentId AS PCUrl +--FROM Comprehensive_InspectionEquipment AS Equipment +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Equipment.ProjectId=@projectId AND +--Equipment.Status!='3' AND Equipment.InspectionEquipmentId IN (select InspectionEquipmentId from Comprehensive_InspectionEquipmentApprove approve where approve.ApproveType!='S' AND approve.ApproveMan=@userId AND approve.ApproveDate IS NULL ) +--UNION ALL +--SELECT InspectionPersonId AS DataId +-- ,'8ed133de-5899-4687-878a-20b1f5280f18' AS MenuId +-- ,'Աȷ' AS MenuName +-- ,Person.PersonName AS Content +-- ,UserId +-- ,users.UserName +-- ,Person.CompileDate AS DataTime +-- ,CONVERT(varchar(100),Person.CompileDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionPersonEdit.aspx?ToDo=ToDo&InspectionPersonId='+Person.InspectionPersonId AS PCUrl +--FROM Comprehensive_InspectionPerson AS Person +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Person.ProjectId=@projectId AND +--Person.Status!='3' AND Person.InspectionPersonId IN (select InspectionPersonId from Comprehensive_InspectionPersonApprove approve where approve.ApproveType!='S' AND approve.ApproveMan=@userId AND approve.ApproveDate IS NULL ) +--UNION ALL +--SELECT InspectionMachineId AS DataId +-- ,'aa55fad1-6c51-43f5-8c99-3c6aaae79118' AS MenuId +-- ,'߱ȷ' AS MenuName +-- ,Machine.InspectionMachineName AS Content +-- ,UserId +-- ,users.UserName +-- ,Machine.CompileDate AS DataTime +-- ,CONVERT(varchar(100),Machine.CompileDate, 23) AS DataTimeStr +-- ,'../CQMS/Comprehensive/InspectionMachineEdit.aspx?ToDo=ToDo&InspectionMachineId='+Machine.InspectionMachineId AS PCUrl +--FROM Comprehensive_InspectionMachine AS Machine +--LEFT JOIN Sys_User AS users ON users.UserId =@userId +--WHERE Machine.ProjectId=@projectId AND +--Machine.Status!='3' AND Machine.InspectionMachineId IN (select InspectionMachineId from Comprehensive_InspectionMachineApprove approve where approve.ApproveType!='S' AND approve.ApproveMan=@userId AND approve.ApproveDate IS NULL ) +UNION ALL +SELECT ConstructSolutionId AS DataId + ,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId + ,'ʩ' AS MenuName + ,Solution.SolutionName AS Content + ,UserId + ,users.UserName + ,Solution.CompileDate AS DataTime + ,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr + ,'../CQMS/Solution/EditConstructSolution.aspx?ToDo=ToDo&ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl +FROM Solution_CQMSConstructSolution AS Solution +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE Solution.ProjectId=@projectId AND +Solution.State!='3' +AND Solution.ConstructSolutionId IN +(select top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove where ApproveType!='S' AND ApproveDate IS NULL GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] AND Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +where approve.ApproveMan=@userId ) + +UNION ALL +SELECT InspectionId AS DataId + ,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId + ,'֪ͨ' AS MenuName + ,InspectionManagement.AcceptanceSite AS Content + ,UserId + ,users.UserName + ,InspectionManagement.CompileDate AS DataTime + ,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr + ,'../CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl +FROM ProcessControl_InspectionManagement AS InspectionManagement +LEFT JOIN Sys_User AS users ON users.UserId =@userId +WHERE InspectionManagement.ProjectId=@projectId AND +dateadd(day,3,InspectionManagement.CompileDate)>getdate() AND InspectionManagement.AcceptanceCheckMan LIKE '%'+@userId+'%' +UNION ALL +SELECT DCheck.CheckRectifyId AS DataId + ,'2E4A3E58-44B7-41B0-BFE3-634DF29AAE27' AS MenuId + ,'Ŷ' AS MenuName + ,''+DCheck.CheckRectifyCode+''+DCheck.ProjectName AS Content + ,'' + ,'' + ,DCheck.CheckDate AS DataTime + ,CONVERT(varchar(100),DCheck.CheckDate, 23) AS DataTimeStr + ,'../DCGL/ServerCheck/CheckRectify.aspx?proType=1' AS PCUrl +FROM DCGL_Check_CheckRectify AS DCheck +LEFT JOIN Project_ProjectUser AS projectUser ON projectUser.UserId=@userId +WHERE DCheck.ProjectId = @projectId AND projectUser.ProjectId = @projectId AND DCheck.HandleState = '2' AND projectUser.IsPost=1 +UNION ALL +SELECT CheckSpecialId AS DataId + ,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId + ,'ר' AS MenuName + ,CheckItemSet.CheckItemName AS Content + ,UserId + ,users.UserName + ,CheckSpecial.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl +FROM Check_CheckSpecial AS CheckSpecial +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId +WHERE CheckSpecial.ProjectId=@projectId AND +dateadd(day,3,CheckSpecial.CheckTime)>getdate() AND CheckSpecial.PartInPersonIds LIKE '%'+@userId+'%' +UNION ALL +SELECT CheckColligationId AS DataId + ,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId + ,'ۺϼ' AS MenuName + ,case CheckType when '0' then 'ܼ' when '1' then '¼' else '' end AS Content + ,users.UserId + ,users.UserName + ,CheckColligation.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr + ,'../HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl +FROM Check_CheckColligation AS CheckColligation +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId +LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId +WHERE CheckColligation.ProjectId=@projectId AND FlowOperate.IsClosed <> 1 AND FlowOperate.OperaterId=@userId +UNION ALL +SELECT PatrolPlanId AS DataId + ,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId + ,'Ѳ' AS MenuName + ,HazardListItem.HazardItems AS Content + ,UserId + ,users.UserName + ,PatrolPlan.LimitCheckDate AS DataTime + ,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr + ,'../HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl +FROM Hazard_PatrolPlan AS PatrolPlan +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem ON HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId +WHERE HazardListItem.ProjectId=@projectId AND +dateadd(day,-3,PatrolPlan.LimitCheckDate)=22 AND (select COUNT(*) from JDGL_QuantityCompletion WHERE ProjectId=@projectId AND DATENAME(year,GETDATE())=DATENAME(year,EndDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0) +--OR (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))=22 AND +DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate) + +UNION ALL +SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId + '' AS DataId + ,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId + ,'ȹܽȼƻδ' AS MenuName + ,'' AS Content + ,users.UserId + ,users.UserName + ,GETDATE() AS DataTime + ,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr + ,'../JDGL/Check/WeekPlanEdit.aspx?ToDo=ToDo&WeekNo='+WeekPlan.WeekNo AS PCUrl +FROM JDGL_WeekPlan AS WeekPlan +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Project_ProjectUser AS pu ON pu.UserId=@userId +WHERE WeekPlan.ProjectId=@projectId +AND WeekPlan.DutyPerson LIKE '%'+@userId+'%' AND WeekPlan.IsOK =0 AND DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate) +AND DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate) + +UNION ALL +SELECT DISTINCT --MonthPlan.MonthPlanId AS DataId + '' AS DataId + ,'C62F4256-4AC5-44BB-A990-2D330541A968' AS MenuId + ,'ļ·' AS MenuName + ,'' AS Content + ,users.UserId + ,users.UserName + ,GETDATE() AS DataTime + ,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr + ,'../CQMS/DesignDrawing/ArchivesLibReceive.aspx' AS PCUrl +FROM IDP_DesignDrawingIssue AS DesignDrawingIssue +LEFT JOIN Sys_User AS users ON users.UserId =@userId +LEFT JOIN Project_ProjectUser AS pu ON pu.UserId=@userId +WHERE DesignDrawingIssue.ProjectId=@projectId AND DesignDrawingIssue.ReceiveUserId=@userId +AND DesignDrawingIssue.IsSee IS NULL + +ORDER BY DataTime DESC +END + + + + + +GO + + diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_WorkBench_GetToDoItems）.sql b/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_WorkBench_GetToDoItems）.sql new file mode 100644 index 00000000..07d85666 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-05-09-xiaj（Sp_WorkBench_GetToDoItems）.sql @@ -0,0 +1,420 @@ + +GO + +/****** Object: StoredProcedure [dbo].[Sp_WorkBench_GetToDoItems] Script Date: 2026-5-9 15:28:58 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + + + + + + + +--ȡǰ˹̨Ԥ +ALTER PROCEDURE [dbo].[Sp_WorkBench_GetToDoItems] + @userId NVARCHAR(200)=NULL, + @sType char(10)=NULL +AS +/*ȡǰ˴*/ +BEGIN +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲ' AS MenuName + ,project.ProjectCode + ,register.RegisterDef AS Content + ,users.UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'HSSE/HiddenInspection/HiddenRectificationRectify.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND register.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +((register.states = '1' AND (register.ResponsibleMan =@userId OR register.CCManIds LIKE ('%'+@userId+'%') )) +) +UNION ALL + +SELECT HazardRegisterId AS DataId + ,'B6BE5FE0-CB84-47FF-A6C3-5AD9E1CCE079' AS MenuId + ,'ȫѲȷ' AS MenuName + ,project.ProjectCode + ,register.RegisterDef AS Content + ,users.UserId + ,users.UserName + ,register.RegisterDate AS DataTime + ,CONVERT(varchar(100),register.RegisterDate, 23) AS DataTimeStr + ,'HSSE/HiddenInspection/HiddenRectificationConfirm.aspx?HazardRegisterId='+register.HazardRegisterId AS PCUrl +FROM HSSE_Hazard_HazardRegister AS register +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND register.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +register.states = '2' AND register.CheckManId =@userId + +UNION ALL +SELECT CheckControlCode AS DataId + ,'B3E99BD9-FDC7-4F15-8C3C-A7821AC9E306' AS MenuId + ,'Ѳ' AS MenuName + ,project.ProjectCode + ,checkControl.QuestionDef AS Content + ,users.UserId + ,users.UserName + ,checkControl.CheckDate AS DataTime + ,CONVERT(varchar(100),checkControl.CheckDate, 23) AS DataTimeStr + ,'CQMS/Check/ChecklistEdit.aspx?CheckControlCode='+checkControl.CheckControlCode AS PCUrl +FROM Check_CheckControl AS checkControl +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND checkControl.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +checkControl.State != '7' AND checkControl.CheckControlCode IN (select CheckControlCode from Check_CheckControlApprove approve WHERE approve.ApproveType!='S' AND approve.ApproveMan=@userId AND approve.ApproveDate IS NULL ) + +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼ' AS MenuName + ,project.ProjectCode + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID+'&ProjectId='+project.ProjectId AS PCUrl +FROM GJSX +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND GJSX.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +GJSX.State != 0 AND (((select count(*) from GJSX_detail detail WHERE detail.Progress_user=@userId AND detail.GJSXID=GJSX.GJSXID)=0 +AND (select count(*) from GJSX_Process process WHERE process.UserId=@userId AND process.GJSXID=GJSX.GJSXID)>0) +OR (GJSX.User_Acceptance LIKE '%'+@userId+'%' AND (select count(*) from GJSX_detail detail WHERE detail.GJSXID=GJSX.GJSXID)=(select count(*) from GJSX_Process process WHERE process.GJSXID=GJSX.GJSXID)) +) +UNION ALL +SELECT GJSXID AS DataId + ,'0BEA2126-7A48-40EB-8E21-99148E91A22B' AS MenuId + ,'ؼر' AS MenuName + ,project.ProjectCode + ,GJSX.Detail AS Content + ,users.UserId + ,users.UserName + ,GJSX.CreateDate AS DataTime + ,CONVERT(varchar(100),GJSX.CreateDate, 23) AS DataTimeStr + ,'PZHGL/GJSX/GJSXListEdit.aspx?ToDo=ToDo&EditType=Edit&ID='+GJSXID+'&ProjectId='+project.ProjectId AS PCUrl +FROM GJSX +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND GJSX.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +GJSX.State = 3 AND GJSX.ProgressStatus=1 AND (GJSX.UserID = @userId OR GJSX.User_ReceiveID = @userId ) + + +UNION ALL +SELECT ConstructSolutionId AS DataId + ,'91C4BFDB-0A51-4992-99CC-EB4EC185593D' AS MenuId + ,'ʩ' AS MenuName + ,project.ProjectCode + ,Solution.SolutionName AS Content + ,users.UserId + ,users.UserName + ,Solution.CompileDate AS DataTime + ,CONVERT(varchar(100),Solution.CompileDate, 23) AS DataTimeStr + ,'CQMS/Solution/EditConstructSolution.aspx?ConstructSolutionId='+Solution.ConstructSolutionId AS PCUrl +FROM Solution_CQMSConstructSolution AS Solution +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND Solution.ProjectId = projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +Solution.State!='3' +AND Solution.ConstructSolutionId IN +(select top 1 ConstructSolutionId from ( +SELECT Solution_CQMSConstructSolutionApprove.* +FROM Solution_CQMSConstructSolutionApprove, +(SELECT MIN([order]) AS [order],ConstructSolutionId FROM Solution_CQMSConstructSolutionApprove WHERE ApproveType!='S' AND ApproveDate IS NULL GROUP BY ConstructSolutionId )b +WHERE Solution_CQMSConstructSolutionApprove.[order] = b.[order] AND Solution_CQMSConstructSolutionApprove.ConstructSolutionId = b.ConstructSolutionId + ) approve +WHERE approve.ApproveMan=@userId ) + +UNION ALL +SELECT InspectionId AS DataId + ,'4781f467-35bf-4cf2-aaa4-7960a175eb61' AS MenuId + ,'֪ͨ' AS MenuName + ,project.ProjectCode + ,InspectionManagement.AcceptanceSite AS Content + ,users.UserId + ,users.UserName + ,InspectionManagement.CompileDate AS DataTime + ,CONVERT(varchar(100),InspectionManagement.CompileDate, 23) AS DataTimeStr + ,'CQMS/ProcessControl/InspectionNoticeEdit.aspx?View=View&InspectionId='+InspectionManagement.InspectionId AS PCUrl +FROM ProcessControl_InspectionManagement AS InspectionManagement +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND InspectionManagement.ProjectId=projectUser.ProjectId AND (project.ProjectState = '1' OR project.ProjectState IS NULL) +AND InspectionManagement.InspectionDate IS NULL AND InspectionManagement.AcceptanceCheckMan LIKE '%'+@userId+'%' +UNION ALL +SELECT DCheck.CheckRectifyId AS DataId + ,'2E4A3E58-44B7-41B0-BFE3-634DF29AAE27' AS MenuId + ,'Ŷ' AS MenuName + ,project.ProjectCode + ,''+DCheck.CheckRectifyCode+''+DCheck.ProjectName AS Content + ,'' + ,'' + ,DCheck.CheckDate AS DataTime + ,CONVERT(varchar(100),DCheck.CheckDate, 23) AS DataTimeStr + ,'DCGL/ServerCheck/CheckRectify.aspx?proType=1' AS PCUrl +FROM DCGL_Check_CheckRectify AS DCheck +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +WHERE (@sType='1' OR @sType='2') AND DCheck.ProjectId = projectUser.ProjectId AND DCheck.HandleState = '2' AND projectUser.IsPost=1 +UNION ALL +SELECT CheckSpecialId AS DataId + ,'1B08048F-93ED-4E84-AE65-DB7917EA2DFB' AS MenuId + ,'ר' AS MenuName + ,project.ProjectCode + ,CheckItemSet.CheckItemName AS Content + ,users.UserId + ,users.UserName + ,CheckSpecial.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckSpecial.CheckTime, 23) AS DataTimeStr + ,'HSSE/Check/CheckSpecialView.aspx?CheckSpecialId='+CheckSpecial.CheckSpecialId AS PCUrl +FROM Check_CheckSpecial AS CheckSpecial +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +LEFT JOIN Technique_CheckItemSet AS CheckItemSet ON CheckItemSet.CheckItemSetId =CheckSpecial.CheckItemSetId +WHERE (@sType='1' OR @sType='2') AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +dateadd(day,3,CheckSpecial.CheckTime)>getdate() AND CheckSpecial.PartInPersonIds LIKE '%'+@userId+'%' +AND CheckSpecial.ProjectId = projectUser.ProjectId +UNION ALL +SELECT CheckColligationId AS DataId + ,'C198EBA8-9E23-4654-92E1-09C61105C522' AS MenuId + ,'ۺϼ' AS MenuName + ,project.ProjectCode + ,case CheckType when '0' then 'ܼ' when '1' then '¼' else '' end AS Content + ,users.UserId + ,users.UserName + ,CheckColligation.CheckTime AS DataTime + ,CONVERT(varchar(100),CheckColligation.CheckTime, 23) AS DataTimeStr + ,'HSSE/Check/CheckColligationEdit.aspx?CheckColligationId='+CheckColligation.CheckColligationId AS PCUrl +FROM Check_CheckColligation AS CheckColligation +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +LEFT JOIN Sys_FlowOperate AS FlowOperate ON CheckColligation.CheckColligationId=FlowOperate.DataId +LEFT JOIN Sys_User AS OperateUser ON FlowOperate.OperaterId=OperateUser.UserId +WHERE (@sType='1' OR @sType='2') AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +FlowOperate.IsClosed <> 1 AND FlowOperate.OperaterId=@userId +AND CheckColligation.ProjectId = projectUser.ProjectId +UNION ALL +SELECT PatrolPlanId AS DataId + ,'D256E5C8-DC76-4F4D-BABE-A253418823F4' AS MenuId + ,'Ѳ' AS MenuName + ,project.ProjectCode + ,HazardListItem.HazardItems AS Content + ,users.UserId + ,users.UserName + ,PatrolPlan.LimitCheckDate AS DataTime + ,CONVERT(varchar(100),PatrolPlan.LimitCheckDate, 23) AS DataTimeStr + ,'HSSE/Hazard/RoutingInspectionEdit.aspx?PatrolPlanId='+PatrolPlan.PatrolPlanId AS PCUrl +FROM Hazard_PatrolPlan AS PatrolPlan +LEFT JOIN Project_ProjectUser as projectUser on projectUser.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId = projectUser.UserId +LEFT JOIN Base_Project as project on project.ProjectId =projectUser.ProjectId +LEFT JOIN Hazard_HazardSelectedItem AS HazardListItem on HazardListItem.HazardSelectedItemId=PatrolPlan.HazardSelectedItemId +WHERE (@sType='1' OR @sType='2') AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND +dateadd(day,-3,PatrolPlan.LimitCheckDate)=22 AND (select COUNT(*) from JDGL_QuantityCompletion WHERE DATENAME(year,GETDATE())=DATENAME(year,EndDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,EndDate))=0) +AND (@sType='1' OR @sType='2') AND Project.ProjectId = pu.ProjectId --OR (DATEADD(day,60,(select top 1 EndDate from JDGL_QuantityCompletion WHERE ProjectId=@projectId order by EndDate desc))=22 AND +DATENAME(year,GETDATE())=DATENAME(year,MonthPlan.PlanDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,MonthPlan.PlanDate) +AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND (@sType='1' OR @sType='2') +UNION ALL +SELECT DISTINCT --WeekPlan.WeekPlanId AS DataId + '' AS DataId + ,'56A54B4B-BBA3-4249-9FFC-3A60DAC79059' AS MenuId + ,'ȹܽȼƻδ' AS MenuName + ,project.ProjectCode + ,'' AS Content + ,users.UserId + ,users.UserName + ,GETDATE() AS DataTime + ,CONVERT(varchar(100),GETDATE(), 23) AS DataTimeStr + ,'JDGL/Check/WeekPlanEdit.aspx?WeekNo='+WeekPlan.WeekNo AS PCUrl +FROM JDGL_WeekPlan AS WeekPlan +LEFT JOIN Project_ProjectUser as pu on pu.UserId=@userId +LEFT JOIN Sys_User AS users ON users.UserId =pu.UserId +LEFT JOIN Base_Project as project on project.ProjectId =pu.ProjectId +WHERE WeekPlan.ProjectId = pu.ProjectId +AND WeekPlan.DutyPerson LIKE '%'+@userId+'%' AND WeekPlan.IsOK =0 AND DATENAME(DAY,GETDATE())<=DATENAME(DAY,WeekPlan.EndDate) +AND DATENAME(year,GETDATE())=DATENAME(year,WeekPlan.EndDate) AND DATENAME(MONTH,GETDATE())=DATENAME(MONTH,WeekPlan.EndDate) +AND (project.ProjectState = '1' OR project.ProjectState IS NULL) AND (@sType='1' OR @sType='2') + +ORDER BY DataTime DESC +END + + + + + +GO + + From 225f83a88d9b2266ab6c45ca516b6170fe63fd61 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 12 May 2026 09:52:48 +0800 Subject: [PATCH 05/11] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectDataSync/Project_CQMSData_CQMS.aspx.cs | 13 +++++++++---- .../ProjectDataSync/Project_CQMSData_CQMSEdit.aspx | 4 ++-- .../Project_CQMSData_CQMSEdit.aspx.cs | 4 ++-- .../Project_CQMSData_CQMSEdit.aspx.designer.cs | 9 --------- .../ProjectDataSync/Project_HJGLData_HJGL.aspx.cs | 5 +++++ .../ProjectDataSync/Project_HJGLData_HJGLEdit.aspx | 4 ++-- .../Project_HJGLData_HJGLEdit.aspx.cs | 4 ++-- .../Project_HJGLData_HJGLEdit.aspx.designer.cs | 9 --------- .../ProjectDataSync/Project_HSSEData_HSSE.aspx.cs | 5 +++++ .../ProjectDataSync/Project_HSSEData_HSSEEdit.aspx | 4 ++-- .../Project_HSSEData_HSSEEdit.aspx.cs | 4 ++-- .../Project_HSSEData_HSSEEdit.aspx.designer.cs | 9 --------- 12 files changed, 31 insertions(+), 43 deletions(-) diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs index a5cc5e82..e4d7df79 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMS.aspx.cs @@ -8,7 +8,7 @@ using System.Collections.Generic; using System.Linq; namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { - public partial class Project_CQMSData_CQMS : PageBase + public partial class Project_CQMSData_CQMS : PageBase { protected void Page_Load(object sender, EventArgs e) @@ -33,6 +33,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); } + string projectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrWhiteSpace(projectId)) + { + list = list.Where(x => x.ProjectId == projectId); + } int count = list.Count(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); @@ -101,7 +106,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("Project_CQMSData_CQMSEdit.aspx?Id={0}", string.Empty, "增加 - "))); - + } @@ -148,12 +153,12 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { string rowID = Grid1.DataKeys[rowIndex][0].ToString(); var model = BLL.Project_CQMSDataService.GetProject_CQMSData_CQMSById(rowID); - if (model!=null) + if (model != null) { BLL.Project_CQMSDataService.DeleteProject_CQMSData_CQMSById(rowID); } - + } BindGrid(); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx index 149b75ff..06787f0e 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx @@ -153,9 +153,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs index a6170fb2..b5c556b6 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.cs @@ -44,7 +44,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; if (!string.IsNullOrEmpty(this.Id)) { @@ -265,7 +265,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs index 21722d3a..c8ece09b 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_CQMSData_CQMSEdit.aspx.designer.cs @@ -338,15 +338,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs index cdba51a3..ac050eb1 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGL.aspx.cs @@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); } + string projectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrWhiteSpace(projectId)) + { + list = list.Where(x => x.ProjectId == projectId); + } int count = list.Count(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx index 681ba7b6..a982f9bd 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx @@ -83,9 +83,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs index 259c4012..e109c0f7 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; BLL.Base_DefectService.InitDefectDropDownList(DropDefect, false, null); if (!string.IsNullOrEmpty(this.Id)) @@ -225,7 +225,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs index a91df4b1..33094cab 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HJGLData_HJGLEdit.aspx.designer.cs @@ -176,15 +176,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 /// diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs index 46efcf63..333bfd64 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSE.aspx.cs @@ -36,6 +36,11 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { list = list.Where(x => x.ProjectName.Contains(txtProjectName.Text.Trim())); } + string projectId = this.CurrUser.LoginProjectId; + if (!string.IsNullOrWhiteSpace(projectId)) + { + list = list.Where(x => x.ProjectId == projectId); + } int count = list.Count(); list = SortConditionHelper.SortingAndPaging(list, Grid1.SortField, Grid1.SortDirection, Grid1.PageIndex, Grid1.PageSize); diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx index 897a6c27..d02e2146 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx @@ -309,9 +309,9 @@ - - + --%> <%-- --%> diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs index a1368364..4a4f9690 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.cs @@ -34,7 +34,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { this.btnClose.OnClientClick = ActiveWindow.GetHideReference(); ////权限按钮方法 - this.GetButtonPower(); + //this.GetButtonPower(); this.Id = Request.Params["Id"]; BLL.RectifyService.InitRectifyDropDownList(DropTypeName, false, null); if (!string.IsNullOrEmpty(this.Id)) @@ -549,7 +549,7 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync { if (buttonList.Contains(BLL.Const.BtnSave)) { - this.btnSave.Hidden = false; + //this.btnSave.Hidden = false; } } } diff --git a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs index 9eb768d6..a8007b76 100644 --- a/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEEdit.aspx.designer.cs @@ -770,15 +770,6 @@ namespace FineUIPro.Web.ZHGL.DataSync.ProjectDataSync /// protected global::FineUIPro.Toolbar Toolbar1; - /// - /// btnSave 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Button btnSave; - /// /// btnClose 控件。 /// From f91ad2ca45d11646e7eef701277a7916cfc2ca36 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Thu, 21 May 2026 15:58:21 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E4=B8=BB=E6=95=B0?= =?UTF-8?q?=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...6-05-21-xiaj（集团主数据在建项目使用情况）.sql | 17 ++ SGGL/BLL/ProjectData/ProjectService.cs | 33 +++ SGGL/FineUIPro.Web/FineUIPro.Web.csproj | 8 + .../ProjectData/MasterProjectData.aspx | 144 ++++++++++++ .../ProjectData/MasterProjectData.aspx.cs | 147 ++++++++++++ .../MasterProjectData.aspx.designer.cs | 134 +++++++++++ .../FineUIPro.Web/ProjectData/ProjectSet.aspx | 218 +++++++++--------- .../ProjectData/ProjectSetSave.aspx | 32 ++- .../ProjectData/ProjectSetSave.aspx.cs | 143 +++++++++++- .../ProjectSetSave.aspx.designer.cs | 9 + SGGL/FineUIPro.Web/common/Menu_SysSet.xml | 1 + SGGL/FineUIPro.Web/common/PageBase.cs | 12 +- .../APIItem/CNCEC/Ads_pms_pro_info_build.cs | 81 +++++++ SGGL/Model/Model.csproj | 1 + 14 files changed, 850 insertions(+), 130 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-05-21-xiaj（集团主数据在建项目使用情况）.sql create mode 100644 SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx create mode 100644 SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs create mode 100644 SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs create mode 100644 SGGL/Model/APIItem/CNCEC/Ads_pms_pro_info_build.cs diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-21-xiaj（集团主数据在建项目使用情况）.sql b/DataBase/版本日志/SUBQHSE_V2026-05-21-xiaj（集团主数据在建项目使用情况）.sql new file mode 100644 index 00000000..991f169a --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-05-21-xiaj（集团主数据在建项目使用情况）.sql @@ -0,0 +1,17 @@ + + + +--˾ڽĿʹ +--ע˵Ŀ˵棻ݶƵλ봦 +SELECT SuperMenu,MenuType,* FROM Sys_Menu WHERE MenuName='Ŀ' + +IF NOT EXISTS (SELECT * FROM Sys_Menu WHERE MenuId = '204ACA82-15B4-4C80-AE9F-ACF25CE79999') +BEGIN +INSERT INTO dbo.Sys_Menu (MenuId, MenuName,Url, SortIndex, SuperMenu, MenuType, IsOffice, IsEnd, IsUsed) +VALUES (N'204ACA82-15B4-4C80-AE9F-ACF25CE79999', N'ڽĿʹ', N'ProjectData/MasterProjectData.aspx', 20, N'75AA6177-8AAD-4AA4-BC4E-3883FB095A65', N'Menu_SysSet', 1,1, 1); +END +GO + + + + diff --git a/SGGL/BLL/ProjectData/ProjectService.cs b/SGGL/BLL/ProjectData/ProjectService.cs index 0c66a4a4..56df2dda 100644 --- a/SGGL/BLL/ProjectData/ProjectService.cs +++ b/SGGL/BLL/ProjectData/ProjectService.cs @@ -798,6 +798,36 @@ } #endregion + #region 获取集团主数据项目 + + /// + /// 获取主数据项目【新的主数据表】 + /// + /// + public static List GetMasterProjectDataInfos() + { + var thisUnit = CommonService.GetIsThisUnit(); + Dictionary dic = new Dictionary() + { + {"collCropCode", thisUnit.CollCropCode} + }; + //var cacheKey = "MasterDataProjects"; + //if (CacheHelper.Exists(cacheKey)) + //{ + // return CacheHelper.Get>(cacheKey); + //} + List projectlist = new List(); + var returnData = ServerService.GerDataFromCncec("/api/Common/GetMasterProjectDataByCollCropCode", dic, null); + if (returnData != null && returnData.code == 1) + { + projectlist = JsonConvert.DeserializeObject>(returnData.data.ToString()); + //CacheHelper.Add(cacheKey, projectlist, DateTimeOffset.Now.AddDays(2)); + } + + return projectlist; + } + + /// /// 获取主数据项目 /// @@ -851,5 +881,8 @@ Funs.FineUIPleaseSelect(dropName); } } + + #endregion + } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj index d5c45da5..bd60f767 100644 --- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj +++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj @@ -1719,6 +1719,7 @@ + @@ -16233,6 +16234,13 @@ MainItemView.aspx + + MasterProjectData.aspx + ASPXCodeBehind + + + MasterProjectData.aspx + ProjectInformation.aspx ASPXCodeBehind diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx new file mode 100644 index 00000000..5c802f14 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx @@ -0,0 +1,144 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MasterProjectData.aspx.cs" Inherits="FineUIPro.Web.ProjectData.MasterProjectData" %> + + + + + + 集团在建项目清单 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + + + + + + + + + + + + + + + + + + + <%----%> + + + + + + + + + + + + + <%----%> + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs new file mode 100644 index 00000000..eec1ffb9 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs @@ -0,0 +1,147 @@ +using BLL; +using System; +using System.Collections.Generic; +using System.Data; +using System.Data.SqlClient; +using System.Linq; +using System.Runtime.InteropServices.ComTypes; + +namespace FineUIPro.Web.ProjectData +{ + public partial class MasterProjectData : PageBase + { + #region 加载 + /// + /// 加载页面 + /// + /// + /// + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + Funs.DropDownPageSize(this.ddlPageSize); + this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString(); + // 绑定表格 + this.BindGrid(); + } + } + #endregion + + #region 绑定数据 + /// + /// 绑定数据 + /// + private void BindGrid() + { + var db = Funs.DB; + var masterProDatas = ProjectService.GetMasterProjectDataInfos(); + var query = from x in masterProDatas + join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup + from pro in proGroup.DefaultIfEmpty() + select new + { + Pid= x.Pro_id+(pro != null ? $"-{pro.ProjectId}":""), + x.Pro_id, + x.Pro_name, + x.Pro_code, + x.Start_date, + x.Pro_status, + ProjectName = pro != null ? pro.ProjectName : "", + ProjectCode = pro != null ? pro.ProjectCode : "", + StartDate = pro != null ? pro.StartDate : null, + ProjectState = pro != null ? pro.ProjectState : "", + relate = pro != null && pro.MasterSysId != null ? "已关联" : "" + }; + + string proName = this.txtProjectName.Text.Trim(); + string proCode = this.txtProjectCode.Text.Trim(); + if (!string.IsNullOrEmpty(proName)) + { + query = query.Where(x => x.Pro_name.Contains(proName)); + } + if (!string.IsNullOrEmpty(proCode)) + { + query = query.Where(x => x.Pro_code.Contains(proCode)); + } + DataTable tb = Funs.LINQToDataTable(query); + Grid1.RecordCount = tb.Rows.Count; + Grid1.DataSource = this.GetPagedDataTable(Grid1, tb); + Grid1.DataBind(); + } + + /// + /// 项目状态 + /// + /// + /// + protected string ConvertProjectState(object state) + { + string result = string.Empty; + string stateStr = state.ToString(); + if (state != null && !string.IsNullOrWhiteSpace(stateStr)) + { + result = stateStr == "2" ? "暂停中" : stateStr == "3" ? "已完工" : "施工中"; + } + return result; + } + #endregion + + #region Grid + + protected void TextBox_TextChanged(object sender, EventArgs e) + { + this.BindGrid(); + } + + /// + /// + /// + /// + /// + protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e) + { + BindGrid(); + } + + /// + /// + /// + /// + /// + protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e) + { + Grid1.PageSize = Convert.ToInt32(ddlPageSize.SelectedValue); + BindGrid(); + } + + protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e) + { + BindGrid(); + } + #endregion + + + #region 导出按钮 + /// 导出按钮 + /// + /// + /// + protected void btnOut_Click(object sender, EventArgs e) + { + Response.ClearContent(); + string filename = Funs.GetNewFileName(); + Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("集团主数据在建项目使用情况" + filename, System.Text.Encoding.UTF8) + ".xls"); + Response.ContentType = "application/excel"; + Response.ContentEncoding = System.Text.Encoding.UTF8; + this.Grid1.PageSize = this.Grid1.RecordCount; + this.BindGrid(); + Response.Write(GetGridMultiHeaderTableHtml(Grid1)); + //Response.Write(GetGridTableHtml(Grid1)); + Response.End(); + } + #endregion + + + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs new file mode 100644 index 00000000..d8db173e --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs @@ -0,0 +1,134 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ProjectData +{ + + + public partial class MasterProjectData + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// Panel1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Panel Panel1; + + /// + /// Grid1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Grid Grid1; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtProjectCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectCode; + + /// + /// txtProjectName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectName; + + /// + /// btnOut 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnOut; + + /// + /// lblNumber 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblNumber; + + /// + /// lblState 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.WebControls.Label lblState; + + /// + /// ToolbarSeparator1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; + + /// + /// ToolbarText1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarText ToolbarText1; + + /// + /// ddlPageSize 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList ddlPageSize; + } +} diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx index 74a1e744..9c8f268e 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSet.aspx @@ -5,88 +5,90 @@ 项目设置 - +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - <%-- + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- --%> - <%-- --%> - - - - - - - <%-- + + + + + + + <%-- @@ -104,49 +106,49 @@ ToolTip='<%# ConvertHSSEManager(Eval("ProjectId")) %>'> --%> - <%-- - --%> - - - - - - - - - - - - - - - - - - - - - --%> + + + + + + + + + + + + + + + + + + + + + - - + - - + - - + + diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs index eec1ffb9..8f1086b3 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.cs @@ -1,10 +1,10 @@ using BLL; +using FineUIPro.Web.BaseInfo; +using Model; using System; -using System.Collections.Generic; using System.Data; -using System.Data.SqlClient; using System.Linq; -using System.Runtime.InteropServices.ComTypes; +using AspNet = System.Web.UI.WebControls; namespace FineUIPro.Web.ProjectData { @@ -39,23 +39,36 @@ namespace FineUIPro.Web.ProjectData var query = from x in masterProDatas join pro in db.Base_Project on x.Pro_id equals pro.MasterSysId into proGroup from pro in proGroup.DefaultIfEmpty() + join use in db.Project_MasterDataUsage on x.Pro_id equals use.Pro_id into useGroup + from use in useGroup.DefaultIfEmpty() select new { - Pid= x.Pro_id+(pro != null ? $"-{pro.ProjectId}":""), + //Pid = x.Pro_id + (pro != null ? $"-{pro.ProjectId}" : ""), + Pid = $"{x.Pro_id}|{(pro != null ? $"{pro.ProjectId}" : "")}|{(use != null ? use.Id : "")}", x.Pro_id, x.Pro_name, x.Pro_code, x.Start_date, x.Pro_status, + ProjectId = pro != null ? pro.ProjectId : null, ProjectName = pro != null ? pro.ProjectName : "", ProjectCode = pro != null ? pro.ProjectCode : "", StartDate = pro != null ? pro.StartDate : null, ProjectState = pro != null ? pro.ProjectState : "", - relate = pro != null && pro.MasterSysId != null ? "已关联" : "" + relate = pro != null && pro.MasterSysId != null ? "已关联" : "未关联", + UseId = use != null ? use.Id : null, + Use = use == null ? "" : (use != null && use.Is_use == true) ? "已使用" : "未使用", + Reason = use != null ? use.Reason : "", + Situation = use != null ? use.Situation : "", + Remark = use != null ? use.Remark : "", }; - string proName = this.txtProjectName.Text.Trim(); - string proCode = this.txtProjectCode.Text.Trim(); + string proName = this.txtProName.Text.Trim(); + string proCode = this.txtProCode.Text.Trim(); + string projectName = this.txtProjectName.Text.Trim(); + string projectCode = this.txtProjectCode.Text.Trim(); + string relate = this.rblIsRelate.SelectedValue; + if (!string.IsNullOrEmpty(proName)) { query = query.Where(x => x.Pro_name.Contains(proName)); @@ -64,6 +77,18 @@ namespace FineUIPro.Web.ProjectData { query = query.Where(x => x.Pro_code.Contains(proCode)); } + if (!string.IsNullOrEmpty(projectName)) + { + query = query.Where(x => x.ProjectName.Contains(projectName)); + } + if (!string.IsNullOrEmpty(projectCode)) + { + query = query.Where(x => x.ProjectCode.Contains(projectCode)); + } + if (!string.IsNullOrWhiteSpace(relate)) + { + query = query.Where(x => x.relate == relate); + } DataTable tb = Funs.LINQToDataTable(query); Grid1.RecordCount = tb.Rows.Count; Grid1.DataSource = this.GetPagedDataTable(Grid1, tb); @@ -89,6 +114,69 @@ namespace FineUIPro.Web.ProjectData #region Grid + protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e) + { + EditData(sender, e); + } + + /// + /// 编辑数据方法 + /// + private void EditData(object sender, GridRowClickEventArgs e) + { + if (Grid1.SelectedRowIndexArray.Length == 0) + { + Alert.ShowInTop("请至少选择一条记录", MessageBoxIcon.Warning); + return; + } + var pId = Grid1.SelectedRowID; + + string pro_id = pId.Split('|')[0]; + string projectId = pId.Split('|')[1]; + string useId = pId.Split('|')[2]; + + var obj = Grid1.SelectedRow.Values; + string num = obj[0].ToString(); + string pro_name = obj[2].ToString(); + string pro_code = obj[3].ToString(); + string startdate = obj[4].ToString(); + string prostatus = obj[5].ToString(); + string projectName = obj[7].ToString(); + string projectCode = obj[8].ToString(); + string startDate = obj[9].ToString(); + string lblState = (Grid1.SelectedRow.FindControl("lblState") as AspNet.Label).Text; + + if (!string.IsNullOrWhiteSpace(pro_id)) + { + var masterUsage = Funs.DB.Project_MasterDataUsage.Where(x => x.Pro_id == pro_id).FirstOrDefault(); + if (masterUsage != null) + { + } + else + { + useId = SQLHelper.GetNewID(typeof(Model.Project_MasterDataUsage)); + Model.Project_MasterDataUsage model = new Model.Project_MasterDataUsage(); + model.Id = useId; + model.Pro_id = pro_id; + model.Pro_code = pro_code; + model.Pro_name = pro_name; + model.Is_relate = !string.IsNullOrWhiteSpace(projectId); + model.Is_use = !string.IsNullOrWhiteSpace(projectId); + model.Projectid = projectId; + model.Projectcode = projectName; + model.Projectname = projectCode; + model.Create_user = this.CurrUser.UserName; + model.Create_date = DateTime.Now; + ProjectMasterDataUsageService.AddProjectMasterDataUsage(model); + } + PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("MasterProjectDataUsage.aspx?UseId={0}", useId))); + } + } + + protected void Window1_Close(object sender, WindowCloseEventArgs e) + { + this.BindGrid(); + } protected void TextBox_TextChanged(object sender, EventArgs e) { this.BindGrid(); diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs index d8db173e..791c266d 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx.designer.cs @@ -59,6 +59,24 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.Toolbar Toolbar2; + /// + /// txtProCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProCode; + + /// + /// txtProName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProName; + /// /// txtProjectCode 控件。 /// @@ -77,6 +95,15 @@ namespace FineUIPro.Web.ProjectData /// protected global::FineUIPro.TextBox txtProjectName; + /// + /// rblIsRelate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsRelate; + /// /// btnOut 控件。 /// @@ -130,5 +157,14 @@ namespace FineUIPro.Web.ProjectData /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList ddlPageSize; + + /// + /// Window1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Window Window1; } } diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx new file mode 100644 index 00000000..fe83d7be --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx @@ -0,0 +1,111 @@ +<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="MasterProjectDataUsage.aspx.cs" Inherits="FineUIPro.Web.ProjectData.MasterProjectDataUsage" %> + + + + + + 质量巡检 + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs new file mode 100644 index 00000000..7b642e42 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.cs @@ -0,0 +1,67 @@ +using BLL; +using Model; +using System; + +namespace FineUIPro.Web.ProjectData +{ + public partial class MasterProjectDataUsage : PageBase + { + #region 公共字段 + /// + /// 主键 + /// + public string UseId + { + get + { + return (string)ViewState["UseId"]; + } + set + { + ViewState["UseId"] = value; + } + } + + #endregion + + protected void Page_Load(object sender, EventArgs e) + { + if (!IsPostBack) + { + this.UseId = Request.Params["UseId"]; + + if (!string.IsNullOrEmpty(UseId)) + { + var usage = ProjectMasterDataUsageService.GetProjectMasterDataUsageById(UseId); + this.txtPro_code.Text = usage.Pro_code; + this.txtPro_name.Text = usage.Pro_name; + this.txtProjectcode.Text = usage.Projectcode; + this.txtProjectname.Text = usage.Projectname; + this.rblIsRelate.SelectedValue = usage.Is_relate ? "1" : "0"; + this.rblIsUse.SelectedValue = usage.Is_use ? "1" : "0"; + //this.txtPro_code.Text = usage.Pro_code; + this.txtSituation.Text = usage.Situation; + this.txtReason.Text = usage.Reason; + this.txtRemark.Text = usage.Remark; + } + } + } + + protected void btnSave_Click(object sender, EventArgs e) + { + Project_MasterDataUsage usage = new Project_MasterDataUsage(); + usage.Id = this.UseId; + usage.Is_use = this.rblIsUse.SelectedValue == "1"; + usage.Situation = this.txtSituation.Text.Trim(); + usage.Reason = this.txtReason.Text.Trim(); + usage.Remark = this.txtRemark.Text.Trim(); + ProjectMasterDataUsageService.UpdateProjectMasterDataUsage(usage); + PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference()); + } + + protected void WindowAtt_Close(object sender, WindowCloseEventArgs e) + { + + } + } +} \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs new file mode 100644 index 00000000..27d54211 --- /dev/null +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectDataUsage.aspx.designer.cs @@ -0,0 +1,161 @@ +//------------------------------------------------------------------------------ +// <自动生成> +// 此代码由工具生成。 +// +// 对此文件的更改可能导致不正确的行为，如果 +// 重新生成代码，则所做更改将丢失。 +// +//------------------------------------------------------------------------------ + +namespace FineUIPro.Web.ProjectData +{ + + + public partial class MasterProjectDataUsage + { + + /// + /// form1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::System.Web.UI.HtmlControls.HtmlForm form1; + + /// + /// PageManager1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.PageManager PageManager1; + + /// + /// SimpleForm1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Form SimpleForm1; + + /// + /// txtPro_code 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPro_code; + + /// + /// txtPro_name 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPro_name; + + /// + /// txtProjectcode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectcode; + + /// + /// txtProjectname 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtProjectname; + + /// + /// rblIsRelate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsRelate; + + /// + /// rblIsUse 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.RadioButtonList rblIsUse; + + /// + /// txtReason 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtReason; + + /// + /// txtSituation 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtSituation; + + /// + /// txtRemark 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextArea txtRemark; + + /// + /// Toolbar1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar1; + + /// + /// hfGpsAreId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HiddenField hfGpsAreId; + + /// + /// ToolbarFill1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.ToolbarFill ToolbarFill1; + + /// + /// btnSave 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Button btnSave; + } +} diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index bbd899c2..4681410a 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -2024,6 +2024,9 @@ namespace Model partial void InsertProject_Installation(Project_Installation instance); partial void UpdateProject_Installation(Project_Installation instance); partial void DeleteProject_Installation(Project_Installation instance); + partial void InsertProject_MasterDataUsage(Project_MasterDataUsage instance); + partial void UpdateProject_MasterDataUsage(Project_MasterDataUsage instance); + partial void DeleteProject_MasterDataUsage(Project_MasterDataUsage instance); partial void InsertProject_ProjectUnit(Project_ProjectUnit instance); partial void UpdateProject_ProjectUnit(Project_ProjectUnit instance); partial void DeleteProject_ProjectUnit(Project_ProjectUnit instance); @@ -8236,6 +8239,14 @@ namespace Model } } + public System.Data.Linq.Table Project_MasterDataUsage + { + get + { + return this.GetTable(); + } + } + public System.Data.Linq.Table Project_ProjectUnit { get @@ -320551,6 +320562,380 @@ namespace Model } } + [global::System.Data.Linq.Mapping.TableAttribute(Name="dbo.Project_MasterDataUsage")] + public partial class Project_MasterDataUsage : INotifyPropertyChanging, INotifyPropertyChanged + { + + private static PropertyChangingEventArgs emptyChangingEventArgs = new PropertyChangingEventArgs(String.Empty); + + private string _Id; + + private string _Pro_id; + + private string _Pro_code; + + private string _Pro_name; + + private bool _Is_relate; + + private bool _Is_use; + + private string _Projectid; + + private string _Projectname; + + private string _Projectcode; + + private string _Reason; + + private string _Situation; + + private string _Remark; + + private string _Create_user; + + private System.DateTime _Create_date; + + #region 可扩展性方法定义 + partial void OnLoaded(); + partial void OnValidate(System.Data.Linq.ChangeAction action); + partial void OnCreated(); + partial void OnIdChanging(string value); + partial void OnIdChanged(); + partial void OnPro_idChanging(string value); + partial void OnPro_idChanged(); + partial void OnPro_codeChanging(string value); + partial void OnPro_codeChanged(); + partial void OnPro_nameChanging(string value); + partial void OnPro_nameChanged(); + partial void OnIs_relateChanging(bool value); + partial void OnIs_relateChanged(); + partial void OnIs_useChanging(bool value); + partial void OnIs_useChanged(); + partial void OnProjectidChanging(string value); + partial void OnProjectidChanged(); + partial void OnProjectnameChanging(string value); + partial void OnProjectnameChanged(); + partial void OnProjectcodeChanging(string value); + partial void OnProjectcodeChanged(); + partial void OnReasonChanging(string value); + partial void OnReasonChanged(); + partial void OnSituationChanging(string value); + partial void OnSituationChanged(); + partial void OnRemarkChanging(string value); + partial void OnRemarkChanged(); + partial void OnCreate_userChanging(string value); + partial void OnCreate_userChanged(); + partial void OnCreate_dateChanging(System.DateTime value); + partial void OnCreate_dateChanged(); + #endregion + + public Project_MasterDataUsage() + { + OnCreated(); + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="id", Storage="_Id", DbType="NVarChar(50) NOT NULL", CanBeNull=false, IsPrimaryKey=true)] + public string Id + { + get + { + return this._Id; + } + set + { + if ((this._Id != value)) + { + this.OnIdChanging(value); + this.SendPropertyChanging(); + this._Id = value; + this.SendPropertyChanged("Id"); + this.OnIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="pro_id", Storage="_Pro_id", DbType="VarChar(32)")] + public string Pro_id + { + get + { + return this._Pro_id; + } + set + { + if ((this._Pro_id != value)) + { + this.OnPro_idChanging(value); + this.SendPropertyChanging(); + this._Pro_id = value; + this.SendPropertyChanged("Pro_id"); + this.OnPro_idChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="pro_code", Storage="_Pro_code", DbType="VarChar(200)")] + public string Pro_code + { + get + { + return this._Pro_code; + } + set + { + if ((this._Pro_code != value)) + { + this.OnPro_codeChanging(value); + this.SendPropertyChanging(); + this._Pro_code = value; + this.SendPropertyChanged("Pro_code"); + this.OnPro_codeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="pro_name", Storage="_Pro_name", DbType="VarChar(500)")] + public string Pro_name + { + get + { + return this._Pro_name; + } + set + { + if ((this._Pro_name != value)) + { + this.OnPro_nameChanging(value); + this.SendPropertyChanging(); + this._Pro_name = value; + this.SendPropertyChanged("Pro_name"); + this.OnPro_nameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="is_relate", Storage="_Is_relate", DbType="Bit NOT NULL")] + public bool Is_relate + { + get + { + return this._Is_relate; + } + set + { + if ((this._Is_relate != value)) + { + this.OnIs_relateChanging(value); + this.SendPropertyChanging(); + this._Is_relate = value; + this.SendPropertyChanged("Is_relate"); + this.OnIs_relateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="is_use", Storage="_Is_use", DbType="Bit NOT NULL")] + public bool Is_use + { + get + { + return this._Is_use; + } + set + { + if ((this._Is_use != value)) + { + this.OnIs_useChanging(value); + this.SendPropertyChanging(); + this._Is_use = value; + this.SendPropertyChanged("Is_use"); + this.OnIs_useChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectid", Storage="_Projectid", DbType="NVarChar(50)")] + public string Projectid + { + get + { + return this._Projectid; + } + set + { + if ((this._Projectid != value)) + { + this.OnProjectidChanging(value); + this.SendPropertyChanging(); + this._Projectid = value; + this.SendPropertyChanged("Projectid"); + this.OnProjectidChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectname", Storage="_Projectname", DbType="NVarChar(200)")] + public string Projectname + { + get + { + return this._Projectname; + } + set + { + if ((this._Projectname != value)) + { + this.OnProjectnameChanging(value); + this.SendPropertyChanging(); + this._Projectname = value; + this.SendPropertyChanged("Projectname"); + this.OnProjectnameChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="projectcode", Storage="_Projectcode", DbType="VarChar(100)")] + public string Projectcode + { + get + { + return this._Projectcode; + } + set + { + if ((this._Projectcode != value)) + { + this.OnProjectcodeChanging(value); + this.SendPropertyChanging(); + this._Projectcode = value; + this.SendPropertyChanged("Projectcode"); + this.OnProjectcodeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="reason", Storage="_Reason", DbType="NVarChar(500)")] + public string Reason + { + get + { + return this._Reason; + } + set + { + if ((this._Reason != value)) + { + this.OnReasonChanging(value); + this.SendPropertyChanging(); + this._Reason = value; + this.SendPropertyChanged("Reason"); + this.OnReasonChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="situation", Storage="_Situation", DbType="NVarChar(500)")] + public string Situation + { + get + { + return this._Situation; + } + set + { + if ((this._Situation != value)) + { + this.OnSituationChanging(value); + this.SendPropertyChanging(); + this._Situation = value; + this.SendPropertyChanged("Situation"); + this.OnSituationChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="remark", Storage="_Remark", DbType="NVarChar(500)")] + public string Remark + { + get + { + return this._Remark; + } + set + { + if ((this._Remark != value)) + { + this.OnRemarkChanging(value); + this.SendPropertyChanging(); + this._Remark = value; + this.SendPropertyChanged("Remark"); + this.OnRemarkChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="create_user", Storage="_Create_user", DbType="VarChar(100) NOT NULL", CanBeNull=false)] + public string Create_user + { + get + { + return this._Create_user; + } + set + { + if ((this._Create_user != value)) + { + this.OnCreate_userChanging(value); + this.SendPropertyChanging(); + this._Create_user = value; + this.SendPropertyChanged("Create_user"); + this.OnCreate_userChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Name="create_date", Storage="_Create_date", DbType="DateTime NOT NULL")] + public System.DateTime Create_date + { + get + { + return this._Create_date; + } + set + { + if ((this._Create_date != value)) + { + this.OnCreate_dateChanging(value); + this.SendPropertyChanging(); + this._Create_date = value; + this.SendPropertyChanged("Create_date"); + this.OnCreate_dateChanged(); + } + } + } + + 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.Project_ProjectUnit")] public partial class Project_ProjectUnit : INotifyPropertyChanging, INotifyPropertyChanged { From b17dafcbe91d88b1a2ccdd83e409caaa1b8e809a Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 26 May 2026 10:02:34 +0800 Subject: [PATCH 08/11] 1 --- .../ProjectData/ProjectSetSave.aspx.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs index 49b8df09..fd7b46a5 100644 --- a/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs +++ b/SGGL/FineUIPro.Web/ProjectData/ProjectSetSave.aspx.cs @@ -257,7 +257,6 @@ namespace FineUIPro.Web.ProjectData string masterSysId = this.drpMasterBox1.Value; if (!string.IsNullOrWhiteSpace(masterSysId)) { - var obj = Grid1.SelectedRow.Values; var relatePro = Funs.DB.Base_Project.FirstOrDefault(x => x.MasterSysId == masterSysId && (x.ProjectId != this.ProjectId || (this.ProjectId == null && x.ProjectId != null))); if (relatePro != null) { @@ -2002,10 +2001,18 @@ namespace FineUIPro.Web.ProjectData // ShowNotify($"已存在相同名称、编号的项目：（{relatePro.ProjectCode}）{relatePro.ProjectName}！", MessageBoxIcon.Warning); //} - this.txtProjectCode.Text = code; + //this.txtProjectCode.Text = code; + if (string.IsNullOrWhiteSpace(this.txtProjectCode.Text.Trim())) + { + this.txtProjectCode.Text = code; + } this.txtJTProjectCode.Text = code; //this.txtProjectName.Text = name; - this.txtShortName.Text = shortname; + //this.txtShortName.Text = shortname; + if (!string.IsNullOrWhiteSpace(shortname)) + { + this.txtShortName.Text = shortname; + } this.txtProjectAddress.Text = address; if (!string.IsNullOrWhiteSpace(startdate)) { From 329ee99962b34a73bec5e224de18781894a3a748 Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Tue, 26 May 2026 14:56:00 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E9=9B=86=E5=9B=A2=E5=9C=A8=E5=BB=BA?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=BD=BF=E7=94=A8=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/SUBQHSE_V2026-05-23-xiaj.sql | 54 +++ SGGL/BLL/Common/Const.cs | 5 + .../ProjectMasterDataUsageService.cs | 18 + .../ProjectData/MasterProjectData.aspx | 325 +++++++++----- .../ProjectData/MasterProjectData.aspx.cs | 406 ++++++++++++++++-- .../MasterProjectData.aspx.designer.cs | 180 +++++++- .../ProjectData/MasterProjectDataUsage.aspx | 81 +++- .../MasterProjectDataUsage.aspx.cs | 210 ++++++++- .../MasterProjectDataUsage.aspx.designer.cs | 93 +++- .../ProjectData/ProjectSet.aspx.cs | 2 +- .../ProjectData/ProjectSetSave.aspx.cs | 7 +- SGGL/FineUIPro.Web/common/PageBase.cs | 8 +- .../APIItem/CNCEC/Ads_pms_pro_info_build.cs | 128 ++++++ SGGL/Model/Model.cs | 120 ++++++ 14 files changed, 1459 insertions(+), 178 deletions(-) create mode 100644 DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql diff --git a/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql b/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql new file mode 100644 index 00000000..8d26a928 --- /dev/null +++ b/DataBase/版本日志/SUBQHSE_V2026-05-23-xiaj.sql @@ -0,0 +1,54 @@ + + +--去除多个QHSE项目绑定同一个集团主数据项目的异常数据，只保留一条QHSE项目绑定 + +WITH CTE AS ( +    SELECT  +        RN = ROW_NUMBER() OVER(PARTITION BY MasterSysId ORDER BY ISNULL(ProjectState,'1'),StartDate asc ) + ,* +    FROM Base_Project + WHERE MasterSysId <>'' AND MasterSysId IS NOT NULL +) + +/*** + +SELECT ProjectId as 项目id,MasterSysId as sss,ProjectState,StartDate ,RN as 序号,*  +FROM CTE +--WHERE RN > 1 +ORDER BY MasterSysId,RN + +***/ + +UPDATE Base_Project +SET MasterSysId=NULL +WHERE ProjectId IN (select ProjectId FROM CTE WHERE RN > 1 ); + + +GO + + + + + +--集团在建项目使用详情补充字段：审批人信息 +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_MasterDataUsage' AND COLUMN_NAME = 'HandleMan') +BEGIN + ALTER TABLE Project_MasterDataUsage ADD HandleMan nvarchar(50); + ALTER TABLE Project_MasterDataUsage ADD HandleManName nvarchar(50); + ALTER TABLE Project_MasterDataUsage ADD HandleState char(1); + ALTER TABLE Project_MasterDataUsage ADD HandleDate datetime; + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批人' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleMan' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批人姓名' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleManName' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批状态（0：通过，1：不通过）' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleState' + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'审批时间' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'HandleDate' +END +GO + + +--集团在建项目使用详情补充字段：原因类型 +IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = 'Project_MasterDataUsage' AND COLUMN_NAME = 'ReasonType') +BEGIN + ALTER TABLE Project_MasterDataUsage ADD ReasonType nvarchar(50); + EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'原因类型' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Project_MasterDataUsage', @level2type=N'COLUMN',@level2name=N'ReasonType' +END +GO diff --git a/SGGL/BLL/Common/Const.cs b/SGGL/BLL/Common/Const.cs index 62564386..3a0e6f96 100644 --- a/SGGL/BLL/Common/Const.cs +++ b/SGGL/BLL/Common/Const.cs @@ -43,6 +43,11 @@ namespace BLL /// public const string zhanghuijuanId = "8cd25563-429e-4ac7-a13f-610e35eea62d"; + /// + /// 施工部——詹佩佩 + /// + public const string zhanpeipeiId = "23dafa35-cde1-44c6-844a-c9fbc8d50546"; + /// /// 公共临时账户ID /// diff --git a/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs b/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs index 47861b8f..9df5f614 100644 --- a/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs +++ b/SGGL/BLL/ProjectData/ProjectMasterDataUsageService.cs @@ -18,6 +18,16 @@ namespace BLL return Funs.DB.Project_MasterDataUsage.FirstOrDefault(e => e.Id == useId); } + /// + /// 根据主数据项目Id获取使用详情 + /// + /// + /// + public static Model.Project_MasterDataUsage GetProjectMasterDataUsageByProId(string proId) + { + return Funs.DB.Project_MasterDataUsage.FirstOrDefault(e => e.Pro_id == proId); + } + /// /// 添加使用详情 /// @@ -36,11 +46,14 @@ namespace BLL Projectid = model.Projectid, Projectcode = model.Projectcode, Projectname = model.Projectname, + ReasonType = model.ReasonType, Reason = model.Reason, Situation = model.Situation, Remark = model.Remark, Create_user = model.Create_user, Create_date = model.Create_date, + HandleMan = model.HandleMan, + HandleManName = model.HandleManName, }; db.Project_MasterDataUsage.InsertOnSubmit(newModel); db.SubmitChanges(); @@ -66,9 +79,14 @@ namespace BLL //newModel.Create_user = model.Create_user; //newModel.Create_date = model.Create_date; newModel.Is_use = model.Is_use; + newModel.ReasonType = model.ReasonType; newModel.Reason = model.Reason; newModel.Situation = model.Situation; newModel.Remark = model.Remark; + newModel.HandleMan = model.HandleMan; + newModel.HandleManName = model.HandleManName; + newModel.HandleState = model.HandleState; + newModel.HandleDate = model.HandleDate; db.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx index 9d9e1b76..043d0d9b 100644 --- a/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx +++ b/SGGL/FineUIPro.Web/ProjectData/MasterProjectData.aspx @@ -11,6 +11,17 @@ white-space: normal; word-break: break-all; } + /* 增强合计行样式 - 使用多种选择器确保生效 */ + .f-grid-row-summary .f-grid-cell, + .f-grid-summary-row .f-grid-cell-inner { + font-weight: bold !important; + color: red !important; + } + + .Pause { + /*background-color: darkgray;*/ + background-color: red; + } @@ -19,109 +30,221 @@ - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- + --%> + + + + + <%-- + + + --%> + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +