diff --git a/DataBase/版本日志/SGGLDB_V2022-07-15.sql b/DataBase/版本日志/SGGLDB_V2022-07-15.sql deleted file mode 100644 index eeaffd37..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-07-15.sql +++ /dev/null @@ -1,153 +0,0 @@ -CREATE TABLE [dbo].[SitePerson_PersonItem]( - [PersonItemId] [nvarchar](50) NOT NULL, - [PersonId] [nvarchar](50) NULL, - [PersonName] [nvarchar](200) NULL, - [IdentityCard] [nvarchar](50) NULL, - [ProjectId] [nvarchar](50) NULL, - [ProjectName] [nvarchar](500) NULL, - [UnitId] [nvarchar](50) NULL, - [UnitName] [nvarchar](500) NULL, - [WorkPostId] [nvarchar](50) NULL, - [WorkPostName] [nvarchar](500) NULL, - [RoleId] [nvarchar](500) NULL, - [RoleName] [nvarchar](2000) NULL, - [InTime] [datetime] NULL, - [OutTime] [datetime] NULL, - CONSTRAINT [PK_SitePerson_PersonItem] PRIMARY KEY CLUSTERED -( - [PersonItemId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -GO - -ALTER TABLE [dbo].[SitePerson_PersonItem] WITH CHECK ADD CONSTRAINT [FK_SitePerson_PersonItem_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[SitePerson_PersonItem] CHECK CONSTRAINT [FK_SitePerson_PersonItem_Base_Project] -GO - -ALTER TABLE [dbo].[SitePerson_PersonItem] WITH CHECK ADD CONSTRAINT [FK_SitePerson_PersonItem_Person_Persons] FOREIGN KEY([PersonId]) -REFERENCES [dbo].[Person_Persons] ([PersonId]) -GO - -ALTER TABLE [dbo].[SitePerson_PersonItem] CHECK CONSTRAINT [FK_SitePerson_PersonItem_Person_Persons] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'PersonItemId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'PersonId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'PersonName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'IdentityCard' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'ProjectName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'UnitName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'WorkPostId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'WorkPostName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɫID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'RoleId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ɫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'RoleName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'InTime' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'OutTime' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֳԱ¼' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem' -GO - -INSERT INTO SitePerson_PersonItem (PersonItemId,ProjectId,PersonId,RoleId,InTime,OutTime,ProjectName) -SELECT [RoleItemId],[ProjectId],[UserId],[RoleId],[IntoDate],[OutDate],[ProjectName] -FROM [dbo].[Sys_RoleItem] -GO - -UPDATE SitePerson_PersonItem SET PersonName=B.PersonName,IdentityCard=B.IdentityCard,UnitId=b.UnitId -FROM Person_Persons AS B -WHERE SitePerson_PersonItem.PersonId=B.PersonId -GO - -UPDATE SitePerson_PersonItem SET UnitName=B.UnitName -FROM Base_Unit AS B -WHERE SitePerson_PersonItem.UnitId=B.UnitId -GO - -UPDATE SitePerson_PersonItem SET ProjectName=B.ProjectName -FROM Base_Project AS B -WHERE SitePerson_PersonItem.ProjectId=B.ProjectId -GO - -UPDATE SitePerson_PersonItem SET RoleName=STUFF(( SELECT ',' + RoleName FROM Sys_Role - where PATINDEX('%,' + RTRIM(Sys_Role.RoleId) + ',%',',' + SitePerson_PersonItem.RoleId + ',')>0 - ORDER BY PATINDEX('%,' + RTRIM(SitePerson_PersonItem.RoleId) + ',%',',' + SitePerson_PersonItem.RoleId + ',') - FOR XML PATH('')), 1, 1,'') -GO - -/****** Object: Index [NonClusteredIndex-20220715-102119] Script Date: 2022/7/15 10:22:02 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220715-102119] ON [dbo].[SitePerson_PersonItem] -( - [PersonName] ASC, - [ProjectId] ASC, - [UnitId] ASC, - [InTime] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - ---/****** Object: Table [dbo].[Sys_RoleItem] Script Date: 2022/7/15 10:23:16 ******/ ---IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[Sys_RoleItem]') AND type in (N'U')) ---DROP TABLE [dbo].[Sys_RoleItem] ---GO - ---/****** Object: View [dbo].[View_Sys_RoleItem] Script Date: 2022/7/15 10:24:59 ******/ ---DROP VIEW [dbo].[View_Sys_RoleItem] ---GO - -/****** Object: Index [NonClusteredIndex-20220719-094239] Script Date: 2022/7/19 9:44:28 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220719-094239] ON [dbo].[Person_Persons] -( - [PersonName] ASC, - [Account] ASC, - [Password] ASC, - [IdentityCard] ASC, - [Telephone] ASC, - [IsPost] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - -/****** Object: Index [NonClusteredIndex-20220719-170838] Script Date: 2022/7/19 17:09:02 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220719-170838] ON [dbo].[WBS_ControlItemAndCycle] -( - [ProjectId] ASC, - [IsApprove] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - - -/****** Object: Index [NonClusteredIndex-20220719-171050] Script Date: 2022/7/19 17:11:06 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220719-171050] ON [dbo].[Check_SpotCheckDetail] -( - [IsOK] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO diff --git a/DataBase/版本日志/SGGLDB_V2022-07-20.sql b/DataBase/版本日志/SGGLDB_V2022-07-20.sql deleted file mode 100644 index 377da30f..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-07-20.sql +++ /dev/null @@ -1,10 +0,0 @@ -/****** Object: Index [NonClusteredIndex-20220720-154349] Script Date: 2022/7/20 15:44:14 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220720-154349] ON [dbo].[SitePerson_PersonItem] -( - [PersonId] ASC, - [InTime] ASC, - [OutTime] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-08.sql b/DataBase/版本日志/SGGLDB_V2022-08-08.sql deleted file mode 100644 index 3b4b3697..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-08.sql +++ /dev/null @@ -1,18 +0,0 @@ ---- -/****** Object: Index [NonClusteredIndex-20220808-170401] Script Date: 2022/8/8 17:04:14 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220808-170401] ON [dbo].[Check_SpotCheckDetail] -( - [ControlItemAndCycleId] ASC, - [IsOK] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - -/****** Object: Index [NonClusteredIndex-20220808-170526] Script Date: 2022/8/8 17:05:54 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-20220808-170526] ON [dbo].[WBS_ControlItemAndCycle] -( - [ProjectId] ASC, - [ControlPoint] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-10.sql b/DataBase/版本日志/SGGLDB_V2022-08-10.sql deleted file mode 100644 index f1d69239..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-10.sql +++ /dev/null @@ -1,784 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('751BFAB7-1589-4CCF-AF6C-85B214D94E6D','豸չ','',20,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('3C592866-2355-4371-9056-9BCEC405D419','Ϣ','CQMS/Material/Material.aspx',10,'751BFAB7-1589-4CCF-AF6C-85B214D94E6D','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('AE24AC6C-0AE4-490B-84A8-E6789013A99D','3C592866-2355-4371-9056-9BCEC405D419','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('12F0CDED-24B7-4548-AA96-9EFDEA845D0E','3C592866-2355-4371-9056-9BCEC405D419','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('A46D587A-5B5C-4462-BC8A-58CAD6DDA03E','3C592866-2355-4371-9056-9BCEC405D419','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('1F0D7856-CFC0-451C-812D-7E33DB9EA402','3C592866-2355-4371-9056-9BCEC405D419','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('C9E75EEC-6A93-4313-89EB-E24E05CAC4F1','豸Ϣ','CQMS/Material/Equipment.aspx',20,'751BFAB7-1589-4CCF-AF6C-85B214D94E6D','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('FE10382F-182C-46E1-B276-52DE4914D634','C9E75EEC-6A93-4313-89EB-E24E05CAC4F1','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('CE6C9792-27D0-431A-BD08-CA167FDEA2FA','C9E75EEC-6A93-4313-89EB-E24E05CAC4F1','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('0767B4D1-BB3D-4145-84C4-CFE93735F076','C9E75EEC-6A93-4313-89EB-E24E05CAC4F1','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('2A8951D4-2A3A-438C-B867-B9589C34BBE8','C9E75EEC-6A93-4313-89EB-E24E05CAC4F1','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6','','CQMS/Material/Inspection.aspx',30,'751BFAB7-1589-4CCF-AF6C-85B214D94E6D','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('CDC6253B-418F-400C-94E8-CBCC2CD81C50','BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('E6DBCEB9-5193-418B-8876-4DC46BC95817','BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('C8631C03-156F-4C64-A87C-1E1539D105B6','BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('A9BC6C5A-5ED1-4FF6-AEAD-21AACE77BDB1','BF90BB3C-13FC-4FB4-B2E2-14B81E7867F6','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('F07ADB87-F2B4-4D31-A38C-3EC4F32F08C4','','',40,'751BFAB7-1589-4CCF-AF6C-85B214D94E6D','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('DA501F39-86A4-4315-9D3B-1E341DE75B9D','','CQMS/Material/MaterialTest.aspx',10,'F07ADB87-F2B4-4D31-A38C-3EC4F32F08C4','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('EE17D255-391F-45FE-A184-186B82AC91F4','DA501F39-86A4-4315-9D3B-1E341DE75B9D','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('4CA9100C-3EFC-4D03-9CAB-A3CA0D7E8CBD','DA501F39-86A4-4315-9D3B-1E341DE75B9D','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('3D856F39-70D6-4A16-85E7-34B978C0E5DA','DA501F39-86A4-4315-9D3B-1E341DE75B9D','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('2D51DAD1-A04B-48D9-9959-E393E84328F0','DA501F39-86A4-4315-9D3B-1E341DE75B9D','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('3AE88614-052D-413D-ACC3-190CEB195F90','ʩ','CQMS/Material/ConstructionTest.aspx',20,'F07ADB87-F2B4-4D31-A38C-3EC4F32F08C4','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('9A6635E8-9081-4B51-A1AF-999C5DE69D5A','3AE88614-052D-413D-ACC3-190CEB195F90','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('01635BBC-ADA8-4C98-8733-F36011900BD9','3AE88614-052D-413D-ACC3-190CEB195F90','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('B702B213-12AD-4BC2-9B26-E1F577C2F3D2','3AE88614-052D-413D-ACC3-190CEB195F90','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('F559F9F5-2DF1-4976-9A65-42685311B0BA','3AE88614-052D-413D-ACC3-190CEB195F90','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('88822AAB-A13F-4ECA-B2ED-592321CDB173','֪ͼ','CQMS/Material/NoticeAndSupervision.aspx',50,'751BFAB7-1589-4CCF-AF6C-85B214D94E6D','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('60F679F3-D400-44F5-9A9C-19FF39E8A1E4','88822AAB-A13F-4ECA-B2ED-592321CDB173','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('02623100-E169-4BC7-8476-A335233CB6BA','88822AAB-A13F-4ECA-B2ED-592321CDB173','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('B5C83981-0AAD-4163-A788-6C48217B2A73','88822AAB-A13F-4ECA-B2ED-592321CDB173','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('6754E56B-8EC4-408D-8924-A683FE9CB19E','88822AAB-A13F-4ECA-B2ED-592321CDB173','',4) -GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('A424D70C-6763-4E2C-B41F-19C0DF1FA29F','Ͷ','BaseInfo/MaterialType.aspx',40,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('844FD2E3-4B2C-4A2C-AB5E-53B4EEFC6EB5','A424D70C-6763-4E2C-B41F-19C0DF1FA29F','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('FEFCFEF5-727D-444F-9049-434849CBCD1A','A424D70C-6763-4E2C-B41F-19C0DF1FA29F','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('B28E1B89-8A65-4A1E-8059-803A9A56CAEA','A424D70C-6763-4E2C-B41F-19C0DF1FA29F','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('9297D469-7210-478A-B927-E6E410E3422F','A424D70C-6763-4E2C-B41F-19C0DF1FA29F','',4) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD','ʩͶ','BaseInfo/ConstructionTestType.aspx',50,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('E8AED975-C79B-4888-9D71-65782BB673A4','0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('CABD7950-469D-4396-B222-4F84C19C7471','0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('C99D1815-DC64-450C-B1E3-10E244E83F9E','0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('0B8BECFD-22E7-410F-906C-DEC72EE263DE','0BA0735E-2EFE-4E31-B7DD-A62E5F1E7BBD','',4) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('CCD45D20-EA3F-47E7-8176-AB085778539E','֪ͼͶ','BaseInfo/NoticeAndSupervisionType.aspx',60,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('D9A3DC60-C943-4FDD-A899-942745CEFAA3','CCD45D20-EA3F-47E7-8176-AB085778539E','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('54A2D132-6224-4273-B6A7-A663AC86BA3A','CCD45D20-EA3F-47E7-8176-AB085778539E','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('B10CDEBB-32E4-4CF6-A9F0-8E3F7407DFF7','CCD45D20-EA3F-47E7-8176-AB085778539E','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('AF3594FB-0CC9-419E-9D8D-25ECD888AD47','CCD45D20-EA3F-47E7-8176-AB085778539E','',4) - GO - -CREATE TABLE [dbo].[Base_MaterialType]( - [MaterialTypeId] [nvarchar](50) NOT NULL, - [MaterialTypeCode] [nvarchar](50) NULL, - [MaterialTypeName] [nvarchar](50) NULL, - [Remark] [nvarchar](200) NULL, - CONSTRAINT [PK_Base_MaterialType] PRIMARY KEY CLUSTERED -( - [MaterialTypeId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialType', @level2type=N'COLUMN',@level2name=N'MaterialTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialType', @level2type=N'COLUMN',@level2name=N'MaterialTypeCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialType', @level2type=N'COLUMN',@level2name=N'MaterialTypeName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialType', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_MaterialType' -GO - - - -CREATE TABLE [dbo].[Base_ConstructionTestType]( - [ConstructionTestTypeId] [nvarchar](50) NOT NULL, - [ConstructionTestTypeCode] [nvarchar](50) NULL, - [ConstructionTestTypeName] [nvarchar](50) NULL, - [Remark] [nvarchar](200) NULL, - CONSTRAINT [PK_Base_ConstructionTestType] PRIMARY KEY CLUSTERED -( - [ConstructionTestTypeId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ConstructionTestType', @level2type=N'COLUMN',@level2name=N'ConstructionTestTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ConstructionTestType', @level2type=N'COLUMN',@level2name=N'ConstructionTestTypeCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ConstructionTestType', @level2type=N'COLUMN',@level2name=N'ConstructionTestTypeName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ConstructionTestType', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩͱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_ConstructionTestType' -GO - - - -CREATE TABLE [dbo].[Base_NoticeAndSupervisionType]( - [NoticeAndSupervisionTypeId] [nvarchar](50) NOT NULL, - [NoticeAndSupervisionTypeCode] [nvarchar](50) NULL, - [NoticeAndSupervisionTypeName] [nvarchar](50) NULL, - [Remark] [nvarchar](200) NULL, - CONSTRAINT [PK_Base_NoticeAndSupervisionType] PRIMARY KEY CLUSTERED -( - [NoticeAndSupervisionTypeId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_NoticeAndSupervisionType', @level2type=N'COLUMN',@level2name=N'NoticeAndSupervisionTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_NoticeAndSupervisionType', @level2type=N'COLUMN',@level2name=N'NoticeAndSupervisionTypeCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_NoticeAndSupervisionType', @level2type=N'COLUMN',@level2name=N'NoticeAndSupervisionTypeName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_NoticeAndSupervisionType', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͼͱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_NoticeAndSupervisionType' -GO - - - -CREATE TABLE [dbo].[Material_Material]( - [MaterialId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [ContractNo] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MainItemId] [nvarchar](50) NULL, - [MaterialName] [nvarchar](50) NULL, - [SpecificationAndModel] [nvarchar](50) NULL, - [MaterialCode] [nvarchar](50) NULL, - [Material] [nvarchar](50) NULL, - [PressClass] [nvarchar](50) NULL, - [Unit] [nvarchar](50) NULL, - [Num] [decimal](18, 2) NULL, - [ArrivalDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [InspectionId] [nvarchar](50) NULL, - CONSTRAINT [PK_Material_Material] PRIMARY KEY CLUSTERED -( - [MaterialId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Material_Material] WITH CHECK ADD CONSTRAINT [FK_Material_Material_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_Material] CHECK CONSTRAINT [FK_Material_Material_Base_Project] -GO - -ALTER TABLE [dbo].[Material_Material] WITH CHECK ADD CONSTRAINT [FK_Material_Material_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[Material_Material] CHECK CONSTRAINT [FK_Material_Material_Base_Unit] -GO - -ALTER TABLE [dbo].[Material_Material] WITH CHECK ADD CONSTRAINT [FK_Material_Material_ProjectData_MainItem] FOREIGN KEY([MainItemId]) -REFERENCES [dbo].[ProjectData_MainItem] ([MainItemId]) -GO - -ALTER TABLE [dbo].[Material_Material] CHECK CONSTRAINT [FK_Material_Material_ProjectData_MainItem] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'MaterialId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'ContractNo' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'MainItemId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'MaterialName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'SpecificationAndModel' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'MaterialCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'Material' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'PressClass' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'Unit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'Num' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'ArrivalDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ϣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Material' -GO - - - -CREATE TABLE [dbo].[Material_Equipment]( - [EquipmentId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [ContractNo] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MainItemId] [nvarchar](50) NULL, - [EquipmentName] [nvarchar](50) NULL, - [SpecificationAndModel] [nvarchar](50) NULL, - [EquipmentCode] [nvarchar](50) NULL, - [PressClass] [nvarchar](50) NULL, - [Unit] [nvarchar](50) NULL, - [Num] [decimal](18, 2) NULL, - [ArrivalDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [InspectionId] [nvarchar](50) NULL, - CONSTRAINT [PK_Material_Equipment] PRIMARY KEY CLUSTERED -( - [EquipmentId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Material_Equipment] WITH CHECK ADD CONSTRAINT [FK_Material_Equipment_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_Equipment] CHECK CONSTRAINT [FK_Material_Equipment_Base_Project] -GO - -ALTER TABLE [dbo].[Material_Equipment] WITH CHECK ADD CONSTRAINT [FK_Material_Equipment_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[Material_Equipment] CHECK CONSTRAINT [FK_Material_Equipment_Base_Unit] -GO - -ALTER TABLE [dbo].[Material_Equipment] WITH CHECK ADD CONSTRAINT [FK_Material_Equipment_ProjectData_MainItem] FOREIGN KEY([MainItemId]) -REFERENCES [dbo].[ProjectData_MainItem] ([MainItemId]) -GO - -ALTER TABLE [dbo].[Material_Equipment] CHECK CONSTRAINT [FK_Material_Equipment_ProjectData_MainItem] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'EquipmentId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'ContractNo' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'MainItemId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'SpecificationAndModel' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'EquipmentCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'PressClass' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'Unit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'Num' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'ArrivalDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'豸Ϣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Equipment' -GO - - - -CREATE TABLE [dbo].[Material_Inspection]( - [InspectionId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [InspectionType] [char](1) NULL, - [InspectionCode] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [IsSpotCheck] [bit] NULL, - [IsNoticeAndSupervision] [bit] NULL, - [State] [char](1) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Material_Inspection] PRIMARY KEY CLUSTERED -( - [InspectionId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Material_Inspection] WITH CHECK ADD CONSTRAINT [FK_Material_Inspection_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_Inspection] CHECK CONSTRAINT [FK_Material_Inspection_Base_Project] -GO - -ALTER TABLE [dbo].[Material_Inspection] WITH CHECK ADD CONSTRAINT [FK_Material_Inspection_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[Material_Inspection] CHECK CONSTRAINT [FK_Material_Inspection_Base_Unit] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣM-ϱ飬E-豸飩' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'InspectionType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'յ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'InspectionCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'IsSpotCheck' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿ֪ͼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'IsNoticeAndSupervision' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_Inspection' -GO - - - -CREATE TABLE [dbo].[Material_InspectionApprove]( - [InspectionApproveId] [nvarchar](50) NOT NULL, - [InspectionId] [nvarchar](50) NULL, - [ApproveMan] [nvarchar](50) NULL, - [ApproveDate] [datetime] NULL, - [IsAgree] [bit] NULL, - [ApproveIdea] [nvarchar](200) NULL, - [ApproveType] [char](1) NULL, - CONSTRAINT [PK_Material_InspectionApprove] PRIMARY KEY CLUSTERED -( - [InspectionApproveId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Material_InspectionApprove] WITH CHECK ADD CONSTRAINT [FK_Material_InspectionApprove_Material_Inspection] FOREIGN KEY([InspectionId]) -REFERENCES [dbo].[Material_Inspection] ([InspectionId]) -GO - -ALTER TABLE [dbo].[Material_InspectionApprove] CHECK CONSTRAINT [FK_Material_InspectionApprove_Material_Inspection] -GO - -ALTER TABLE [dbo].[Material_InspectionApprove] WITH CHECK ADD CONSTRAINT [FK_Material_InspectionApprove_Person_Persons] FOREIGN KEY([ApproveMan]) -REFERENCES [dbo].[Person_Persons] ([PersonId]) -GO - -ALTER TABLE [dbo].[Material_InspectionApprove] CHECK CONSTRAINT [FK_Material_InspectionApprove_Person_Persons] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'InspectionApproveId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove', @level2type=N'COLUMN',@level2name=N'ApproveType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_InspectionApprove' -GO - - - -CREATE TABLE [dbo].[Material_MaterialTest]( - [MaterialTestId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [InspectionId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MaterialTypeId] [nvarchar](50) NULL, - [SpotCheckRate] [nvarchar](50) NULL, - [SpotCheckNum] [nvarchar](50) NULL, - [Witness] [nvarchar](500) NULL, - [CheckResult] [bit] NULL, - [CheckUnit] [nvarchar](50) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Material_MaterialTest] PRIMARY KEY CLUSTERED -( - [MaterialTestId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Material_MaterialTest] WITH CHECK ADD CONSTRAINT [FK_Material_MaterialTest_Base_MaterialType] FOREIGN KEY([MaterialTypeId]) -REFERENCES [dbo].[Base_MaterialType] ([MaterialTypeId]) -GO - -ALTER TABLE [dbo].[Material_MaterialTest] CHECK CONSTRAINT [FK_Material_MaterialTest_Base_MaterialType] -GO - -ALTER TABLE [dbo].[Material_MaterialTest] WITH CHECK ADD CONSTRAINT [FK_Material_MaterialTest_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_MaterialTest] CHECK CONSTRAINT [FK_Material_MaterialTest_Base_Project] -GO - -ALTER TABLE [dbo].[Material_MaterialTest] WITH CHECK ADD CONSTRAINT [FK_Material_MaterialTest_Material_Inspection] FOREIGN KEY([InspectionId]) -REFERENCES [dbo].[Material_Inspection] ([InspectionId]) -GO - -ALTER TABLE [dbo].[Material_MaterialTest] CHECK CONSTRAINT [FK_Material_MaterialTest_Material_Inspection] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'MaterialTestId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'MaterialTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'SpotCheckRate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'SpotCheckNum' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'Witness' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'CheckResult' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鵥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'CheckUnit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_MaterialTest' -GO - - - -CREATE TABLE [dbo].[Material_ConstructionTest]( - [ConstructionTestId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [ConstructionTestTypeId] [nvarchar](50) NULL, - [ConstructionTestName] [nvarchar](50) NULL, - [SpotCheckRate] [nvarchar](50) NULL, - [SpotCheckNum] [nvarchar](50) NULL, - [Witness] [nvarchar](500) NULL, - [CheckResult] [bit] NULL, - [CheckUnit] [nvarchar](50) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Material_ConstructionTest] PRIMARY KEY CLUSTERED -( - [ConstructionTestId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Material_ConstructionTest] WITH CHECK ADD CONSTRAINT [FK_Material_ConstructionTest_Base_ConstructionTestType] FOREIGN KEY([ConstructionTestTypeId]) -REFERENCES [dbo].[Base_ConstructionTestType] ([ConstructionTestTypeId]) -GO - -ALTER TABLE [dbo].[Material_ConstructionTest] CHECK CONSTRAINT [FK_Material_ConstructionTest_Base_ConstructionTestType] -GO - -ALTER TABLE [dbo].[Material_ConstructionTest] WITH CHECK ADD CONSTRAINT [FK_Material_ConstructionTest_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_ConstructionTest] CHECK CONSTRAINT [FK_Material_ConstructionTest_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'ConstructionTestId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'ConstructionTestTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'ConstructionTestName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'SpotCheckRate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'SpotCheckNum' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֤' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'Witness' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'CheckResult' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'鵥λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'CheckUnit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_ConstructionTest' -GO - - - -CREATE TABLE [dbo].[Material_NoticeAndSupervision]( - [NoticeAndSupervisionId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [InspectionId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MainItemId] [nvarchar](50) NULL, - [NoticeAndSupervisionTypeId] [nvarchar](50) NULL, - [Unit] [nvarchar](50) NULL, - [Num] [decimal](18, 2) NULL, - [NoticeDate] [datetime] NULL, - [Conclusion] [nvarchar](500) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Material_NoticeAndSupervision] PRIMARY KEY CLUSTERED -( - [NoticeAndSupervisionId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] WITH CHECK ADD CONSTRAINT [FK_Material_NoticeAndSupervision_Base_NoticeAndSupervisionType] FOREIGN KEY([NoticeAndSupervisionTypeId]) -REFERENCES [dbo].[Base_NoticeAndSupervisionType] ([NoticeAndSupervisionTypeId]) -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] CHECK CONSTRAINT [FK_Material_NoticeAndSupervision_Base_NoticeAndSupervisionType] -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] WITH CHECK ADD CONSTRAINT [FK_Material_NoticeAndSupervision_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] CHECK CONSTRAINT [FK_Material_NoticeAndSupervision_Base_Project] -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] WITH CHECK ADD CONSTRAINT [FK_Material_NoticeAndSupervision_Material_Inspection] FOREIGN KEY([InspectionId]) -REFERENCES [dbo].[Material_Inspection] ([InspectionId]) -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] CHECK CONSTRAINT [FK_Material_NoticeAndSupervision_Material_Inspection] -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] WITH CHECK ADD CONSTRAINT [FK_Material_NoticeAndSupervision_ProjectData_MainItem] FOREIGN KEY([MainItemId]) -REFERENCES [dbo].[ProjectData_MainItem] ([MainItemId]) -GO - -ALTER TABLE [dbo].[Material_NoticeAndSupervision] CHECK CONSTRAINT [FK_Material_NoticeAndSupervision_ProjectData_MainItem] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'NoticeAndSupervisionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'MainItemId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͼId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'NoticeAndSupervisionTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'Unit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'Num' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'NoticeDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'Conclusion' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'֪ͼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Material_NoticeAndSupervision' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-10修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-10修改明细.txt deleted file mode 100644 index 1bc1e5c5..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-10修改明细.txt +++ /dev/null @@ -1,4 +0,0 @@ ---ADD BY Gaofei 2022-08-10 -1.公司级系统设置—基础设置—质量设置，增加菜单材料类型定义、施工试验类型定义、告知和监检类型定义 -2.项目级质量模块，增加材料设备验收管理，包括菜单：材料信息、设备信息、报验管理、材料试验、施工试验、告知和监检管理 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-16.sql b/DataBase/版本日志/SGGLDB_V2022-08-16.sql deleted file mode 100644 index 753e592d..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-16.sql +++ /dev/null @@ -1,170 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('7E19D4B2-190A-4707-A72B-1161F2BB3261','Ա','',50,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('B7BCBD17-14CC-49D9-BF92-BEB0239C6429','','',10,'7E19D4B2-190A-4707-A72B-1161F2BB3261','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('073390B9-3B8E-48B1-BBAB-1127FABEB82C','Ϣ','CQMS/PersonManage/WelderManage.aspx',10,'B7BCBD17-14CC-49D9-BF92-BEB0239C6429','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('C0898659-A503-4E91-87FD-78DC06C00241','073390B9-3B8E-48B1-BBAB-1127FABEB82C','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('578319E7-360E-4E5B-BEC8-72A1D3035F7E','073390B9-3B8E-48B1-BBAB-1127FABEB82C','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('19B52923-D6D5-4E6D-9145-48DE7AA63CBF','073390B9-3B8E-48B1-BBAB-1127FABEB82C','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('35CB48DA-95D5-480B-84EC-0D567FE5CF73','073390B9-3B8E-48B1-BBAB-1127FABEB82C','',4) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('389AAB07-135C-4E9D-A422-8FC2D5276D38','073390B9-3B8E-48B1-BBAB-1127FABEB82C','',5) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('BBB314BA-1671-4086-8819-92444E4F12D8','볡','',20,'B7BCBD17-14CC-49D9-BF92-BEB0239C6429','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('D2C94CEC-BB3C-4C61-844D-91384285BACD','Լƻ','CQMS/PersonManage/TestPlan.aspx',10,'BBB314BA-1671-4086-8819-92444E4F12D8','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('EAB678AD-206D-4A99-800D-9059CD9B155C','D2C94CEC-BB3C-4C61-844D-91384285BACD','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('1E60BEA9-3C02-4E74-B2D2-DFDD01F407D2','D2C94CEC-BB3C-4C61-844D-91384285BACD','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('6BEE2CAF-C5F0-4471-8588-A176FE54B2AD','D2C94CEC-BB3C-4C61-844D-91384285BACD','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('532DFDB2-2EB0-4FEB-81DE-E7315780EB0A','D2C94CEC-BB3C-4C61-844D-91384285BACD','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('6D280D83-B39F-4F0B-99B7-9C1A576B8287','Լ¼','CQMS/PersonManage/TestRecord.aspx',20,'BBB314BA-1671-4086-8819-92444E4F12D8','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('EBD67709-0384-41F7-A3E9-54E1D8907F07','6D280D83-B39F-4F0B-99B7-9C1A576B8287','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('22BD0849-031D-47DF-86AB-34FC2690D4A3','6D280D83-B39F-4F0B-99B7-9C1A576B8287','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('E92EFE82-0231-44F7-837A-FD3455F0B886','6D280D83-B39F-4F0B-99B7-9C1A576B8287','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('055B771A-1433-48A9-81A9-A5A25ED3692E','6D280D83-B39F-4F0B-99B7-9C1A576B8287','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('0A8195B1-4136-4CF1-A0A2-C29A1620B018','⹤','CQMS/PersonManage/CheckerManage.aspx',30,'7E19D4B2-190A-4707-A72B-1161F2BB3261','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('F7E2797E-32A3-4C18-ACD6-6BC5912991CC','0A8195B1-4136-4CF1-A0A2-C29A1620B018','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('C257E4C1-C3FE-41DB-AFC9-B6D9503FD954','0A8195B1-4136-4CF1-A0A2-C29A1620B018','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('4491BEAD-3B64-4417-A2AF-D516CCC7EA0B','0A8195B1-4136-4CF1-A0A2-C29A1620B018','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('D33464D8-F68F-48BE-B9C8-A219F7A3A758','0A8195B1-4136-4CF1-A0A2-C29A1620B018','',4) -GO - -alter table [dbo].[SitePerson_Person] add IsWeldAudit bit null -alter table [dbo].[SitePerson_Person] add IsWeldOK bit null -GO - - -CREATE TABLE [dbo].[Welder_TestPlan]( - [TestPlanId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [TestPlanCode] [nvarchar](50) NULL, - [PlanTestDate] [datetime] NULL, - [RealTestDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Welder_TestPlan] PRIMARY KEY CLUSTERED -( - [TestPlanId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Welder_TestPlan] WITH CHECK ADD CONSTRAINT [FK_Welder_TestPlan_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Welder_TestPlan] CHECK CONSTRAINT [FK_Welder_TestPlan_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'TestPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Լƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'TestPlanCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ƻʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'PlanTestDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʵʿʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'RealTestDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Լƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlan' -GO - - - -CREATE TABLE [dbo].[Welder_TestPlanDetail]( - [TestPlanDetailId] [nvarchar](50) NOT NULL, - [TestPlanId] [nvarchar](50) NULL, - [PersonId] [nvarchar](50) NULL, - [QualifiedItem] [nvarchar](500) NULL, - [TestItem] [nvarchar](100) NULL, - [IsAppearanceOK] [bit] NULL, - [CheckMan] [nvarchar](50) NULL, - [NDTResult] [bit] NULL, - [CheckUnit] [nvarchar](50) NULL, - [State] [bit] NULL, - CONSTRAINT [PK_Welder_TestPlanDetail] PRIMARY KEY CLUSTERED -( - [TestPlanDetailId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'TestPlanDetailId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'TestPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'PersonId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϸĿ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'QualifiedItem' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'IsAppearanceOK' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'CheckMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'NDTResult' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ⵥλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'CheckUnit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Լƻϸ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Welder_TestPlanDetail' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-16修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-16修改明细.txt deleted file mode 100644 index ee72c495..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-16修改明细.txt +++ /dev/null @@ -1,3 +0,0 @@ ---ADD BY Gaofei 2022-08-16 -1.项目级质量模块，增加人员管理，包括菜单：焊工信息、考试计划、考试记录、无损检测工管理 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-22.sql b/DataBase/版本日志/SGGLDB_V2022-08-22.sql deleted file mode 100644 index bb01f6a6..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-22.sql +++ /dev/null @@ -1,272 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('34A3DBD0-1472-4D99-B2A4-21F0AF3227BD','ƻ','',10,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('02970CE5-1A63-4DED-83B2-B283E7E68A1F','ܰʩƻ','CQMS/Plan/MainPlan.aspx',10,'34A3DBD0-1472-4D99-B2A4-21F0AF3227BD','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('D72DAB61-1A86-42C0-A016-9273AA6EE1F0','02970CE5-1A63-4DED-83B2-B283E7E68A1F','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('20F832D3-A1E7-4DB0-8EFA-1AF07F9EADC4','02970CE5-1A63-4DED-83B2-B283E7E68A1F','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('71608783-CFDE-4C45-A299-4B53EF1E7DCC','02970CE5-1A63-4DED-83B2-B283E7E68A1F','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('E86CFDC7-2E46-4C50-8018-208CF2ADDBD7','02970CE5-1A63-4DED-83B2-B283E7E68A1F','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('68DA6E87-1016-4225-AA80-117E788EEE9B','ְʩƻ','CQMS/Plan/SubPlan.aspx',20,'34A3DBD0-1472-4D99-B2A4-21F0AF3227BD','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('AC9D1E02-3A48-4B22-846F-F43E3EE1786B','68DA6E87-1016-4225-AA80-117E788EEE9B','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('6DE3776E-03C6-4AC7-9B44-FA891E20F809','68DA6E87-1016-4225-AA80-117E788EEE9B','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('C504D68B-F366-481D-ACF6-55EB87605B69','68DA6E87-1016-4225-AA80-117E788EEE9B','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('17C413D8-0A84-4E6B-A222-A47750A62DA1','68DA6E87-1016-4225-AA80-117E788EEE9B','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('B9ADD006-BA46-4191-BCD1-CCB56767C82B','ܰʩƻ','ZHGL/Plan/MainPlan.aspx',35,'0','Menu_ZHGL',0,1,1) -GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('EB908892-B220-4EFD-97F6-DBB4F63960EC','B9ADD006-BA46-4191-BCD1-CCB56767C82B','޸',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('EF4D5271-ECEF-4AF3-941C-02580696179E','B9ADD006-BA46-4191-BCD1-CCB56767C82B','',2) - GO - - -CREATE TABLE [dbo].[Plan_MainPlan]( - [MainPlanId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [PlanCode] [nvarchar](50) NULL, - [FileName] [nvarchar](50) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [State] [char](1) NULL, - CONSTRAINT [PK_Plan_MainPlan] PRIMARY KEY CLUSTERED -( - [MainPlanId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Plan_MainPlan] WITH CHECK ADD CONSTRAINT [FK_Plan_MainPlan_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Plan_MainPlan] CHECK CONSTRAINT [FK_Plan_MainPlan_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'MainPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'PlanCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'FileName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܰʩƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlan' -GO - - - -CREATE TABLE [dbo].[Plan_MainPlanApprove]( - [MainPlanApproveId] [nvarchar](50) NOT NULL, - [MainPlanId] [nvarchar](50) NULL, - [ApproveMan] [nvarchar](50) NULL, - [ApproveDate] [datetime] NULL, - [IsAgree] [bit] NULL, - [ApproveIdea] [nvarchar](500) NULL, - [ApproveType] [char](1) NULL, - CONSTRAINT [PK_Plan_MainPlanApprove] PRIMARY KEY CLUSTERED -( - [MainPlanApproveId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Plan_MainPlanApprove] WITH CHECK ADD CONSTRAINT [FK_Plan_MainPlanApprove_Plan_MainPlan] FOREIGN KEY([MainPlanId]) -REFERENCES [dbo].[Plan_MainPlan] ([MainPlanId]) -GO - -ALTER TABLE [dbo].[Plan_MainPlanApprove] CHECK CONSTRAINT [FK_Plan_MainPlanApprove_Plan_MainPlan] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'MainPlanApproveId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'MainPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܰʩƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_MainPlanApprove' -GO - - - -CREATE TABLE [dbo].[Plan_SubPlan]( - [SubPlanId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [Code] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [PlanName] [nvarchar](100) NULL, - [UnitWorkIds] [nvarchar](2000) NULL, - [CNProfessionalCodes] [nvarchar](500) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [State] [char](1) NULL, - [Edition] [int] NULL, - CONSTRAINT [PK_Plan_SubPlan] PRIMARY KEY CLUSTERED -( - [SubPlanId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Plan_SubPlan] WITH CHECK ADD CONSTRAINT [FK_Plan_SubPlan_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Plan_SubPlan] CHECK CONSTRAINT [FK_Plan_SubPlan_Base_Project] -GO - -ALTER TABLE [dbo].[Plan_SubPlan] WITH CHECK ADD CONSTRAINT [FK_Plan_SubPlan_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[Plan_SubPlan] CHECK CONSTRAINT [FK_Plan_SubPlan_Base_Unit] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'SubPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'Code' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ļ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'PlanName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'UnitWorkIds' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵid' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'CNProfessionalCodes' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan', @level2type=N'COLUMN',@level2name=N'Edition' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְʩƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlan' -GO - - - -CREATE TABLE [dbo].[Plan_SubPlanApprove]( - [SubPlanApproveId] [nvarchar](50) NOT NULL, - [SubPlanId] [nvarchar](50) NULL, - [ApproveMan] [nvarchar](50) NULL, - [ApproveDate] [datetime] NULL, - [IsAgree] [bit] NULL, - [ApproveIdea] [nvarchar](200) NULL, - [ApproveType] [char](1) NULL, - [SignType] [nvarchar](20) NULL, - [Edition] [int] NULL, - CONSTRAINT [PK_Plan_SubPlanApprove] PRIMARY KEY CLUSTERED -( - [SubPlanApproveId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Plan_SubPlanApprove] WITH CHECK ADD CONSTRAINT [FK_Plan_SubPlanApprove_Plan_SubPlan] FOREIGN KEY([SubPlanId]) -REFERENCES [dbo].[Plan_SubPlan] ([SubPlanId]) -GO - -ALTER TABLE [dbo].[Plan_SubPlanApprove] CHECK CONSTRAINT [FK_Plan_SubPlanApprove_Plan_SubPlan] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'SubPlanApproveId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'SubPlanId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove', @level2type=N'COLUMN',@level2name=N'Edition' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְʩƻ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Plan_SubPlanApprove' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-22修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-22修改明细.txt deleted file mode 100644 index 466abfd8..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-22修改明细.txt +++ /dev/null @@ -1,4 +0,0 @@ ---ADD BY Gaofei 2022-08-22 -1.项目级质量模块，增加质量计划，包括总包施工质量计划和分包施工质量计划 -2.公司级综合管理，增加总包施工质量计划 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-23.sql b/DataBase/版本日志/SGGLDB_V2022-08-23.sql deleted file mode 100644 index c734ee44..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-23.sql +++ /dev/null @@ -1,163 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('53A5EF93-F0F0-4416-A5F8-1AEC37C0C622','','',30,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('CB0754F9-55D3-4AA3-8E8D-82F11884DAB7','','CQMS/Meeting/MonthMeeting.aspx',10,'53A5EF93-F0F0-4416-A5F8-1AEC37C0C622','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('D8F95A35-8D04-4093-BA2A-EBFC38A31A28','CB0754F9-55D3-4AA3-8E8D-82F11884DAB7','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('E490AA3B-501C-4E4C-B91B-DD0A82E0A146','CB0754F9-55D3-4AA3-8E8D-82F11884DAB7','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('4137A04C-0D5D-4CC8-973D-CF61A4F138AB','CB0754F9-55D3-4AA3-8E8D-82F11884DAB7','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('604F7980-E1B9-4510-9EE4-795AD9D60D03','CB0754F9-55D3-4AA3-8E8D-82F11884DAB7','',4) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('31A86992-5FB9-4525-AE97-E2E9E28FACE8','ר','CQMS/Meeting/SpecialMeeting.aspx',20,'53A5EF93-F0F0-4416-A5F8-1AEC37C0C622','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('8F639349-5AB4-4E9B-B7F4-B925AF9253F2','31A86992-5FB9-4525-AE97-E2E9E28FACE8','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('E37909D5-A504-42FC-A614-87B7C3C22EC1','31A86992-5FB9-4525-AE97-E2E9E28FACE8','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('742E778A-E7DF-41C1-A3F8-7176C9A61E55','31A86992-5FB9-4525-AE97-E2E9E28FACE8','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('5F527E8B-1AD0-4206-9D28-31308B275ACC','31A86992-5FB9-4525-AE97-E2E9E28FACE8','',4) -GO - - -CREATE TABLE [dbo].[Meeting_CQMSMeeting]( - [MeetingId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MeetingType] [char](1) NULL, - [MeetingCode] [nvarchar](50) NULL, - [MeetingDate] [datetime] NULL, - [Place] [nvarchar](200) NULL, - [HostMan] [nvarchar](100) NULL, - [AttentPerson] [nvarchar](500) NULL, - [AttentPersonNum] [int] NULL, - [MeetingTheme] [nvarchar](200) NULL, - [MeetingContents] [nvarchar](max) NULL, - [State] [nvarchar](50) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Meeting_CQMSMeeting] PRIMARY KEY CLUSTERED -( - [MeetingId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Meeting_CQMSMeeting] WITH CHECK ADD CONSTRAINT [FK_Meeting_CQMSMeeting_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Meeting_CQMSMeeting] CHECK CONSTRAINT [FK_Meeting_CQMSMeeting_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͣM-ᣬS-רᣩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'Place' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'HostMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'μԱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'AttentPerson' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'AttentPersonNum' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingTheme' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ҫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'MeetingContents' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeeting' -GO - - - -CREATE TABLE [dbo].[Meeting_CQMSMeetingApprove]( - [MeetingApproveId] [nvarchar](50) NOT NULL, - [MeetingId] [nvarchar](50) NULL, - [ApproveMan] [nvarchar](50) NULL, - [ApproveDate] [datetime] NULL, - [IsAgree] [bit] NULL, - [ApproveIdea] [nvarchar](200) NULL, - [ApproveType] [char](1) NULL, - CONSTRAINT [PK_Meeting_CQMSMeetingApprove] PRIMARY KEY CLUSTERED -( - [MeetingApproveId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Meeting_CQMSMeetingApprove] WITH CHECK ADD CONSTRAINT [FK_Meeting_CQMSMeetingApprove_Meeting_CQMSMeeting] FOREIGN KEY([MeetingId]) -REFERENCES [dbo].[Meeting_CQMSMeeting] ([MeetingId]) -GO - -ALTER TABLE [dbo].[Meeting_CQMSMeetingApprove] CHECK CONSTRAINT [FK_Meeting_CQMSMeetingApprove_Meeting_CQMSMeeting] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'MeetingApproveId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'MeetingId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove', @level2type=N'COLUMN',@level2name=N'ApproveType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Meeting_CQMSMeetingApprove' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-23修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-23修改明细.txt deleted file mode 100644 index fd0b04c9..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-23修改明细.txt +++ /dev/null @@ -1,3 +0,0 @@ ---ADD BY Gaofei 2022-08-23 -1.项目级质量模块，增加质量会议，包括质量月例会和质量专题会 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-24.sql b/DataBase/版本日志/SGGLDB_V2022-08-24.sql deleted file mode 100644 index e40ceab1..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-24.sql +++ /dev/null @@ -1,105 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('1011063B-FEAC-4B89-A9D9-0F9F6BB3328E','ʩ׹','',60,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F','ʩ','CQMS/Technical/TechnicalDisclose.aspx',10,'1011063B-FEAC-4B89-A9D9-0F9F6BB3328E','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('DD5D9F2B-2214-4E41-A9A3-A505E2259600','F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('672D01B9-8895-49A6-8A32-C716A0E2D177','F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('1D40A608-8C0D-4E9E-B310-7444543B633F','F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('678C7429-3A70-47D7-9101-75960508DAE3','F0D0B2C6-51ED-4C47-95EB-C3DCB639BA5F','',4) -GO - - - -CREATE TABLE [dbo].[Technical_TechnicalDisclose]( - [TechnicalDiscloseId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [UnitWorkId] [nvarchar](50) NULL, - [DataId] [nvarchar](50) NULL, - [DiscloseName] [nvarchar](300) NULL, - [DiscloseRequire] [nvarchar](200) NULL, - [DiscloseMan] [nvarchar](50) NULL, - [DiscloseDate] [datetime] NULL, - [MainPartys] [nvarchar](500) NULL, - [State] [char](1) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [QRCodeAttachUrl] [nvarchar](200) NULL, - CONSTRAINT [PK_Technical_TechnicalDisclose] PRIMARY KEY CLUSTERED -( - [TechnicalDiscloseId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[Technical_TechnicalDisclose] WITH CHECK ADD CONSTRAINT [FK_Technical_TechnicalDisclose_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Technical_TechnicalDisclose] CHECK CONSTRAINT [FK_Technical_TechnicalDisclose_Base_Project] -GO - -ALTER TABLE [dbo].[Technical_TechnicalDisclose] WITH CHECK ADD CONSTRAINT [FK_Technical_TechnicalDisclose_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[Technical_TechnicalDisclose] CHECK CONSTRAINT [FK_Technical_TechnicalDisclose_Base_Unit] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'TechnicalDiscloseId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'UnitWorkId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'DataId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'DiscloseName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ҫ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'DiscloseRequire' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'DiscloseMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'DiscloseDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ܰ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'MainPartys' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ά·' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose', @level2type=N'COLUMN',@level2name=N'QRCodeAttachUrl' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ʩױ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Technical_TechnicalDisclose' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-24修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-24修改明细.txt deleted file mode 100644 index 83776d68..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-24修改明细.txt +++ /dev/null @@ -1,9 +0,0 @@ ---ADD BY Gaofei 2022-08-24 -1.项目级质量模块，增加施工技术交底管理，包括施工技术交底 ---END - ---ADD BY YangHongwei 2022-08-24 -1、按需求文档优化公司人员列表信息 -2、部门人员列表信息及更多操作列事件。 -3、优化人员分流管理列表数据呈现。 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26(YHW).sql b/DataBase/版本日志/SGGLDB_V2022-08-26(YHW).sql deleted file mode 100644 index 405eb627..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26(YHW).sql +++ /dev/null @@ -1,123 +0,0 @@ ---Ա Աֶ ɾǷƸֶ -ALTER TABLE Person_Persons ADD PersonType NVARCHAR(10) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աͣ1-ʽԱ2-Ƹ3-' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_Persons', @level2type=N'COLUMN',@level2name=N'PersonType' -GO - -UPDATE Person_Persons SET PersonType='2' WHERE IsOutside =1 -GO -UPDATE Person_Persons SET PersonType='1' WHERE PersonType IS NULL -GO - -ALTER TABLE Person_Persons DROP COLUMN IsOutside -GO - -ALTER VIEW [dbo].[View_SitePerson_Person] -AS -/*ֳԱͼ*/ -SELECT SitePerson.ProjectId, - Project.ProjectCode, - Project.ProjectName, - SitePerson.SitePersonId, - persons.PersonId, - SitePerson.CardNo, - Persons.PersonName, - Persons.Sex, - (Case Persons.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, - Persons.IdentityCard, - Persons.Address, - SitePerson.UnitId, - Persons.Birthday, - SitePerson.TeamGroupId, - SitePerson.WorkAreaId, - SitePerson.WorkPostId, - SitePerson.InTime, - SitePerson.OutTime, - SitePerson.OutResult, - Persons.Telephone, - Persons.PositionId, - Persons.PostTitleId, - Persons.PhotoUrl, - Unit.UnitCode, - Unit.UnitName, - TeamGroup.TeamGroupName, - Post.WorkPostName, - Position.PositionName, - Title.PostTitleName, - Depart.DepartName, - Post.PostType, - Post.IsHsse, - (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T - LEFT JOIN EduTrain_TrainRecord AS E ON T.TrainingId=E.TrainingId - WHERE T.PersonId=SitePerson.PersonId AND E.ProjectId=SitePerson.ProjectId) AS TrainCount, - SitePerson.AuditorId, - Persons.PersonName AS AuditorName, - SitePerson.AuditorDate, - Persons.IDCardUrl, - Persons.IsForeign, - case when Persons.IsForeign=1 then '' else '' end as IsForeignStr, - Persons.IdcardType, - BasicData1.dictName as IdcardTypeName, - Persons.IdcardStartDate, - Persons.IdcardEndDate, - Persons.IdcardForever, - case when Persons.IdcardForever='Y' then '' else '' end as IdcardForeverStr, - Persons.PoliticsStatus, - BasicData2.dictName as PoliticsStatusName, - Persons.IdcardAddress, - Persons.Nation, - BasicData3.dictName as NationName, - Persons.EduLevel, - BasicData4.dictName as EduLevelName, - Persons.MaritalStatus, - BasicData5.dictName as MaritalStatusName, - Persons.CountryCode, - Country.cname as CountryName, - Persons.ProvinceCode, - City.cname as ProvinceName, - Persons.PersonType, - (case when Persons.PersonType='2' then 'Ƹ' when Persons.PersonType='3' then '' else 'Ա' end) as IsOutsideStr, - --WorkArea.UnitWorkCode AS WorkAreaCode, - WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), - --WorkArea.UnitWorkName AS WorkAreaName - WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), - SitePerson.RealNameAddTime, - SitePerson.RealNameUpdateTime, - Persons.HeadImage, - SitePerson.States -FROM SitePerson_Person AS SitePerson -LEFT JOIN Person_Persons AS Persons ON SitePerson.PersonId=Persons.PersonId -LEFT JOIN Base_Project AS Project ON Project.ProjectId=SitePerson.ProjectId -LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = SitePerson.UnitId -LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=SitePerson.TeamGroupId -LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = SitePerson.WorkPostId -LEFT JOIN Base_Position AS Position ON Position.PositionId = Persons.PositionId -Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Persons.PostTitleId -Left JOIN Base_Depart AS Depart ON Depart.DepartId = Persons.DepartId -Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Persons.IdcardType -Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Persons.PoliticsStatus -Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Persons.Nation -Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Persons.EduLevel -Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Persons.MaritalStatus -Left JOIN RealName_Country AS Country ON Country.CountryId = Persons.CountryCode -Left JOIN RealName_City AS City ON City.provinceCode = Persons.ProvinceCode and City.CountryId = Persons.CountryCode - -GO - -/****** Object: Index [NonClusteredIndex-20220629-102151] Script Date: 2022/8/26 10:37:54 ******/ -DROP INDEX [NonClusteredIndex-20220629-102151] ON [dbo].[Person_Persons] -GO - -/****** Object: Index [NonClusteredIndex-20220629-102151] Script Date: 2022/8/26 10:37:33 ******/ -CREATE NONCLUSTERED INDEX [NonClusteredIndex-ListData-param] ON [dbo].[Person_Persons] -( - [UnitId] ASC, - [DepartId] ASC, - [RoleIds] ASC, - [WorkPostId] ASC, - [IsPost] ASC, - [PersonType] ASC, - [IsCardNoOK] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -GO - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26(YHW)修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-26(YHW)修改明细.txt deleted file mode 100644 index 9537b777..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26(YHW)修改明细.txt +++ /dev/null @@ -1,3 +0,0 @@ ---ADD BY YangHongwei 2022-08-26 -1、人员表新增人员类型字段，删除是否外聘字段。 ---END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26(gaofei).sql b/DataBase/版本日志/SGGLDB_V2022-08-26(gaofei).sql deleted file mode 100644 index 1d709680..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26(gaofei).sql +++ /dev/null @@ -1,112 +0,0 @@ - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('99C99DF8-103F-4CA4-83CB-A6C924B5A698','˾','BaseInfo/CompanyModel.aspx',70,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('7492A4CE-8E9C-4942-B433-AAB10078A0EB','99C99DF8-103F-4CA4-83CB-A6C924B5A698','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('E46BFBC8-976E-49F3-A400-6C98CD38FD7A','99C99DF8-103F-4CA4-83CB-A6C924B5A698','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('F092FE5C-247E-4DD7-A25A-1461F12586F6','99C99DF8-103F-4CA4-83CB-A6C924B5A698','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('D4A41AEC-10F3-44CD-B1D5-403E754AAC9C','99C99DF8-103F-4CA4-83CB-A6C924B5A698','',4) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('F54EABD2-4242-4A5D-9154-680E02E9F466','','',80,'0','Menu_CQMS',0,0,1) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('B44EC915-7854-4F06-8C87-CD5FF41E3AC0','','CQMS/Models/QualityModel.aspx',10,'F54EABD2-4242-4A5D-9154-680E02E9F466','Menu_CQMS',0,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('8C606C84-E75A-4101-A628-28A8169509F9','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('25968F9E-FD4B-43C3-A6A2-47A27ACF1B0B','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('55219178-2320-4DDD-951D-4EE4FBFC2584','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('7DF98E0A-A3E1-46A3-AF33-883CE726ED08','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','',4) - GO - - -CREATE TABLE [dbo].[Base_CompanyModel]( - [CompanyModelId] [nvarchar](50) NOT NULL, - [ModelType] [nvarchar](50) NULL, - [Remark] [nvarchar](100) NULL, - CONSTRAINT [PK_Base_CompanyModel] PRIMARY KEY CLUSTERED -( - [CompanyModelId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'CompanyModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'ModelType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˾' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel' -GO - - - -CREATE TABLE [dbo].[Model_QualityModel]( - [QualityModelId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [CompanyModelId] [nvarchar](50) NULL, - [Evaluate] [nvarchar](10) NULL, - [Remark] [nvarchar](100) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Model_QualityModel] PRIMARY KEY CLUSTERED -( - [QualityModelId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Model_QualityModel] WITH CHECK ADD CONSTRAINT [FK_Model_QualityModel_Base_CompanyModel] FOREIGN KEY([CompanyModelId]) -REFERENCES [dbo].[Base_CompanyModel] ([CompanyModelId]) -GO - -ALTER TABLE [dbo].[Model_QualityModel] CHECK CONSTRAINT [FK_Model_QualityModel_Base_CompanyModel] -GO - -ALTER TABLE [dbo].[Model_QualityModel] WITH CHECK ADD CONSTRAINT [FK_Model_QualityModel_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Model_QualityModel] CHECK CONSTRAINT [FK_Model_QualityModel_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'QualityModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompanyModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀʵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'Evaluate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26.sql b/DataBase/版本日志/SGGLDB_V2022-08-26.sql deleted file mode 100644 index 1d709680..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26.sql +++ /dev/null @@ -1,112 +0,0 @@ - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('99C99DF8-103F-4CA4-83CB-A6C924B5A698','˾','BaseInfo/CompanyModel.aspx',70,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('7492A4CE-8E9C-4942-B433-AAB10078A0EB','99C99DF8-103F-4CA4-83CB-A6C924B5A698','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('E46BFBC8-976E-49F3-A400-6C98CD38FD7A','99C99DF8-103F-4CA4-83CB-A6C924B5A698','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('F092FE5C-247E-4DD7-A25A-1461F12586F6','99C99DF8-103F-4CA4-83CB-A6C924B5A698','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('D4A41AEC-10F3-44CD-B1D5-403E754AAC9C','99C99DF8-103F-4CA4-83CB-A6C924B5A698','',4) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('F54EABD2-4242-4A5D-9154-680E02E9F466','','',80,'0','Menu_CQMS',0,0,1) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('B44EC915-7854-4F06-8C87-CD5FF41E3AC0','','CQMS/Models/QualityModel.aspx',10,'F54EABD2-4242-4A5D-9154-680E02E9F466','Menu_CQMS',0,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('8C606C84-E75A-4101-A628-28A8169509F9','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('25968F9E-FD4B-43C3-A6A2-47A27ACF1B0B','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('55219178-2320-4DDD-951D-4EE4FBFC2584','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('7DF98E0A-A3E1-46A3-AF33-883CE726ED08','B44EC915-7854-4F06-8C87-CD5FF41E3AC0','',4) - GO - - -CREATE TABLE [dbo].[Base_CompanyModel]( - [CompanyModelId] [nvarchar](50) NOT NULL, - [ModelType] [nvarchar](50) NULL, - [Remark] [nvarchar](100) NULL, - CONSTRAINT [PK_Base_CompanyModel] PRIMARY KEY CLUSTERED -( - [CompanyModelId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'CompanyModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'ModelType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˾' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_CompanyModel' -GO - - - -CREATE TABLE [dbo].[Model_QualityModel]( - [QualityModelId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [CompanyModelId] [nvarchar](50) NULL, - [Evaluate] [nvarchar](10) NULL, - [Remark] [nvarchar](100) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_Model_QualityModel] PRIMARY KEY CLUSTERED -( - [QualityModelId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[Model_QualityModel] WITH CHECK ADD CONSTRAINT [FK_Model_QualityModel_Base_CompanyModel] FOREIGN KEY([CompanyModelId]) -REFERENCES [dbo].[Base_CompanyModel] ([CompanyModelId]) -GO - -ALTER TABLE [dbo].[Model_QualityModel] CHECK CONSTRAINT [FK_Model_QualityModel_Base_CompanyModel] -GO - -ALTER TABLE [dbo].[Model_QualityModel] WITH CHECK ADD CONSTRAINT [FK_Model_QualityModel_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[Model_QualityModel] CHECK CONSTRAINT [FK_Model_QualityModel_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'QualityModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompanyModelId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ŀʵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'Evaluate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Model_QualityModel' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26修改明细(gaofei).txt b/DataBase/版本日志/SGGLDB_V2022-08-26修改明细(gaofei).txt deleted file mode 100644 index 3dd43a25..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26修改明细(gaofei).txt +++ /dev/null @@ -1,5 +0,0 @@ ---ADD BY Gaofei 2022-08-26 -1.公司级系统设置-基础设置-质量设置模块，增加公司质量看板 -2.项目级质量模块，增加质量样板管理，包括质量样板 ---END - diff --git a/DataBase/版本日志/SGGLDB_V2022-08-26修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-08-26修改明细.txt deleted file mode 100644 index 3dd43a25..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-08-26修改明细.txt +++ /dev/null @@ -1,5 +0,0 @@ ---ADD BY Gaofei 2022-08-26 -1.公司级系统设置-基础设置-质量设置模块，增加公司质量看板 -2.项目级质量模块，增加质量样板管理，包括质量样板 ---END - diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02 lpf 修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-02 lpf 修改明细.txt deleted file mode 100644 index e0222789..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-02 lpf 修改明细.txt +++ /dev/null @@ -1,4 +0,0 @@ -增加焊接材料管理 -修改点口管理 -增加库存信息 -修改焊接施工计划 \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02 lpf.sql b/DataBase/版本日志/SGGLDB_V2022-09-02 lpf.sql deleted file mode 100644 index 524f2858..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-02 lpf.sql +++ /dev/null @@ -1,143 +0,0 @@ -alter table HJGL_Pipeline add State int -go -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('DB50A5AA-08DB-4915-9173-6DB133CA76F0','Ϣ','HJGL/DataImport/MaterialStock.aspx',14,'0','Menu_HJGL',0,1,1) - -GO -ALTER VIEW [dbo].[View_HJGL_NoWeldJointFind] -AS ---δڲ -SELECT jot.WeldJointId,jot.WeldJointCode,jot.PipelineId,jot.WeldingDailyId,jot.JointAttribute,WeldType.WeldTypeCode, - method.WeldingMethodCode,jot.Dia,jot.Thickness, rod.ConsumablesCode AS WeldingRodCode - ,wire.ConsumablesCode AS WeldingWireCode, - mat1.MaterialCode AS Material1Code ,mat2.MaterialCode AS Material2Code -FROM dbo.HJGL_WeldJoint jot -LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId -LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId -LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId -LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id -LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id -LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire -LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod -WHERE pre.PreWeldingDailyId IS NULL -GO -ALTER VIEW [dbo].[View_HJGL_WeldingTask] -AS -SELECT T.WeldTaskId,T.WeldJointId,T.CoverWelderId,T.BackingWelderId, - cov.WelderCode AS CoverWelderCode,back.WelderCode AS BackingWelderCode, - case when jot.JointAttribute is not null then jot.JointAttribute else T.JointAttribute end as JointAttribute, - T.WeldingMode,T.ProjectId,T.UnitWorkId,T.UnitId,T.TaskDate,T.Tabler,T.TableDate, - jot.WeldJointCode,jot.Dia,jot.Thickness,jot.Size,jot.WeldingLocationId, - CASE WHEN jot.WeldingDailyId IS NULL THEN '' ELSE '' END AS IsWelding, - P.PipelineCode,B.WeldTypeCode,M.WeldingMethodCode,L.WeldingLocationCode, - t.CanWelderCode,t.CanWelderId ,rod.ConsumablesName AS WeldingRodCode,T.CanWeldingRodName,T.CanWeldingWireName, - wire.ConsumablesName AS WeldingWireCode,jot.WeldingDailyId,p.PipeArea -from HJGL_WeldTask T -left join HJGL_WeldJoint jot on T.WeldJointId=jot.WeldJointId -LEFT JOIN dbo.SitePerson_Person cov ON cov.PersonId=t.CoverWelderId -LEFT JOIN dbo.SitePerson_Person back ON back.PersonId=t.BackingWelderId -LEFT join HJGL_Pipeline P on jot.PipelineId=P.PipelineId -left join Base_WeldType B on jot.WeldTypeId=B.WeldTypeId -LEFT join Base_WeldingMethod M on jot.WeldingMethodId=M.WeldingMethodId -left join Base_WeldingLocation L on jot.WeldingLocationId=L.WeldingLocationId -LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire -LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod -GO -CREATE TABLE [dbo].[HJGL_MaterialManage]( - [MaterialId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [ContractNo] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [MainItemId] [nvarchar](50) NULL, - [MaterialName] [nvarchar](50) NULL, - [SpecificationAndModel] [nvarchar](50) NULL, - [MaterialCode] [nvarchar](50) NULL, - [Material] [nvarchar](50) NULL, - [PressClass] [nvarchar](50) NULL, - [Unit] [nvarchar](50) NULL, - [Num] [decimal](18, 2) NULL, - [ArrivalDate] [datetime] NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - [InspectionId] [nvarchar](50) NULL, - CONSTRAINT [PK_HJGL_MaterialManage] PRIMARY KEY CLUSTERED -( - [MaterialId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_Base_Project] -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_Base_Unit] FOREIGN KEY([UnitId]) -REFERENCES [dbo].[Base_Unit] ([UnitId]) -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_Base_Unit] -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_ProjectData_MainItem] FOREIGN KEY([MainItemId]) -REFERENCES [dbo].[ProjectData_MainItem] ([MainItemId]) -GO - -ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_ProjectData_MainItem] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ContractNo' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MainItemId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialName' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'SpecificationAndModel' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Material' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'PressClass' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Unit' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Num' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ArrivalDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'InspectionId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ϣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei).sql b/DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei).sql deleted file mode 100644 index 552e3d79..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei).sql +++ /dev/null @@ -1,93 +0,0 @@ -/****** Object: Table [dbo].[Person_PersonsCertificate] Script Date: 2022/8/31 9:23:18 ******/ -IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[Person_PersonsCertificate]') AND type in (N'U')) -DROP TABLE [dbo].[Person_PersonsCertificate] -GO - -ALTER TABLE QualityAudit_PersonQuality ADD RegisterDate DATETIME NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'עʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'RegisterDate' -GO - -ALTER TABLE QualityAudit_PersonQuality ADD Major nvarchar(50) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'Major' -GO - -ALTER TABLE QualityAudit_PersonQuality ADD Url nvarchar(2000) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'Url' -GO - -UPDATE QualityAudit_PersonQuality SET Url=(SELECT AttachUrl FROM AttachFile WHERE ToKeyId=QualityAudit_PersonQuality.PersonQualityId) -GO - -CREATE TABLE [dbo].[Person_PersonTrain]( - [PersonTrainId] [nvarchar](50) NOT NULL, - [PersonId] [nvarchar](50) NULL, - [TrainTypeId] [nvarchar](50) NULL, - [TrainDate] [datetime] NULL, - [TrainPlace] [nvarchar](500) NULL, - [TrainResult] [nvarchar](50) NULL, - CONSTRAINT [PK_Person_PersonTrain] PRIMARY KEY CLUSTERED -( - [PersonTrainId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'PersonTrainId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'PersonId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainPlace' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainResult' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain' -GO - - -ALTER TABLE Base_WorkPost ADD IsDuty BIT NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_WorkPost', @level2type=N'COLUMN',@level2name=N'IsDuty' -GO - -ALTER TABLE Base_WorkPost ADD IsTotal BIT NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աܽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_WorkPost', @level2type=N'COLUMN',@level2name=N'IsTotal' -GO - - -ALTER TABLE SitePerson_PersonItem ADD TeamGroupId NVARCHAR(50) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'TeamGroupId' -GO -ALTER TABLE SitePerson_PersonItem ADD TeamGroupName NVARCHAR(50) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'TeamGroupName' -GO - -ALTER TABLE SitePerson_PersonItem ADD OutResult NVARCHAR(50) NULL -GO -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˳ԭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'OutResult' -GO - -UPDATE SitePerson_PersonItem SET TeamGroupId=b.TeamGroupId,OutResult=b.OutResult -FROM SitePerson_Person AS b -WHERE SitePerson_PersonItem.IdentityCard=b.IdentityCard and SitePerson_PersonItem.ProjectId=b.ProjectId -GO - -UPDATE SitePerson_PersonItem SET TeamGroupName=b.TeamGroupName -FROM ProjectData_TeamGroup AS b -WHERE SitePerson_PersonItem.TeamGroupId=b.TeamGroupId -GO diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02(gaofei).sql b/DataBase/版本日志/SGGLDB_V2022-09-02(gaofei).sql deleted file mode 100644 index 3f1c7cd7..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-02(gaofei).sql +++ /dev/null @@ -1,221 +0,0 @@ -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('BA383490-BAE3-4E65-B221-8F89D2431135','','',70,'0','Menu_CQMS',0,0,1) -GO - -INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -VALUES('81053EAB-09C6-4A6B-A952-B756071EE0DA','','CQMS/RewardAndPunish/RewardAndPunish.aspx',10,'BA383490-BAE3-4E65-B221-8F89D2431135','Menu_CQMS',0,1,1) -GO -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('4A1ACB37-8E46-4192-A40E-B4BEC6C0B8FC','81053EAB-09C6-4A6B-A952-B756071EE0DA','',1) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('1C61A92C-2B4A-4118-9A98-A1C8ACE29D13','81053EAB-09C6-4A6B-A952-B756071EE0DA','޸',2) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('7104955E-586D-4BAF-90CE-3DB3F1A313A9','81053EAB-09C6-4A6B-A952-B756071EE0DA','ɾ',3) -INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) -VALUES('CE5580C3-6385-4FD5-B48C-84DFDC1DEF93','81053EAB-09C6-4A6B-A952-B756071EE0DA','',4) -GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('E20647B6-315D-483B-8E5D-4810DBECE79E','Ͷ','',90,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,0,1) - GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('84DB3C33-8828-407B-8B8A-5E98AD610FA6','','BaseInfo/RewardType.aspx',10,'E20647B6-315D-483B-8E5D-4810DBECE79E','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('8E4BF950-5859-4319-8EA5-F73A87DBF807','84DB3C33-8828-407B-8B8A-5E98AD610FA6','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('C71CB6E0-7D3C-486A-94DD-D72D27D6DE1B','84DB3C33-8828-407B-8B8A-5E98AD610FA6','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('9A7587D8-B5AE-44DF-8A40-366D10E00B32','84DB3C33-8828-407B-8B8A-5E98AD610FA6','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('815844ED-E84C-4B1C-9CBA-1FEA13D27D44','84DB3C33-8828-407B-8B8A-5E98AD610FA6','',4) - GO - - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('92DF46C6-1CE4-4324-A3F2-EBC6261376AC','','BaseInfo/PunishType.aspx',20,'E20647B6-315D-483B-8E5D-4810DBECE79E','Menu_SysSet',1,1,1) - GO - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('A61A94F0-5D3F-4D9D-B901-9806EC92EC0B','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','',1) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('8DD92D1E-DD3A-46A8-8E97-949C9542FB62','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','޸',2) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('DB2D95C7-1D40-4F44-AAB2-AFA16889D364','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','ɾ',3) - INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) - VALUES('7A0D6E09-5619-40FE-8447-37E593247EB3','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','',4) - GO - - -CREATE TABLE [dbo].[Base_RewardType]( - [RewardTypeId] [nvarchar](50) NOT NULL, - [RewardCause] [nvarchar](500) NULL, - [RewardDecision] [nvarchar](500) NULL, - [Remark] [nvarchar](200) NULL, - CONSTRAINT [PK_Base_RewardType] PRIMARY KEY CLUSTERED -( - [RewardTypeId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardCause' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardDecision' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType' -GO - - -CREATE TABLE [dbo].[Base_PunishType]( - [PunishTypeId] [nvarchar](50) NOT NULL, - [PunishCause] [nvarchar](500) NULL, - [PunishDecision] [nvarchar](500) NULL, - [Remark] [nvarchar](200) NULL, - CONSTRAINT [PK_Base_PunishType] PRIMARY KEY CLUSTERED -( - [PunishTypeId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishCause' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishDecision' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'Remark' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType' -GO - - - -CREATE TABLE [dbo].[RewardAndPunish_RewardAndPunish]( - [RewardAndPunishId] [nvarchar](50) NOT NULL, - [ProjectId] [nvarchar](50) NULL, - [RewardAndPunishCode] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [Type] [char](1) NULL, - [RewardAndPunishTypeId] [nvarchar](50) NULL, - [RewardAndPunishBasis] [nvarchar](200) NULL, - [State] [char](1) NULL, - [CompileMan] [nvarchar](50) NULL, - [CompileDate] [datetime] NULL, - CONSTRAINT [PK_RewardAndPunish_RewardAndPunish] PRIMARY KEY CLUSTERED -( - [RewardAndPunishId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunish] WITH CHECK ADD CONSTRAINT [FK_RewardAndPunish_RewardAndPunish_Base_Project] FOREIGN KEY([ProjectId]) -REFERENCES [dbo].[Base_Project] ([ProjectId]) -GO - -ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunish] CHECK CONSTRAINT [FK_RewardAndPunish_RewardAndPunish_Base_Project] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishCode' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'󣨷ְλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'1-2-' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'Type' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishTypeId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishBasis' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'State' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'CompileMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'CompileDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish' -GO - - - -CREATE TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove]( - [RewardAndPunishApproveId] [nvarchar](50) NOT NULL, - [RewardAndPunishId] [nvarchar](50) NULL, - [ApproveMan] [nvarchar](50) NULL, - [ApproveDate] [datetime] NULL, - [IsAgree] [bit] NULL, - [ApproveIdea] [nvarchar](200) NULL, - [ApproveType] [char](1) NULL, - CONSTRAINT [PK_RewardAndPunish_RewardAndPunishApprove] PRIMARY KEY CLUSTERED -( - [RewardAndPunishApproveId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] - -GO - -SET ANSI_PADDING OFF -GO - -ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove] WITH CHECK ADD CONSTRAINT [FK_RewardAndPunish_RewardAndPunishApprove_RewardAndPunish_RewardAndPunish] FOREIGN KEY([RewardAndPunishId]) -REFERENCES [dbo].[RewardAndPunish_RewardAndPunish] ([RewardAndPunishId]) -GO - -ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove] CHECK CONSTRAINT [FK_RewardAndPunish_RewardAndPunishApprove_RewardAndPunish_RewardAndPunish] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'RewardAndPunishApproveId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'RewardAndPunishId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02修改明细(gaofei).txt b/DataBase/版本日志/SGGLDB_V2022-09-02修改明细(gaofei).txt deleted file mode 100644 index 2cf66823..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-02修改明细(gaofei).txt +++ /dev/null @@ -1,6 +0,0 @@ ---ADD BY Gaofei 2022-09-02 -1.公司级系统设置-基础设置-质量设置，增加质量奖惩定义，包括奖励定义、处罚定义 -2.项目级质量模块，增加质量奖惩，包括质量奖励处罚 -3.项目级质量模块，施工图纸增加附件上传 ---END - diff --git a/DataBase/版本日志/SGGLDB_V2022-09-05(YangHongwei).sql b/DataBase/版本日志/SGGLDB_V2022-09-05(YangHongwei).sql deleted file mode 100644 index d352135e..00000000 --- a/DataBase/版本日志/SGGLDB_V2022-09-05(YangHongwei).sql +++ /dev/null @@ -1,46 +0,0 @@ - -CREATE TABLE [dbo].[Person_PersonContract]( - [PersonContractId] [nvarchar](50) NOT NULL, - [PersonId] [nvarchar](50) NULL, - [UnitId] [nvarchar](50) NULL, - [ProjectId] [nvarchar](50) NULL, - [LeadManId] [nvarchar](50) NULL, - [Telephone] [nvarchar](50) NULL, - [ContractType] [nvarchar](50) NULL, - [StartDate] [datetime] NULL, - [EndDate] [datetime] NULL, - CONSTRAINT [PK_Person_PersonContract] PRIMARY KEY CLUSTERED -( - [PersonContractId] ASC -)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] -) ON [PRIMARY] -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'PersonContractId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'PersonId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λID׷' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'UnitId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'ProjectId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'LeadManId' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϵ绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'Telephone' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'ContractType' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'StartDate' -GO - -EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract' -GO - - diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08.sql b/DataBase/版本日志/SGGLDB_V2022-09-08.sql index 02b5c583..49431ed1 100644 --- a/DataBase/版本日志/SGGLDB_V2022-09-08.sql +++ b/DataBase/版本日志/SGGLDB_V2022-09-08.sql @@ -93,3 +93,242 @@ Left JOIN RealName_City AS City ON City.provinceCode = Persons.ProvinceCode and GO +alter table PHTGL_Contract add Status int +alter table PHTGL_Contract add ContactUnitOfPartyA [varchar](50) +alter table PHTGL_Contract add ContactPersonOfPartyA [varchar](50) +alter table PHTGL_Contract add ContactPersonOfPartyB [varchar](50) +alter table PHTGL_Contract add ContactPersonPhoneOfPartyB [varchar](50) +alter table PHTGL_Contract add ContactPersonEmailOfPartyB [varchar](50) +alter table PHTGL_Contract add ContractAmountExcludingTax [decimal](18, 2) +alter table PHTGL_Contract add PriceMethod [varchar](50) +alter table PHTGL_Contract add SignedOnDate date +alter table PHTGL_Contract add ContractStartDate date +alter table PHTGL_Contract add ContractEndDate date +alter table PHTGL_Contract add PricingBasis [varchar](50) +alter table PHTGL_Contract add SubcontractingMethod [varchar](50) +alter table PHTGL_Contract add IsItACentralizedPurchaseSupplier int +GO +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'Status' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'׷ϵλ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContactUnitOfPartyA' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'׷ϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContactPersonOfPartyA' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҷϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContactPersonOfPartyB' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҷϵ˵绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContactPersonPhoneOfPartyB' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҷϵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContactPersonEmailOfPartyB' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ˰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContractAmountExcludingTax' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƽ۷ʽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'PriceMethod' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ǩ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'SignedOnDate' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬʼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContractStartDate' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ֹͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'ContractEndDate' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'PricingBasis' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ְģʽ 1-ڲְ2-ⲿְ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'SubcontractingMethod' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ҷǷΪɹӦ/ְ 0-1-' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'PHTGL_Contract', @level2type=N'COLUMN', +@level2name=N'IsItACentralizedPurchaseSupplier' +GO + +ALTER PROC [dbo].[sp_rpt_WelderFirstPassRate] + @unitcode NVARCHAR(50) = NULL, --λ + @detectionTypeId NVARCHAR(50) = NULL, --̽ + @UnitWork NVARCHAR(50) = NULL, -- + @MaterialCode NVARCHAR(50) = NULL, -- + @SingleName NVARCHAR(50) = NULL, --ھ + @Thickness NVARCHAR(50) = NULL, --ں + @Specification NVARCHAR(50) = NULL, -- + @WeldTypeCode NVARCHAR(50) = NULL, -- + @JointAttribute NVARCHAR(50) = NULL, -- + @PersonName NVARCHAR(50) = NULL, -- + @date1 DATETIME = NULL, + @date2 DATETIME = NULL, + @projectId NVARCHAR(50) = NULL + +AS +/*ҵ*/ + +SELECT + welder.ProjectId, + welder.WelderCode,-- + welder.PersonName,-- + unit.UnitName, --ʩλ + welder.CertificateLimitTime, --Ч + welder.WelderLevel, --ʵȼ + -------------start + CAST(ISNULL(nowtotal.nowtotal_din,0) AS DECIMAL(19,2)) AS nowtotal_din, --ֵܴ + ISNULL(nowtotal.nowtotal_jot,0) AS nowtotal_jot, --ܺ + ISNULL(oneCheck.OneCheckJotNum,0) AS OneCheckJotNum, -- һμ⺸ + (ISNULL(oneCheck.OneCheckJotNum,0)-ISNULL(oneCheckRepair.OneCheckRepairJotNum,0)) AS OneCheckPassJotNum,--һμϸ񺸿 + + CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(oneCheck.OneCheckJotNum,0) WHEN 0 THEN 0 + ELSE 100.0 * (ISNULL(oneCheck.OneCheckJotNum,0)-ISNULL(oneCheckRepair.oneCheckRepairJotNum,0))/(1.0 * oneCheck.OneCheckJotNum) END) AS DECIMAL(8,1))))+'%' AS passRate, -- ϸʣڣ + + ISNULL(oneCheck.OneCheckTotalFilm,0) AS OneCheckTotalFilm, --һμƬ + ISNULL(oneCheck.OneCheckPassFilm,0) AS OneCheckPassFilm, --һμϸƬ + CONVERT(NVARCHAR(10),(CAST((CASE ISNULL(oneCheck.OneCheckTotalFilm,0) WHEN 0 THEN 0 + ELSE 100.0 * ISNULL(oneCheck.OneCheckPassFilm,0)/(1.0 * oneCheck.OneCheckTotalFilm) END) AS DECIMAL(8,1))))+'%' + AS passfilmrate ---RTϸʣƬ + +FROM SitePerson_Person AS welder +LEFT JOIN dbo.Base_Unit unit ON unit.UnitId = welder.UnitId + --ֵܴ --ܺ +LEFT JOIN (SELECT SUM(jot.Size) AS nowtotal_din + ,COUNT(*) AS nowtotal_jot + ,jot.CoverWelderId + FROM dbo.HJGL_WeldJoint jot + LEFT JOIN dbo.HJGL_Pipeline pipe ON pipe.PipelineId = jot.PipelineId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN WBS_UnitWork area ON area.UnitWorkId = pipe.UnitWorkId + LEFT JOIN dbo.Base_Material AS mat ON mat.MaterialId=pipe.MaterialId + WHERE jot.WeldingDailyId IS NOT NULL + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) + AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + AND (pipe.UnitWorkId=@UnitWork OR @UnitWork IS NULL) --λ + AND (mat.MaterialCode like @MaterialCode OR @MaterialCode IS NULL) -- + And (pipe.SingleName like @SingleName OR @SingleName IS NULL) --⾶ + GROUP BY jot.CoverWelderId) AS nowtotal ON nowtotal.CoverWelderId = welder.PersonId + +--ڼ⺸ +LEFT JOIN (SELECT jot.CoverWelderId,COUNT(ndeItem.NDEItemID) AS OneCheckJotNum, --һμ⺸ + SUM(ISNULL(ndeItem.TotalFilm,0)) AS OneCheckTotalFilm, --һμƬ + SUM(ISNULL(ndeItem.PassFilm,0)) AS OneCheckPassFilm --һμϸƬ + FROM dbo.HJGL_Batch_NDEItem ndeItem + LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.TrustBatchItemId = ndeItem.TrustBatchItemId + LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = trustItem.WeldJointId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.PointBatchItemId = trustItem.PointBatchItemId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId + WHERE pointItem.PointDate IS NOT NULL AND pointItem.PointState=1 AND trustItem.RepairRecordId IS NULL + AND (point.DetectionTypeId=@detectionTypeId OR @detectionTypeId IS NULL) --ʾ + AND (jot.Thickness like @Thickness OR @Thickness IS NULL) --ں + AND (jot.Specification like @Specification OR @Specification IS NULL) -- + AND (WeldType.WeldTypeCode like @WeldTypeCode OR @WeldTypeCode IS NULL) -- + AND (jot.JointAttribute = @JointAttribute OR @JointAttribute IS NULL) -- + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) + AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + GROUP BY jot.CoverWelderId) AS oneCheck ON oneCheck.CoverWelderId = welder.PersonId + +LEFT JOIN (SELECT jot.CoverWelderId,COUNT(ndeItem.NDEItemID) AS OneCheckRepairJotNum --һμⷵ޺ + FROM dbo.HJGL_Batch_NDEItem ndeItem + LEFT JOIN dbo.HJGL_Batch_BatchTrustItem trustItem ON trustItem.TrustBatchItemId = ndeItem.TrustBatchItemId + LEFT JOIN dbo.HJGL_WeldJoint jot ON jot.WeldJointId = trustItem.WeldJointId + LEFT JOIN dbo.HJGL_WeldingDaily daily ON daily.WeldingDailyId = jot.WeldingDailyId + LEFT JOIN dbo.HJGL_Batch_PointBatchItem pointItem ON pointItem.PointBatchItemId = trustItem.PointBatchItemId + LEFT JOIN dbo.HJGL_Batch_PointBatch point ON point.PointBatchId = pointItem.PointBatchId + WHERE pointItem.PointDate IS NOT NULL AND pointItem.PointState=1 + AND trustItem.RepairRecordId IS NULL AND ndeItem.CheckResult='2' + AND (point.DetectionTypeId=@detectionTypeId OR @detectionTypeId IS NULL) --ʾ + AND (daily.WeldingDate >= @date1 OR @date1 IS NULL) + AND (daily.WeldingDate <= @date2 OR @date2 IS NULL) + GROUP BY jot.CoverWelderId) AS oneCheckRepair ON oneCheckRepair.CoverWelderId = welder.PersonId + +WHERE +(welder.WelderCode IS NOT NULL AND welder.WelderCode!='') +AND (welder.ProjectId = @projectId OR @projectId IS NULL) +AND (welder.UnitId=@unitcode OR @unitcode IS NULL) +AND (welder.PersonName like @PersonName OR @PersonName IS NULL) -- +AND (welder.WorkPostId='19B8F2A9-28D3-4F20-867A-1B2237C2E228') +ORDER BY welder.WelderCode + +GO + +ALTER PROCEDURE [dbo].[HJGL_rpt_CheckDefects] +( + @projectId NVARCHAR(50), + @unitcode NVARCHAR(50) = NULL, --λ + @UnitWork NVARCHAR(50) = NULL, -- + @MaterialCode NVARCHAR(50) = NULL, -- + @SingleName NVARCHAR(50) = NULL, --ھ + @Thickness NVARCHAR(50) = NULL, --ں + @Specification NVARCHAR(50) = NULL, -- + @WeldTypeCode NVARCHAR(50) = NULL, -- + @JointAttribute NVARCHAR(50) = NULL, -- + @PersonName NVARCHAR(50) = NULL -- +) +AS + SELECT n.*,UnitWork.UnitWorkName,UnitWork.UnitWorkCode + FROM + (SELECT m.ProjectId,m.UnitWorkId,SUM(Defect1) AS Defect1,SUM(Defect2) AS Defect2,SUM(Defect3) AS Defect3, + SUM(Defect4) AS Defect4,SUM(Defect5) AS Defect5,SUM(Defect6) AS Defect6,SUM(Defect7) AS Defect7, + SUM(Defect8) AS Defect8,SUM(Defect9) AS Defect9,SUM(Defect10) AS Defect10,SUM(Defect11) AS Defect11, + SUM(Defect12) AS Defect12,SUM(Defect13) AS Defect13,SUM(Defect14) AS Defect14,SUM(Defect15) AS Defect15, + SUM(Defect16) AS Defect16,SUM(Defect17) AS Defect17,SUM(Defect18) AS Defect18, + SUM(Defect19) AS Defect19,SUM(Defect20) AS Defect20,SUM(Defect21) AS Defect21 + FROM + + (SELECT t.ProjectId,t.UnitWorkId, + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect1', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect2', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect3', + (SELECT COUNT(*) WHERE CHARINDEX('δ͸',t.DefectsName)>0) AS 'Defect4', + (SELECT COUNT(*) WHERE CHARINDEX('δۺ',t.DefectsName)>0) AS 'Defect5', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect6', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect7', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect8', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect9', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect10', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect11', + (SELECT COUNT(*) WHERE CHARINDEX('ڰ',t.DefectsName)>0) AS 'Defect12', + (SELECT COUNT(*) WHERE CHARINDEX('ҧ',t.DefectsName)>0) AS 'Defect13', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect14', + (SELECT COUNT(*) WHERE CHARINDEX('湵',t.DefectsName)>0) AS 'Defect15', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect16', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect17', + (SELECT COUNT(*) WHERE CHARINDEX('϶1~3mm',t.DefectsName)>0) AS 'Defect18', + (SELECT COUNT(*) WHERE CHARINDEX('ԭ',t.DefectsName)>0) AS 'Defect19', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect20', + (SELECT COUNT(*) WHERE CHARINDEX('',t.DefectsName)>0) AS 'Defect21' + + FROM + (SELECT dbo.HJGL_Fun_CheckDefects(item.CheckDefects) AS DefectsName, + nde.ProjectId ,nde.UnitWorkId + FROM dbo.HJGL_Batch_NDEItem item + LEFT JOIN dbo.HJGL_Batch_NDE nde ON nde.NDEID = item.NDEID + left join View_Batch_NDEItem vbn on vbn.NDEID=item.NDEID + left join View_HJGL_Pipeline pipe on pipe.PipelineCode=vbn.PipelineCode + left join View_HJGL_WeldJoint jot on jot.WeldJointId=vbn.WeldJointId + left join SitePerson_Person person on person.WelderCode =vbn.WelderCode + WHERE (item.CheckDefects IS NOT NULL ) + AND (item.CheckDefects!='') + AND (pipe.UnitWorkId=@UnitWork OR @UnitWork IS NULL) --λ + AND (pipe.MaterialCode like @MaterialCode OR @MaterialCode IS NULL) -- + And (pipe.SingleName like @SingleName OR @SingleName IS NULL) --⾶ + AND (jot.Thickness like @Thickness OR @Thickness IS NULL) --ں + AND (jot.Specification like @Specification OR @Specification IS NULL) -- + AND (jot.WeldTypeCode like @WeldTypeCode OR @WeldTypeCode IS NULL) -- + AND (jot.JointAttribute = @JointAttribute OR @JointAttribute IS NULL) -- + AND (person.PersonName like @PersonName OR @PersonName IS NULL) -- + ) t + ) m GROUP BY m.ProjectId,m.UnitWorkId + ) n + LEFT JOIN dbo.WBS_UnitWork UnitWork ON UnitWork.UnitWorkId = n.UnitWorkId + WHERE n.ProjectId = @projectId + + + +GO + diff --git a/DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt b/DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt new file mode 100644 index 00000000..5b1307f9 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_V2022-09-08修改明细.txt @@ -0,0 +1,11 @@ +--ADD BY lipengfei 2022-09-08 +1,合同基本信息字段添加 +2,焊接一次合格率查询修改 +3,焊接缺陷分析查询修改 +4，合同mobile针对人员修改 +--END + +--ADD BY YangHongwei 2022-09-08 +1、现场人员档案列表优化。 +2、删除重复人员。 +--END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-11 001.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-11.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-08-11 001.sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-11.sql diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26.sql index 1d709680..3ee6a2c8 100644 --- a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26.sql +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26.sql @@ -110,3 +110,126 @@ EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N' GO +--Ա Աֶ ɾǷƸֶ +ALTER TABLE Person_Persons ADD PersonType NVARCHAR(10) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աͣ1-ʽԱ2-Ƹ3-' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_Persons', @level2type=N'COLUMN',@level2name=N'PersonType' +GO + +UPDATE Person_Persons SET PersonType='2' WHERE IsOutside =1 +GO +UPDATE Person_Persons SET PersonType='1' WHERE PersonType IS NULL +GO + +ALTER TABLE Person_Persons DROP COLUMN IsOutside +GO + +ALTER VIEW [dbo].[View_SitePerson_Person] +AS +/*ֳԱͼ*/ +SELECT SitePerson.ProjectId, + Project.ProjectCode, + Project.ProjectName, + SitePerson.SitePersonId, + persons.PersonId, + SitePerson.CardNo, + Persons.PersonName, + Persons.Sex, + (Case Persons.Sex WHEN '1' THEN '' WHEN '2' THEN 'Ů' ELSE '' END) AS SexName, + Persons.IdentityCard, + Persons.Address, + SitePerson.UnitId, + Persons.Birthday, + SitePerson.TeamGroupId, + SitePerson.WorkAreaId, + SitePerson.WorkPostId, + SitePerson.InTime, + SitePerson.OutTime, + SitePerson.OutResult, + Persons.Telephone, + Persons.PositionId, + Persons.PostTitleId, + Persons.PhotoUrl, + Unit.UnitCode, + Unit.UnitName, + TeamGroup.TeamGroupName, + Post.WorkPostName, + Position.PositionName, + Title.PostTitleName, + Depart.DepartName, + Post.PostType, + Post.IsHsse, + (SELECT COUNT(*) FROM EduTrain_TrainRecordDetail T + LEFT JOIN EduTrain_TrainRecord AS E ON T.TrainingId=E.TrainingId + WHERE T.PersonId=SitePerson.PersonId AND E.ProjectId=SitePerson.ProjectId) AS TrainCount, + SitePerson.AuditorId, + Persons.PersonName AS AuditorName, + SitePerson.AuditorDate, + Persons.IDCardUrl, + Persons.IsForeign, + case when Persons.IsForeign=1 then '' else '' end as IsForeignStr, + Persons.IdcardType, + BasicData1.dictName as IdcardTypeName, + Persons.IdcardStartDate, + Persons.IdcardEndDate, + Persons.IdcardForever, + case when Persons.IdcardForever='Y' then '' else '' end as IdcardForeverStr, + Persons.PoliticsStatus, + BasicData2.dictName as PoliticsStatusName, + Persons.IdcardAddress, + Persons.Nation, + BasicData3.dictName as NationName, + Persons.EduLevel, + BasicData4.dictName as EduLevelName, + Persons.MaritalStatus, + BasicData5.dictName as MaritalStatusName, + Persons.CountryCode, + Country.cname as CountryName, + Persons.ProvinceCode, + City.cname as ProvinceName, + Persons.PersonType, + (case when Persons.PersonType='2' then 'Ƹ' when Persons.PersonType='3' then '' else 'Ա' end) as IsOutsideStr, + --WorkArea.UnitWorkCode AS WorkAreaCode, + WorkAreaCode= STUFF((SELECT ',' + UnitWorkCode FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + --WorkArea.UnitWorkName AS WorkAreaName + WorkAreaName= STUFF((SELECT ',' + UnitWorkName FROM dbo.WBS_UnitWork where PATINDEX('%,' + RTRIM(UnitWorkId) + ',%',',' +SitePerson.WorkAreaId + ',')>0 FOR XML PATH('')), 1, 1,''), + SitePerson.RealNameAddTime, + SitePerson.RealNameUpdateTime, + Persons.HeadImage, + SitePerson.States +FROM SitePerson_Person AS SitePerson +LEFT JOIN Person_Persons AS Persons ON SitePerson.PersonId=Persons.PersonId +LEFT JOIN Base_Project AS Project ON Project.ProjectId=SitePerson.ProjectId +LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = SitePerson.UnitId +LEFT JOIN ProjectData_TeamGroup AS TeamGroup ON TeamGroup.TeamGroupId=SitePerson.TeamGroupId +LEFT JOIN Base_WorkPost AS Post ON Post.WorkPostId = SitePerson.WorkPostId +LEFT JOIN Base_Position AS Position ON Position.PositionId = Persons.PositionId +Left JOIN Base_PostTitle AS Title ON Title.PostTitleId = Persons.PostTitleId +Left JOIN Base_Depart AS Depart ON Depart.DepartId = Persons.DepartId +Left JOIN RealName_BasicData AS BasicData1 ON BasicData1.dictCode = Persons.IdcardType +Left JOIN RealName_BasicData AS BasicData2 ON BasicData2.dictCode = Persons.PoliticsStatus +Left JOIN RealName_BasicData AS BasicData3 ON BasicData3.dictCode = Persons.Nation +Left JOIN RealName_BasicData AS BasicData4 ON BasicData4.dictCode = Persons.EduLevel +Left JOIN RealName_BasicData AS BasicData5 ON BasicData5.dictCode = Persons.MaritalStatus +Left JOIN RealName_Country AS Country ON Country.CountryId = Persons.CountryCode +Left JOIN RealName_City AS City ON City.provinceCode = Persons.ProvinceCode and City.CountryId = Persons.CountryCode + +GO + +/****** Object: Index [NonClusteredIndex-20220629-102151] Script Date: 2022/8/26 10:37:54 ******/ +DROP INDEX [NonClusteredIndex-20220629-102151] ON [dbo].[Person_Persons] +GO + +/****** Object: Index [NonClusteredIndex-20220629-102151] Script Date: 2022/8/26 10:37:33 ******/ +CREATE NONCLUSTERED INDEX [NonClusteredIndex-ListData-param] ON [dbo].[Person_Persons] +( + [UnitId] ASC, + [DepartId] ASC, + [RoleIds] ASC, + [WorkPostId] ASC, + [IsPost] ASC, + [PersonType] ASC, + [IsCardNoOK] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, DROP_EXISTING = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +GO + diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26修改明细.txt index 3dd43a25..add0f15c 100644 --- a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26修改明细.txt +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-26修改明细.txt @@ -3,3 +3,6 @@ 2.项目级质量模块，增加质量样板管理，包括质量样板 --END +--ADD BY YangHongwei 2022-08-26 +1、人员表新增人员类型字段，删除是否外聘字段。 +--END \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_V2022-08-30(YangHongwei).sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-30.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-08-30(YangHongwei).sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-30.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-08-30(YangHongwei)修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-30修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-08-30(YangHongwei)修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-30修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-08-31(gaofei).sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-31.sql similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-08-31(gaofei).sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-31.sql diff --git a/DataBase/版本日志/SGGLDB_V2022-08-31修改明细(gaofei).txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-31修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-08-31修改明细(gaofei).txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-08-31修改明细.txt diff --git a/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02.sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02.sql new file mode 100644 index 00000000..bcdef99d --- /dev/null +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02.sql @@ -0,0 +1,458 @@ +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('BA383490-BAE3-4E65-B221-8F89D2431135','','',70,'0','Menu_CQMS',0,0,1) +GO + +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('81053EAB-09C6-4A6B-A952-B756071EE0DA','','CQMS/RewardAndPunish/RewardAndPunish.aspx',10,'BA383490-BAE3-4E65-B221-8F89D2431135','Menu_CQMS',0,1,1) +GO +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('4A1ACB37-8E46-4192-A40E-B4BEC6C0B8FC','81053EAB-09C6-4A6B-A952-B756071EE0DA','',1) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('1C61A92C-2B4A-4118-9A98-A1C8ACE29D13','81053EAB-09C6-4A6B-A952-B756071EE0DA','޸',2) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('7104955E-586D-4BAF-90CE-3DB3F1A313A9','81053EAB-09C6-4A6B-A952-B756071EE0DA','ɾ',3) +INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) +VALUES('CE5580C3-6385-4FD5-B48C-84DFDC1DEF93','81053EAB-09C6-4A6B-A952-B756071EE0DA','',4) +GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('E20647B6-315D-483B-8E5D-4810DBECE79E','Ͷ','',90,'A93BA810-3511-4BB2-9C10-9663351DF79F','Menu_SysSet',1,0,1) + GO + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('84DB3C33-8828-407B-8B8A-5E98AD610FA6','','BaseInfo/RewardType.aspx',10,'E20647B6-315D-483B-8E5D-4810DBECE79E','Menu_SysSet',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8E4BF950-5859-4319-8EA5-F73A87DBF807','84DB3C33-8828-407B-8B8A-5E98AD610FA6','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('C71CB6E0-7D3C-486A-94DD-D72D27D6DE1B','84DB3C33-8828-407B-8B8A-5E98AD610FA6','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('9A7587D8-B5AE-44DF-8A40-366D10E00B32','84DB3C33-8828-407B-8B8A-5E98AD610FA6','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('815844ED-E84C-4B1C-9CBA-1FEA13D27D44','84DB3C33-8828-407B-8B8A-5E98AD610FA6','',4) + GO + + INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + VALUES('92DF46C6-1CE4-4324-A3F2-EBC6261376AC','','BaseInfo/PunishType.aspx',20,'E20647B6-315D-483B-8E5D-4810DBECE79E','Menu_SysSet',1,1,1) + GO + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('A61A94F0-5D3F-4D9D-B901-9806EC92EC0B','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','',1) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('8DD92D1E-DD3A-46A8-8E97-949C9542FB62','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','޸',2) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('DB2D95C7-1D40-4F44-AAB2-AFA16889D364','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','ɾ',3) + INSERT INTO dbo.Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) + VALUES('7A0D6E09-5619-40FE-8447-37E593247EB3','92DF46C6-1CE4-4324-A3F2-EBC6261376AC','',4) + GO + + +CREATE TABLE [dbo].[Base_RewardType]( + [RewardTypeId] [nvarchar](50) NOT NULL, + [RewardCause] [nvarchar](500) NULL, + [RewardDecision] [nvarchar](500) NULL, + [Remark] [nvarchar](200) NULL, + CONSTRAINT [PK_Base_RewardType] PRIMARY KEY CLUSTERED +( + [RewardTypeId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardTypeId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardCause' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'RewardDecision' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_RewardType' +GO + + +CREATE TABLE [dbo].[Base_PunishType]( + [PunishTypeId] [nvarchar](50) NOT NULL, + [PunishCause] [nvarchar](500) NULL, + [PunishDecision] [nvarchar](500) NULL, + [Remark] [nvarchar](200) NULL, + CONSTRAINT [PK_Base_PunishType] PRIMARY KEY CLUSTERED +( + [PunishTypeId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishTypeId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishCause' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'PunishDecision' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ע' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType', @level2type=N'COLUMN',@level2name=N'Remark' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_PunishType' +GO + + + +CREATE TABLE [dbo].[RewardAndPunish_RewardAndPunish]( + [RewardAndPunishId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [RewardAndPunishCode] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [Type] [char](1) NULL, + [RewardAndPunishTypeId] [nvarchar](50) NULL, + [RewardAndPunishBasis] [nvarchar](200) NULL, + [State] [char](1) NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + CONSTRAINT [PK_RewardAndPunish_RewardAndPunish] PRIMARY KEY CLUSTERED +( + [RewardAndPunishId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + +ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunish] WITH CHECK ADD CONSTRAINT [FK_RewardAndPunish_RewardAndPunish_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunish] CHECK CONSTRAINT [FK_RewardAndPunish_RewardAndPunish_Base_Project] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'󣨷ְλId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'1-2-' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'Type' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishTypeId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'RewardAndPunishBasis' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'״̬' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'State' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunish' +GO + + + +CREATE TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove]( + [RewardAndPunishApproveId] [nvarchar](50) NOT NULL, + [RewardAndPunishId] [nvarchar](50) NULL, + [ApproveMan] [nvarchar](50) NULL, + [ApproveDate] [datetime] NULL, + [IsAgree] [bit] NULL, + [ApproveIdea] [nvarchar](200) NULL, + [ApproveType] [char](1) NULL, + CONSTRAINT [PK_RewardAndPunish_RewardAndPunishApprove] PRIMARY KEY CLUSTERED +( + [RewardAndPunishApproveId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +SET ANSI_PADDING OFF +GO + +ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove] WITH CHECK ADD CONSTRAINT [FK_RewardAndPunish_RewardAndPunishApprove_RewardAndPunish_RewardAndPunish] FOREIGN KEY([RewardAndPunishId]) +REFERENCES [dbo].[RewardAndPunish_RewardAndPunish] ([RewardAndPunishId]) +GO + +ALTER TABLE [dbo].[RewardAndPunish_RewardAndPunishApprove] CHECK CONSTRAINT [FK_RewardAndPunish_RewardAndPunishApprove_RewardAndPunish_RewardAndPunish] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'RewardAndPunishApproveId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'RewardAndPunishId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ƿͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'IsAgree' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveIdea' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove', @level2type=N'COLUMN',@level2name=N'ApproveType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'RewardAndPunish_RewardAndPunishApprove' +GO + + + +alter table HJGL_Pipeline add State int +go +INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) +VALUES('DB50A5AA-08DB-4915-9173-6DB133CA76F0','Ϣ','HJGL/DataImport/MaterialStock.aspx',14,'0','Menu_HJGL',0,1,1) + +GO +ALTER VIEW [dbo].[View_HJGL_NoWeldJointFind] +AS +--δڲ +SELECT jot.WeldJointId,jot.WeldJointCode,jot.PipelineId,jot.WeldingDailyId,jot.JointAttribute,WeldType.WeldTypeCode, + method.WeldingMethodCode,jot.Dia,jot.Thickness, rod.ConsumablesCode AS WeldingRodCode + ,wire.ConsumablesCode AS WeldingWireCode, + mat1.MaterialCode AS Material1Code ,mat2.MaterialCode AS Material2Code +FROM dbo.HJGL_WeldJoint jot +LEFT JOIN dbo.HJGL_PreWeldingDaily pre ON pre.WeldJointId = jot.WeldJointId +LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=jot.WeldTypeId +LEFT JOIN Base_WeldingMethod AS method ON method.WeldingMethodId=jot.WeldingMethodId +LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = jot.Material1Id +LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = jot.Material2Id +LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire +LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod +WHERE pre.PreWeldingDailyId IS NULL +GO +ALTER VIEW [dbo].[View_HJGL_WeldingTask] +AS +SELECT T.WeldTaskId,T.WeldJointId,T.CoverWelderId,T.BackingWelderId, + cov.WelderCode AS CoverWelderCode,back.WelderCode AS BackingWelderCode, + case when jot.JointAttribute is not null then jot.JointAttribute else T.JointAttribute end as JointAttribute, + T.WeldingMode,T.ProjectId,T.UnitWorkId,T.UnitId,T.TaskDate,T.Tabler,T.TableDate, + jot.WeldJointCode,jot.Dia,jot.Thickness,jot.Size,jot.WeldingLocationId, + CASE WHEN jot.WeldingDailyId IS NULL THEN '' ELSE '' END AS IsWelding, + P.PipelineCode,B.WeldTypeCode,M.WeldingMethodCode,L.WeldingLocationCode, + t.CanWelderCode,t.CanWelderId ,rod.ConsumablesName AS WeldingRodCode,T.CanWeldingRodName,T.CanWeldingWireName, + wire.ConsumablesName AS WeldingWireCode,jot.WeldingDailyId,p.PipeArea +from HJGL_WeldTask T +left join HJGL_WeldJoint jot on T.WeldJointId=jot.WeldJointId +LEFT JOIN dbo.SitePerson_Person cov ON cov.PersonId=t.CoverWelderId +LEFT JOIN dbo.SitePerson_Person back ON back.PersonId=t.BackingWelderId +LEFT join HJGL_Pipeline P on jot.PipelineId=P.PipelineId +left join Base_WeldType B on jot.WeldTypeId=B.WeldTypeId +LEFT join Base_WeldingMethod M on jot.WeldingMethodId=M.WeldingMethodId +left join Base_WeldingLocation L on jot.WeldingLocationId=L.WeldingLocationId +LEFT JOIN Base_Consumables AS wire ON wire.ConsumablesId=jot.WeldingWire +LEFT JOIN Base_Consumables AS rod ON rod.ConsumablesId=jot.WeldingRod +GO +CREATE TABLE [dbo].[HJGL_MaterialManage]( + [MaterialId] [nvarchar](50) NOT NULL, + [ProjectId] [nvarchar](50) NULL, + [ContractNo] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [MainItemId] [nvarchar](50) NULL, + [MaterialName] [nvarchar](50) NULL, + [SpecificationAndModel] [nvarchar](50) NULL, + [MaterialCode] [nvarchar](50) NULL, + [Material] [nvarchar](50) NULL, + [PressClass] [nvarchar](50) NULL, + [Unit] [nvarchar](50) NULL, + [Num] [decimal](18, 2) NULL, + [ArrivalDate] [datetime] NULL, + [CompileMan] [nvarchar](50) NULL, + [CompileDate] [datetime] NULL, + [InspectionId] [nvarchar](50) NULL, + CONSTRAINT [PK_HJGL_MaterialManage] PRIMARY KEY CLUSTERED +( + [MaterialId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] + +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_Base_Project] FOREIGN KEY([ProjectId]) +REFERENCES [dbo].[Base_Project] ([ProjectId]) +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_Base_Project] +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_Base_Unit] FOREIGN KEY([UnitId]) +REFERENCES [dbo].[Base_Unit] ([UnitId]) +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_Base_Unit] +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] WITH CHECK ADD CONSTRAINT [FK_HJGL_MaterialManage_ProjectData_MainItem] FOREIGN KEY([MainItemId]) +REFERENCES [dbo].[ProjectData_MainItem] ([MainItemId]) +GO + +ALTER TABLE [dbo].[HJGL_MaterialManage] CHECK CONSTRAINT [FK_HJGL_MaterialManage_ProjectData_MainItem] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ContractNo' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λId' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MainItemId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialName' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͺ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'SpecificationAndModel' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'MaterialCode' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Material' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѹȼ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'PressClass' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Unit' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'Num' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'ArrivalDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'CompileMan' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'CompileDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Id' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage', @level2type=N'COLUMN',@level2name=N'InspectionId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Ϣ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'HJGL_MaterialManage' +GO + + +/****** Object: Table [dbo].[Person_PersonsCertificate] Script Date: 2022/8/31 9:23:18 ******/ +IF EXISTS (SELECT * FROM sys.objects WHERE object_id = OBJECT_ID(N'[dbo].[Person_PersonsCertificate]') AND type in (N'U')) +DROP TABLE [dbo].[Person_PersonsCertificate] +GO + +ALTER TABLE QualityAudit_PersonQuality ADD RegisterDate DATETIME NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'עʱ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'RegisterDate' +GO + +ALTER TABLE QualityAudit_PersonQuality ADD Major nvarchar(50) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'רҵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'Major' +GO + +ALTER TABLE QualityAudit_PersonQuality ADD Url nvarchar(2000) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'QualityAudit_PersonQuality', @level2type=N'COLUMN',@level2name=N'Url' +GO + +UPDATE QualityAudit_PersonQuality SET Url=(SELECT AttachUrl FROM AttachFile WHERE ToKeyId=QualityAudit_PersonQuality.PersonQualityId) +GO + +CREATE TABLE [dbo].[Person_PersonTrain]( + [PersonTrainId] [nvarchar](50) NOT NULL, + [PersonId] [nvarchar](50) NULL, + [TrainTypeId] [nvarchar](50) NULL, + [TrainDate] [datetime] NULL, + [TrainPlace] [nvarchar](500) NULL, + [TrainResult] [nvarchar](50) NULL, + CONSTRAINT [PK_Person_PersonTrain] PRIMARY KEY CLUSTERED +( + [PersonTrainId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'PersonTrainId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'PersonId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainTypeId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵص' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainPlace' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵЧ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain', @level2type=N'COLUMN',@level2name=N'TrainResult' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonTrain' +GO + + +ALTER TABLE Base_WorkPost ADD IsDuty BIT NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_WorkPost', @level2type=N'COLUMN',@level2name=N'IsDuty' +GO + +ALTER TABLE Base_WorkPost ADD IsTotal BIT NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աܽ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Base_WorkPost', @level2type=N'COLUMN',@level2name=N'IsTotal' +GO + + +ALTER TABLE SitePerson_PersonItem ADD TeamGroupId NVARCHAR(50) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'TeamGroupId' +GO +ALTER TABLE SitePerson_PersonItem ADD TeamGroupName NVARCHAR(50) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'TeamGroupName' +GO + +ALTER TABLE SitePerson_PersonItem ADD OutResult NVARCHAR(50) NULL +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'˳ԭ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'SitePerson_PersonItem', @level2type=N'COLUMN',@level2name=N'OutResult' +GO + +UPDATE SitePerson_PersonItem SET TeamGroupId=b.TeamGroupId,OutResult=b.OutResult +FROM SitePerson_Person AS b +WHERE SitePerson_PersonItem.IdentityCard=b.IdentityCard and SitePerson_PersonItem.ProjectId=b.ProjectId +GO + +UPDATE SitePerson_PersonItem SET TeamGroupName=b.TeamGroupName +FROM ProjectData_TeamGroup AS b +WHERE SitePerson_PersonItem.TeamGroupId=b.TeamGroupId +GO diff --git a/DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei)修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02修改明细.txt similarity index 51% rename from DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei)修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02修改明细.txt index 1c9ae105..35a965c5 100644 --- a/DataBase/版本日志/SGGLDB_V2022-09-02(YangHongwei)修改明细.txt +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-02修改明细.txt @@ -1,3 +1,16 @@ +--ADD BY Gaofei 2022-09-02 +1.公司级系统设置-基础设置-质量设置，增加质量奖惩定义，包括奖励定义、处罚定义 +2.项目级质量模块，增加质量奖惩，包括质量奖励处罚 +3.项目级质量模块，施工图纸增加附件上传 +--END + +--ADD BY LiPengfei 2022-09-02 +增加焊接材料管理 +修改点口管理 +增加库存信息 +修改焊接施工计划 +--END + --ADD BY YangHongwei 2022-09-02 1、人员表新增证书对应子表。 2、公司及部门人员编辑页面新增培训信息显示及维护、证书信息显示及维护。项目级特岗人员资质证书页面功能优化。 diff --git a/DataBase/版本日志/SGGLDB_V2022-09-04(YangHongwei).sql b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-05.sql similarity index 80% rename from DataBase/版本日志/SGGLDB_V2022-09-04(YangHongwei).sql rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-05.sql index bdf66b79..b28c3270 100644 --- a/DataBase/版本日志/SGGLDB_V2022-09-04(YangHongwei).sql +++ b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-05.sql @@ -181,3 +181,49 @@ UNION ALL GO + +CREATE TABLE [dbo].[Person_PersonContract]( + [PersonContractId] [nvarchar](50) NOT NULL, + [PersonId] [nvarchar](50) NULL, + [UnitId] [nvarchar](50) NULL, + [ProjectId] [nvarchar](50) NULL, + [LeadManId] [nvarchar](50) NULL, + [Telephone] [nvarchar](50) NULL, + [ContractType] [nvarchar](50) NULL, + [StartDate] [datetime] NULL, + [EndDate] [datetime] NULL, + CONSTRAINT [PK_Person_PersonContract] PRIMARY KEY CLUSTERED +( + [PersonContractId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'PersonContractId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ԱID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'PersonId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'λID׷' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'UnitId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ĿID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'ProjectId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'LeadManId' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ϵ绰' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'Telephone' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'ContractType' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ѵ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract', @level2type=N'COLUMN',@level2name=N'StartDate' +GO + +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Աͬ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Person_PersonContract' +GO + + diff --git a/DataBase/版本日志/SGGLDB_V2022-09-05(YangHongwei)修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-05修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-05(YangHongwei)修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-05修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-06修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-06修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-06修改明细.txt diff --git a/DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt b/DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-07修改明细.txt similarity index 100% rename from DataBase/版本日志/SGGLDB_V2022-09-07修改明细.txt rename to DataBase/版本日志/已更新脚本/SGGLDB_V2022-09-07修改明细.txt diff --git a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs index 543a274f..38809482 100644 --- a/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs +++ b/SGGL/BLL/PHTGL/ContractCompile/ContractService.cs @@ -71,44 +71,60 @@ namespace BLL /// 增加合同基本信息 /// /// - public static void AddContract(Model.PHTGL_Contract contract) + public static void AddContract(Model.PHTGL_Contract newtable) { - Model.PHTGL_Contract newContract = new Model.PHTGL_Contract(); - newContract.ContractId = contract.ContractId; - newContract.ContractCode = contract.ContractCode; - newContract.ProjectId = contract.ProjectId; - newContract.ContractName = contract.ContractName; - newContract.ContractNum = contract.ContractNum; - newContract.Parties = contract.Parties; - newContract.Currency = contract.Currency; - newContract.ContractAmount = contract.ContractAmount; - newContract.DepartId = contract.DepartId; - newContract.Agent = contract.Agent; - newContract.ContractType = contract.ContractType; - newContract.Remarks = contract.Remarks; - newContract.ApproveState = contract.ApproveState; - newContract.CreatUser = contract.CreatUser; - newContract.IsPassBid = contract.IsPassBid; - newContract.PassBidCode = contract.PassBidCode; - newContract.BuildUnit = contract.BuildUnit; - newContract.EPCCode = contract.EPCCode; - newContract.IsUseStandardtxt = contract.IsUseStandardtxt; - newContract.NoUseStandardtxtRemark = contract.NoUseStandardtxtRemark; - newContract.ProjectShortName = contract.ProjectShortName; - newContract.ContractAttribute = contract.ContractAttribute; - newContract.ContractAttributeRemark = contract.ContractAttributeRemark; - newContract.ConfirmWay = contract.ConfirmWay; - newContract.SetSubReviewCode = contract.SetSubReviewCode; - newContract.ActionPlanCode = contract.ActionPlanCode; - newContract.SituationRemark = contract.SituationRemark; - newContract.OpeningBank_TT = contract.OpeningBank_TT; - newContract.OpeningBank_Electrophore = contract.OpeningBank_Electrophore; - newContract.BankAccount_TT = contract.BankAccount_TT; - newContract.BankAccount_Electrophore = contract.BankAccount_Electrophore; - newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore; - newContract.Retentionmoney = contract.Retentionmoney; - newContract.CreateDate = contract.CreateDate; - Funs.DB.PHTGL_Contract.InsertOnSubmit(newContract); + Model.PHTGL_Contract table = new Model.PHTGL_Contract + { + ContractId = newtable.ContractId, + ProjectId = newtable.ProjectId, + ContractName = newtable.ContractName, + ContractNum = newtable.ContractNum, + Parties = newtable.Parties, + Currency = newtable.Currency, + ContractAmount = newtable.ContractAmount, + DepartId = newtable.DepartId, + Agent = newtable.Agent, + ContractType = newtable.ContractType, + Remarks = newtable.Remarks, + ApproveState = newtable.ApproveState, + CreatUser = newtable.CreatUser, + ContractCode = newtable.ContractCode, + IsPassBid = newtable.IsPassBid, + PassBidCode = newtable.PassBidCode, + BuildUnit = newtable.BuildUnit, + IsUseStandardtxt = newtable.IsUseStandardtxt, + NoUseStandardtxtRemark = newtable.NoUseStandardtxtRemark, + EPCCode = newtable.EPCCode, + ProjectShortName = newtable.ProjectShortName, + ContractAttribute = newtable.ContractAttribute, + ContractAttributeRemark = newtable.ContractAttributeRemark, + ConfirmWay = newtable.ConfirmWay, + SetSubReviewCode = newtable.SetSubReviewCode, + ActionPlanCode = newtable.ActionPlanCode, + SituationRemark = newtable.SituationRemark, + OpeningBank_TT = newtable.OpeningBank_TT, + OpeningBank_Electrophore = newtable.OpeningBank_Electrophore, + BankAccount_TT = newtable.BankAccount_TT, + BankAccount_Electrophore = newtable.BankAccount_Electrophore, + LineNumber_Electrophore = newtable.LineNumber_Electrophore, + Retentionmoney = newtable.Retentionmoney, + CreateDate = newtable.CreateDate, + Status = newtable.Status, + ContactPersonOfPartyA = newtable.ContactPersonOfPartyA, + ContactPersonOfPartyB = newtable.ContactPersonOfPartyB, + ContactPersonPhoneOfPartyB = newtable.ContactPersonPhoneOfPartyB, + ContactPersonEmailOfPartyB = newtable.ContactPersonEmailOfPartyB, + ContractAmountExcludingTax = newtable.ContractAmountExcludingTax, + PriceMethod = newtable.PriceMethod, + SignedOnDate = newtable.SignedOnDate, + ContractStartDate = newtable.ContractStartDate, + ContractEndDate = newtable.ContractEndDate, + PricingBasis = newtable.PricingBasis, + SubcontractingMethod = newtable.SubcontractingMethod, + IsItACentralizedPurchaseSupplier = newtable.IsItACentralizedPurchaseSupplier, + ContactUnitOfPartyA = newtable.ContactUnitOfPartyA, + }; + Funs.DB.PHTGL_Contract.InsertOnSubmit(table); Funs.DB.SubmitChanges(); } @@ -155,7 +171,20 @@ namespace BLL newContract.LineNumber_Electrophore = contract.LineNumber_Electrophore; newContract.Retentionmoney = contract.Retentionmoney; newContract.CreateDate = contract.CreateDate; - + newContract.Status = contract.Status; + newContract.ContactPersonOfPartyA = contract.ContactPersonOfPartyA; + newContract.ContactPersonOfPartyB = contract.ContactPersonOfPartyB; + newContract.ContactPersonPhoneOfPartyB = contract.ContactPersonPhoneOfPartyB; + newContract.ContactPersonEmailOfPartyB = contract.ContactPersonEmailOfPartyB; + newContract.ContractAmountExcludingTax = contract.ContractAmountExcludingTax; + newContract.PriceMethod = contract.PriceMethod; + newContract.SignedOnDate = contract.SignedOnDate; + newContract.ContractStartDate = contract.ContractStartDate; + newContract.ContractEndDate = contract.ContractEndDate; + newContract.PricingBasis = contract.PricingBasis; + newContract.SubcontractingMethod = contract.SubcontractingMethod; + newContract.IsItACentralizedPurchaseSupplier = contract.IsItACentralizedPurchaseSupplier; + newContract.ContactUnitOfPartyA = contract.ContactUnitOfPartyA; Funs.DB.SubmitChanges(); } } diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs index ad0b371b..399886d1 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ActionPlanReviewDetail.aspx.cs @@ -59,16 +59,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["ApproveManModels"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -86,23 +86,23 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ApproveManModels = PHTGL_ActionPlanReviewService.GetApproveManModels(_ActionPlanFormation.ProjectID, ActionPlanReviewId); EndApproveType = ApproveManModels.Count; //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ActionPlanReviewId, PersonId); this.txtProjectCode.Text = _ActionPlanFormation.EPCCode; this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_ActionPlanFormation.CreatUser); - if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, UserId)) + if (PHTGL_ApproveService.IsApproveMan(ActionPlanReviewId, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_ActionPlanFormation.CreatUser == UserId) + else if (_ActionPlanFormation.CreatUser == PersonId) { BindGrid(); } @@ -125,7 +125,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -133,7 +133,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", ActionPlanReviewId)); diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs index a46be16d..d5dd106d 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/ApproveUserReviewDetail.aspx.cs @@ -60,16 +60,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -86,24 +86,24 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement EndApproveType = ApproveManModels.Count; //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ApproveUserReviewID, PersonId); //文本框赋值 txtBidProject.Text = _Bid.BidProject; txtProjectName.Text = PHTGL_ActionPlanFormationService.GetPHTGL_ActionPlanFormationById(BidDoc.ActionPlanID).ProjectShortName; txtBidDocumentsCode.Text = BidDoc.BidDocumentsCode; ; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser); - if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, UserId)) + if (PHTGL_ApproveService.IsApproveMan(ApproveUserReviewID, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_Bid.CreateUser == UserId) + else if (_Bid.CreateUser == PersonId) { BindGrid(); } @@ -119,7 +119,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -127,7 +127,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", ApproveUserReviewID)); @@ -148,7 +148,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ,APP.ApproveUserUnit ,APP.Remarks" + @" FROM PHTGL_BidApproveUserReview_Sch1 AS APP " - + @" LEFT JOIN Sys_User AS U ON U.UserId =APP.ApproveUserName " + + @" LEFT JOIN SitePerson_Person AS U ON U.PersonId =APP.ApproveUserName " + @"where 1=1 AND ApproveUserReviewID = @ApproveUserReviewID "; List listStr = new List(); if (string.IsNullOrEmpty(ApproveUserReviewID)) diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs index 25ddd15b..9d0dde03 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/BidDocumentsReviewDetail.aspx.cs @@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -106,22 +106,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement ApproveManModels = PHTGL_BidDocumentsReviewService.GetApproveManModels(_Bid.ProjectId, _Bid.BidDocumentsReviewId); //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(BidDocumentsReviewId, PersonId); this.txtProjectCode.Text = _ActionPlanFormation.EPCCode; this.txtProjectName.Text = _ActionPlanFormation.ProjectShortName; this.txtCreateUser.Text = BLL.Person_PersonsService.GetPersonsNameById(_Bid.CreateUser); - if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, UserId)) + if (PHTGL_ApproveService.IsApproveMan(BidDocumentsReviewId, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_Bid.CreateUser == UserId) + else if (_Bid.CreateUser == PersonId) { BindGrid(); } @@ -146,7 +146,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -154,7 +154,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", BidDocumentsReviewId)); diff --git a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs index 70b64c53..eff2ce8a 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/BiddingManagement/SetSubReviewDetail.aspx.cs @@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -97,22 +97,22 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement Dic_ApproveMan = PHTGL_SetSubReviewService.Get_DicApproveman(SetSubReviewID); ApproveManModels = PHTGL_SetSubReviewService.GetApproveManModels(SetSubReviewID); //获取当前登录人审批信息 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(SetSubReviewID, PersonId); //数据加载 Bind(); var _SetSubReview = BLL.PHTGL_SetSubReviewService.GetPHTGL_SetSubReviewById(SetSubReviewID); - if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, UserId)) + if (PHTGL_ApproveService.IsApproveMan(SetSubReviewID, PersonId)) { BindGrid(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_SetSubReview.CreateUser == UserId) + else if (_SetSubReview.CreateUser == PersonId) { BindGrid(); } @@ -236,7 +236,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement /// private void BindGrid() { - string strSql = @" select u.UserName as ApproveMan, + string strSql = @" select u.PersonName as ApproveMan, App.ApproveDate, (CASE App.IsAgree WHEN '1' THEN '不同意' WHEN '2' THEN '同意' END) AS IsAgree, @@ -244,7 +244,7 @@ namespace FineUIPro.Mobile.PHTGL.BiddingManagement App.ApproveId, App.ApproveType from PHTGL_Approve as App" - + @" left join Sys_User AS U ON U.UserId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; + + @" left join SitePerson_Person AS U ON U.PersonId = App.ApproveMan WHERE 1=1 and App.IsAgree <>0 and app.ContractId= @ContractId order by convert(datetime ,App.ApproveDate) "; List listStr = new List(); listStr.Add(new SqlParameter("@ContractId", SetSubReviewID)); diff --git a/SGGL/FineUIPro.Mobile/PHTGL/ContractCompile/ContractReviewDetail.aspx.cs b/SGGL/FineUIPro.Mobile/PHTGL/ContractCompile/ContractReviewDetail.aspx.cs index ceab672e..c0d30036 100644 --- a/SGGL/FineUIPro.Mobile/PHTGL/ContractCompile/ContractReviewDetail.aspx.cs +++ b/SGGL/FineUIPro.Mobile/PHTGL/ContractCompile/ContractReviewDetail.aspx.cs @@ -73,16 +73,16 @@ namespace FineUIPro.Mobile.Mobile Session["pHTGL_Approve"] = value; } } - public string UserId + public string PersonId { get { - UserId = Request.Params["UserId"]; - return (string)ViewState["UserId"]; + PersonId = Request.Params["PersonId"]; + return (string)ViewState["PersonId"]; } set { - ViewState["UserId"] = value; + ViewState["PersonId"] = value; } } #endregion @@ -101,21 +101,21 @@ namespace FineUIPro.Mobile.Mobile //获取审批人字典 ApproveManModels = PHTGL_ContractReviewService.GetApproveManModels(ContractReviewId); //05b5897b-3ff2-4074-b0a2-cfff1e377743 - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ContractReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ContractReviewId, PersonId); GetEndApproveType(); Tab1.Hidden = true; Tab3.Hidden = true; - if (PHTGL_ApproveService.IsApproveMan(ContractReviewId, UserId)) + if (PHTGL_ApproveService.IsApproveMan(ContractReviewId, PersonId)) { BindGrid(); //GetTabPower(); } - else if (UserId == Const.sysglyId || UserId == Const.hfnbdId) + else if (PersonId == Const.sysglyId || PersonId == Const.hfnbdId) { BindGrid(); } - else if (_Contract.CreatUser == UserId) + else if (_Contract.CreatUser == PersonId) { BindGrid(); } @@ -182,7 +182,7 @@ namespace FineUIPro.Mobile.Mobile } - pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ContractReviewId, UserId); + pHTGL_Approve = BLL.PHTGL_ApproveService.GetPHTGL_ApproveByUserId(ContractReviewId, PersonId); if (pHTGL_Approve != null) { btnAgree.Enabled = true; @@ -207,7 +207,7 @@ namespace FineUIPro.Mobile.Mobile Model.PHTGL_ContractReview _ContractReview = PHTGL_ContractReviewService.GetPHTGL_ContractReviewById(ContractReviewId); var ApproveManModels__Countersigner = PHTGL_ContractReviewService.GetApproveManModels__Countersigner(ContractReviewId); var allApproveMan = ApproveManModels__Countersigner.Concat(ApproveManModels).ToList(); - var ApproveManList = PHTGL_ApproveService.GetListPHTGL_ApproveByUserId(ContractReviewId, UserId); + var ApproveManList = PHTGL_ApproveService.GetListPHTGL_ApproveByUserId(ContractReviewId, PersonId); int Number = 0; if (ApproveManList.Count > 0) { diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index e69de29b..34b8e588 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -0,0 +1,114 @@ + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/08/2022 19:56:26 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:56:26 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/08/2022 19:57:31 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:57:31 + + +错误信息开始=====> +错误类型:SqlException +错误信息:列名 'Sex' 无效。 +列名 'IsUsed' 无效。 +错误堆栈: + 在 System.Data.SqlClient.SqlConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.SqlInternalConnection.OnError(SqlException exception, Boolean breakConnection, Action`1 wrapCloseInAction) + 在 System.Data.SqlClient.TdsParser.ThrowExceptionAndWarning(TdsParserStateObject stateObj, Boolean callerHasConnectionLock, Boolean asyncClose) + 在 System.Data.SqlClient.TdsParser.TryRun(RunBehavior runBehavior, SqlCommand cmdHandler, SqlDataReader dataStream, BulkCopySimpleResultSet bulkCopyHandler, TdsParserStateObject stateObj, Boolean& dataReady) + 在 System.Data.SqlClient.SqlDataReader.TryConsumeMetaData() + 在 System.Data.SqlClient.SqlDataReader.get_MetaData() + 在 System.Data.SqlClient.SqlCommand.FinishExecuteReader(SqlDataReader ds, RunBehavior runBehavior, String resetOptionsString, Boolean isInternal, Boolean forDescribeParameterEncryption, Boolean shouldCacheForAlwaysEncrypted) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReaderTds(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, Boolean async, Int32 timeout, Task& task, Boolean asyncWrite, Boolean inRetry, SqlDataReader ds, Boolean describeParameterEncryptionRequest) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method, TaskCompletionSource`1 completion, Int32 timeout, Task& task, Boolean& usedCache, Boolean asyncWrite, Boolean inRetry) + 在 System.Data.SqlClient.SqlCommand.RunExecuteReader(CommandBehavior cmdBehavior, RunBehavior runBehavior, Boolean returnStream, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteReader(CommandBehavior behavior, String method) + 在 System.Data.SqlClient.SqlCommand.ExecuteDbDataReader(CommandBehavior behavior) + 在 System.Data.Common.DbCommand.System.Data.IDbCommand.ExecuteReader(CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.FillInternal(DataSet dataset, DataTable[] datatables, Int32 startRecord, Int32 maxRecords, String srcTable, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable[] dataTables, Int32 startRecord, Int32 maxRecords, IDbCommand command, CommandBehavior behavior) + 在 System.Data.Common.DbDataAdapter.Fill(DataTable dataTable) + 在 BLL.SQLHelper.GetDataTableRunProc(String storedProcName, SqlParameter[] parameters) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\BLL\SQLHelper.cs:行号 277 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BindGrid() 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 90 + 在 FineUIPro.Web.HJGL.WeldingReport.WelderPerformance.BtnAnalyse_Click(Object sender, EventArgs e) 位置 D:\诺必达\赛鼎\SGGL_SeDin_new\SGGL\FineUIPro.Web\HJGL\WeldingReport\WelderPerformance.aspx.cs:行号 137 + 在 FineUIPro.Button.OnClick(EventArgs e) + 在 (Button , EventArgs ) + 在 FineUIPro.Button.RaisePostBackEvent(String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) + 在 System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +出错时间:09/08/2022 19:57:53 +出错文件:http://localhost:8008/HJGL/WeldingReport/WelderPerformance.aspx +IP地址:::1 +操作人员:JT + +出错时间:09/08/2022 19:57:53 + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx index 008e1829..84f2a1da 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx @@ -18,12 +18,57 @@ SortField="UnitWorkCode" SortDirection="DESC" OnSort="Grid1_Sort" AllowPaging="true" IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs index 89b83780..d8821b86 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.cs @@ -15,13 +15,110 @@ namespace FineUIPro.Web.HJGL.WeldingReport if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + Funs.FineUIPleaseSelect(drpJointAttribute); + + BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); + BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); + } } private void BindGrid() { List listStr = new List(); + listStr.Add(new SqlParameter("@projectId", this.CurrUser.LoginProjectId)); + if (this.drpUnitId.SelectedValue != BLL.Const._Null) + { + listStr.Add(new SqlParameter("@unitcode", this.drpUnitId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@unitcode", null)); + } + if (drpUnitWorkId.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@UnitWork", null)); + + } + + if (!string.IsNullOrEmpty(this.txtMaterialCode.Text)) + { + listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@MaterialCode", null)); + + } + if (!string.IsNullOrEmpty(this.txtSingleName.Text)) + { + listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@SingleName ", null)); + + } + if (!string.IsNullOrEmpty(this.txtThickness.Text)) + { + listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Thickness", null)); + + } + if (!string.IsNullOrEmpty(this.txtSpecification.Text)) + { + listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Specification", null)); + + } + if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text)) + { + listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@WeldTypeCode", null)); + + } + if (drpJointAttribute.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@JointAttribute", null)); + + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text)) + { + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@PersonName", null)); + + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("HJGL_rpt_CheckDefects", parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs index 014b4759..c49078f8 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/DefectStatistics.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingReport { - - - public partial class DefectStatistics { - +namespace FineUIPro.Web.HJGL.WeldingReport +{ + + + public partial class DefectStatistics + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,106 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + + /// + /// drpUnitId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitId; + + /// + /// drpUnitWorkId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkId; + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtMaterialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode; + + /// + /// txtSingleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSingleName; + + /// + /// txtThickness 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtThickness; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtWeldTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldTypeCode; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + /// /// ToolbarFill1 控件。 /// @@ -65,7 +166,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// BtnAnalyse 控件。 /// @@ -74,7 +175,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// btnOut 控件。 /// @@ -83,7 +184,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// ToolbarSeparator1 控件。 /// @@ -92,7 +193,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -101,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx index 2fcb3fa2..daf047d1 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx @@ -23,22 +23,65 @@ + LabelAlign="Right" Width="240px" LabelWidth="80px" > + + + LabelAlign="Right" Width="240px" LabelWidth="80px"> + Width="180px" LabelWidth="80px"> - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs index 48c370c7..e4c29480 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.cs @@ -15,7 +15,13 @@ namespace FineUIPro.Web.HJGL.WeldingReport if (!IsPostBack) { this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString(); + this.drpJointAttribute.DataTextField = "Text"; + this.drpJointAttribute.DataValueField = "Value"; + this.drpJointAttribute.DataSource = BLL.DropListService.HJGL_JointAttribute(); + this.drpJointAttribute.DataBind(); + Funs.FineUIPleaseSelect(drpJointAttribute); + BLL.UnitWorkService.InitUnitWorkDropDownList(this.drpUnitWorkId, this.CurrUser.LoginProjectId, true); BLL.UnitService.InitUnitByProjectIdUnitTypeDropDownList(this.drpUnitId, this.CurrUser.LoginProjectId, BLL.Const.ProjectUnitType_2, true); BLL.Base_DetectionTypeService.InitDetectionTypeDropDownList(drpDetectionType, true, string.Empty); @@ -64,6 +70,85 @@ namespace FineUIPro.Web.HJGL.WeldingReport { listStr.Add(new SqlParameter("@date2", null)); } + if (drpUnitWorkId.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@UnitWork", drpUnitWorkId.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@UnitWork", null)); + + } + + if (!string.IsNullOrEmpty(this.txtMaterialCode.Text)) + { + listStr.Add(new SqlParameter("@MaterialCode", "%" + this.txtMaterialCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@MaterialCode", null)); + + } + if (!string.IsNullOrEmpty(this.txtSingleName.Text)) + { + listStr.Add(new SqlParameter("@SingleName ", "%" + this.txtSingleName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@SingleName ", null)); + + } + if (!string.IsNullOrEmpty(this.txtThickness.Text)) + { + listStr.Add(new SqlParameter("@Thickness", "%" + this.txtThickness.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Thickness", null)); + + } + if (!string.IsNullOrEmpty(this.txtSpecification.Text)) + { + listStr.Add(new SqlParameter("@Specification", "%" + this.txtSpecification.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@Specification", null)); + + } + if (!string.IsNullOrEmpty(this.txtWeldTypeCode.Text)) + { + listStr.Add(new SqlParameter("@WeldTypeCode", "%" + this.txtWeldTypeCode.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@WeldTypeCode", null)); + + } + if (drpJointAttribute.SelectedValue != Const._Null) + { + listStr.Add(new SqlParameter("@JointAttribute", drpJointAttribute.SelectedValue)); + } + else + { + listStr.Add(new SqlParameter("@JointAttribute", null)); + + } + if (!string.IsNullOrEmpty(this.txtPersonName.Text)) + { + listStr.Add(new SqlParameter("@PersonName", "%" + this.txtPersonName.Text + "%")); + + } + else + { + listStr.Add(new SqlParameter("@PersonName", null)); + + } SqlParameter[] parameter = listStr.ToArray(); DataTable tb = SQLHelper.GetDataTableRunProc("sp_rpt_WelderFirstPassRate", parameter); diff --git a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs index 6e5554f1..b7aaf51b 100644 --- a/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HJGL/WeldingReport/FirstPassRate.aspx.designer.cs @@ -7,11 +7,13 @@ // //------------------------------------------------------------------------------ -namespace FineUIPro.Web.HJGL.WeldingReport { - - - public partial class FirstPassRate { - +namespace FineUIPro.Web.HJGL.WeldingReport +{ + + + public partial class FirstPassRate + { + /// /// form1 控件。 /// @@ -20,7 +22,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::System.Web.UI.HtmlControls.HtmlForm form1; - + /// /// PageManager1 控件。 /// @@ -29,7 +31,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.PageManager PageManager1; - + /// /// Panel1 控件。 /// @@ -38,7 +40,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Panel Panel1; - + /// /// Grid1 控件。 /// @@ -47,7 +49,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Grid Grid1; - + /// /// Toolbar1 控件。 /// @@ -56,7 +58,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Toolbar Toolbar1; - + /// /// drpUnitId 控件。 /// @@ -65,7 +67,16 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpUnitId; - + + /// + /// drpUnitWorkId 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpUnitWorkId; + /// /// drpDetectionType 控件。 /// @@ -74,7 +85,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DropDownList drpDetectionType; - + /// /// txtStarTime 控件。 /// @@ -83,7 +94,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtStarTime; - + /// /// Label1 控件。 /// @@ -92,7 +103,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Label Label1; - + /// /// txtEndTime 控件。 /// @@ -101,7 +112,88 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.DatePicker txtEndTime; - + + /// + /// Toolbar2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar2; + + /// + /// txtMaterialCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtMaterialCode; + + /// + /// txtSingleName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSingleName; + + /// + /// txtThickness 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtThickness; + + /// + /// txtSpecification 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtSpecification; + + /// + /// Toolbar3 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Toolbar Toolbar3; + + /// + /// txtWeldTypeCode 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWeldTypeCode; + + /// + /// txtPersonName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPersonName; + + /// + /// drpJointAttribute 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList drpJointAttribute; + /// /// ToolbarFill1 控件。 /// @@ -110,7 +202,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarFill ToolbarFill1; - + /// /// BtnAnalyse 控件。 /// @@ -119,7 +211,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button BtnAnalyse; - + /// /// btnOut 控件。 /// @@ -128,7 +220,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.Button btnOut; - + /// /// ToolbarSeparator1 控件。 /// @@ -137,7 +229,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarSeparator ToolbarSeparator1; - + /// /// ToolbarText1 控件。 /// @@ -146,7 +238,7 @@ namespace FineUIPro.Web.HJGL.WeldingReport { /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// protected global::FineUIPro.ToolbarText ToolbarText1; - + /// /// ddlPageSize 控件。 /// diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx index e18c4a63..a50e943a 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx @@ -25,21 +25,21 @@
- - + - + - - @@ -50,10 +50,26 @@ - + - - + + + + + + + + + + + + + + + + + + @@ -68,8 +84,11 @@ - - + + + + + @@ -82,85 +101,126 @@ - + - - + + - - + + + - - + + - - + + - + - - - + + + + + + + + + + + + + + + + + + + - + - - + + - - + + + + + + - - + + + + + + + + + + - - + + - + + - + + + + + + + + + + + + - - + - + - <%-- + <%-- @@ -169,8 +229,8 @@ - - + @@ -279,7 +339,7 @@ - + @@ -1379,7 +1439,7 @@ + Width="120px" LabelAlign="right"> @@ -1410,7 +1470,7 @@ + Width="120px" LabelAlign="right"> @@ -1625,7 +1685,7 @@ + Width="120px" LabelAlign="left"> @@ -1646,9 +1706,9 @@ - - + @@ -1704,7 +1764,7 @@ + Width="120px" LabelAlign="right"> @@ -2193,7 +2253,7 @@ - @@ -2213,7 +2273,7 @@ - + @@ -2225,13 +2285,13 @@ - + - + @@ -2343,7 +2403,7 @@ + Width="120px" LabelAlign="left"> @@ -2379,7 +2439,7 @@ + Width="120px" LabelAlign="left"> @@ -2491,8 +2551,8 @@ - - + + @@ -2524,7 +2584,7 @@ + Width="120px" LabelAlign="right"> @@ -2558,7 +2618,7 @@ - @@ -2567,7 +2627,7 @@ - @@ -2616,7 +2676,7 @@ - + diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs index 8bdc07a9..ce64dcb1 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.cs @@ -205,6 +205,31 @@ namespace FineUIPro.Web.PHTGL.ContractCompile txtBankAccount_Electrophore.Text = contract.BankAccount_Electrophore; txtLineNumber_Electrophore.Text = contract.LineNumber_Electrophore; txtRetentionmoney.Text = contract.Retentionmoney; + txtContactUnitOfPartyA.Text = contract.ContactUnitOfPartyA; + txtContactPersonOfPartyA.Text = contract.ContactPersonOfPartyA; + txtContactPersonOfPartyB.Text = contract.ContactPersonOfPartyB; + txtContactPersonPhoneOfPartyB.Text = contract.ContactPersonPhoneOfPartyB; + txtContactPersonEmailOfPartyB.Text = contract.ContactPersonEmailOfPartyB; + txtContractAmountExcludingTax.Text = contract.ContractAmountExcludingTax.ToString(); + txtPriceMethod.Text = contract.PriceMethod; + txtSignedOnDate.SelectedDate = contract.SignedOnDate; + txtContractStartDate.SelectedDate = contract.ContractStartDate; + txtContractEndDate.SelectedDate = contract.ContractEndDate; + txtPricingBasis.Text = contract.PricingBasis; + + if (contract.Status != null) + { + DropStatus.SelectedValue = contract.Status.ToString(); + + } + if (!string.IsNullOrEmpty(contract.SubcontractingMethod)) + { + dropSubcontractingMethod.SelectedValue = contract.SubcontractingMethod; + } + if (contract.IsItACentralizedPurchaseSupplier != null) + { + dropIsItACentralizedPurchaseSupplier.SelectedValue = contract.IsItACentralizedPurchaseSupplier.ToString(); + } if (!string.IsNullOrEmpty(contract.Currency)) { this.drpCurrency.SelectedValue = contract.Currency; @@ -480,6 +505,21 @@ namespace FineUIPro.Web.PHTGL.ContractCompile newContract.BankAccount_Electrophore = this.txtBankAccount_Electrophore.Text; newContract.LineNumber_Electrophore = this.txtLineNumber_Electrophore.Text; newContract.Retentionmoney = this.txtRetentionmoney.Text; + newContract.ContactUnitOfPartyA = txtContactUnitOfPartyA.Text; + newContract.ContactPersonOfPartyA = txtContactPersonOfPartyA.Text; + newContract.ContactPersonOfPartyB = txtContactPersonOfPartyB.Text; + newContract.ContactPersonPhoneOfPartyB = txtContactPersonPhoneOfPartyB.Text; + newContract.ContactPersonEmailOfPartyB = txtContactPersonEmailOfPartyB.Text; + newContract.ContractAmountExcludingTax = Funs.GetNewDecimal(txtContractAmountExcludingTax.Text.Trim()); + newContract.PriceMethod = txtPriceMethod.Text; + newContract.SignedOnDate = txtSignedOnDate.SelectedDate; + newContract.ContractStartDate = txtContractStartDate.SelectedDate; + newContract.ContractEndDate = txtContractEndDate.SelectedDate; + newContract.PricingBasis = txtPricingBasis.Text; + newContract.Status = Funs.GetNewInt(DropStatus.SelectedValue); + newContract.SubcontractingMethod = dropSubcontractingMethod.SelectedValue; + newContract.IsItACentralizedPurchaseSupplier = Funs.GetNewInt(dropIsItACentralizedPurchaseSupplier.SelectedValue); + if (this.drpCurrency.SelectedValue != BLL.Const._Null) { newContract.Currency = this.drpCurrency.SelectedValue; diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs index 3fd0bcf4..a5123c94 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractFormationEdit.aspx.designer.cs @@ -113,6 +113,42 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList DropContractAttribute; + /// + /// DropStatus 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList DropStatus; + + /// + /// txtSignedOnDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtSignedOnDate; + + /// + /// txtContractStartDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtContractStartDate; + + /// + /// txtContractEndDate 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DatePicker txtContractEndDate; + /// /// DropConfirmWay 控件。 /// @@ -122,6 +158,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.DropDownList DropConfirmWay; + /// + /// dropSubcontractingMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList dropSubcontractingMethod; + /// /// IsUseStandardtxt 控件。 /// @@ -195,13 +240,40 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected global::FineUIPro.TextBox tab1_txtContractNum; /// - /// tab1_txtParties 控件。 + /// drpContractType 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox tab1_txtParties; + protected global::FineUIPro.DropDownList drpContractType; + + /// + /// tab1_BuildUnit 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox tab1_BuildUnit; + + /// + /// txtPriceMethod 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPriceMethod; + + /// + /// txtPricingBasis 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtPricingBasis; /// /// drpCurrency 控件。 @@ -221,6 +293,15 @@ namespace FineUIPro.Web.PHTGL.ContractCompile /// protected global::FineUIPro.NumberBox tab1_txtContractAmount; + /// + /// txtContractAmountExcludingTax 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.NumberBox txtContractAmountExcludingTax; + /// /// drpDepartId 控件。 /// @@ -240,22 +321,67 @@ namespace FineUIPro.Web.PHTGL.ContractCompile protected global::FineUIPro.DropDownList drpAgent; /// - /// drpContractType 控件。 + /// txtContactUnitOfPartyA 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.DropDownList drpContractType; + protected global::FineUIPro.TextBox txtContactUnitOfPartyA; /// - /// tab1_BuildUnit 控件。 + /// txtContactPersonOfPartyA 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox tab1_BuildUnit; + protected global::FineUIPro.TextBox txtContactPersonOfPartyA; + + /// + /// tab1_txtParties 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox tab1_txtParties; + + /// + /// dropIsItACentralizedPurchaseSupplier 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.DropDownList dropIsItACentralizedPurchaseSupplier; + + /// + /// txtContactPersonOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonOfPartyB; + + /// + /// txtContactPersonPhoneOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonPhoneOfPartyB; + + /// + /// txtContactPersonEmailOfPartyB 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtContactPersonEmailOfPartyB; /// /// txtOpeningBank_TT 控件。 diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx index a5f7159b..5bf74bca 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx @@ -95,7 +95,48 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + <%-- diff --git a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs index a7f76e14..8f251fb3 100644 --- a/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/ContractCompile/ContractStandingBook.aspx.cs @@ -72,6 +72,23 @@ namespace FineUIPro.Web.PHTGL.ContractCompile Con.EPCCode, con.ProjectShortName, (convert(varchar(20), Sub.SignedYear) + '年' + convert(varchar(20), Sub.SignedMonth) + '月') as DepartName, + (CASE Con.Status WHEN '0' THEN '已签订' + WHEN '1' THEN '已完毕' END) as Status, + Con.ContactUnitOfPartyA, + Con.ContactPersonOfPartyA, + Con.ContactPersonOfPartyB, + Con.ContactPersonPhoneOfPartyB, + Con.ContactPersonEmailOfPartyB, + Con.ContractAmountExcludingTax, + Con.PriceMethod, + CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate, + CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate, + CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate, + Con.PricingBasis, + (CASE Con.SubcontractingMethod WHEN '1' then '内部分包' + WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, + (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否' + WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier, Sub.Bank1, Sub.SubcontractPriceForm, Sub.Account1" diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx index badb84f1..5a52327c 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx @@ -94,6 +94,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -130,6 +172,6 @@ + diff --git a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs index 37667e72..8a4790f9 100644 --- a/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs +++ b/SGGL/FineUIPro.Web/PHTGL/Filing/ContractFile.aspx.cs @@ -46,11 +46,11 @@ namespace FineUIPro.Web.PHTGL.Filing WHEN '5' THEN 'ds' END) AS ContractType, ( CASE Rev.State WHEN @ContractCreating THEN '编制中' - WHEN @Contract_countersign THEN '会签中' + WHEN @Contract_countersign THEN '会签中' WHEN @ContractReviewing THEN '审批中' WHEN @ContractReview_Complete THEN '审批成功' WHEN @ContractReview_Refuse THEN '审批被拒' END) AS State , - Con.Remarks, + Con.Remarks, Con.EPCCode, Con.ProjectShortName, Con.[OpeningBank-TT] as OpeningBank_TT , @@ -58,11 +58,28 @@ namespace FineUIPro.Web.PHTGL.Filing Con.[BankAccount-TT] as BankAccount_TT, Con.[BankAccount-electrophore] as BankAccount_electrophore, Con.[LineNumber-electrophore] as LineNumber_electrophore, - Con.Retentionmoney, + Con.Retentionmoney, + (CASE Con.Status WHEN '0' THEN '已签订' + WHEN '1' THEN '已完毕' END) as Status, + Con.ContactUnitOfPartyA, + Con.ContactPersonOfPartyA, + Con.ContactPersonOfPartyB, + Con.ContactPersonPhoneOfPartyB, + Con.ContactPersonEmailOfPartyB, + Con.ContractAmountExcludingTax, + Con.PriceMethod, + CONVERT(varchar(100), SignedOnDate, 111) as SignedOnDate, + CONVERT(varchar(100), ContractStartDate, 111) as ContractStartDate, + CONVERT(varchar(100), ContractEndDate, 111) as ContractEndDate, + Con.PricingBasis, + (CASE Con.SubcontractingMethod WHEN '1' then '内部分包' + WHEN '2' THEN '外部分包' END ) as SubcontractingMethod, + (CASE Con.IsItACentralizedPurchaseSupplier WHEN '0' then '否' + WHEN '1' THEN '是' END ) as IsItACentralizedPurchaseSupplier, Pro.ProjectCode, Pro.ProjectName, Dep.DepartName, - U.PersonName AS AgentName" + U.PersonName AS AgentName " + @" from PHTGL_ContractReview AS Rev" + @" LEFT JOIN PHTGL_Contract AS Con ON Con.ContractId=Rev.ContractId" //+ @" left join PHTGL_ActionPlanFormation as Act on Act.EPCCode=Con.EPCCode" diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 065e9df9..cd15e5cd 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -137216,6 +137216,34 @@ namespace Model private System.Nullable _CreateDate; + private System.Nullable _Status; + + private string _ContactUnitOfPartyA; + + private string _ContactPersonOfPartyA; + + private string _ContactPersonOfPartyB; + + private string _ContactPersonPhoneOfPartyB; + + private string _ContactPersonEmailOfPartyB; + + private System.Nullable _ContractAmountExcludingTax; + + private string _PriceMethod; + + private System.Nullable _SignedOnDate; + + private System.Nullable _ContractStartDate; + + private System.Nullable _ContractEndDate; + + private string _PricingBasis; + + private string _SubcontractingMethod; + + private System.Nullable _IsItACentralizedPurchaseSupplier; + private EntityRef _Base_Depart; private EntityRef _Base_Project; @@ -137296,6 +137324,34 @@ namespace Model partial void OnRetentionmoneyChanged(); partial void OnCreateDateChanging(System.Nullable value); partial void OnCreateDateChanged(); + partial void OnStatusChanging(System.Nullable value); + partial void OnStatusChanged(); + partial void OnContactUnitOfPartyAChanging(string value); + partial void OnContactUnitOfPartyAChanged(); + partial void OnContactPersonOfPartyAChanging(string value); + partial void OnContactPersonOfPartyAChanged(); + partial void OnContactPersonOfPartyBChanging(string value); + partial void OnContactPersonOfPartyBChanged(); + partial void OnContactPersonPhoneOfPartyBChanging(string value); + partial void OnContactPersonPhoneOfPartyBChanged(); + partial void OnContactPersonEmailOfPartyBChanging(string value); + partial void OnContactPersonEmailOfPartyBChanged(); + partial void OnContractAmountExcludingTaxChanging(System.Nullable value); + partial void OnContractAmountExcludingTaxChanged(); + partial void OnPriceMethodChanging(string value); + partial void OnPriceMethodChanged(); + partial void OnSignedOnDateChanging(System.Nullable value); + partial void OnSignedOnDateChanged(); + partial void OnContractStartDateChanging(System.Nullable value); + partial void OnContractStartDateChanged(); + partial void OnContractEndDateChanging(System.Nullable value); + partial void OnContractEndDateChanged(); + partial void OnPricingBasisChanging(string value); + partial void OnPricingBasisChanged(); + partial void OnSubcontractingMethodChanging(string value); + partial void OnSubcontractingMethodChanged(); + partial void OnIsItACentralizedPurchaseSupplierChanging(System.Nullable value); + partial void OnIsItACentralizedPurchaseSupplierChanged(); #endregion public PHTGL_Contract() @@ -137999,6 +138055,286 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="Int")] + public System.Nullable Status + { + get + { + return this._Status; + } + set + { + if ((this._Status != value)) + { + this.OnStatusChanging(value); + this.SendPropertyChanging(); + this._Status = value; + this.SendPropertyChanged("Status"); + this.OnStatusChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactUnitOfPartyA", DbType="VarChar(50)")] + public string ContactUnitOfPartyA + { + get + { + return this._ContactUnitOfPartyA; + } + set + { + if ((this._ContactUnitOfPartyA != value)) + { + this.OnContactUnitOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactUnitOfPartyA = value; + this.SendPropertyChanged("ContactUnitOfPartyA"); + this.OnContactUnitOfPartyAChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyA", DbType="VarChar(50)")] + public string ContactPersonOfPartyA + { + get + { + return this._ContactPersonOfPartyA; + } + set + { + if ((this._ContactPersonOfPartyA != value)) + { + this.OnContactPersonOfPartyAChanging(value); + this.SendPropertyChanging(); + this._ContactPersonOfPartyA = value; + this.SendPropertyChanged("ContactPersonOfPartyA"); + this.OnContactPersonOfPartyAChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonOfPartyB", DbType="VarChar(50)")] + public string ContactPersonOfPartyB + { + get + { + return this._ContactPersonOfPartyB; + } + set + { + if ((this._ContactPersonOfPartyB != value)) + { + this.OnContactPersonOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonOfPartyB = value; + this.SendPropertyChanged("ContactPersonOfPartyB"); + this.OnContactPersonOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonPhoneOfPartyB", DbType="VarChar(50)")] + public string ContactPersonPhoneOfPartyB + { + get + { + return this._ContactPersonPhoneOfPartyB; + } + set + { + if ((this._ContactPersonPhoneOfPartyB != value)) + { + this.OnContactPersonPhoneOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonPhoneOfPartyB = value; + this.SendPropertyChanged("ContactPersonPhoneOfPartyB"); + this.OnContactPersonPhoneOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContactPersonEmailOfPartyB", DbType="VarChar(50)")] + public string ContactPersonEmailOfPartyB + { + get + { + return this._ContactPersonEmailOfPartyB; + } + set + { + if ((this._ContactPersonEmailOfPartyB != value)) + { + this.OnContactPersonEmailOfPartyBChanging(value); + this.SendPropertyChanging(); + this._ContactPersonEmailOfPartyB = value; + this.SendPropertyChanged("ContactPersonEmailOfPartyB"); + this.OnContactPersonEmailOfPartyBChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractAmountExcludingTax", DbType="Decimal(18,2)")] + public System.Nullable ContractAmountExcludingTax + { + get + { + return this._ContractAmountExcludingTax; + } + set + { + if ((this._ContractAmountExcludingTax != value)) + { + this.OnContractAmountExcludingTaxChanging(value); + this.SendPropertyChanging(); + this._ContractAmountExcludingTax = value; + this.SendPropertyChanged("ContractAmountExcludingTax"); + this.OnContractAmountExcludingTaxChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PriceMethod", DbType="VarChar(50)")] + public string PriceMethod + { + get + { + return this._PriceMethod; + } + set + { + if ((this._PriceMethod != value)) + { + this.OnPriceMethodChanging(value); + this.SendPropertyChanging(); + this._PriceMethod = value; + this.SendPropertyChanged("PriceMethod"); + this.OnPriceMethodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SignedOnDate", DbType="Date")] + public System.Nullable SignedOnDate + { + get + { + return this._SignedOnDate; + } + set + { + if ((this._SignedOnDate != value)) + { + this.OnSignedOnDateChanging(value); + this.SendPropertyChanging(); + this._SignedOnDate = value; + this.SendPropertyChanged("SignedOnDate"); + this.OnSignedOnDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractStartDate", DbType="Date")] + public System.Nullable ContractStartDate + { + get + { + return this._ContractStartDate; + } + set + { + if ((this._ContractStartDate != value)) + { + this.OnContractStartDateChanging(value); + this.SendPropertyChanging(); + this._ContractStartDate = value; + this.SendPropertyChanged("ContractStartDate"); + this.OnContractStartDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ContractEndDate", DbType="Date")] + public System.Nullable ContractEndDate + { + get + { + return this._ContractEndDate; + } + set + { + if ((this._ContractEndDate != value)) + { + this.OnContractEndDateChanging(value); + this.SendPropertyChanging(); + this._ContractEndDate = value; + this.SendPropertyChanged("ContractEndDate"); + this.OnContractEndDateChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PricingBasis", DbType="VarChar(50)")] + public string PricingBasis + { + get + { + return this._PricingBasis; + } + set + { + if ((this._PricingBasis != value)) + { + this.OnPricingBasisChanging(value); + this.SendPropertyChanging(); + this._PricingBasis = value; + this.SendPropertyChanged("PricingBasis"); + this.OnPricingBasisChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SubcontractingMethod", DbType="VarChar(50)")] + public string SubcontractingMethod + { + get + { + return this._SubcontractingMethod; + } + set + { + if ((this._SubcontractingMethod != value)) + { + this.OnSubcontractingMethodChanging(value); + this.SendPropertyChanging(); + this._SubcontractingMethod = value; + this.SendPropertyChanged("SubcontractingMethod"); + this.OnSubcontractingMethodChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsItACentralizedPurchaseSupplier", DbType="Int")] + public System.Nullable IsItACentralizedPurchaseSupplier + { + get + { + return this._IsItACentralizedPurchaseSupplier; + } + set + { + if ((this._IsItACentralizedPurchaseSupplier != value)) + { + this.OnIsItACentralizedPurchaseSupplierChanging(value); + this.SendPropertyChanging(); + this._IsItACentralizedPurchaseSupplier = value; + this.SendPropertyChanged("IsItACentralizedPurchaseSupplier"); + this.OnIsItACentralizedPurchaseSupplierChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_HTGL_Contract_Base_Depart", Storage="_Base_Depart", ThisKey="DepartId", OtherKey="DepartId", IsForeignKey=true)] public Base_Depart Base_Depart {