diff --git a/DataBase/版本日志/SGGLDB_CD_V2024-02-01-001.sql b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-001.sql new file mode 100644 index 00000000..b2102f31 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-001.sql @@ -0,0 +1,54 @@ + + + Alter TABLE [dbo].[License_FireWork]add + [WorkLeaderId] [nvarchar](50) NULL, + [WorkLeaderTel] [nvarchar](50) NULL, + [HasSpecialProgramme] [nvarchar](5) NULL, + [OtherAttach] [nvarchar](50) NULL, + [WorkType] [nvarchar](200) NULL, + [Other1] [nvarchar](50) NULL, + [Other2] [nvarchar](50) NULL, + [PossibleHazards] [nvarchar](100) NULL, + [NeedGasDetection] [nvarchar](5) NULL, + [DetectionFrequency] [nvarchar](50) NULL, + [GasDetectionAttach] [nvarchar](500) NULL + + +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'C4093497-1CC9-4300-AFBA-E9F50D8733AA', '1', N'豸ûɨЧ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'1F941B60-A4AD-45FF-94CC-213365666DD3', '2', N'15m޿ȼȼ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'76D8CB00-FF5E-4904-AB4D-4E5043EBC1CC', '3', N'8kgʽɷѵλ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'13E55242-75A9-496F-B519-B9CF240E91BE', '4', N'豸ߡҪ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'E4AE50B2-6D0C-488E-AFB7-D723CA573072', '5', N'ͨѺϸ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'9AB8483C-F40C-4A2D-B096-63F5FF56558D', '6', N'ѽΧ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'3E55D29D-D64A-480C-87DD-C47B597C6AE1', '7', N'񿾮©ѷ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'35D2A22C-7394-4AC4-80D2-A7BC4001EC67', '8', N'Ҫҵ֤', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'81335C1E-DF9A-44F2-96FD-40EC8B52A4CC', '9', N'кϸҵͨӦͨ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'2BE8E90A-4AD3-468D-9E93-D20CB45831C9', '10', N'Χͱʶ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'57FF68E3-0088-492C-98F6-03A5F7EF700C', '11', N'໤ѵλ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'D892032B-9C28-4F8F-818E-2C2E98F3C780', '12', N'ҵԱаȫ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'DEF30EB4-DBC1-451A-BA03-95B4A69FE0DD', '13', N'ҵԱ֤ϸ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'CF9E6BB0-8464-49DE-AB43-0AA0E90B6856', '14', N'˷װȫ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'D54CFFF3-8734-4993-AF0C-D77BB97B64F0', '15', N'ӦʩԱѵλ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'289F5DC3-B2C6-41CF-BA5A-4AC41CFD90F8', '16', N'ȼ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'D7364F8E-32E6-4EA9-ADDC-74B40987690C', '17', N'豸׼׵', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'8059FA72-794B-4FA4-B61D-696949BD90FB', '18', N'ʩ', N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B'); + + +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'C4093497-1CC9-4300-AFBA-E9F50D8733AA', [SortIndex]='1', [SafetyMeasures]=N'豸ûɨЧ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'C4093497-1CC9-4300-AFBA-E9F50D8733AA'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'1F941B60-A4AD-45FF-94CC-213365666DD3', [SortIndex]='2', [SafetyMeasures]=N'15m޿ȼȼ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'1F941B60-A4AD-45FF-94CC-213365666DD3'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'76D8CB00-FF5E-4904-AB4D-4E5043EBC1CC', [SortIndex]='3', [SafetyMeasures]=N'8kgʽɷѵλ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'76D8CB00-FF5E-4904-AB4D-4E5043EBC1CC'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'13E55242-75A9-496F-B519-B9CF240E91BE', [SortIndex]='4', [SafetyMeasures]=N'豸ߡҪ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'13E55242-75A9-496F-B519-B9CF240E91BE'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'E4AE50B2-6D0C-488E-AFB7-D723CA573072', [SortIndex]='5', [SafetyMeasures]=N'ͨѺϸ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'E4AE50B2-6D0C-488E-AFB7-D723CA573072'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'9AB8483C-F40C-4A2D-B096-63F5FF56558D', [SortIndex]='6', [SafetyMeasures]=N'ѽΧ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'9AB8483C-F40C-4A2D-B096-63F5FF56558D'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'3E55D29D-D64A-480C-87DD-C47B597C6AE1', [SortIndex]='7', [SafetyMeasures]=N'񿾮©ѷ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'3E55D29D-D64A-480C-87DD-C47B597C6AE1'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'35D2A22C-7394-4AC4-80D2-A7BC4001EC67', [SortIndex]='8', [SafetyMeasures]=N'Ҫҵ֤', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'35D2A22C-7394-4AC4-80D2-A7BC4001EC67'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'81335C1E-DF9A-44F2-96FD-40EC8B52A4CC', [SortIndex]='9', [SafetyMeasures]=N'кϸҵͨӦͨ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'81335C1E-DF9A-44F2-96FD-40EC8B52A4CC'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'2BE8E90A-4AD3-468D-9E93-D20CB45831C9', [SortIndex]='10', [SafetyMeasures]=N'Χͱʶ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'2BE8E90A-4AD3-468D-9E93-D20CB45831C9'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'57FF68E3-0088-492C-98F6-03A5F7EF700C', [SortIndex]='11', [SafetyMeasures]=N'໤ѵλ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'57FF68E3-0088-492C-98F6-03A5F7EF700C'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'D892032B-9C28-4F8F-818E-2C2E98F3C780', [SortIndex]='12', [SafetyMeasures]=N'ҵԱаȫ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'D892032B-9C28-4F8F-818E-2C2E98F3C780'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'DEF30EB4-DBC1-451A-BA03-95B4A69FE0DD', [SortIndex]='13', [SafetyMeasures]=N'ҵԱ֤ϸ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'DEF30EB4-DBC1-451A-BA03-95B4A69FE0DD'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'CF9E6BB0-8464-49DE-AB43-0AA0E90B6856', [SortIndex]='14', [SafetyMeasures]=N'˷װȫ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'CF9E6BB0-8464-49DE-AB43-0AA0E90B6856'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'D54CFFF3-8734-4993-AF0C-D77BB97B64F0', [SortIndex]='15', [SafetyMeasures]=N'ӦʩԱѵλ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'D54CFFF3-8734-4993-AF0C-D77BB97B64F0'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'289F5DC3-B2C6-41CF-BA5A-4AC41CFD90F8', [SortIndex]='16', [SafetyMeasures]=N'ȼ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'289F5DC3-B2C6-41CF-BA5A-4AC41CFD90F8'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'D7364F8E-32E6-4EA9-ADDC-74B40987690C', [SortIndex]='17', [SafetyMeasures]=N'豸׼׵', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'D7364F8E-32E6-4EA9-ADDC-74B40987690C'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'8059FA72-794B-4FA4-B61D-696949BD90FB', [SortIndex]='18', [SafetyMeasures]=N'ʩ', [LicenseType]=N'2E58D4F1-2FF1-450E-8A00-1CE3BBCF8D4B' WHERE ([SafetyMeasuresId]=N'8059FA72-794B-4FA4-B61D-696949BD90FB'); diff --git a/DataBase/版本日志/SGGLDB_CD_V2024-02-01-002.sql b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-002.sql new file mode 100644 index 00000000..e772b428 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-002.sql @@ -0,0 +1,6 @@ +Alter TABLE [dbo].[License_BreakGround] add + [WorkLeaderId] [nvarchar](50) NULL, + [HasSpecialProgramme] [nvarchar](5) NULL, + [OtherAttach] [nvarchar](50) NULL, + [HasDrawing] [nvarchar](5) NULL, + [DrawingDes] [nvarchar](500) NULL \ No newline at end of file diff --git a/DataBase/版本日志/SGGLDB_CD_V2024-02-01-003.sql b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-003.sql new file mode 100644 index 00000000..49f0039d --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2024-02-01-003.sql @@ -0,0 +1,66 @@ +Alter TABLE [dbo].[License_TempElectricity]add + [WorkLeaderId] [nvarchar](50) NULL, + [UseTo] [nvarchar](50) NULL, + [AccessPoint] [nvarchar](50) NULL, + [AccessPointNo] [nvarchar](50) NULL, + [AccessPointAddress] [nvarchar](50) NULL, + [WorkingVoltage] [nvarchar](50) NULL, + [ElectricianPhone] [nvarchar](50) NULL, + [HasSpecialProgramme] [nvarchar](5) NULL, + [OtherAttach] [nvarchar](50) NULL, + [EquipmentLoadList] [nvarchar](5) NULL, + [EquipmentLoadDes] [nvarchar](50) NULL + + +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'13CED800-F8DE-41E8-80AD-989D3AD808C9', '1', N'ȷ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'14B67CAE-6403-4DB8-92A0-0EF67CB6D801', '2', N'ȷ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'167BA827-ED01-4928-BE7E-F0CB4D44C444', '3', N'Դ״̬Ҫ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'2CE96370-C894-4E23-B662-F4FDBA1734DE', '4', N'¹Ҫ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'2EE5F68E-B195-4C56-93C2-D72AC8F68D4C', '5', N'ӵصҪ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'3DEEAAC1-2A36-4442-B589-4B4DECC66CE3', '6', N'¼豸ۺϸ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'437F858A-15DC-4F37-AF8E-34E12F78CB03', '7', N'©籣Ҫ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'498FED3C-3022-40B1-A50B-7DF593BEC0A0', '8', N'ȷ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'4F074731-C520-492D-9CE8-D4CBC807CF2B', '9', N'Ե״', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'547495E4-31B4-49AE-AC99-BF9CC16343D0', '10', N'', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'58701BA0-E313-4733-920C-E2B6B3B692C5', '11', N'·ܿ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'6EEDD919-5D83-43DC-83E7-ACA995E2B1CC', '12', N'豸', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'807B0260-A9C7-4777-99E9-5458A50388C8', '13', N'·־ȷ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'9DDDA524-BA7C-431F-B237-EB39458C3821', '14', N'Խ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'A9A135DD-F42B-4EFF-95BD-8ED5963F5655', '15', N'ʱõ豸Դͷ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'AB828CD7-086C-4DF0-86BB-533417A20FFF', '16', N'̡俪÷Ҫ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'AD29F36F-5D8C-47FF-BDDE-321A5821E115', '17', N'һһբһ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'B04D50DC-33BC-4571-B789-655B6AF56AC3', '18', N'豸ǾԵ1M', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'B4E51CF1-83A7-48A3-808A-A738AB457685', '19', N'ʱ豸Ҫ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'B7A12100-71EE-437B-B568-62B7F9A9D3E4', '20', N'ֳֵ綯ߺϸ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'CC0CF27E-9B37-4DD7-9799-C50F46BD01BC', '21', N'ϷҪ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'CF721428-7359-4EF8-8856-40FB3F1AB214', '22', N'豸ϸ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'D4353BD4-65CB-42B9-BA95-DB92A2DBDAC1', '23', N'ʱõ֯', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'E94C71E2-678A-43B8-93E3-2604FD81A635', '24', N'нֹբȾʾʶ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); +INSERT INTO [dbo].[Base_SafetyMeasures] ([SafetyMeasuresId], [SortIndex], [SafetyMeasures], [LicenseType]) VALUES (N'F011A50B-609E-4A9D-8353-ECAAAB297464', '25', N'ȫʩ', N'E9EF8980-C60C-4A87-8498-5A0A061844ED'); + + +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'13CED800-F8DE-41E8-80AD-989D3AD808C9', [SortIndex]='1', [SafetyMeasures]=N'ȷ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'13CED800-F8DE-41E8-80AD-989D3AD808C9'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'14B67CAE-6403-4DB8-92A0-0EF67CB6D801', [SortIndex]='2', [SafetyMeasures]=N'ȷ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'14B67CAE-6403-4DB8-92A0-0EF67CB6D801'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'167BA827-ED01-4928-BE7E-F0CB4D44C444', [SortIndex]='3', [SafetyMeasures]=N'Դ״̬Ҫ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'167BA827-ED01-4928-BE7E-F0CB4D44C444'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'2CE96370-C894-4E23-B662-F4FDBA1734DE', [SortIndex]='4', [SafetyMeasures]=N'¹Ҫ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'2CE96370-C894-4E23-B662-F4FDBA1734DE'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'2EE5F68E-B195-4C56-93C2-D72AC8F68D4C', [SortIndex]='5', [SafetyMeasures]=N'ӵصҪ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'2EE5F68E-B195-4C56-93C2-D72AC8F68D4C'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'3DEEAAC1-2A36-4442-B589-4B4DECC66CE3', [SortIndex]='6', [SafetyMeasures]=N'¼豸ۺϸ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'3DEEAAC1-2A36-4442-B589-4B4DECC66CE3'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'437F858A-15DC-4F37-AF8E-34E12F78CB03', [SortIndex]='7', [SafetyMeasures]=N'©籣Ҫ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'437F858A-15DC-4F37-AF8E-34E12F78CB03'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'498FED3C-3022-40B1-A50B-7DF593BEC0A0', [SortIndex]='8', [SafetyMeasures]=N'ȷ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'498FED3C-3022-40B1-A50B-7DF593BEC0A0'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'4F074731-C520-492D-9CE8-D4CBC807CF2B', [SortIndex]='9', [SafetyMeasures]=N'Ե״', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'4F074731-C520-492D-9CE8-D4CBC807CF2B'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'547495E4-31B4-49AE-AC99-BF9CC16343D0', [SortIndex]='10', [SafetyMeasures]=N'', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'547495E4-31B4-49AE-AC99-BF9CC16343D0'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'58701BA0-E313-4733-920C-E2B6B3B692C5', [SortIndex]='11', [SafetyMeasures]=N'·ܿ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'58701BA0-E313-4733-920C-E2B6B3B692C5'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'6EEDD919-5D83-43DC-83E7-ACA995E2B1CC', [SortIndex]='12', [SafetyMeasures]=N'豸', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'6EEDD919-5D83-43DC-83E7-ACA995E2B1CC'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'807B0260-A9C7-4777-99E9-5458A50388C8', [SortIndex]='13', [SafetyMeasures]=N'·־ȷ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'807B0260-A9C7-4777-99E9-5458A50388C8'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'9DDDA524-BA7C-431F-B237-EB39458C3821', [SortIndex]='14', [SafetyMeasures]=N'Խ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'9DDDA524-BA7C-431F-B237-EB39458C3821'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'A9A135DD-F42B-4EFF-95BD-8ED5963F5655', [SortIndex]='15', [SafetyMeasures]=N'ʱõ豸Դͷ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'A9A135DD-F42B-4EFF-95BD-8ED5963F5655'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'AB828CD7-086C-4DF0-86BB-533417A20FFF', [SortIndex]='16', [SafetyMeasures]=N'̡俪÷Ҫ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'AB828CD7-086C-4DF0-86BB-533417A20FFF'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'AD29F36F-5D8C-47FF-BDDE-321A5821E115', [SortIndex]='17', [SafetyMeasures]=N'һһբһ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'AD29F36F-5D8C-47FF-BDDE-321A5821E115'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'B04D50DC-33BC-4571-B789-655B6AF56AC3', [SortIndex]='18', [SafetyMeasures]=N'豸ǾԵ1M', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'B04D50DC-33BC-4571-B789-655B6AF56AC3'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'B4E51CF1-83A7-48A3-808A-A738AB457685', [SortIndex]='19', [SafetyMeasures]=N'ʱ豸Ҫ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'B4E51CF1-83A7-48A3-808A-A738AB457685'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'B7A12100-71EE-437B-B568-62B7F9A9D3E4', [SortIndex]='20', [SafetyMeasures]=N'ֳֵ綯ߺϸ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'B7A12100-71EE-437B-B568-62B7F9A9D3E4'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'CC0CF27E-9B37-4DD7-9799-C50F46BD01BC', [SortIndex]='21', [SafetyMeasures]=N'ϷҪ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'CC0CF27E-9B37-4DD7-9799-C50F46BD01BC'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'CF721428-7359-4EF8-8856-40FB3F1AB214', [SortIndex]='22', [SafetyMeasures]=N'豸ϸ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'CF721428-7359-4EF8-8856-40FB3F1AB214'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'D4353BD4-65CB-42B9-BA95-DB92A2DBDAC1', [SortIndex]='23', [SafetyMeasures]=N'ʱõ֯', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'D4353BD4-65CB-42B9-BA95-DB92A2DBDAC1'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'E94C71E2-678A-43B8-93E3-2604FD81A635', [SortIndex]='24', [SafetyMeasures]=N'нֹբȾʾʶ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'E94C71E2-678A-43B8-93E3-2604FD81A635'); +UPDATE TOP(1) [dbo].[Base_SafetyMeasures] SET [SafetyMeasuresId]=N'F011A50B-609E-4A9D-8353-ECAAAB297464', [SortIndex]='25', [SafetyMeasures]=N'ȫʩ', [LicenseType]=N'E9EF8980-C60C-4A87-8498-5A0A061844ED' WHERE ([SafetyMeasuresId]=N'F011A50B-609E-4A9D-8353-ECAAAB297464'); diff --git a/DataBase/版本日志/SGGLDB_CD_V2024-02-02-001.sql b/DataBase/版本日志/SGGLDB_CD_V2024-02-02-001.sql new file mode 100644 index 00000000..03a94331 --- /dev/null +++ b/DataBase/版本日志/SGGLDB_CD_V2024-02-02-001.sql @@ -0,0 +1,5 @@ +Alter TABLE [dbo].[License_LiftingWork]add + [CapacityDes] [nvarchar](500) NULL, + [WorkLeaderId] [nvarchar](50) NULL, + [HasSpecialProgramme] [nvarchar](5) NULL, + [OtherAttach] [nvarchar](50) NULL \ No newline at end of file diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs index 20e1ea54..63380cdf 100644 --- a/SGGL/BLL/API/APIPersonService.cs +++ b/SGGL/BLL/API/APIPersonService.cs @@ -703,24 +703,24 @@ namespace BLL { foreach (var item in getPersons) { - int score = 80; - var sysTestRule = db.Sys_TestRule.FirstOrDefault(); - if (sysTestRule != null) - { - if (sysTestRule.PassingScore > 0) - { - score = sysTestRule.PassingScore; - } - } - var getTrainPersonIdList2 = (from x in db.Training_TestRecord - join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId - where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId - where x.TestScores > score - select x).FirstOrDefault(); - if (getTrainPersonIdList2 != null) - { - continue; - } + //int score = 80; + //var sysTestRule = db.Sys_TestRule.FirstOrDefault(); + //if (sysTestRule != null) + //{ + // if (sysTestRule.PassingScore > 0) + // { + // score = sysTestRule.PassingScore; + // } + //} + //var getTrainPersonIdList2 = (from x in db.Training_TestRecord + // join y in db.Training_TestPlan on x.TestPlanId equals y.TestPlanId + // where y.ProjectId == projectId && y.TrainTypeId == trainTypeId && y.States != "3" && x.TestManId == item.PersonId + // where x.TestScores > score + // select x).FirstOrDefault(); + //if (getTrainPersonIdList2 != null) + //{ + // continue; + //} getTrainPersonList.Add(item); } return getTrainPersonList; diff --git a/SGGL/BLL/API/APIUserService.cs b/SGGL/BLL/API/APIUserService.cs index 2cc46ebb..e5ba0cad 100644 --- a/SGGL/BLL/API/APIUserService.cs +++ b/SGGL/BLL/API/APIUserService.cs @@ -102,7 +102,7 @@ namespace BLL foreach (var role in roleList) { - if (item.RoleId.IndexOf(role) >= 0) + if (item.RoleId !=null && item.RoleId.IndexOf(role) >= 0) { if (!userid.Contains(item.UserId)) { diff --git a/SGGL/BLL/API/HSSE/APILicenseDataService.cs b/SGGL/BLL/API/HSSE/APILicenseDataService.cs index 65135f40..c38e1f64 100644 --- a/SGGL/BLL/API/HSSE/APILicenseDataService.cs +++ b/SGGL/BLL/API/HSSE/APILicenseDataService.cs @@ -1,4 +1,5 @@ -using System; +using Org.BouncyCastle.Utilities.Collections; +using System; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; @@ -1500,6 +1501,17 @@ namespace BLL LicenseCode = newItem.LicenseCode, ApplyUnitId = newItem.ApplyUnitId, ApplyManId = newItem.ApplyManId, + WorkLeaderId = newItem.WorkLeaderId, + WorkLeaderTel = newItem.WorkLeaderTel, + HasSpecialProgramme=newItem.HasSpecialProgramme, + GasDetectionAttach = newItem.GasDetectionAttach, + OtherAttach = newItem.OtherAttach, + WorkType = newItem.WorkType, + Other1 = newItem.Other1, + Other2 = newItem.Other2, + PossibleHazards = newItem.PossibleHazards, + NeedGasDetection = newItem.NeedGasDetection, + DetectionFrequency = newItem.DetectionFrequency, ApplyDate = Funs.GetNewDateTime(newItem.ApplyDate), WorkPalce = newItem.WorkPalce, FireWatchManId = newItem.FireWatchManId, @@ -1531,7 +1543,7 @@ namespace BLL newFireWork.ApplyDate = DateTime.Now; strLicenseId = newFireWork.FireWorkId = SQLHelper.GetNewID(); newFireWork.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newFireWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId); + newItem.LicenseCode = newFireWork.LicenseCode ="DH"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId); db.License_FireWork.InsertOnSubmit(newFireWork); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectFireWorkMenuId, newFireWork.ProjectId, newFireWork.ApplyUnitId, newFireWork.FireWorkId, newFireWork.ApplyDate); @@ -1615,7 +1627,7 @@ namespace BLL newHeightWork.ApplyDate = DateTime.Now; strLicenseId = newHeightWork.HeightWorkId = SQLHelper.GetNewID(); newHeightWork.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newHeightWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectHeightWorkMenuId, newHeightWork.ProjectId, newHeightWork.ApplyUnitId); + newItem.LicenseCode = newHeightWork.LicenseCode = "GC" + CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectHeightWorkMenuId, newHeightWork.ProjectId, newHeightWork.ApplyUnitId); db.License_HeightWork.InsertOnSubmit(newHeightWork); ////增加一条编码记录 @@ -1698,7 +1710,7 @@ namespace BLL newLimitedSpace.ApplyDate = DateTime.Now; strLicenseId = newLimitedSpace.LimitedSpaceId = SQLHelper.GetNewID(); newLimitedSpace.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newLimitedSpace.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId); + newItem.LicenseCode = newLimitedSpace.LicenseCode ="LS"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId); db.License_LimitedSpace.InsertOnSubmit(newLimitedSpace); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectLimitedSpaceMenuId, newLimitedSpace.ProjectId, newLimitedSpace.ApplyUnitId, newLimitedSpace.LimitedSpaceId, newLimitedSpace.ApplyDate); @@ -1789,7 +1801,7 @@ namespace BLL newRadialWork.ApplyDate = DateTime.Now; strLicenseId = newRadialWork.RadialWorkId = SQLHelper.GetNewID(); newRadialWork.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newRadialWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId); + newItem.LicenseCode = newRadialWork.LicenseCode = "SX"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId); db.License_RadialWork.InsertOnSubmit(newRadialWork); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectRadialWorkMenuId, newRadialWork.ProjectId, newRadialWork.ApplyUnitId, newRadialWork.RadialWorkId, newRadialWork.ApplyDate); @@ -1874,7 +1886,7 @@ namespace BLL newOpenCircuit.ApplyDate = DateTime.Now; strLicenseId = newOpenCircuit.OpenCircuitId = SQLHelper.GetNewID(); newOpenCircuit.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newOpenCircuit.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId); + newItem.LicenseCode = newOpenCircuit.LicenseCode = "DL"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId); db.License_OpenCircuit.InsertOnSubmit(newOpenCircuit); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectOpenCircuitMenuId, newOpenCircuit.ProjectId, newOpenCircuit.ApplyUnitId, newOpenCircuit.OpenCircuitId, newOpenCircuit.ApplyDate); @@ -1942,7 +1954,13 @@ namespace BLL CloseTime = Funs.GetNewDateTime(newItem.CloseTime), NextManId = newItem.NextManId, States = newItem.States, - SignatureUrl = newItem.SignatureUrl + SignatureUrl = newItem.SignatureUrl, + WorkLeaderId= newItem.WorkLeaderId, + OtherAttach=newItem.OtherAttach, + HasSpecialProgramme=newItem.HasSpecialProgramme, + HasDrawing=newItem.HasDrawing, + DrawingDes = newItem.HasDrawing + }; if (newItem.States == Const.State_0) { @@ -1955,7 +1973,7 @@ namespace BLL newBreakGround.ApplyDate = DateTime.Now; strLicenseId = newBreakGround.BreakGroundId = SQLHelper.GetNewID(); newBreakGround.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newBreakGround.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId); + newItem.LicenseCode = newBreakGround.LicenseCode ="DT"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId); db.License_BreakGround.InsertOnSubmit(newBreakGround); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectBreakGroundMenuId, newBreakGround.ProjectId, newBreakGround.ApplyUnitId, newBreakGround.BreakGroundId, newBreakGround.ApplyDate); @@ -2037,7 +2055,7 @@ namespace BLL newNightWork.ApplyDate = DateTime.Now; strLicenseId = newNightWork.NightWorkId = SQLHelper.GetNewID(); newNightWork.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newNightWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId); + newItem.LicenseCode = newNightWork.LicenseCode ="YJ"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId); db.License_NightWork.InsertOnSubmit(newNightWork); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectNightWorkMenuId, newNightWork.ProjectId, newNightWork.ApplyUnitId, newNightWork.NightWorkId, newNightWork.ApplyDate); @@ -2114,6 +2132,10 @@ namespace BLL CarNum = newItem.CarNum, OtherMan = newItem.OtherMan, WatchMan = newItem.WatchMan, + CapacityDes = newItem.CapacityDes, + WorkLeaderId = newItem.WorkLeaderId, + HasSpecialProgramme = newItem.HasSpecialProgramme, + OtherAttach = newItem.OtherAttach, SignatureUrl = newItem.SignatureUrl }; if (newItem.States == Const.State_0) @@ -2127,7 +2149,7 @@ namespace BLL newLiftingWork.ApplyDate = DateTime.Now; strLicenseId = newLiftingWork.LiftingWorkId = SQLHelper.GetNewID(); newLiftingWork.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newLiftingWork.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId); + newItem.LicenseCode = newLiftingWork.LicenseCode = "QZ"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId); db.License_LiftingWork.InsertOnSubmit(newLiftingWork); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectLiftingWorkMenuId, newLiftingWork.ProjectId, newLiftingWork.ApplyUnitId, newLiftingWork.LiftingWorkId, newLiftingWork.ApplyDate); @@ -2197,7 +2219,18 @@ namespace BLL States = newItem.States, Electrician = newItem.Electrician, Tools = newItem.Tools, - SignatureUrl = newItem.SignatureUrl + SignatureUrl = newItem.SignatureUrl, + WorkLeaderId= newItem.WorkLeaderId, + UseTo=newItem.UseTo, + AccessPoint=newItem.AccessPoint, + AccessPointNo = newItem.AccessPointNo, + AccessPointAddress = newItem.AccessPointAddress, + WorkingVoltage = newItem.WorkingVoltage, + ElectricianPhone = newItem.ElectricianPhone, + HasSpecialProgramme = newItem.HasSpecialProgramme, + OtherAttach = newItem.OtherAttach, + EquipmentLoadList = newItem.EquipmentLoadList, + EquipmentLoadDes=newItem.EquipmentLoadDes }; if (newItem.States == Const.State_0) @@ -2211,7 +2244,7 @@ namespace BLL newTempElectricity.ApplyDate = DateTime.Now; strLicenseId = newTempElectricity.TempElectricityId = SQLHelper.GetNewID(); newTempElectricity.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newTempElectricity.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId); + newItem.LicenseCode = newTempElectricity.LicenseCode ="LD"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId); db.License_TempElectricity.InsertOnSubmit(newTempElectricity); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectTempElectricityMenuId, newTempElectricity.ProjectId, newTempElectricity.ApplyUnitId, newTempElectricity.TempElectricityId, newTempElectricity.ApplyDate); @@ -2296,7 +2329,7 @@ namespace BLL newPressureTest.ApplyDate = DateTime.Now; strLicenseId = newPressureTest.PressureTestId = SQLHelper.GetNewID(); newPressureTest.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newPressureTest.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectPressureTestMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId); + newItem.LicenseCode = newPressureTest.LicenseCode ="SY"+ CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectPressureTestMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId); db.License_PressureTest.InsertOnSubmit(newPressureTest); ////增加一条编码记录 CodeRecordsService.InsertCodeRecordsByMenuIdProjectIdUnitIdForApi(Const.ProjectTempElectricityMenuId, newPressureTest.ProjectId, newPressureTest.ApplyUnitId, newPressureTest.PressureTestId, newPressureTest.ApplyDate); @@ -2384,7 +2417,7 @@ namespace BLL newJiaBan.ApplyDate = DateTime.Now; strLicenseId = newJiaBan.JiaBanId = SQLHelper.GetNewID(); newJiaBan.OldLicenseId = newItem.OldLicenseId; - newItem.LicenseCode = newJiaBan.LicenseCode = CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectJiaBanWorkMenuId, newJiaBan.ProjectId, newJiaBan.ApplyUnitId); + newItem.LicenseCode = newJiaBan.LicenseCode = "JB"+CodeRecordsService.ReturnCodeByMenuIdProjectId(Const.ProjectJiaBanWorkMenuId, newJiaBan.ProjectId, newJiaBan.ApplyUnitId); db.License_JiaBan.InsertOnSubmit(newJiaBan); ////增加一条编码记录 diff --git a/SGGL/FineUIPro.Web/ErrLog.txt b/SGGL/FineUIPro.Web/ErrLog.txt index c73dfe2f..50e4f8e5 100644 --- a/SGGL/FineUIPro.Web/ErrLog.txt +++ b/SGGL/FineUIPro.Web/ErrLog.txt @@ -1407,3 +1407,286 @@ IP地址:::1 出错时间:01/26/2024 11:24:42 出错时间:01/26/2024 11:24:42 + +错误信息开始=====> +错误类型:FileCorruptedException +错误信息:The document appears to be corrupted and cannot be loaded. +错误堆栈: + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document.x5d95f5f98c940295(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.FireWork.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\FireWork.aspx.cs:行号 303 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +----错误类型:ArgumentOutOfRangeException +----错误信息: +----索引超出范围。必须为非负值并小于集合大小。 +参数名: startIndex +----错误堆栈: + 在 System.String.CtorCharArrayStartLength(Char[] value, Int32 startIndex, Int32 length) + 在 xa604c4d210ae0581.x1f93754c360623ac.x06b0e25aa6ad68a9(BinaryReader xe134235b3526fa75, Int32 xde3de5b024452f3d, Int32 x8e15aa2edd06439a, Document x6beba47238e0ade6) + 在 x16f9a31f749b8bb1.x0f8a9a895bdf560e.x06b0e25aa6ad68a9() + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) +出错时间:01/31/2024 19:14:21 +出错文件:http://localhost:1295/HSSE/License/FireWork.aspx +IP地址:::1 +操作人员:JT + +出错时间:01/31/2024 19:14:22 + + +错误信息开始=====> +错误类型:FileCorruptedException +错误信息:The document appears to be corrupted and cannot be loaded. +错误堆栈: + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document.x5d95f5f98c940295(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.FireWork.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\FireWork.aspx.cs:行号 303 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +----错误类型:ArgumentOutOfRangeException +----错误信息: +----索引超出范围。必须为非负值并小于集合大小。 +参数名: startIndex +----错误堆栈: + 在 System.String.CtorCharArrayStartLength(Char[] value, Int32 startIndex, Int32 length) + 在 xa604c4d210ae0581.x1f93754c360623ac.x06b0e25aa6ad68a9(BinaryReader xe134235b3526fa75, Int32 xde3de5b024452f3d, Int32 x8e15aa2edd06439a, Document x6beba47238e0ade6) + 在 x16f9a31f749b8bb1.x0f8a9a895bdf560e.x06b0e25aa6ad68a9() + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) +出错时间:01/31/2024 19:14:48 +出错文件:http://localhost:1295/HSSE/License/FireWork.aspx +IP地址:::1 +操作人员:JT + +出错时间:01/31/2024 19:14:48 + + +错误信息开始=====> +错误类型:FileCorruptedException +错误信息:The document appears to be corrupted and cannot be loaded. +错误堆栈: + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document.x5d95f5f98c940295(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.FireWork.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\FireWork.aspx.cs:行号 303 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +----错误类型:ArgumentOutOfRangeException +----错误信息: +----索引超出范围。必须为非负值并小于集合大小。 +参数名: startIndex +----错误堆栈: + 在 System.String.CtorCharArrayStartLength(Char[] value, Int32 startIndex, Int32 length) + 在 xa604c4d210ae0581.x1f93754c360623ac.x06b0e25aa6ad68a9(BinaryReader xe134235b3526fa75, Int32 xde3de5b024452f3d, Int32 x8e15aa2edd06439a, Document x6beba47238e0ade6) + 在 x16f9a31f749b8bb1.x0f8a9a895bdf560e.x06b0e25aa6ad68a9() + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) +出错时间:01/31/2024 19:17:03 +出错文件:http://localhost:1295/HSSE/License/FireWork.aspx +IP地址:::1 +操作人员:JT + +出错时间:01/31/2024 19:17:03 + + +错误信息开始=====> +错误类型:IOException +错误信息:文件“D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\File\Word\HSSE\动火作业票202401310737394544.doc”正由另一进程使用，因此该进程无法访问此文件。 +错误堆栈: + 在 System.IO.__Error.WinIOError(Int32 errorCode, String maybeFullPath) + 在 System.IO.FileStream.Init(String path, FileMode mode, FileAccess access, Int32 rights, Boolean useRights, FileShare share, Int32 bufferSize, FileOptions options, SECURITY_ATTRIBUTES secAttrs, String msgPath, Boolean bFromProxy, Boolean useLongPath, Boolean checkHost) + 在 System.IO.FileStream..ctor(String path, FileMode mode, FileAccess access, FileShare share) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.FireWork.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\FireWork.aspx.cs:行号 991 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +出错时间:01/31/2024 19:38:20 +出错文件:http://localhost:1295/HSSE/License/FireWork.aspx +IP地址:::1 +操作人员:JT + +出错时间:01/31/2024 19:38:20 + + +错误信息开始=====> +错误类型:FileCorruptedException +错误信息:The document appears to be corrupted and cannot be loaded. +错误堆栈: + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document.x5d95f5f98c940295(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.FireWork.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\FireWork.aspx.cs:行号 303 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +----错误类型:ArgumentOutOfRangeException +----错误信息: +----索引超出范围。必须为非负值并小于集合大小。 +参数名: startIndex +----错误堆栈: + 在 System.String.CtorCharArrayStartLength(Char[] value, Int32 startIndex, Int32 length) + 在 xa604c4d210ae0581.x1f93754c360623ac.x06b0e25aa6ad68a9(BinaryReader xe134235b3526fa75, Int32 xde3de5b024452f3d, Int32 x8e15aa2edd06439a, Document x6beba47238e0ade6) + 在 x16f9a31f749b8bb1.x0f8a9a895bdf560e.x06b0e25aa6ad68a9() + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) +出错时间:01/31/2024 20:56:07 +出错文件:http://localhost:1295/HSSE/License/FireWork.aspx +IP地址:::1 +操作人员:JT + +出错时间:01/31/2024 20:56:07 + + +错误信息开始=====> +错误类型:JsonReaderException +错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0. +错误堆栈: + 在 Newtonsoft.Json.JsonTextReader.ParseValue() + 在 Newtonsoft.Json.JsonTextReader.Read() + 在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter) + 在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent) + 在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value) + 在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96 +出错时间:02/01/2024 15:16:42 +出错时间:02/01/2024 15:16:42 + + +错误信息开始=====> +错误类型:FileCorruptedException +错误信息:The document appears to be corrupted and cannot be loaded. +错误堆栈: + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document.x5d95f5f98c940295(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) + 在 Aspose.Words.Document..ctor(String fileName, LoadOptions loadOptions) + 在 Aspose.Words.Document..ctor(String fileName) + 在 FineUIPro.Web.HSSE.License.BreakGround.btnPrinter_Click(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\HSSE\License\BreakGround.aspx.cs:行号 300 + 在 FineUIPro.MenuButton.OnClick(EventArgs e) + 在 (MenuButton , EventArgs ) + 在 FineUIPro.MenuButton.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) +----错误类型:ArgumentOutOfRangeException +----错误信息: +----索引超出范围。必须为非负值并小于集合大小。 +参数名: startIndex +----错误堆栈: + 在 System.String.CtorCharArrayStartLength(Char[] value, Int32 startIndex, Int32 length) + 在 xa604c4d210ae0581.x1f93754c360623ac.x06b0e25aa6ad68a9(BinaryReader xe134235b3526fa75, Int32 xde3de5b024452f3d, Int32 x8e15aa2edd06439a, Document x6beba47238e0ade6) + 在 x16f9a31f749b8bb1.x0f8a9a895bdf560e.x06b0e25aa6ad68a9() + 在 Aspose.Words.Document.x5d4db34d48fb3129(Stream xcf18e5243f8d5fd3, LoadOptions x27aceb70372bde46) +出错时间:02/01/2024 15:16:53 +出错文件:http://localhost:1295/HSSE/License/BreakGround.aspx +IP地址:::1 +操作人员:JT + +出错时间:02/01/2024 15:17:02 + + +错误信息开始=====> +错误类型:JsonReaderException +错误信息:Unexpected character encountered while parsing value: 未. Path '', line 0, position 0. +错误堆栈: + 在 Newtonsoft.Json.JsonTextReader.ParseValue() + 在 Newtonsoft.Json.JsonTextReader.Read() + 在 Newtonsoft.Json.JsonReader.ReadForType(JsonContract contract, Boolean hasConverter) + 在 Newtonsoft.Json.Serialization.JsonSerializerInternalReader.Deserialize(JsonReader reader, Type objectType, Boolean checkAdditionalContent) + 在 Newtonsoft.Json.JsonSerializer.DeserializeInternal(JsonReader reader, Type objectType) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject(String value, Type type, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value, JsonSerializerSettings settings) + 在 Newtonsoft.Json.JsonConvert.DeserializeObject[T](String value) + 在 BLL.WeatherService.GetWeather(String projectId) 位置 D:\project\vs\sggl_cd\SGGL\BLL\Common\WeatherService.cs:行号 96 +出错时间:02/01/2024 15:44:02 +出错时间:02/01/2024 15:44:03 + + +错误信息开始=====> +错误类型:SqlException +错误信息:执行超时已过期。完成操作之前已超时或服务器未响应。 +错误堆栈: + 在 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.ExecuteReader() + 在 System.Data.Linq.SqlClient.SqlProvider.Execute(Expression query, QueryInfo queryInfo, IObjectReaderFactory factory, Object[] parentArgs, Object[] userArgs, ICompiledSubQuery[] subQueries, Object lastResult) + 在 System.Data.Linq.SqlClient.SqlProvider.ExecuteAll(Expression query, QueryInfo[] queryInfos, IObjectReaderFactory factory, Object[] userArguments, ICompiledSubQuery[] subQueries) + 在 System.Data.Linq.SqlClient.SqlProvider.System.Data.Linq.Provider.IProvider.Execute(Expression query) + 在 System.Data.Linq.DataQuery`1.System.Collections.Generic.IEnumerable.GetEnumerator() + 在 System.Collections.Generic.List`1..ctor(IEnumerable`1 collection) + 在 System.Linq.Enumerable.ToList[TSource](IEnumerable`1 source) + 在 FineUIPro.Web.mainMenu_HSSE.getSitePerson() 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\common\mainMenu_HSSE.aspx.cs:行号 69 + 在 FineUIPro.Web.mainMenu_HSSE.Page_Load(Object sender, EventArgs e) 位置 D:\project\vs\sggl_cd\SGGL\FineUIPro.Web\common\mainMenu_HSSE.aspx.cs:行号 41 + 在 System.Web.Util.CalliEventHandlerDelegateProxy.Callback(Object sender, EventArgs e) + 在 System.EventHandler.Invoke(Object sender, EventArgs e) + 在 System.Web.UI.Control.OnLoad(EventArgs e) + 在 System.Web.UI.Control.LoadRecursive() + 在 System.Web.UI.Page.ProcessRequestMain(Boolean includeStagesBeforeAsyncPoint, Boolean includeStagesAfterAsyncPoint) +----错误类型:Win32Exception +----错误信息: +----等待的操作过时。 +----错误堆栈: + 出错时间:02/01/2024 17:08:26 +出错文件:http://localhost:1295/common/mainMenu_HSSE.aspx +IP地址:::1 +操作人员:JT + +出错时间:02/01/2024 17:08:26 + + +错误信息开始=====> +错误类型:HttpParseException +错误信息:“FineUIPro.ControlBaseCollection”内不允许包含文字内容(“WorkLevel”)。 +错误堆栈: + 在 System.Web.UI.TemplateParser.ProcessException(Exception ex) + 在 System.Web.UI.TemplateParser.ProcessLiteral() + 在 System.Web.UI.TemplateParser.MaybeTerminateControl(String tagName, Match match) + 在 System.Web.UI.TemplateParser.ProcessEndTag(Match match) + 在 System.Web.UI.TemplateParser.ParseStringInternal(String text, Encoding fileEncoding) + 在 System.Web.UI.TemplateParser.ParseString(String text, VirtualPath virtualPath, Encoding fileEncoding) +----错误类型:HttpException +----错误信息: +----“FineUIPro.ControlBaseCollection”内不允许包含文字内容(“WorkLevel”)。 +----错误堆栈: + 在 System.Web.UI.CollectionBuilder.AppendLiteralString(String s) + 在 System.Web.UI.TemplateParser.ProcessLiteral() +出错时间:02/02/2024 15:29:25 +出错文件:http://localhost:1295/HSSE/License/LiftingWorkView.aspx?LiftingWorkId=989c9eba-fee9-4e0f-81c6-27df56cc6e0a +IP地址:::1 + +出错时间:02/02/2024 15:29:25 + diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/临电作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/临电作业票.doc new file mode 100644 index 00000000..d672fe7b --- /dev/null +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/临电作业票.doc @@ -0,0 +1,36 @@ + + 临时用电作业许可证 + 编号： +|信|用电单位： | |作业负责人： | |监护人： | | +|息| | | | | | | +| |用电用途： | |用电地点： | | +| |接入点名称： | |接入点编号： | |电气专业人| | +| | | | | |员 | | +| | | | | |姓名及手机| | +| | | | | |号： | | +| |接入点位置： | |工作电压： | | | | +| |作业时间： |从（最长有效期7日） | +|安|是否附专项安全方案 ： 是 否 |其他附件(危害识别等)： | +|全| | | +|措| | | +|施| | | +| |是否附用电设备负荷清单： 是 否 |清单说明： | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | +|施|已对施工用电的设备设施进行检查确认，符合安全要求；对作业过程可能出现的风险进| +|工|行了识别并采取了风险削减和监控措施，能够满足作业安全要求。 | +| |施工单位HSE经理： |施工单位施工经理： | +|总|已经对安全措施进行了检查，符合施工用电相关标准，可以送电。 | +|包| | +| |成达EPC项目HSE经理/HSE专业工程师： | | +| |成达EPC项目施工经理： | | +|关|本人已确认现场总开关箱没有负荷，将按照用电申请接线部位拆除接线线路并确保拆除| +|闭|过程中的安全。 | +| |用电单位电气专业人员： | diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc index 55f12de9..351e9dad 100644 --- a/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/动土作业票.doc @@ -1,29 +1,30 @@ - 动土作业票 -编号： -|动土作业需附简图： | -|申请单位 | |申请人 | | -|作业地点 | |开挖深度| | -|有效期限 | | -|作业内容、机 | | -|具及安全措施 | | -|序号 |检查单 |确认执行 |不适用 | -|1 |施工方案已审批，作业人员已经交底 | | | -|2 |已经标出准确的开挖位置 | | | -|3 |开挖区域地面障碍物已清理 | | | -|4 |开挖区域地下障碍物（管线、电缆）已经 | | | -| |过确认并作好标识，保护措施已落实 | | | -|5 |使用的开挖设备、工具已经检查完好 | | | -|6 |开挖作业区域周围已经设立警示标识和围 | | | -| |档 | | | -|施工单位安全人员意见： |总包单位安全人员意见： | -| | | -| | | -|总包单位专业工程师意见： |总包单位施工经理意见： | -| | | -| | | -|监理单位意见： |业主单位意见： | -| | | -| | | -|取消： | -|关闭： | + 动土作业许可证 + + 作业证编号： +|信|作业单位： | |作业负责人| |监护人： | | +|息| | |： | | | | +| |作业地点： | |作业内容： | | +| |作业时间： |从（最长有效期7日） | +|安|是否附专项安全方案： 是 否 |其他附件(危害识别等)： | +|全| | | +|措| | | +|施| | | +| |是否附图纸： 是 否 |图纸说明： | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +|施|我保证我及我单位阅读理解并遵照执行安全方案和此许可证，并在作业过程中负责落| +|工|实各项安全措施。 | +| |施工单位HSE经理： |施工单位施工经理： | +|总|已确认该作业票的安全措施已落实。 | +|包| | +| |成达EPC项目HSE经理/HSE专业工程师： | | +| |成达EPC项目施工经理： | | +|关|此项作业已经安全的完成，未在施工现场留下任何不安全隐患。 | +|闭|施工单位负责人： | diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc index b37b2884..092c9cd9 100644 --- a/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/动火作业票.doc @@ -1,34 +1,36 @@ - 动火作业票 -编号： -|申请单位 | |申请人 | | -|作业地点 | |监火人员 | | -|有效期限 | | -|作业内容、机 | | -|具及安全措施 | | -|序号 |检查单 |确认执行|不适用 | -|1 |电焊、气割等设备符合要求，已贴标签 | | | -|2 |防护面罩、眼镜和工作服符合要求 | | | -|3 |气带、电线等符合要求 | | | -|4 |电焊回路线接在焊件上，地线不得穿过下水井| | | -| |或与其它设备搭接 | | | -|5 |清除动火点周围易燃物或采取有效的防护措施| | | -|6 |气瓶直立固定并有防晒措施 | | | -|7 |乙炔、氧气瓶间距不小于5米，与火源距离不 | | | -| |小于10米 | | | -|8 |动火作业现场备灭火器（）个，其他消防器材| | | -|9 |高处作业须采取防火花飞溅措施 | | | -|10 |现场人员会使用灭火器 | | | -|11 |作业点已进行可燃气体检测 | | | -|12 |其它措施 | | | -|施工单位安全人员意见： |总包单位安全人员意见： | -| | | -| | | -|总包单位专业工程师意见： |总包单位施工经理意见： | -| | | -| | | -|监理单位意见： |业主单位意见： | -| | | -| | | -|取消： | -|关闭： | + 动火作业许可证 + 编号： +|信|作业单位：| |现场负责人： | |联系电话：| | +|息| | | | | | | +| |作业地点：| |作业内容： | | +| |作业时间：|从（最长有效期7日） | +| |动火作业人| | +| |： | | +|安|是否附专项安全方案 ： 是 否 |其他附件(危害识别等)： | +|全| | | +|措| | | +|施| | | +| |动火作业类型： | +| |焊接 气割 燃烧 明火 研磨 打磨 钻孔 破碎 其他________ | +| |使用非防爆的电气设备 使用内燃发动机设备 其他特种作业 其他________ | +| |可能产生的危害： | +| |爆炸 火灾 灼伤 烫伤 机械伤害 中毒 辐射 触电 泄漏 | +| |窒息 坠落 落物 掩埋 噪声 其他： | +| |安全措施： | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| |是否需要气体检测 是 否 |检测频次： □ 附检测单 | +|施|阅读理解并遵照执行安全方案和此许可证，并在作业过程中负责落实各项安全措施。 | +|工| | +| |施工单位HSE经理： |施工单位施工经理： | +|总|已确认该作业票的安全措施已落。 | +|包| | +| |成达EPC项目HSE经理/HSE专业工程师： | | +| |成达EPC项目施工经理： | | +|关|此项作业已经安全的完成，未在施工现场留下任何不安全隐患。 | +|闭|施工单位负责人： | diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc index 3b294b67..8d1e43cb 100644 --- a/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/受限空间作业票.doc @@ -1,35 +1,36 @@ - 受限空间作业票 -编号： -|申请单位 | |申请人 | | -|作业地点 | |监护人 | | -|作业内容 | | -|作业时间 | | -|序号 |检查单 |确认执行 |不适用 | -|1 |作业人员已接受专项安全培训，清楚受限 | | | -| |空间内存在的危险因素 | | | -|2 |与受限空间相连接的管道、设备、电源、 | | | -| |气源已采取隔离措施 | | | -|3 |受限空间已进行置换、清洗，并检测合格 | | | -|4 |受限空间内照明电压应小于等于36V，在潮| | | -| |湿、金属容器内作业时，电压应小于等于1| | | -| |2V | | | -|5 |进出口通道、作业的平台已落实 | | | -|6 |受限空间已经通风，且气体检测符合要求 | | | -| |（见附表） | | | -|7 |监护人已明确，并经过培训 | | | -|8 |通讯方式、设施已落实 | | | -|9 |应急救援设施已到位 | | | -|10 |作业安全措施：消防器材（ ）、救生绳（| | | -| |）、气体呼吸设备（ ） | | | -|施工单位安全人员意见： |总包单位安全人员意见： | -| | | -| | | -|总包单位专业工程师意见： |总包单位施工经理意见： | -| | | -| | | -|监理单位意见： |业主单位意见： | -| | | -| | | -|取消： | -|关闭： | + 受限空间作业许可证 + 编号： +|信|作业单位： | |现场负责人| | +|息| | |： | | +| |作业时间： |从___年___月___日___ 时 分 至 ___年___月___日___时 | +| | |分（最长有效期8小时） | +| |作业人： | | +|安|是否附专项安全方案 ： □ 是 □ 否 |其他附件(危害识别等)： | +|全| | | +|措| | | +|施| | | +| |作业类型： □焊接 □钻孔 □气割 □化学清洗 □用电 □喷涂 □挖掘| +| |□其它： | +| |涉及的相关作业许可： □ 动火作业许可 □ 高处作业许可 □ 盲板作业许可 □ | +| |施工用电作业许可 | +| |□ 射线作业许可 □ 挖掘作业许可 □ 其它作业许可 | +| |危害识别：：□爆炸性粉尘 □易燃性物质 □腐蚀性液体 □挥发性物质 □高压 | +| |介质 □惰性气体 □有毒有害化学品 □高温、低温 □转动设备 □淹没、掩埋 | +| |□空间内活动受限 □坠落、滑跌 □其它： | +| |安全措施： | +| |设备隔离 | +| |是否需要气体检测： □ 是 □ 否 |检测频次： |□ 附检测单 | +|施|阅遵照执行安全方案和此许可证，并在作业过程中负责落实各项安全措施。 | +|工|施工单位HSE经理： 施工单位施工经理： | +| | | +| |年 月 日 时 年 月 日 时 | +| | | +|总|已确认该作业票的安全措施已落。 | +|包|成达EPC项目HSE经理/HSE专业工程师： 年| +| |月 日 时 | +| |成达EPC项目施工经理： | +| |年 月 日 时 | +|关|此项作业已经安全的完成，未在施工现场留下任何不安全隐患。 | +|闭|施工单位负责人： | +| |年 月 日 时 | diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc index 7cb27531..bdd0e98f 100644 --- a/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc +++ b/SGGL/FineUIPro.Web/File/Word/HSSE/吊装作业票.doc @@ -1,36 +1,33 @@ - 吊装作业票 -编号： -|申请单位 | |申请人 | | -|作业地点 | |级别 | | -|有效期限 | | -|作业内容 | | -|起重机能力及 | | -|索具规格 | | -|序号 |检查单 |确认执行 |不适用 | -|1 |吊装方案已按程序报审并通过，已进行方 | | | -| |案交底 | | | -|2 |起重工持证上岗 | | | -|3 |起重指挥和吊车司机能有效沟通和传递信 | | | -| |号（旗、哨、对讲机等） | | | -|4 |天气状况良好（大雪、大雨、大雾及六级 | | | -| |以上大风不得进行吊装作业） | | | -|5 |吊车资质证件齐全、吊索具状况良好，符 | | | -| |合要求 | | | -|6 |吊点的选择、吊装作业半径、站位及行走 | | | -| |地基符合规范和施工方案要求 | | | -|7 |吊装区域、场地满足吊装作业的要求，周 | | | -| |围无影响吊装作业的障碍物或已采取相应 | | | -| |措施 | | | -|8 |吊装警戒围护设置到位，监护人员到位 | | | -|施工单位安全人员意见： |总包单位安全人员意见： | -| | | -| | | -|总包单位专业工程师意见： |总包单位施工经理意见： | -| | | -| | | -|监理单位意见： |业主单位意见： | -| | | -| | | -|取消： | -|关闭： | + 起重作业许可证 + 编号： +|信|作业单位： | |现场作业负责人： | | +|息| | | | | +| |起重司机（证件号| |起重指挥（证件号码| | +| |）： | |）： | | +| |作业地点： | |作业内容： | | +| |负荷描述： | |吊车类型/额定载荷 | | +| | | |： | | +| |有效期： |从（最长有效期7日） | +|安|是否附专项安全方案 ： 是 |其他附件(危害识别等)： | +|全|否 | | +|措| | | +|施| | | +| |吊装等级： | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | +|施|已阅读许可并且确认所有条件都满足，对作业过程可能出现的风险进行了识别并采取| +|工|了风险削减和监控措施，能够满足作业安全要求。 | +| |施工单位HSE经理： |施工单位施工经理： | +|总|已确认该作业票的安全措施已落实。 | +|包| | +| |成达EPC项目HSE经理/HSE专业工程师： | | +| |成达EPC项目施工经理： | | +|关|此项作业已经安全的完成，未在施工现场留下任何不安全隐患。 | +|闭|施工单位负责人： | diff --git a/SGGL/FineUIPro.Web/HSSE/KqShowScreen/KqShowScreen.aspx b/SGGL/FineUIPro.Web/HSSE/KqShowScreen/KqShowScreen.aspx index 3849bb86..317dedbe 100644 --- a/SGGL/FineUIPro.Web/HSSE/KqShowScreen/KqShowScreen.aspx +++ b/SGGL/FineUIPro.Web/HSSE/KqShowScreen/KqShowScreen.aspx @@ -250,7 +250,7 @@ // 每10分钟 通过 websocket 向服务器发送一次心跳 证明客户端没有离线 依然在线可以正常接受消息 setInterval(websocketsend, 20000); - initWebsocket(); + //initWebsocket(); function initWebsocket() { /* * 初始化 websock @@ -320,4 +320,8 @@ } + setInterval(function () { //执行任务 + getData(); + }, 2000); + \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs index 14dbf8db..e4cfd852 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGround.aspx.cs @@ -297,7 +297,16 @@ namespace FineUIPro.Web.HSSE.License File.Copy(uploadfilepath, newUrl); ///更新书签 var getBreakGround = LicensePublicService.GetBreakGroundById(Id); + var projectName = ProjectService.GetProjectNameByProjectId(getBreakGround.ProjectId); Document doc = new Aspose.Words.Document(newUrl); + Bookmark bookmarkProjectName = doc.Range.Bookmarks["ProjectName"];//编号 + if (bookmarkProjectName != null) + { + if (!string.IsNullOrEmpty(projectName)) + { + bookmarkProjectName.Text = projectName; + } + } Bookmark bookmarkLicenseCode = doc.Range.Bookmarks["LicenseCode"];//编号 if (bookmarkLicenseCode != null) { @@ -330,6 +339,19 @@ namespace FineUIPro.Web.HSSE.License } } + Bookmark bookmarkWorkLeader = doc.Range.Bookmarks["WorkLeader"];//现场负责人 + if (bookmarkWorkLeader != null) + { + if (getBreakGround != null) + { + var getUser = UserService.GetUserByUserId(getBreakGround.WorkLeaderId); + if (getUser != null) + { + bookmarkWorkLeader.Text = getUser.UserName; + } + + } + } Bookmark bookmarkUnitName = doc.Range.Bookmarks["UnitName"];//申请单位 if (bookmarkUnitName != null) { @@ -403,300 +425,85 @@ namespace FineUIPro.Web.HSSE.License } } - - - + Bookmark bookmarkOtherAttach = doc.Range.Bookmarks["OtherAttach"];//其他附件(危害识别等) + if (bookmarkOtherAttach != null && !string.IsNullOrEmpty(getBreakGround.OtherAttach)) + { + bookmarkOtherAttach.Text = getBreakGround.OtherAttach; + } + Bookmark bookmarkDrawingDes = doc.Range.Bookmarks["DrawingDes"];//图纸说明 + if (bookmarkDrawingDes != null && !string.IsNullOrEmpty(getBreakGround.DrawingDes)) + { + bookmarkDrawingDes.Text = getBreakGround.DrawingDes; + } + + Bookmark bookmarkHasSpecial1 = doc.Range.Bookmarks["HasSpecial1"];//分析数据 + Bookmark bookmarkHasSpecial2 = doc.Range.Bookmarks["HasSpecial2"];//分析数据 + if (!string.IsNullOrEmpty(getBreakGround.HasSpecialProgramme)) + { + if (getBreakGround.HasSpecialProgramme == "是") + { + bookmarkHasSpecial1.Text = "■"; + bookmarkHasSpecial2.Text = "□"; + } + else + { + bookmarkHasSpecial1.Text = "□"; + bookmarkHasSpecial2.Text = "■"; + } + } + else + { + bookmarkHasSpecial2.Text = "□"; + bookmarkHasSpecial1.Text = "□"; + } + Bookmark bookmarkHasDrawing1 = doc.Range.Bookmarks["HasDrawing1"];//分析数据 + Bookmark bookmarkHasDrawing2 = doc.Range.Bookmarks["HasDrawing2"];//分析数据 + if (!string.IsNullOrEmpty(getBreakGround.HasDrawing)) + { + if (getBreakGround.HasDrawing == "是") + { + bookmarkHasDrawing1.Text = "■"; + bookmarkHasDrawing2.Text = "□"; + } + else + { + bookmarkHasDrawing1.Text = "□"; + bookmarkHasDrawing2.Text = "■"; + } + } + else + { + bookmarkHasDrawing1.Text = "□"; + bookmarkHasDrawing2.Text = "□"; + } var GetLicenseItemList = LicensePublicService.GetLicenseItemListByDataId(Id); if (GetLicenseItemList.Count > 0) { - var item1 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 1); - if (item1 != null) - { - if (item1.IsUsed == true) - { - Bookmark bookmarkUser1 = doc.Range.Bookmarks["User1"];//确认执行 - if (bookmarkUser1 != null) - { - bookmarkUser1.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit1 = doc.Range.Bookmarks["IsFit1"]; - if (bookmarkIsFit1 != null) - { - if (item1 != null) - { - bookmarkIsFit1.Text = "×"; - } - } - } - } - - - - var item2 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 2); - if (item2 != null) - { - if (item2.IsUsed == true) - { - Bookmark bookmarkUser2 = doc.Range.Bookmarks["User2"];//确认执行 - if (bookmarkUser2 != null) - { - bookmarkUser2.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit2 = doc.Range.Bookmarks["IsFit2"]; - if (bookmarkIsFit2 != null) - { - if (item2 != null) - { - bookmarkIsFit2.Text = "×"; - } - } - } - } - var item3 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 3); - if (item3 != null) - { - if (item3.IsUsed == true) - { - Bookmark bookmarkUser3 = doc.Range.Bookmarks["User3"];//确认执行 - if (bookmarkUser3 != null) - { - bookmarkUser3.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit3 = doc.Range.Bookmarks["IsFit3"]; - if (bookmarkIsFit3 != null) - { - if (item3 != null) - { - bookmarkIsFit3.Text = "×"; - } - } - } - } - - var item4 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 4); - if (item4 != null) - { - if (item4.IsUsed == true) - { - Bookmark bookmarkUser4 = doc.Range.Bookmarks["User4"];//确认执行 - if (bookmarkUser4 != null) - { - bookmarkUser4.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit4 = doc.Range.Bookmarks["IsFit4"]; - if (bookmarkIsFit4 != null) - { - if (item4 != null) - { - bookmarkIsFit4.Text = "×"; - } - } - } - } - var item5 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 5); - if (item5 != null) - { - if (item5.IsUsed == true) - { - Bookmark bookmarkUser5 = doc.Range.Bookmarks["User5"];//确认执行 - if (bookmarkUser5 != null) - { - bookmarkUser5.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit5 = doc.Range.Bookmarks["IsFit5"]; - if (bookmarkIsFit5 != null) - { - if (item5 != null) - { - bookmarkIsFit5.Text = "×"; - } - } - } - } - - var item6 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 6); - if (item6 != null) - { - if (item6.IsUsed == true) - { - Bookmark bookmarkUser6 = doc.Range.Bookmarks["User6"];//确认执行 - if (bookmarkUser6 != null) - { - bookmarkUser6.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit6 = doc.Range.Bookmarks["IsFit6"]; - if (bookmarkIsFit6 != null) - { - if (item6 != null) - { - bookmarkIsFit6.Text = "×"; - } - } - } - } - var item7 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 7); - if (item7 != null) - { - if (item7.IsUsed == true) - { - Bookmark bookmarkUser7 = doc.Range.Bookmarks["User7"];//确认执行 - if (bookmarkUser7 != null) - { - bookmarkUser7.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit7 = doc.Range.Bookmarks["IsFit7"]; - if (bookmarkIsFit7 != null) - { - if (item7 != null) - { - bookmarkIsFit7.Text = "×"; - } - } - } - } - - var item8 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 8); - if (item8 != null) - { - if (item8.IsUsed == true) - { - Bookmark bookmarkUser8 = doc.Range.Bookmarks["User8"];//确认执行 - if (bookmarkUser8 != null) - { - bookmarkUser8.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit8 = doc.Range.Bookmarks["IsFit8"]; - if (bookmarkIsFit8 != null) - { - if (item8 != null) - { - bookmarkIsFit8.Text = "×"; - } - } - } - } - - var item9 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 9); - if (item9 != null) - { - if (item9.IsUsed == true) - { - Bookmark bookmarkUser9 = doc.Range.Bookmarks["User9"];//确认执行 - if (bookmarkUser9 != null) - { - bookmarkUser9.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit9 = doc.Range.Bookmarks["IsFit9"]; - if (bookmarkIsFit9 != null) - { - if (item9 != null) - { - bookmarkIsFit9.Text = "×"; - } - } - } - } - - var item10 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 10); - if (item10 != null) - { - if (item10.IsUsed == true) - { - Bookmark bookmarkUser10 = doc.Range.Bookmarks["User10"];//确认执行 - if (bookmarkUser10 != null) - { - bookmarkUser10.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit10 = doc.Range.Bookmarks["IsFit10"]; - if (bookmarkIsFit10 != null) - { - if (item10 != null) - { - bookmarkIsFit10.Text = "×"; - } - } - } - } - var item11 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 11); - if (item11 != null) - { - if (item11.IsUsed == true) - { - Bookmark bookmarkUser11 = doc.Range.Bookmarks["User11"];//确认执行 - if (bookmarkUser11 != null) - { - bookmarkUser11.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit11 = doc.Range.Bookmarks["IsFit11"]; - if (bookmarkIsFit11 != null) - { - if (item11 != null) - { - bookmarkIsFit11.Text = "×"; - } - } - } - } - - var item12 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 12); - if (item12 != null) - { - if (item12.IsUsed == true) - { - Bookmark bookmarkUser12 = doc.Range.Bookmarks["User12"];//确认执行 - if (bookmarkUser12 != null) - { - bookmarkUser12.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit12 = doc.Range.Bookmarks["IsFit12"]; - if (bookmarkIsFit12 != null) - { - if (item12 != null) - { - bookmarkIsFit12.Text = "×"; - } - } - } - } - - + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 1, "LicenseItemList1"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 2, "LicenseItemList2"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 3, "LicenseItemList3"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 4, "LicenseItemList4"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 5, "LicenseItemList5"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 6, "LicenseItemList6"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 7, "LicenseItemList7"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 8, "LicenseItemList8"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 9, "LicenseItemList9"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 10, "LicenseItemList10"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 11, "LicenseItemList11"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 12, "LicenseItemList12"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 13, "LicenseItemList13"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 14, "LicenseItemList14"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 15, "LicenseItemList15"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 16, "LicenseItemList16"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 17, "LicenseItemList17"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 18, "LicenseItemList18"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 19, "LicenseItemList19"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 20, "LicenseItemList20"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 21, "LicenseItemList21"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 22, "LicenseItemList22"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 23, "LicenseItemList23"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 24, "LicenseItemList24"); } //审核记录 var getFlows = LicensePublicService.GetFlowOperateListByDataId(Id); @@ -1121,6 +928,31 @@ namespace FineUIPro.Web.HSSE.License File.Delete(newUrl); File.Delete(pdfUrl); } + + private void bookmarLicense_LicenseItem(Document doc, List list, int index, string LicenseItem) + { + var item1 = list.FirstOrDefault(x => x.SortIndex == index); + if (item1 != null) + { + Bookmark bookmarkUser1 = doc.Range.Bookmarks[LicenseItem];//确认执行 + + if (item1.IsUsed == true) + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "■" + item1.SafetyMeasures; + } + } + else + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "□" + item1.SafetyMeasures; + } + } + } + + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx index 996b5142..fc6a93f9 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx @@ -33,38 +33,52 @@ - + - + - - - + + + - + - - - + + + - + + + + + + + + + + + + + + + - + - + @@ -94,7 +108,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全审核："> @@ -117,7 +131,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位施工经理审批："> @@ -144,7 +158,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包安全审批："> @@ -167,7 +181,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包施工经理签发："> @@ -177,7 +191,7 @@ - @@ -191,54 +205,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -282,6 +249,7 @@ case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return; case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return; case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return; + case 4: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return; } } diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs index b68c1ef6..582ebe5b 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.cs @@ -49,8 +49,26 @@ this.txtApplyManName.Text = UserService.GetUserNameByUserId(getBreakGround.ApplyManId); this.txtWorkPalce.Text = getBreakGround.WorkPalce; this.txtWatchMan.Text = getBreakGround.WatchMan; - this.txtWorkMan.Text = getBreakGround.WorkMan; - this.txtIdNum.Text = getBreakGround.IdNum; + if (!string.IsNullOrEmpty(getBreakGround.WorkLeaderId)) + { + this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getBreakGround.WorkLeaderId); + } + if (!string.IsNullOrEmpty(getBreakGround.HasSpecialProgramme)) + { + this.txtHasSpecialProgramme.Text = getBreakGround.HasSpecialProgramme; + } + if (!string.IsNullOrEmpty(getBreakGround.OtherAttach)) + { + txtOtherAttach.Text = getBreakGround.OtherAttach; + } + if (!string.IsNullOrEmpty(getBreakGround.HasDrawing)) + { + txtHasDrawing.Text = getBreakGround.HasDrawing; + } + if (!string.IsNullOrEmpty(getBreakGround.DrawingDes)) + { + txtDrawingDes.Text = getBreakGround.DrawingDes; + } if (getBreakGround.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getBreakGround.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -92,8 +110,7 @@ public string FlowOperateId2; public string FlowOperateId3; public string FlowOperateId4; - public string FlowOperateId5; - /// + /// /// /// private void SetFlow() @@ -213,53 +230,7 @@ this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); } } - var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); - if (getF5 != null) - { - FlowOperateId5 = getF5.FlowOperateId; - this.txtForm5.Title = getF5.AuditFlowName + "："; - if (getF5.OperaterTime.HasValue) - { - if (getF5.IsAgree == true) - { - this.txtOpinion5.Text = "同意。"; - } - else - { - this.txtOpinion5.Text = getF5.Opinion; - } - if (!string.IsNullOrEmpty(getF5.SignatureUrl)) - { - this.Image5.ImageUrl = "~/" + getF5.SignatureUrl; - } - var signUser5= UserService.GetUserByUserId(getF5.OperaterId); - if (signUser5 != null) - { - this.txtName5.Text = signUser5.UserName; - - } - this.txtTime5.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF5.OperaterTime); - } - } - var getF6 = getFlows.FirstOrDefault(x => x.SortIndex == 6); - if (getF6 != null) - { - this.txtForm6.Title = getF6.AuditFlowName + "："; - if (getF6.OperaterTime.HasValue) - { - if (getF6.IsAgree == true) - { - // this.txtOpinion4.Text = "同意。"; - } - else - { - this.txtOpinion6.Text = getF6.Opinion; - } - this.txtName6.Text = UserService.GetUserNameByUserId(getF4.OperaterId); - this.txtTime6.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - } - } - + } } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs index 0214d996..7d5b5268 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/BreakGroundView.aspx.designer.cs @@ -78,13 +78,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtApplyManName; /// - /// txtWorkPalce 控件。 + /// txtWorkLeader 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtWorkPalce; + protected global::FineUIPro.TextBox txtWorkLeader; /// /// txtWatchMan 控件。 @@ -96,22 +96,49 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtWatchMan; /// - /// txtWorkMan 控件。 + /// txtHasSpecialProgramme 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtWorkMan; + protected global::FineUIPro.TextBox txtHasSpecialProgramme; /// - /// txtIdNum 控件。 + /// txtOtherAttach 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtIdNum; + protected global::FineUIPro.TextBox txtOtherAttach; + + /// + /// txtHasDrawing 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHasDrawing; + + /// + /// txtDrawingDes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDrawingDes; + + /// + /// txtWorkPalce 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkPalce; /// /// txtWorkDate 控件。 @@ -356,105 +383,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime4; - /// - /// txtForm5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm5; - - /// - /// txtOpinion5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion5; - - /// - /// HyperLink5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.HyperLink HyperLink5; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// Image5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Image Image5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - - /// - /// txtForm6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm6; - - /// - /// txtOpinion6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion6; - - /// - /// Label3 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label Label3; - - /// - /// txtName6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName6; - - /// - /// txtTime6 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime6; - /// /// txtCance 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs index 22be0759..0c11e132 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWork.aspx.cs @@ -7,6 +7,7 @@ using System.Data.SqlClient; using System.IO; using System.Linq; using System.Text; +using System.Web.Services.Description; namespace FineUIPro.Web.HSSE.License { @@ -299,7 +300,16 @@ namespace FineUIPro.Web.HSSE.License File.Copy(uploadfilepath, newUrl); ///更新书签 var getFireWork = LicensePublicService.GetFireWorkById(Id); + var projectName = ProjectService.GetProjectNameByProjectId(getFireWork.ProjectId); Document doc = new Aspose.Words.Document(newUrl); + Bookmark bookmarkProjectName = doc.Range.Bookmarks["ProjectName"];//编号 + if (bookmarkProjectName != null) + { + if (!string.IsNullOrEmpty(projectName)) + { + bookmarkProjectName.Text = projectName; + } + } Bookmark bookmarkLicenseCode = doc.Range.Bookmarks["LicenseCode"];//编号 if (bookmarkLicenseCode != null) { @@ -308,32 +318,39 @@ namespace FineUIPro.Web.HSSE.License bookmarkLicenseCode.Text = getFireWork.LicenseCode; } } - Bookmark bookmarkApplyManName = doc.Range.Bookmarks["ApplyManName"];//申请人 - Bookmark bookmarkApplyManName1 = doc.Range.Bookmarks["ApplyManName1"];//申请人 - Bookmark bookmarkApplyManPhone = doc.Range.Bookmarks["ApplyManPhone"];//申请人 - if (bookmarkApplyManName != null) + Bookmark bookmarkWorkLeader = doc.Range.Bookmarks["WorkLeader"];//现场负责人 + if (bookmarkWorkLeader != null) { if (getFireWork != null) { - var getUser = UserService.GetUserByUserId(getFireWork.ApplyManId); + var getUser = UserService.GetUserByUserId(getFireWork.WorkLeaderId) ; if (getUser != null) { - bookmarkApplyManName.Text = getUser.UserName; - if (bookmarkApplyManName1 != null) - { - bookmarkApplyManName1.Text = getUser.UserName; - } - if (bookmarkApplyManPhone != null) - { - bookmarkApplyManPhone.Text = getUser.Telephone; - } + bookmarkWorkLeader.Text = getUser.UserName; } } } + Bookmark bookmarkWorkLeaderTel = doc.Range.Bookmarks["WorkLeaderTel"];//现场负责人电话 + if (bookmarkWorkLeaderTel != null) + { + if (getFireWork != null&&!string.IsNullOrEmpty(getFireWork.WorkLeaderTel)) + { + bookmarkWorkLeaderTel.Text = getFireWork.WorkLeaderTel; + } + } + Bookmark bookmarkFireMan = doc.Range.Bookmarks["FireMan"];//动火人 + if (bookmarkFireMan != null) + { + if (getFireWork != null && !string.IsNullOrEmpty(getFireWork.FireMan)) + { + bookmarkFireMan.Text = getFireWork.FireMan; + } + } + Bookmark bookmarkUnitName = doc.Range.Bookmarks["UnitName"];//申请单位 if (bookmarkUnitName != null) { @@ -346,31 +363,23 @@ namespace FineUIPro.Web.HSSE.License } } + Bookmark bookmarkWorkPalce = doc.Range.Bookmarks["WorkPalce"];//作业地点 if (bookmarkWorkPalce != null) { - if (getFireWork != null) + if (getFireWork != null && !string.IsNullOrEmpty(getFireWork.WorkPalce)) { bookmarkWorkPalce.Text = getFireWork.WorkPalce; } } - Bookmark bookmarkFireWatchManName = doc.Range.Bookmarks["FireWatchManName"];//监火人员 - if (bookmarkFireWatchManName != null) + Bookmark bookmarkOtherAttach = doc.Range.Bookmarks["OtherAttach"];// + if (bookmarkOtherAttach != null && !string.IsNullOrEmpty(getFireWork.OtherAttach)) { - if (getFireWork != null) - { - //var getUser = UserService.GetUserByUserId(getFireWork.FireWatchManId); - //if (getUser != null) - //{ - if (!string.IsNullOrEmpty(getFireWork.FireWatchManName)) - { - bookmarkFireWatchManName.Text = getFireWork.FireWatchManName; - } - //} - - } - } + bookmarkOtherAttach.Text = getFireWork.OtherAttach; + } + + Bookmark bookmarkValidityDate = doc.Range.Bookmarks["ValidityDate"];//有效期限 if (bookmarkValidityDate != null) { @@ -379,325 +388,127 @@ namespace FineUIPro.Web.HSSE.License if (getFireWork.ValidityStartTime.HasValue) { - bookmarkValidityDate.Text = getFireWork.ValidityStartTime.Value.Year + "年" + getFireWork.ValidityStartTime.Value.Month + "月" + getFireWork.ValidityStartTime.Value.Day + "日" + getFireWork.ValidityStartTime.Value.Hour + "时至"; + bookmarkValidityDate.Text = getFireWork.ValidityStartTime.Value.Year + "年" + getFireWork.ValidityStartTime.Value.Month + "月" + getFireWork.ValidityStartTime.Value.Day + "日" + getFireWork.ValidityStartTime.Value.Hour + "时" + getFireWork.ValidityStartTime.Value.Minute + "分至"; if (getFireWork.ValidityEndTime.HasValue) { - bookmarkValidityDate.Text += getFireWork.ValidityEndTime.Value.Year + "年" + getFireWork.ValidityEndTime.Value.Month + "月" + getFireWork.ValidityEndTime.Value.Day + "日" + getFireWork.ValidityEndTime.Value.Hour + "时"; + bookmarkValidityDate.Text += getFireWork.ValidityEndTime.Value.Year + "年" + getFireWork.ValidityEndTime.Value.Month + "月" + getFireWork.ValidityEndTime.Value.Day + "日" + getFireWork.ValidityEndTime.Value.Hour + "时" + getFireWork.ValidityEndTime.Value.Minute + "分"; } } } } Bookmark bookmarkWorkMeasures = doc.Range.Bookmarks["WorkMeasures"];//作业内容 - if (bookmarkWorkMeasures != null) + if (bookmarkWorkMeasures != null && !string.IsNullOrEmpty(getFireWork.WorkMeasures)) { - if (getFireWork != null) - { - bookmarkWorkMeasures.Text = getFireWork.WorkMeasures; - - } + bookmarkWorkMeasures.Text = getFireWork.WorkMeasures; } - Bookmark bookmarkAnalysisData = doc.Range.Bookmarks["AnalysisData"];//分析数据 - if (bookmarkAnalysisData != null&& getFireWork.AnalysisData!=null) + Bookmark bookmarOther1 = doc.Range.Bookmarks["Other1"];//作业内容 + if (bookmarOther1 != null && !string.IsNullOrEmpty(getFireWork.Other1)) { - if (getFireWork != null) - { - bookmarkAnalysisData.Text = getFireWork.AnalysisData; - - } + bookmarOther1.Text = getFireWork.Other1; + } + Bookmark bookmarOther2 = doc.Range.Bookmarks["Other2"];//作业内容 + if (bookmarOther2 != null && !string.IsNullOrEmpty(getFireWork.Other2)) + { + bookmarOther2.Text = getFireWork.Other2; } + Bookmark bookmarkHasSpecial1 = doc.Range.Bookmarks["HasSpecial1"];//分析数据 + Bookmark bookmarkHasSpecial2 = doc.Range.Bookmarks["HasSpecial2"];//分析数据 + if (!string.IsNullOrEmpty(getFireWork.HasSpecialProgramme)) + { + if (getFireWork.HasSpecialProgramme == "是") + { + bookmarkHasSpecial1.Text = "■"; + bookmarkHasSpecial2.Text = "□"; + } + else + { + bookmarkHasSpecial1.Text = "□"; + bookmarkHasSpecial2.Text = "■"; + } + } + else + { + bookmarkHasSpecial2.Text = "□"; + bookmarkHasSpecial1.Text = "□"; + } + bookmarWorkType(doc, getFireWork, "WorkType1", "焊接"); + bookmarWorkType(doc, getFireWork, "WorkType2", "气割"); + bookmarWorkType(doc, getFireWork, "WorkType3", "燃烧"); + bookmarWorkType(doc, getFireWork, "WorkType4", "明火"); + bookmarWorkType(doc, getFireWork, "WorkType5", "研磨"); + bookmarWorkType(doc, getFireWork, "WorkType6", "打磨"); + bookmarWorkType(doc, getFireWork, "WorkType7", "钻孔"); + bookmarWorkType(doc, getFireWork, "WorkType8", "破碎"); + bookmarWorkType(doc, getFireWork, "WorkType9", "其他1"); + bookmarWorkType(doc, getFireWork, "WorkType10", "使用非防爆的电气设备"); + bookmarWorkType(doc, getFireWork, "WorkType11", "使用内燃发动机设备"); + bookmarWorkType(doc, getFireWork, "WorkType12", "其他特种作业"); + bookmarWorkType(doc, getFireWork, "WorkType13", "其他2"); + + bookmarWorkType(doc, getFireWork, "PossibleHazards1", "爆炸"); + bookmarWorkType(doc, getFireWork, "PossibleHazards2", "火灾"); + bookmarWorkType(doc, getFireWork, "PossibleHazards3", "灼伤"); + bookmarWorkType(doc, getFireWork, "PossibleHazards4", "烫伤"); + bookmarWorkType(doc, getFireWork, "PossibleHazards5", "机械伤害"); + bookmarWorkType(doc, getFireWork, "PossibleHazards6", "中毒"); + bookmarWorkType(doc, getFireWork, "PossibleHazards7", "辐射"); + bookmarWorkType(doc, getFireWork, "PossibleHazards8", "触电"); + bookmarWorkType(doc, getFireWork, "PossibleHazards9", "泄漏"); + bookmarWorkType(doc, getFireWork, "PossibleHazards10", "窒息"); + bookmarWorkType(doc, getFireWork, "PossibleHazards11", "坠落"); + bookmarWorkType(doc, getFireWork, "PossibleHazards12", "落物"); + bookmarWorkType(doc, getFireWork, "PossibleHazards13", "掩埋"); + bookmarWorkType(doc, getFireWork, "PossibleHazards14", "噪声"); + bookmarWorkType(doc, getFireWork, "PossibleHazards15", "其他"); + + + + Bookmark bookmarkNeedGasDetection1 = doc.Range.Bookmarks["NeedGasDetection1"];//是否需要气体检测 + Bookmark bookmarkNeedGasDetection2 = doc.Range.Bookmarks["NeedGasDetection2"];//是否需要气体检测 + + if (getFireWork != null && getFireWork.NeedGasDetection == "是") + { + bookmarkNeedGasDetection1.Text = "■"; + bookmarkNeedGasDetection2.Text = "□"; + + } + else + { + bookmarkNeedGasDetection1.Text = "□"; + bookmarkNeedGasDetection2.Text = "■"; + + } + + Bookmark bookmarkDetectionFrequency = doc.Range.Bookmarks["DetectionFrequency"];// 检测频次 + if (bookmarkDetectionFrequency != null && !string.IsNullOrEmpty(getFireWork.DetectionFrequency)) + { + bookmarkDetectionFrequency.Text = getFireWork.DetectionFrequency; + } + + var GetLicenseItemList = LicensePublicService.GetLicenseItemListByDataId(Id); if (GetLicenseItemList.Count > 0) { - var item1 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 1); - if (item1 != null) - { - if (item1.IsUsed == true) - { - Bookmark bookmarkUser1 = doc.Range.Bookmarks["User1"];//确认执行 - if (bookmarkUser1 != null) - { - bookmarkUser1.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit1 = doc.Range.Bookmarks["IsFit1"]; - if (bookmarkIsFit1 != null) - { - if (item1 != null) - { - bookmarkIsFit1.Text = "×"; - } - } - } - } + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 1, "LicenseItemList1"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 2, "LicenseItemList2"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 3, "LicenseItemList3"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 4, "LicenseItemList4"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 5, "LicenseItemList5"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 6, "LicenseItemList6"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 7, "LicenseItemList7"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 8, "LicenseItemList8"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 9, "LicenseItemList9"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 10, "LicenseItemList10"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 11, "LicenseItemList11"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 12, "LicenseItemList12"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 13, "LicenseItemList13"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 14, "LicenseItemList14"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 15, "LicenseItemList15"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 16, "LicenseItemList16"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 17, "LicenseItemList17"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 18, "LicenseItemList18"); - var item2 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 2); - if (item2 != null) - { - if (item2.IsUsed == true) - { - Bookmark bookmarkUser2 = doc.Range.Bookmarks["User2"];//确认执行 - if (bookmarkUser2 != null) - { - bookmarkUser2.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit2 = doc.Range.Bookmarks["IsFit2"]; - if (bookmarkIsFit2 != null) - { - if (item2 != null) - { - bookmarkIsFit2.Text = "×"; - } - } - } - } - var item3 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 3); - if (item3 != null) - { - if (item3.IsUsed == true) - { - Bookmark bookmarkUser3 = doc.Range.Bookmarks["User3"];//确认执行 - if (bookmarkUser3 != null) - { - bookmarkUser3.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit3 = doc.Range.Bookmarks["IsFit3"]; - if (bookmarkIsFit3 != null) - { - if (item3 != null) - { - bookmarkIsFit3.Text = "×"; - } - } - } - } - - var item4 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 4); - if (item4 != null) - { - if (item4.IsUsed == true) - { - Bookmark bookmarkUser4 = doc.Range.Bookmarks["User4"];//确认执行 - if (bookmarkUser4 != null) - { - bookmarkUser4.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit4 = doc.Range.Bookmarks["IsFit4"]; - if (bookmarkIsFit4 != null) - { - if (item4 != null) - { - bookmarkIsFit4.Text = "×"; - } - } - } - } - var item5 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 5); - if (item5 != null) - { - if (item5.IsUsed == true) - { - Bookmark bookmarkUser5 = doc.Range.Bookmarks["User5"];//确认执行 - if (bookmarkUser5 != null) - { - bookmarkUser5.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit5 = doc.Range.Bookmarks["IsFit5"]; - if (bookmarkIsFit5 != null) - { - if (item5 != null) - { - bookmarkIsFit5.Text = "×"; - } - } - } - } - - var item6 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 6); - if (item6 != null) - { - if (item6.IsUsed == true) - { - Bookmark bookmarkUser6 = doc.Range.Bookmarks["User6"];//确认执行 - if (bookmarkUser6 != null) - { - bookmarkUser6.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit6 = doc.Range.Bookmarks["IsFit6"]; - if (bookmarkIsFit6 != null) - { - if (item6 != null) - { - bookmarkIsFit6.Text = "×"; - } - } - } - } - var item7 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 7); - if (item7 != null) - { - if (item7.IsUsed == true) - { - Bookmark bookmarkUser7 = doc.Range.Bookmarks["User7"];//确认执行 - if (bookmarkUser7 != null) - { - bookmarkUser7.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit7 = doc.Range.Bookmarks["IsFit7"]; - if (bookmarkIsFit7 != null) - { - if (item7 != null) - { - bookmarkIsFit7.Text = "×"; - } - } - } - } - - var item8 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 8); - if (item8 != null) - { - if (item8.IsUsed == true) - { - Bookmark bookmarkUser8 = doc.Range.Bookmarks["User8"];//确认执行 - if (bookmarkUser8 != null) - { - bookmarkUser8.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit8 = doc.Range.Bookmarks["IsFit8"]; - if (bookmarkIsFit8 != null) - { - if (item8 != null) - { - bookmarkIsFit8.Text = "×"; - } - } - } - Bookmark bookmarkMeasure8 = doc.Range.Bookmarks["Measure8"];// - if (bookmarkMeasure8 != null) - { - bookmarkMeasure8.Text = item8.SafetyMeasures; - } - - } - - var item9 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 9); - if (item9 != null) - { - if (item9.IsUsed == true) - { - Bookmark bookmarkUser9 = doc.Range.Bookmarks["User9"];//确认执行 - if (bookmarkUser9 != null) - { - bookmarkUser9.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit9 = doc.Range.Bookmarks["IsFit9"]; - if (bookmarkIsFit9 != null) - { - if (item9 != null) - { - bookmarkIsFit9.Text = "×"; - } - } - } - } - - var item10 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 10); - if (item10 != null) - { - if (item10.IsUsed == true) - { - Bookmark bookmarkUser10 = doc.Range.Bookmarks["User10"];//确认执行 - if (bookmarkUser10 != null) - { - bookmarkUser10.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit10 = doc.Range.Bookmarks["IsFit10"]; - if (bookmarkIsFit10 != null) - { - if (item10 != null) - { - bookmarkIsFit10.Text = "×"; - } - } - } - } - var item11 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 11); - if (item11 != null) - { - if (item11.IsUsed == true) - { - Bookmark bookmarkUser11 = doc.Range.Bookmarks["User11"];//确认执行 - if (bookmarkUser11 != null) - { - bookmarkUser11.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit11 = doc.Range.Bookmarks["IsFit11"]; - if (bookmarkIsFit11 != null) - { - if (item11 != null) - { - bookmarkIsFit11.Text = "×"; - } - } - } - } - - var item12 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 12); - if (item12 != null) - { - if (item12.IsUsed == true) - { - Bookmark bookmarkUser12 = doc.Range.Bookmarks["User12"];//确认执行 - if (bookmarkUser12 != null) - { - bookmarkUser12.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit12 = doc.Range.Bookmarks["IsFit12"]; - if (bookmarkIsFit12 != null) - { - if (item12 != null) - { - bookmarkIsFit12.Text = "×"; - } - } - } - } } @@ -865,8 +676,62 @@ namespace FineUIPro.Web.HSSE.License } } } + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4!= null) + { + Bookmark bookmarkOpinion4 = doc.Range.Bookmarks["Opinion4"]; + if (bookmarkOpinion4 != null) + { - Bookmark bookmarkCance = doc.Range.Bookmarks["Cancel"];//取消 + if (getF4.IsAgree == true) + { + if (!string.IsNullOrEmpty(getF4.Opinion)) + { + bookmarkOpinion4.Text = getF4.Opinion; + } + else + { + bookmarkOpinion4.Text = "同意。"; + } + } + else + { + bookmarkOpinion4.Text = "不同意: " + getF4.Opinion; + } + } + if (!string.IsNullOrEmpty(getF4.SignatureUrl) && File.Exists(rootPath + getF4.SignatureUrl)) + { + DocumentBuilder builders = new DocumentBuilder(doc); + var file = rootPath + getF4.SignatureUrl; + builders.MoveToBookmark("OperaterMan4"); + builders.InsertImage(file, 80, 20); + } + else + { + var getUser = UserService.GetUserByUserId(getF4.OperaterId); + if (getUser != null) + { + Bookmark bookmarkOperaterMan4 = doc.Range.Bookmarks["OperaterMan4"]; + if (bookmarkOperaterMan4 != null && getF4.OperaterTime.HasValue) + { + bookmarkOperaterMan4.Text = getUser.UserName; + } + } + } + + + Bookmark bookmarkOperaterTime4 = doc.Range.Bookmarks["OperaterTime4"]; + if (bookmarkOperaterTime4 != null) + { + if (getF4.OperaterTime.HasValue) + { + bookmarkOperaterTime4.Text = string.Format("{0:yyyy年MM月dd日 HH:mm}", getF4.OperaterTime); + } + } + } + + + Bookmark bookmarkCance = doc.Range.Bookmarks["Cancel"];//取消 if (bookmarkCance != null) { if (getFireWork != null) @@ -945,6 +810,50 @@ namespace FineUIPro.Web.HSSE.License File.Delete(newUrl); File.Delete(pdfUrl); } + + private void bookmarWorkType(Document doc, Model.License_FireWork getFireWork, string WorkType1, string WorkType) + { + Bookmark bookmarkWorkType1 = doc.Range.Bookmarks[WorkType1];//分析数据 + if (!string.IsNullOrEmpty(WorkType)) + { + if (!string.IsNullOrEmpty(getFireWork.WorkType) &&getFireWork.WorkType.Contains(WorkType) ) + { + bookmarkWorkType1.Text = "■"; + } + else + { + bookmarkWorkType1.Text = "□"; + } + } + + } + + private void bookmarLicense_LicenseItem(Document doc, List list, int index, string LicenseItem) + { + var item1 = list.FirstOrDefault(x => x.SortIndex == index); + if (item1 != null) + { + Bookmark bookmarkUser1 = doc.Range.Bookmarks[LicenseItem];//确认执行 + + if (item1.IsUsed == true) + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "■" + item1.SafetyMeasures; + } + } + else + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "□" + item1.SafetyMeasures; + } + } + } + + } + + #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx index 027ad329..500e4e76 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx @@ -1,4 +1,4 @@ -<%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FireWorkView.aspx.cs" + <%@ Page Language="C#" AutoEventWireup="true" CodeBehind="FireWorkView.aspx.cs" Inherits="FineUIPro.Web.HSSE.License.FireWorkView" %> @@ -33,6 +33,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -43,7 +125,7 @@ - + @@ -178,7 +260,7 @@ - @@ -232,9 +314,11 @@ function showAttr(index) { switch (index) { + case 0: F.ui.WindowAtt.show("../../<%=GasDetectionAttach%>"); return; case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return; case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return; case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return; + case 4: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return; } } diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs index cca97fb3..fc8c06aa 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.cs @@ -54,6 +54,53 @@ name = UserService.GetUserNameByUserId(getFireWork.FireWatchManId); } this.txtFireWatchManName.Text = name; + if (!string.IsNullOrEmpty(getFireWork.FireMan)) + { + txtFireMan.Text = getFireWork.FireMan; + } + if (!string.IsNullOrEmpty(getFireWork.AnalysisData)) + { + txtAnalysisData.Text = getFireWork.AnalysisData; + } + if (!string.IsNullOrEmpty(getFireWork.WorkLeaderId)) + { + this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getFireWork.WorkLeaderId); + } + if (!string.IsNullOrEmpty(getFireWork.WorkLeaderTel)) + { + this.txtWorkLeaderTel.Text = getFireWork.WorkLeaderTel; + } + if (!string.IsNullOrEmpty(getFireWork.WorkType)) + { + cbWorkType1.SelectedValueArray = getFireWork.WorkType.Split(','); + cbWorkType2.SelectedValueArray = getFireWork.WorkType.Split(','); + } + if (!string.IsNullOrEmpty(getFireWork.PossibleHazards)) + { + cbPossibleHazards1.SelectedValueArray = getFireWork.PossibleHazards.Split(','); + cbPossibleHazards2.SelectedValueArray = getFireWork.PossibleHazards.Split(','); + } + if (!string.IsNullOrEmpty(getFireWork.NeedGasDetection)) + { + txtNeedGasDetection.Text = getFireWork.NeedGasDetection; + } + if (!string.IsNullOrEmpty(getFireWork.DetectionFrequency)) + { + txtDetectionFrequency.Text = getFireWork.DetectionFrequency; + } + if (!string.IsNullOrEmpty(getFireWork.HasSpecialProgramme)) + { + this.txtHasSpecialProgramme.Text = getFireWork.HasSpecialProgramme; + } + if (!string.IsNullOrEmpty(getFireWork.OtherAttach)) + { + txtOtherAttach.Text = getFireWork.OtherAttach; + } + if (!string.IsNullOrEmpty(getFireWork.GasDetectionAttach)) + { + GasDetectionAttach = getFireWork.GasDetectionAttach; + } + if (getFireWork.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getFireWork.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -91,9 +138,11 @@ #endregion #region 获取审核记录信息 + public string GasDetectionAttach; public string FlowOperateId1; public string FlowOperateId2; public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -190,6 +239,8 @@ var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); if (getF4 != null) { + FlowOperateId4 = getF4.FlowOperateId; + this.txtForm4.Title = getF4.AuditFlowName + "："; if (getF4.OperaterTime.HasValue) { diff --git a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs index 15beb759..e5b3bc47 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/FireWorkView.aspx.designer.cs @@ -68,6 +68,105 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtApplyManName; + /// + /// txtWorkLeader 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeader; + + /// + /// txtWorkLeaderTel 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeaderTel; + + /// + /// txtHasSpecialProgramme 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHasSpecialProgramme; + + /// + /// txtOtherAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOtherAttach; + + /// + /// cbWorkType1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbWorkType1; + + /// + /// cbWorkType2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbWorkType2; + + /// + /// cbPossibleHazards1 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbPossibleHazards1; + + /// + /// cbPossibleHazards2 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.CheckBoxList cbPossibleHazards2; + + /// + /// txtNeedGasDetection 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtNeedGasDetection; + + /// + /// txtDetectionFrequency 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtDetectionFrequency; + + /// + /// HyperLink5 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.HyperLink HyperLink5; + /// /// txtWorkPalce 控件。 /// @@ -87,13 +186,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtFireWatchManName; /// - /// TextBox1 控件。 + /// txtFireMan 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox TextBox1; + protected global::FineUIPro.TextBox txtFireMan; /// /// txtWorkDate 控件。 diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs index 36c8c730..8e34d199 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWork.aspx.cs @@ -300,6 +300,8 @@ namespace FineUIPro.Web.HSSE.License File.Copy(uploadfilepath, newUrl); ///更新书签 var getLiftingWork = LicensePublicService.GetLiftingWorkById(Id); + var projectName = ProjectService.GetProjectNameByProjectId(getLiftingWork.ProjectId); + Document doc = new Aspose.Words.Document(newUrl); Bookmark bookmarkLicenseCode = doc.Range.Bookmarks["LicenseCode"];//编号 if (bookmarkLicenseCode != null) @@ -309,6 +311,27 @@ namespace FineUIPro.Web.HSSE.License bookmarkLicenseCode.Text = getLiftingWork.LicenseCode; } } + Bookmark bookmarkProjectName = doc.Range.Bookmarks["ProjectName"];//编号 + if (bookmarkProjectName != null) + { + if (!string.IsNullOrEmpty(projectName)) + { + bookmarkProjectName.Text = projectName; + } + } + Bookmark bookmarkWorkLeader = doc.Range.Bookmarks["WorkLeader"];//现场负责人 + if (bookmarkWorkLeader != null) + { + if (getLiftingWork != null) + { + var getUser = UserService.GetUserByUserId(getLiftingWork.WorkLeaderId); + if (getUser != null) + { + bookmarkWorkLeader.Text = getUser.UserName; + } + + } + } Bookmark bookmarkApplyManName = doc.Range.Bookmarks["ApplyManName"];//申请人 Bookmark bookmarkApplyManName1 = doc.Range.Bookmarks["ApplyManName1"];//申请人 Bookmark bookmarkApplyManPhone = doc.Range.Bookmarks["ApplyManPhone"];//申请人 @@ -416,10 +439,10 @@ namespace FineUIPro.Web.HSSE.License if (getLiftingWork.ValidityStartTime.HasValue) { - bookmarkValidityDate.Text = getLiftingWork.ValidityStartTime.Value.Year + "年" + getLiftingWork.ValidityStartTime.Value.Month + "月" + getLiftingWork.ValidityStartTime.Value.Day + "日" + getLiftingWork.ValidityStartTime.Value.Hour + "时至"; + bookmarkValidityDate.Text = getLiftingWork.ValidityStartTime.Value.Year + "年" + getLiftingWork.ValidityStartTime.Value.Month + "月" + getLiftingWork.ValidityStartTime.Value.Day + "日" + getLiftingWork.ValidityStartTime.Value.Hour + "时" + getLiftingWork.ValidityStartTime.Value.Minute + "分至"; if (getLiftingWork.ValidityEndTime.HasValue) { - bookmarkValidityDate.Text += getLiftingWork.ValidityEndTime.Value.Year + "年" + getLiftingWork.ValidityEndTime.Value.Month + "月" + getLiftingWork.ValidityEndTime.Value.Day + "日" + getLiftingWork.ValidityEndTime.Value.Hour + "时"; + bookmarkValidityDate.Text += getLiftingWork.ValidityEndTime.Value.Year + "年" + getLiftingWork.ValidityEndTime.Value.Month + "月" + getLiftingWork.ValidityEndTime.Value.Day + "日" + getLiftingWork.ValidityEndTime.Value.Hour + "时" + getLiftingWork.ValidityEndTime.Value.Minute + "分"; } } } @@ -442,363 +465,92 @@ namespace FineUIPro.Web.HSSE.License } } + Bookmark bookmarkCapacityDes = doc.Range.Bookmarks["CapacityDes"];//规格 + if (bookmarkCapacityDes != null) + { + if (getLiftingWork != null) + { + bookmarkCapacityDes.Text = getLiftingWork.CapacityDes; + + } + } + Bookmark bookmarkOtherAttach = doc.Range.Bookmarks["OtherAttach"];//规格 + if (bookmarkOtherAttach != null) + { + if (getLiftingWork != null) + { + bookmarkOtherAttach.Text = getLiftingWork.OtherAttach; + + } + } + Bookmark bookmarkHasSpecial1 = doc.Range.Bookmarks["HasSpecial1"];//分析数据 + Bookmark bookmarkHasSpecial2 = doc.Range.Bookmarks["HasSpecial2"];//分析数据 + if (!string.IsNullOrEmpty(getLiftingWork.HasSpecialProgramme)) + { + if (getLiftingWork.HasSpecialProgramme == "是") + { + bookmarkHasSpecial1.Text = "■"; + bookmarkHasSpecial2.Text = "□"; + } + else + { + bookmarkHasSpecial1.Text = "□"; + bookmarkHasSpecial2.Text = "■"; + } + } + else + { + bookmarkHasSpecial2.Text = "□"; + bookmarkHasSpecial1.Text = "□"; + } + Bookmark bookmarkWorkLevel = doc.Range.Bookmarks["WorkLevel"];//分析数据 + if (!string.IsNullOrEmpty(getLiftingWork.WorkLevel)) + { + if (getLiftingWork.WorkLevel == "m ＞100t（一级）") + { + bookmarkWorkLevel.Text = "■ m ＞100t（一级） □ 40t ≤ m ≤100t（二级） □ m ＜40t（三级）"; + } + else if(getLiftingWork.WorkLevel == "40t ≤ m ≤100t（二级）") + { + bookmarkWorkLevel.Text = "□ m ＞100t（一级） ■ 40t ≤ m ≤100t（二级） □ m ＜40t（三级）"; + + } else if (getLiftingWork.WorkLevel == "m ＜40t（三级）") + { + bookmarkWorkLevel.Text = "□ m ＞100t（一级） □40t ≤ m ≤100t（二级） ■ m ＜40t（三级）"; + + } + else + { + bookmarkWorkLevel.Text = "□ m ＞100t（一级） □40t ≤ m ≤100t（二级） □ m ＜40t（三级）"; + + } + } + var GetLicenseItemList = LicensePublicService.GetLicenseItemListByDataId(Id); if (GetLicenseItemList.Count > 0) { - var item1 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 1); - if (item1 != null) - { - if (item1.IsUsed == true) - { - Bookmark bookmarkUser1 = doc.Range.Bookmarks["User1"];//确认执行 - if (bookmarkUser1 != null) - { - bookmarkUser1.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit1 = doc.Range.Bookmarks["IsFit1"]; - if (bookmarkIsFit1 != null) - { - if (item1 != null) - { - bookmarkIsFit1.Text = "×"; - } - } - } - } - - - - var item2 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 2); - if (item2 != null) - { - if (item2.IsUsed == true) - { - Bookmark bookmarkUser2 = doc.Range.Bookmarks["User2"];//确认执行 - if (bookmarkUser2 != null) - { - bookmarkUser2.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit2 = doc.Range.Bookmarks["IsFit2"]; - if (bookmarkIsFit2 != null) - { - if (item2 != null) - { - bookmarkIsFit2.Text = "×"; - } - } - } - } - var item3 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 3); - if (item3 != null) - { - if (item3.IsUsed == true) - { - Bookmark bookmarkUser3 = doc.Range.Bookmarks["User3"];//确认执行 - if (bookmarkUser3 != null) - { - bookmarkUser3.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit3 = doc.Range.Bookmarks["IsFit3"]; - if (bookmarkIsFit3 != null) - { - if (item3 != null) - { - bookmarkIsFit3.Text = "×"; - } - } - } - } - - var item4 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 4); - if (item4 != null) - { - if (item4.IsUsed == true) - { - Bookmark bookmarkUser4 = doc.Range.Bookmarks["User4"];//确认执行 - if (bookmarkUser4 != null) - { - bookmarkUser4.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit4 = doc.Range.Bookmarks["IsFit4"]; - if (bookmarkIsFit4 != null) - { - if (item4 != null) - { - bookmarkIsFit4.Text = "×"; - } - } - } - } - var item5 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 5); - if (item5 != null) - { - if (item5.IsUsed == true) - { - Bookmark bookmarkUser5 = doc.Range.Bookmarks["User5"];//确认执行 - if (bookmarkUser5 != null) - { - bookmarkUser5.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit5 = doc.Range.Bookmarks["IsFit5"]; - if (bookmarkIsFit5 != null) - { - if (item5 != null) - { - bookmarkIsFit5.Text = "×"; - } - } - } - } - - var item6 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 6); - if (item6 != null) - { - if (item6.IsUsed == true) - { - Bookmark bookmarkUser6 = doc.Range.Bookmarks["User6"];//确认执行 - if (bookmarkUser6 != null) - { - bookmarkUser6.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit6 = doc.Range.Bookmarks["IsFit6"]; - if (bookmarkIsFit6 != null) - { - if (item6 != null) - { - bookmarkIsFit6.Text = "×"; - } - } - } - } - var item7 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 7); - if (item7 != null) - { - if (item7.IsUsed == true) - { - Bookmark bookmarkUser7 = doc.Range.Bookmarks["User7"];//确认执行 - if (bookmarkUser7 != null) - { - bookmarkUser7.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit7 = doc.Range.Bookmarks["IsFit7"]; - if (bookmarkIsFit7 != null) - { - if (item7 != null) - { - bookmarkIsFit7.Text = "×"; - } - } - } - } - - var item8 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 8); - if (item8 != null) - { - if (item8.IsUsed == true) - { - Bookmark bookmarkUser8 = doc.Range.Bookmarks["User8"];//确认执行 - if (bookmarkUser8 != null) - { - bookmarkUser8.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit8 = doc.Range.Bookmarks["IsFit8"]; - if (bookmarkIsFit8 != null) - { - if (item8 != null) - { - bookmarkIsFit8.Text = "×"; - } - } - } - } - - var item9 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 9); - if (item9 != null) - { - if (item9.IsUsed == true) - { - Bookmark bookmarkUser9 = doc.Range.Bookmarks["User9"];//确认执行 - if (bookmarkUser9 != null) - { - bookmarkUser9.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit9 = doc.Range.Bookmarks["IsFit9"]; - if (bookmarkIsFit9 != null) - { - if (item9 != null) - { - bookmarkIsFit9.Text = "×"; - } - } - } - } - - var item10 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 10); - if (item10 != null) - { - if (item10.IsUsed == true) - { - Bookmark bookmarkUser10 = doc.Range.Bookmarks["User10"];//确认执行 - if (bookmarkUser10 != null) - { - bookmarkUser10.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit10 = doc.Range.Bookmarks["IsFit10"]; - if (bookmarkIsFit10 != null) - { - if (item10 != null) - { - bookmarkIsFit10.Text = "×"; - } - } - } - } - var item11 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 11); - if (item11 != null) - { - if (item11.IsUsed == true) - { - Bookmark bookmarkUser11 = doc.Range.Bookmarks["User11"];//确认执行 - if (bookmarkUser11 != null) - { - bookmarkUser11.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit11 = doc.Range.Bookmarks["IsFit11"]; - if (bookmarkIsFit11 != null) - { - if (item11 != null) - { - bookmarkIsFit11.Text = "×"; - } - } - } - } - - var item12 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 12); - if (item12 != null) - { - if (item12.IsUsed == true) - { - Bookmark bookmarkUser12 = doc.Range.Bookmarks["User12"];//确认执行 - if (bookmarkUser12 != null) - { - bookmarkUser12.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit12 = doc.Range.Bookmarks["IsFit12"]; - if (bookmarkIsFit12 != null) - { - if (item12 != null) - { - bookmarkIsFit12.Text = "×"; - } - } - } - } - var item13 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 13); - if (item13 != null) - { - if (item13.IsUsed == true) - { - Bookmark bookmarkUser13 = doc.Range.Bookmarks["User13"];//确认执行 - if (bookmarkUser13 != null) - { - bookmarkUser13.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit13 = doc.Range.Bookmarks["IsFit13"]; - if (bookmarkIsFit13 != null) - { - if (item13 != null) - { - bookmarkIsFit13.Text = "×"; - } - } - } - } - var item14 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 14); - if (item14 != null) - { - if (item14.IsUsed == true) - { - Bookmark bookmarkUser14 = doc.Range.Bookmarks["User14"];//确认执行 - if (bookmarkUser14 != null) - { - bookmarkUser14.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit14 = doc.Range.Bookmarks["IsFit14"]; - if (bookmarkIsFit14 != null) - { - if (item14 != null) - { - bookmarkIsFit14.Text = "×"; - } - } - } - } - var item15 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 15); - if (item15 != null) - { - if (item15.IsUsed == true) - { - Bookmark bookmarkUser15 = doc.Range.Bookmarks["User15"];//确认执行 - if (bookmarkUser15 != null) - { - bookmarkUser15.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit15 = doc.Range.Bookmarks["IsFit15"]; - if (bookmarkIsFit15 != null) - { - if (item15 != null) - { - bookmarkIsFit15.Text = "×"; - } - } - } - } + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 1, "LicenseItemList1"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 2, "LicenseItemList2"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 3, "LicenseItemList3"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 4, "LicenseItemList4"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 5, "LicenseItemList5"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 6, "LicenseItemList6"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 7, "LicenseItemList7"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 8, "LicenseItemList8"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 9, "LicenseItemList9"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 10, "LicenseItemList10"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 11, "LicenseItemList11"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 12, "LicenseItemList12"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 13, "LicenseItemList13"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 14, "LicenseItemList14"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 15, "LicenseItemList15"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 16, "LicenseItemList16"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 17, "LicenseItemList17"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 18, "LicenseItemList18"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 19, "LicenseItemList19"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 20, "LicenseItemList20"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 21, "LicenseItemList21"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 22, "LicenseItemList22"); } //审核记录 var getFlows = LicensePublicService.GetFlowOperateListByDataId(Id); @@ -960,59 +712,59 @@ namespace FineUIPro.Web.HSSE.License } } } - //var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); - //if (getF4 != null) - //{ - // var getUser = UserService.GetUserByUserId(getF4.OperaterId); - // Bookmark bookmarkOpinion4 = doc.Range.Bookmarks["Opinion4"]; - // if (bookmarkOpinion4 != null) - // { + var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); + if (getF4 != null) + { + var getUser = UserService.GetUserByUserId(getF4.OperaterId); + Bookmark bookmarkOpinion4 = doc.Range.Bookmarks["Opinion4"]; + if (bookmarkOpinion4 != null) + { - // if (getUser != null) - // { - // if (getF4.IsAgree == true) - // { - // bookmarkOpinion4.Text = getF4.Opinion; - // } - // else - // { - // bookmarkOpinion4.Text = "不同意: " + getF4.Opinion; - // } - // } + if (getUser != null) + { + if (getF4.IsAgree == true) + { + bookmarkOpinion4.Text = getF4.Opinion; + } + else + { + bookmarkOpinion4.Text = "不同意: " + getF4.Opinion; + } + } - // } - // Bookmark bookmarkOperaterMan4 = doc.Range.Bookmarks["OperaterMan4"]; - // if (bookmarkOperaterMan4 != null) - // { - // if (getF4.OperaterTime.HasValue) - // { - // if (getUser != null) - // { - // DocumentBuilder builders = new DocumentBuilder(doc); - // if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) - // { - // var file = rootPath + getUser.SignatureUrl; - // builders.MoveToBookmark("OperaterMan4"); - // builders.InsertImage(file, 80, 20); - // } - // else - // { - // bookmarkOperaterMan4.Text = getUser.UserName; - // } - // } - // } - // } - // Bookmark bookmarkOperaterTime4 = doc.Range.Bookmarks["OperaterTime4"]; - // if (bookmarkOperaterTime4 != null) - // { - // if (getF4.OperaterTime.HasValue) - // { - // bookmarkOperaterTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); - // } - // } - //} + } + Bookmark bookmarkOperaterMan4 = doc.Range.Bookmarks["OperaterMan4"]; + if (bookmarkOperaterMan4 != null) + { + if (getF4.OperaterTime.HasValue) + { + if (getUser != null) + { + DocumentBuilder builders = new DocumentBuilder(doc); + if (!string.IsNullOrEmpty(getUser.SignatureUrl) && File.Exists(rootPath + getUser.SignatureUrl)) + { + var file = rootPath + getUser.SignatureUrl; + builders.MoveToBookmark("OperaterMan4"); + builders.InsertImage(file, 80, 20); + } + else + { + bookmarkOperaterMan4.Text = getUser.UserName; + } + } + } + } + Bookmark bookmarkOperaterTime4 = doc.Range.Bookmarks["OperaterTime4"]; + if (bookmarkOperaterTime4 != null) + { + if (getF4.OperaterTime.HasValue) + { + bookmarkOperaterTime4.Text = string.Format("{0:yyyy年MM月dd日 HH:mm}", getF4.OperaterTime); + } + } + } //var getF5 = getFlows.FirstOrDefault(x => x.SortIndex == 5); //if (getF5 != null) //{ @@ -1200,6 +952,30 @@ namespace FineUIPro.Web.HSSE.License File.Delete(newUrl); File.Delete(pdfUrl); } + private void bookmarLicense_LicenseItem(Document doc, List list, int index, string LicenseItem) + { + var item1 = list.FirstOrDefault(x => x.SortIndex == index); + if (item1 != null) + { + Bookmark bookmarkUser1 = doc.Range.Bookmarks[LicenseItem];//确认执行 + + if (item1.IsUsed == true) + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "■" + item1.SafetyMeasures; + } + } + else + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "□" + item1.SafetyMeasures; + } + } + } + + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx index 4ecee326..df3967fa 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx @@ -21,62 +21,71 @@ - + - + - + - - + + - + - + - + - + - - - + + + + + + + + - - - - - + + + + + - + - + + + - + + + - + + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全审核："> @@ -126,7 +135,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位施工经理审批："> @@ -153,7 +162,7 @@ + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包安全审批："> @@ -175,8 +184,8 @@ - diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs index 4610c953..bea63ca0 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.cs @@ -48,12 +48,8 @@ this.txtApplyUnit.Text = UnitService.GetUnitNameByUnitId(getLiftingWork.ApplyUnitId); this.txtApplyManName.Text = UserService.GetUserNameByUserId(getLiftingWork.ApplyManId); this.txtWorkPalce.Text = getLiftingWork.WorkPalce; - this.txtSafeMan.Text = getLiftingWork.SafeMan; this.txtControlMan.Text = getLiftingWork.ControlMan; this.txtDriverMan.Text = getLiftingWork.DriverMan; - this.txtCarNum.Text = getLiftingWork.CarNum; - this.txtOtherMan.Text = getLiftingWork.OtherMan; - this.txtWatchMan.Text = getLiftingWork.WatchMan; if (getLiftingWork.ValidityStartTime.HasValue) { this.txtWorkDate.Text = getLiftingWork.ValidityStartTime.Value.ToString("f") + " 至 "; @@ -62,8 +58,22 @@ this.txtWorkDate.Text += getLiftingWork.ValidityEndTime.Value.ToString("f"); } } + if (!string.IsNullOrEmpty(getLiftingWork.WorkLeaderId)) + { + this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getLiftingWork.WorkLeaderId); + } + if (!string.IsNullOrEmpty(getLiftingWork.HasSpecialProgramme)) + { + this.txtHasSpecialProgramme.Text = getLiftingWork.HasSpecialProgramme; + } + if (!string.IsNullOrEmpty(getLiftingWork.OtherAttach)) + { + txtOtherAttach.Text = getLiftingWork.OtherAttach; + } this.txtWorkMeasures.Text = getLiftingWork.WorkMeasures; this.txtCraneCapacity.Text = getLiftingWork.CraneCapacity; + this.txtWorkLevel.Text = getLiftingWork.WorkLevel; + this.txtCapacityDes.Text = getLiftingWork.CapacityDes; if (!string.IsNullOrEmpty(getLiftingWork.CancelManId)) { this.txtCance.Text = UserService.GetUserNameByUserId(getLiftingWork.CancelManId) + "；取消时间：" diff --git a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs index dcd64360..767adde3 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/LiftingWorkView.aspx.designer.cs @@ -69,22 +69,22 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtApplyManName; /// - /// txtWorkPalce 控件。 + /// txtWorkLeader 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtWorkPalce; + protected global::FineUIPro.TextBox txtWorkLeader; /// - /// txtSafeMan 控件。 + /// txtWorkLevel 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtSafeMan; + protected global::FineUIPro.TextBox txtWorkLevel; /// /// txtControlMan 控件。 @@ -104,33 +104,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtDriverMan; - /// - /// txtCarNum 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtCarNum; - - /// - /// txtOtherMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtOtherMan; - - /// - /// txtWatchMan 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextBox txtWatchMan; - /// /// txtWorkDate 控件。 /// @@ -140,6 +113,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtWorkDate; + /// + /// txtWorkPalce 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkPalce; + /// /// txtWorkMeasures 控件。 /// @@ -149,6 +131,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtWorkMeasures; + /// + /// txtCapacityDes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtCapacityDes; + /// /// txtCraneCapacity 控件。 /// @@ -158,6 +149,24 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtCraneCapacity; + /// + /// txtHasSpecialProgramme 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtHasSpecialProgramme; + + /// + /// txtOtherAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOtherAttach; + /// /// Grid1 控件。 /// @@ -348,13 +357,13 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextArea txtOpinion4; /// - /// Label5 控件。 + /// HyperLink4 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.Label Label5; + protected global::FineUIPro.HyperLink HyperLink4; /// /// txtName4 控件。 @@ -365,6 +374,15 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtName4; + /// + /// Image4 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.Image Image4; + /// /// txtTime4 控件。 /// diff --git a/SGGL/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs index 122de82b..9eaa5902 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/TempElectricity.aspx.cs @@ -299,7 +299,16 @@ namespace FineUIPro.Web.HSSE.License File.Copy(uploadfilepath, newUrl); ///更新书签 var getTempElectricity = LicensePublicService.GetTempElectricityById(Id); + var projectName = ProjectService.GetProjectNameByProjectId(getTempElectricity.ProjectId); Document doc = new Aspose.Words.Document(newUrl); + Bookmark bookmarkProjectName = doc.Range.Bookmarks["ProjectName"];//编号 + if (bookmarkProjectName != null) + { + if (!string.IsNullOrEmpty(projectName)) + { + bookmarkProjectName.Text = projectName; + } + } Bookmark bookmarkLicenseCode = doc.Range.Bookmarks["LicenseCode"];//编号 if (bookmarkLicenseCode != null) { @@ -308,29 +317,20 @@ namespace FineUIPro.Web.HSSE.License bookmarkLicenseCode.Text = getTempElectricity.LicenseCode; } } - Bookmark bookmarkApplyManName = doc.Range.Bookmarks["ApplyManName"];//申请人 - Bookmark bookmarkApplyManName1= doc.Range.Bookmarks["ApplyManName1"];//申请人 - Bookmark bookmarkApplyManPhone = doc.Range.Bookmarks["ApplyManPhone"];//申请人 - if (bookmarkApplyManName != null) + Bookmark bookmarkWorkLeader = doc.Range.Bookmarks["WorkLeader"];//现场负责人 + if (bookmarkWorkLeader != null) { if (getTempElectricity != null) { - var getUser = UserService.GetUserByUserId(getTempElectricity.ApplyManId); + var getUser = UserService.GetUserByUserId(getTempElectricity.WorkLeaderId); if (getUser != null) { - bookmarkApplyManName.Text = getUser.UserName; - if (bookmarkApplyManName1 != null) - { - bookmarkApplyManName1.Text = getUser.UserName; - } - if (bookmarkApplyManPhone != null) - { - bookmarkApplyManPhone.Text = getUser.Telephone; - } + bookmarkWorkLeader.Text = getUser.UserName; } } } + Bookmark bookmarkUnitName = doc.Range.Bookmarks["UnitName"];//申请单位 if (bookmarkUnitName != null) { @@ -343,28 +343,71 @@ namespace FineUIPro.Web.HSSE.License } } - Bookmark bookmarkWorkPalce = doc.Range.Bookmarks["WorkPalce"];//作业地点 + Bookmark bookmarkUseTo = doc.Range.Bookmarks["UseTo"];//用电用途 + if (bookmarkUseTo != null) + { + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.UseTo)) + { + bookmarkUseTo.Text = getTempElectricity.UseTo; + + } + } + Bookmark bookmarkWorkPalce = doc.Range.Bookmarks["WorkPalce"];//用电地点 if (bookmarkWorkPalce != null) { - if (getTempElectricity != null) + if (getTempElectricity != null &&!string.IsNullOrEmpty(getTempElectricity.WorkPalce)) { bookmarkWorkPalce.Text = getTempElectricity.WorkPalce; } } - Bookmark bookmarkElectrician = doc.Range.Bookmarks["Electrician"];//监火人员 + Bookmark bookmarkAccessPoint = doc.Range.Bookmarks["AccessPoint"];//接入点名称 + if (bookmarkAccessPoint != null) + { + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.AccessPoint)) + { + bookmarkAccessPoint.Text = getTempElectricity.AccessPoint; + + } + } + + Bookmark bookmarkAccessPointNo = doc.Range.Bookmarks["AccessPointNo"];//接入点编号 + if (bookmarkAccessPointNo != null) + { + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.AccessPointNo)) + { + bookmarkAccessPointNo.Text = getTempElectricity.AccessPointNo; + + } + } + Bookmark bookmarkAccessPointAddress = doc.Range.Bookmarks["AccessPointAddress"];//接入点位置 + if (bookmarkAccessPointAddress != null) + { + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.AccessPointAddress)) + { + bookmarkAccessPointAddress.Text = getTempElectricity.AccessPointAddress; + + } + } + Bookmark bookmarkWorkingVoltage = doc.Range.Bookmarks["WorkingVoltage"];//接入点位置 + if (bookmarkWorkingVoltage != null) + { + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.WorkingVoltage)) + { + bookmarkWorkingVoltage.Text = getTempElectricity.WorkingVoltage; + + } + } + Bookmark bookmarkElectrician = doc.Range.Bookmarks["Electrician"];// 电气专业人员 姓名及手机号 + if (bookmarkElectrician != null) { if (getTempElectricity != null) { - var getUser = UserService.GetUserByUserId(getTempElectricity.Electrician); - if (getUser != null) - { - bookmarkElectrician.Text = getUser.UserName; - } - + bookmarkElectrician.Text = getTempElectricity.Electrician + "\n" + getTempElectricity.ElectricianPhone; } } + Bookmark bookmarkWatchManName = doc.Range.Bookmarks["WatchManName"];//监火人员 if (bookmarkWatchManName != null) { @@ -391,15 +434,22 @@ namespace FineUIPro.Web.HSSE.License if (getTempElectricity.ValidityStartTime.HasValue) { - bookmarkValidityDate.Text = getTempElectricity.ValidityStartTime.Value.Year + "年" + getTempElectricity.ValidityStartTime.Value.Month + "月" + getTempElectricity.ValidityStartTime.Value.Day + "日" + getTempElectricity.ValidityStartTime.Value.Hour + "时至"; + bookmarkValidityDate.Text = getTempElectricity.ValidityStartTime.Value.Year + "年" + getTempElectricity.ValidityStartTime.Value.Month + "月" + getTempElectricity.ValidityStartTime.Value.Day + "日" + getTempElectricity.ValidityStartTime.Value.Hour + "时"+ getTempElectricity.ValidityStartTime.Value.Minute + "分至"; if (getTempElectricity.ValidityEndTime.HasValue) { - bookmarkValidityDate.Text += getTempElectricity.ValidityEndTime.Value.Year + "年" + getTempElectricity.ValidityEndTime.Value.Month + "月" + getTempElectricity.ValidityEndTime.Value.Day + "日" + getTempElectricity.ValidityEndTime.Value.Hour + "时"; + bookmarkValidityDate.Text += getTempElectricity.ValidityEndTime.Value.Year + "年" + getTempElectricity.ValidityEndTime.Value.Month + "月" + getTempElectricity.ValidityEndTime.Value.Day + "日" + getTempElectricity.ValidityEndTime.Value.Hour + "时" + getTempElectricity.ValidityEndTime.Value.Minute + "分"; } } } } - Bookmark bookmarkTools = doc.Range.Bookmarks["Tools"];//监火人员 + + Bookmark bookmarkOtherAttach = doc.Range.Bookmarks["OtherAttach"];// + if (bookmarkOtherAttach != null && !string.IsNullOrEmpty(getTempElectricity.OtherAttach)) + { + bookmarkOtherAttach.Text = getTempElectricity.OtherAttach; + } + + Bookmark bookmarkTools = doc.Range.Bookmarks["Tools"];// if (bookmarkTools != null) { if (getTempElectricity != null&&!string.IsNullOrEmpty(getTempElectricity.Tools)) @@ -411,253 +461,90 @@ namespace FineUIPro.Web.HSSE.License Bookmark bookmarkWorkMeasures = doc.Range.Bookmarks["WorkMeasures"];//作业内容 if (bookmarkWorkMeasures != null) { - if (getTempElectricity != null) + if (getTempElectricity != null && !string.IsNullOrEmpty(getTempElectricity.WorkMeasures)) { bookmarkWorkMeasures.Text = getTempElectricity.WorkMeasures; } } + Bookmark bookmarkEquipmentLoadDes = doc.Range.Bookmarks["EquipmentLoadDes"];//作业内容 + if (bookmarkEquipmentLoadDes != null) + { + if (getTempElectricity != null&&!string.IsNullOrEmpty(getTempElectricity.EquipmentLoadDes)) + { + bookmarkEquipmentLoadDes.Text = getTempElectricity.EquipmentLoadDes; + + } + } + Bookmark bookmarkHasSpecial1 = doc.Range.Bookmarks["HasSpecial1"];// + Bookmark bookmarkHasSpecial2 = doc.Range.Bookmarks["HasSpecial2"];// + if (!string.IsNullOrEmpty(getTempElectricity.HasSpecialProgramme)) + { + if (getTempElectricity.HasSpecialProgramme == "是") + { + bookmarkHasSpecial1.Text = "■"; + bookmarkHasSpecial2.Text = "□"; + } + else + { + bookmarkHasSpecial1.Text = "□"; + bookmarkHasSpecial2.Text = "■"; + } + } + else + { + bookmarkHasSpecial2.Text = "□"; + bookmarkHasSpecial1.Text = "□"; + } + Bookmark bookmarkEquipmentLoadList1 = doc.Range.Bookmarks["EquipmentLoadList1"];// + Bookmark bookmarkEquipmentLoadList2 = doc.Range.Bookmarks["EquipmentLoadList2"];// + if (!string.IsNullOrEmpty(getTempElectricity.EquipmentLoadList)) + { + if (getTempElectricity.EquipmentLoadList == "是") + { + bookmarkEquipmentLoadList1.Text = "■"; + bookmarkEquipmentLoadList2.Text = "□"; + } + else + { + bookmarkEquipmentLoadList1.Text = "□"; + bookmarkEquipmentLoadList2.Text = "■"; + } + } + else + { + bookmarkEquipmentLoadList1.Text = "□"; + bookmarkEquipmentLoadList2.Text = "□"; + } var GetLicenseItemList = LicensePublicService.GetLicenseItemListByDataId(Id); if (GetLicenseItemList.Count > 0) { - var item1 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 1); - if (item1 != null) - { - if (item1.IsUsed == true) - { - Bookmark bookmarkUser1 = doc.Range.Bookmarks["User1"];//确认执行 - if (bookmarkUser1 != null) - { - bookmarkUser1.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit1 = doc.Range.Bookmarks["IsFit1"]; - if (bookmarkIsFit1 != null) - { - if (item1 != null) - { - bookmarkIsFit1.Text = "×"; - } - } - } - } - - var item2 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 2); - if (item2 != null) - { - if (item2.IsUsed == true) - { - Bookmark bookmarkUser2 = doc.Range.Bookmarks["User2"];//确认执行 - if (bookmarkUser2 != null) - { - bookmarkUser2.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit2 = doc.Range.Bookmarks["IsFit2"]; - if (bookmarkIsFit2 != null) - { - if (item2 != null) - { - bookmarkIsFit2.Text = "×"; - } - } - } - } - var item3 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 3); - if (item3 != null) - { - if (item3.IsUsed == true) - { - Bookmark bookmarkUser3 = doc.Range.Bookmarks["User3"];//确认执行 - if (bookmarkUser3 != null) - { - bookmarkUser3.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit3 = doc.Range.Bookmarks["IsFit3"]; - if (bookmarkIsFit3 != null) - { - if (item3 != null) - { - bookmarkIsFit3.Text = "×"; - } - } - } - } - - var item4 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 4); - if (item4 != null) - { - if (item4.IsUsed == true) - { - Bookmark bookmarkUser4 = doc.Range.Bookmarks["User4"];//确认执行 - if (bookmarkUser4 != null) - { - bookmarkUser4.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit4 = doc.Range.Bookmarks["IsFit4"]; - if (bookmarkIsFit4 != null) - { - if (item4 != null) - { - bookmarkIsFit4.Text = "×"; - } - } - } - } - var item5 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 5); - if (item5 != null) - { - if (item5.IsUsed == true) - { - Bookmark bookmarkUser5 = doc.Range.Bookmarks["User5"];//确认执行 - if (bookmarkUser5 != null) - { - bookmarkUser5.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit5 = doc.Range.Bookmarks["IsFit5"]; - if (bookmarkIsFit5 != null) - { - if (item5 != null) - { - bookmarkIsFit5.Text = "×"; - } - } - } - } - - var item6 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 6); - if (item6 != null) - { - if (item6.IsUsed == true) - { - Bookmark bookmarkUser6 = doc.Range.Bookmarks["User6"];//确认执行 - if (bookmarkUser6 != null) - { - bookmarkUser6.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit6 = doc.Range.Bookmarks["IsFit6"]; - if (bookmarkIsFit6 != null) - { - if (item6 != null) - { - bookmarkIsFit6.Text = "×"; - } - } - } - } - var item7 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 7); - if (item7 != null) - { - if (item7.IsUsed == true) - { - Bookmark bookmarkUser7 = doc.Range.Bookmarks["User7"];//确认执行 - if (bookmarkUser7 != null) - { - bookmarkUser7.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit7 = doc.Range.Bookmarks["IsFit7"]; - if (bookmarkIsFit7 != null) - { - if (item7 != null) - { - bookmarkIsFit7.Text = "×"; - } - } - } - } - - var item8 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 8); - if (item8 != null) - { - if (item8.IsUsed == true) - { - Bookmark bookmarkUser8 = doc.Range.Bookmarks["User8"];//确认执行 - if (bookmarkUser8 != null) - { - bookmarkUser8.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit8 = doc.Range.Bookmarks["IsFit8"]; - if (bookmarkIsFit8 != null) - { - if (item8 != null) - { - bookmarkIsFit8.Text = "×"; - } - } - } - } - - var item9 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 9); - if (item9 != null) - { - if (item9.IsUsed == true) - { - Bookmark bookmarkUser9 = doc.Range.Bookmarks["User9"];//确认执行 - if (bookmarkUser9 != null) - { - bookmarkUser9.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit9 = doc.Range.Bookmarks["IsFit9"]; - if (bookmarkIsFit9 != null) - { - if (item9 != null) - { - bookmarkIsFit9.Text = "×"; - } - } - } - } - - var item10 = GetLicenseItemList.FirstOrDefault(x => x.SortIndex == 10); - if (item10 != null) - { - if (item10.IsUsed == true) - { - Bookmark bookmarkUser10 = doc.Range.Bookmarks["User10"];//确认执行 - if (bookmarkUser10 != null) - { - bookmarkUser10.Text = "√"; - } - } - else - { - Bookmark bookmarkIsFit10 = doc.Range.Bookmarks["IsFit10"]; - if (bookmarkIsFit10 != null) - { - if (item10 != null) - { - bookmarkIsFit10.Text = "×"; - } - } - } - } - + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 1, "LicenseItemList1"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 2, "LicenseItemList2"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 3, "LicenseItemList3"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 4, "LicenseItemList4"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 5, "LicenseItemList5"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 6, "LicenseItemList6"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 7, "LicenseItemList7"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 8, "LicenseItemList8"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 9, "LicenseItemList9"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 10, "LicenseItemList10"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 11, "LicenseItemList11"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 12, "LicenseItemList12"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 13, "LicenseItemList13"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 14, "LicenseItemList14"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 15, "LicenseItemList15"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 16, "LicenseItemList16"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 17, "LicenseItemList17"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 18, "LicenseItemList18"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 19, "LicenseItemList19"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 20, "LicenseItemList20"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 21, "LicenseItemList21"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 22, "LicenseItemList22"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 23, "LicenseItemList23"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 24, "LicenseItemList24"); + bookmarLicense_LicenseItem(doc, GetLicenseItemList, 25, "LicenseItemList25"); } //审核记录 @@ -904,6 +791,30 @@ namespace FineUIPro.Web.HSSE.License File.Delete(newUrl); File.Delete(pdfUrl); } + private void bookmarLicense_LicenseItem(Document doc, List list, int index, string LicenseItem) + { + var item1 = list.FirstOrDefault(x => x.SortIndex == index); + if (item1 != null) + { + Bookmark bookmarkUser1 = doc.Range.Bookmarks[LicenseItem];//确认执行 + + if (item1.IsUsed == true) + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "■" + item1.SafetyMeasures; + } + } + else + { + if (bookmarkUser1 != null) + { + bookmarkUser1.Text = "□" + item1.SafetyMeasures; + } + } + } + + } #endregion } } \ No newline at end of file diff --git a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx index a3e07e11..b35a762d 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx +++ b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx @@ -35,19 +35,60 @@ - + - + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + @@ -92,32 +133,9 @@ - - - - - - - - - - - - - - - - - - - - - + + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="施工单位安全审核："> @@ -140,13 +158,8 @@ - - - - - - + @@ -169,8 +182,13 @@ + + + + + + BodyPadding="5px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right" Title="总包安全审批："> @@ -195,13 +213,10 @@ - - - @@ -292,6 +284,7 @@ case 1: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId1%>"); return; case 2: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId2%>"); return; case 3: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId3%>"); return; + case 4: F.ui.WindowAtt.show("./AttachFile/webuploader.aspx?type=1&toKeyId=<%=FlowOperateId4%>"); return; } } diff --git a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs index f6c0ddd6..27eff7c8 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.cs @@ -50,11 +50,23 @@ this.txtWorkPalce.Text = getFireWork.WorkPalce; this.txtTools.Text = getFireWork.Tools; this.txtElectrician.Text = getFireWork.Electrician; - string name = getFireWork.WatchManName; + string name = getFireWork.WatchManName; + if (!string.IsNullOrEmpty(getFireWork.HasSpecialProgramme)) + { + this.txtHasSpecialProgramme.Text = getFireWork.HasSpecialProgramme; + } + if (!string.IsNullOrEmpty(getFireWork.OtherAttach)) + { + txtOtherAttach.Text = getFireWork.OtherAttach; + } if (string.IsNullOrEmpty(getFireWork.WatchManName)) { name = UserService.GetUserNameByUserId(getFireWork.WatchManId); } + if (!string.IsNullOrEmpty(getFireWork.WorkLeaderId)) + { + this.txtWorkLeader.Text = UserService.GetUserNameByUserId(getFireWork.WorkLeaderId); + } this.txtFireWatchManName.Text = name; if (getFireWork.ValidityStartTime.HasValue) { @@ -65,13 +77,7 @@ } } this.txtWorkMeasures.Text = getFireWork.WorkMeasures; - if (!string.IsNullOrEmpty(getFireWork.SignatureUrl)) - { - this.txtTime0.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getFireWork.ApplyDate); - this.txtOpinion0.Text = "同意。"; - this.txtName0.Text = this.txtApplyManName.Text; - this.Image0.ImageUrl = "~/" + getFireWork.SignatureUrl; - } + if (!string.IsNullOrEmpty(getFireWork.CancelManId)) { @@ -104,6 +110,7 @@ public string FlowOperateId1; public string FlowOperateId2; public string FlowOperateId3; + public string FlowOperateId4; /// /// /// @@ -134,7 +141,7 @@ var signUser1 = UserService.GetUserByUserId(getF1.OperaterId); if (signUser1 != null) { - this.txtName1.Text = signUser1.UserName; + this.txtName1.Text = signUser1.UserName; } this.txtTime1.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF1.OperaterTime); } @@ -163,7 +170,7 @@ if (signUser2 != null) { this.txtName2.Text = signUser2.UserName; - + } this.txtTime2.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF2.OperaterTime); } @@ -192,7 +199,7 @@ var signUser3 = UserService.GetUserByUserId(getF3.OperaterId); if (signUser3 != null) { - this.txtName3.Text = signUser3.UserName; + this.txtName3.Text = signUser3.UserName; } this.txtTime3.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF3.OperaterTime); } @@ -200,22 +207,33 @@ var getF4 = getFlows.FirstOrDefault(x => x.SortIndex == 4); if (getF4 != null) { + FlowOperateId4 = getF4.FlowOperateId; + this.txtForm4.Title = getF4.AuditFlowName + "："; if (getF4.OperaterTime.HasValue) { if (getF4.IsAgree == true) { - // this.txtOpinion4.Text = "同意。"; + this.txtOpinion4.Text = "同意。"; } else { this.txtOpinion4.Text = getF4.Opinion; } - this.txtName4.Text = UserService.GetUserNameByUserId(getF4.OperaterId); + if (!string.IsNullOrEmpty(getF4.SignatureUrl)) + { + this.Image4.ImageUrl = "~/" + getF4.SignatureUrl; + } + + var signUser4= UserService.GetUserByUserId(getF4.OperaterId); + if (signUser4 != null) + { + this.txtName4.Text = signUser4.UserName; + } this.txtTime4.Text = string.Format("{0:yyyy-MM-dd HH:mm}", getF4.OperaterTime); } } - } + } } #endregion diff --git a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.designer.cs index 08fff87f..c7868f1a 100644 --- a/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.designer.cs +++ b/SGGL/FineUIPro.Web/HSSE/License/TempElectricityView.aspx.designer.cs @@ -68,6 +68,33 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtApplyManName; + /// + /// txtWorkLeader 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkLeader; + + /// + /// txtFireWatchManName 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtFireWatchManName; + + /// + /// txtUseTo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtUseTo; + /// /// txtWorkPalce 控件。 /// @@ -77,6 +104,42 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.TextBox txtWorkPalce; + /// + /// txtAccessPoint 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccessPoint; + + /// + /// txtAccessPointNo 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccessPointNo; + + /// + /// txtAccessPointAddress 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtAccessPointAddress; + + /// + /// txtWorkingVoltage 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtWorkingVoltage; + /// /// txtElectrician 控件。 /// @@ -87,13 +150,40 @@ namespace FineUIPro.Web.HSSE.License protected global::FineUIPro.TextBox txtElectrician; /// - /// txtFireWatchManName 控件。 + /// txtHasSpecialProgramme 控件。 /// /// /// 自动生成的字段。 /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 /// - protected global::FineUIPro.TextBox txtFireWatchManName; + protected global::FineUIPro.TextBox txtHasSpecialProgramme; + + /// + /// txtOtherAttach 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtOtherAttach; + + /// + /// txtEquipmentLoadList 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentLoadList; + + /// + /// txtEquipmentLoadDes 控件。 + /// + /// + /// 自动生成的字段。 + /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 + /// + protected global::FineUIPro.TextBox txtEquipmentLoadDes; /// /// txtWorkDate 控件。 @@ -131,60 +221,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Grid Grid1; - /// - /// txtForm0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form txtForm0; - - /// - /// txtOpinion0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea txtOpinion0; - - /// - /// HyperLink0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.HyperLink HyperLink0; - - /// - /// txtName0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName0; - - /// - /// Image0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Image Image0; - - /// - /// txtTime0 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime0; - /// /// txtForm1 控件。 /// @@ -401,60 +437,6 @@ namespace FineUIPro.Web.HSSE.License /// protected global::FineUIPro.Label txtTime4; - /// - /// Form5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Form Form5; - - /// - /// TextArea2 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.TextArea TextArea2; - - /// - /// HyperLink5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.HyperLink HyperLink5; - - /// - /// txtName5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtName5; - - /// - /// Image5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Image Image5; - - /// - /// txtTime5 控件。 - /// - /// - /// 自动生成的字段。 - /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。 - /// - protected global::FineUIPro.Label txtTime5; - /// /// txtCance 控件。 /// diff --git a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs index b74af76c..29335030 100644 --- a/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs +++ b/SGGL/Model/APIItem/HSSE/LicenseDataItem.cs @@ -279,6 +279,22 @@ namespace Model set; } /// + /// 动火作业类型其他1（） + /// + public string Other1 + { + get; + set; + } + /// + /// 动火作业类型其他2（） + /// + public string Other2 + { + get; + set; + } + /// /// 设备及工具（高处） /// public string EquipmentTools @@ -295,7 +311,7 @@ namespace Model set; } /// - /// 作业负责人ID（射线、夜间） + /// 作业负责人ID（动火、射线、夜间） /// public string WorkLeaderId { @@ -303,7 +319,7 @@ namespace Model set; } /// - /// 作业负责人名字（射线、夜间） + /// 作业负责人名字（动火、射线、夜间） /// public string WorkLeaderName { @@ -311,7 +327,7 @@ namespace Model set; } /// - /// 作业负责人电话（射线、夜间） + /// 作业负责人电话（动火、射线、夜间） /// public string WorkLeaderTel { @@ -517,7 +533,144 @@ namespace Model get; set; } + /// + /// 是否附专项安全方案（动火） + /// + public string HasSpecialProgramme + { + get; + set; + } + /// + /// 附检测单（动火） + /// + public string GasDetectionAttach + { + get; + set; + } + /// + /// 其他附件（动火） + /// + public string OtherAttach + { + get; + set; + } + /// + /// 可能产生的危害（动火） + /// + public string PossibleHazards + { + get; + set; + } + /// + /// 是否需要气体检测（动火） + /// + public string NeedGasDetection + { + get; + set; + } + /// + /// 检测频次（动火） + /// + public string DetectionFrequency + { + get; + set; + } + /// + /// 图纸说明（动土） + /// + public string DrawingDes + { + get; + set; + } + /// + /// 是否附图纸（动土） + /// + public string HasDrawing + { + get; + set; + } + /// + /// 用途（临电） + /// + public string UseTo + { + get; + set; + } + /// + /// 接入点（临电） + /// + public string AccessPoint + { + get; + set; + } + /// + /// 接入点编号（临电） + /// + public string AccessPointNo + { + get; + set; + } + /// + /// 接入点地址（临电） + /// + public string AccessPointAddress + { + get; + set; + } + /// + /// 工作电压（临电） + /// + public string WorkingVoltage + { + get; + set; + } + /// + /// 电工电话（临电） + /// + public string ElectricianPhone + { + get; + set; + } + /// + /// 负载清单（临电） + /// + public string EquipmentLoadList + { + get; + set; + } + /// + /// 负载描述（临电） + /// + public string EquipmentLoadDes + { + get; + set; + } + /// + /// + /// + public string CapacityDes + { + get; + set; + } + public string WorkMan1 { get; set; diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs index 228492d3..0f5a9bd7 100644 --- a/SGGL/Model/Model.cs +++ b/SGGL/Model/Model.cs @@ -214923,6 +214923,16 @@ namespace Model private string _IdNum; + private string _WorkLeaderId; + + private string _HasSpecialProgramme; + + private string _OtherAttach; + + private string _HasDrawing; + + private string _DrawingDes; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -214987,6 +214997,16 @@ namespace Model partial void OnWorkManChanged(); partial void OnIdNumChanging(string value); partial void OnIdNumChanged(); + partial void OnWorkLeaderIdChanging(string value); + partial void OnWorkLeaderIdChanged(); + partial void OnHasSpecialProgrammeChanging(string value); + partial void OnHasSpecialProgrammeChanged(); + partial void OnOtherAttachChanging(string value); + partial void OnOtherAttachChanged(); + partial void OnHasDrawingChanging(string value); + partial void OnHasDrawingChanged(); + partial void OnDrawingDesChanging(string value); + partial void OnDrawingDesChanged(); #endregion public License_BreakGround() @@ -215519,6 +215539,106 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderId", DbType="NVarChar(50)")] + public string WorkLeaderId + { + get + { + return this._WorkLeaderId; + } + set + { + if ((this._WorkLeaderId != value)) + { + this.OnWorkLeaderIdChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderId = value; + this.SendPropertyChanged("WorkLeaderId"); + this.OnWorkLeaderIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HasSpecialProgramme", DbType="NVarChar(5)")] + public string HasSpecialProgramme + { + get + { + return this._HasSpecialProgramme; + } + set + { + if ((this._HasSpecialProgramme != value)) + { + this.OnHasSpecialProgrammeChanging(value); + this.SendPropertyChanging(); + this._HasSpecialProgramme = value; + this.SendPropertyChanged("HasSpecialProgramme"); + this.OnHasSpecialProgrammeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="NVarChar(50)")] + public string OtherAttach + { + get + { + return this._OtherAttach; + } + set + { + if ((this._OtherAttach != value)) + { + this.OnOtherAttachChanging(value); + this.SendPropertyChanging(); + this._OtherAttach = value; + this.SendPropertyChanged("OtherAttach"); + this.OnOtherAttachChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HasDrawing", DbType="NVarChar(5)")] + public string HasDrawing + { + get + { + return this._HasDrawing; + } + set + { + if ((this._HasDrawing != value)) + { + this.OnHasDrawingChanging(value); + this.SendPropertyChanging(); + this._HasDrawing = value; + this.SendPropertyChanged("HasDrawing"); + this.OnHasDrawingChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DrawingDes", DbType="NVarChar(500)")] + public string DrawingDes + { + get + { + return this._DrawingDes; + } + set + { + if ((this._DrawingDes != value)) + { + this.OnDrawingDesChanging(value); + this.SendPropertyChanging(); + this._DrawingDes = value; + this.SendPropertyChanged("DrawingDes"); + this.OnDrawingDesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_BreakGround_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -216230,6 +216350,28 @@ namespace Model private string _SignatureUrl; + private string _WorkLeaderId; + + private string _WorkLeaderTel; + + private string _HasSpecialProgramme; + + private string _OtherAttach; + + private string _WorkType; + + private string _Other1; + + private string _Other2; + + private string _PossibleHazards; + + private string _NeedGasDetection; + + private string _DetectionFrequency; + + private string _GasDetectionAttach; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -216294,6 +216436,28 @@ namespace Model partial void OnAnalysisDataChanged(); partial void OnSignatureUrlChanging(string value); partial void OnSignatureUrlChanged(); + partial void OnWorkLeaderIdChanging(string value); + partial void OnWorkLeaderIdChanged(); + partial void OnWorkLeaderTelChanging(string value); + partial void OnWorkLeaderTelChanged(); + partial void OnHasSpecialProgrammeChanging(string value); + partial void OnHasSpecialProgrammeChanged(); + partial void OnOtherAttachChanging(string value); + partial void OnOtherAttachChanged(); + partial void OnWorkTypeChanging(string value); + partial void OnWorkTypeChanged(); + partial void OnOther1Changing(string value); + partial void OnOther1Changed(); + partial void OnOther2Changing(string value); + partial void OnOther2Changed(); + partial void OnPossibleHazardsChanging(string value); + partial void OnPossibleHazardsChanged(); + partial void OnNeedGasDetectionChanging(string value); + partial void OnNeedGasDetectionChanged(); + partial void OnDetectionFrequencyChanging(string value); + partial void OnDetectionFrequencyChanged(); + partial void OnGasDetectionAttachChanging(string value); + partial void OnGasDetectionAttachChanged(); #endregion public License_FireWork() @@ -216811,6 +216975,226 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderId", DbType="NVarChar(50)")] + public string WorkLeaderId + { + get + { + return this._WorkLeaderId; + } + set + { + if ((this._WorkLeaderId != value)) + { + this.OnWorkLeaderIdChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderId = value; + this.SendPropertyChanged("WorkLeaderId"); + this.OnWorkLeaderIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderTel", DbType="NVarChar(50)")] + public string WorkLeaderTel + { + get + { + return this._WorkLeaderTel; + } + set + { + if ((this._WorkLeaderTel != value)) + { + this.OnWorkLeaderTelChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderTel = value; + this.SendPropertyChanged("WorkLeaderTel"); + this.OnWorkLeaderTelChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HasSpecialProgramme", DbType="NVarChar(5)")] + public string HasSpecialProgramme + { + get + { + return this._HasSpecialProgramme; + } + set + { + if ((this._HasSpecialProgramme != value)) + { + this.OnHasSpecialProgrammeChanging(value); + this.SendPropertyChanging(); + this._HasSpecialProgramme = value; + this.SendPropertyChanged("HasSpecialProgramme"); + this.OnHasSpecialProgrammeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="NVarChar(50)")] + public string OtherAttach + { + get + { + return this._OtherAttach; + } + set + { + if ((this._OtherAttach != value)) + { + this.OnOtherAttachChanging(value); + this.SendPropertyChanging(); + this._OtherAttach = value; + this.SendPropertyChanged("OtherAttach"); + this.OnOtherAttachChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkType", DbType="NVarChar(200)")] + public string WorkType + { + get + { + return this._WorkType; + } + set + { + if ((this._WorkType != value)) + { + this.OnWorkTypeChanging(value); + this.SendPropertyChanging(); + this._WorkType = value; + this.SendPropertyChanged("WorkType"); + this.OnWorkTypeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Other1", DbType="NVarChar(50)")] + public string Other1 + { + get + { + return this._Other1; + } + set + { + if ((this._Other1 != value)) + { + this.OnOther1Changing(value); + this.SendPropertyChanging(); + this._Other1 = value; + this.SendPropertyChanged("Other1"); + this.OnOther1Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Other2", DbType="NVarChar(50)")] + public string Other2 + { + get + { + return this._Other2; + } + set + { + if ((this._Other2 != value)) + { + this.OnOther2Changing(value); + this.SendPropertyChanging(); + this._Other2 = value; + this.SendPropertyChanged("Other2"); + this.OnOther2Changed(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PossibleHazards", DbType="NVarChar(100)")] + public string PossibleHazards + { + get + { + return this._PossibleHazards; + } + set + { + if ((this._PossibleHazards != value)) + { + this.OnPossibleHazardsChanging(value); + this.SendPropertyChanging(); + this._PossibleHazards = value; + this.SendPropertyChanged("PossibleHazards"); + this.OnPossibleHazardsChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NeedGasDetection", DbType="NVarChar(5)")] + public string NeedGasDetection + { + get + { + return this._NeedGasDetection; + } + set + { + if ((this._NeedGasDetection != value)) + { + this.OnNeedGasDetectionChanging(value); + this.SendPropertyChanging(); + this._NeedGasDetection = value; + this.SendPropertyChanged("NeedGasDetection"); + this.OnNeedGasDetectionChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DetectionFrequency", DbType="NVarChar(50)")] + public string DetectionFrequency + { + get + { + return this._DetectionFrequency; + } + set + { + if ((this._DetectionFrequency != value)) + { + this.OnDetectionFrequencyChanging(value); + this.SendPropertyChanging(); + this._DetectionFrequency = value; + this.SendPropertyChanged("DetectionFrequency"); + this.OnDetectionFrequencyChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_GasDetectionAttach", DbType="NVarChar(500)")] + public string GasDetectionAttach + { + get + { + return this._GasDetectionAttach; + } + set + { + if ((this._GasDetectionAttach != value)) + { + this.OnGasDetectionAttachChanging(value); + this.SendPropertyChanging(); + this._GasDetectionAttach = value; + this.SendPropertyChanged("GasDetectionAttach"); + this.OnGasDetectionAttachChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_FireWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -220982,6 +221366,14 @@ namespace Model private string _WatchMan; + private string _CapacityDes; + + private string _WorkLeaderId; + + private string _HasSpecialProgramme; + + private string _OtherAttach; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -221052,6 +221444,14 @@ namespace Model partial void OnOtherManChanged(); partial void OnWatchManChanging(string value); partial void OnWatchManChanged(); + partial void OnCapacityDesChanging(string value); + partial void OnCapacityDesChanged(); + partial void OnWorkLeaderIdChanging(string value); + partial void OnWorkLeaderIdChanged(); + partial void OnHasSpecialProgrammeChanging(string value); + partial void OnHasSpecialProgrammeChanged(); + partial void OnOtherAttachChanging(string value); + partial void OnOtherAttachChanged(); #endregion public License_LiftingWork() @@ -221644,6 +222044,86 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CapacityDes", DbType="NVarChar(500)")] + public string CapacityDes + { + get + { + return this._CapacityDes; + } + set + { + if ((this._CapacityDes != value)) + { + this.OnCapacityDesChanging(value); + this.SendPropertyChanging(); + this._CapacityDes = value; + this.SendPropertyChanged("CapacityDes"); + this.OnCapacityDesChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderId", DbType="NVarChar(50)")] + public string WorkLeaderId + { + get + { + return this._WorkLeaderId; + } + set + { + if ((this._WorkLeaderId != value)) + { + this.OnWorkLeaderIdChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderId = value; + this.SendPropertyChanged("WorkLeaderId"); + this.OnWorkLeaderIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HasSpecialProgramme", DbType="NVarChar(5)")] + public string HasSpecialProgramme + { + get + { + return this._HasSpecialProgramme; + } + set + { + if ((this._HasSpecialProgramme != value)) + { + this.OnHasSpecialProgrammeChanging(value); + this.SendPropertyChanging(); + this._HasSpecialProgramme = value; + this.SendPropertyChanged("HasSpecialProgramme"); + this.OnHasSpecialProgrammeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="NVarChar(50)")] + public string OtherAttach + { + get + { + return this._OtherAttach; + } + set + { + if ((this._OtherAttach != value)) + { + this.OnOtherAttachChanging(value); + this.SendPropertyChanging(); + this._OtherAttach = value; + this.SendPropertyChanged("OtherAttach"); + this.OnOtherAttachChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_LiftingWork_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { @@ -226943,6 +227423,28 @@ namespace Model private string _Tools; + private string _WorkLeaderId; + + private string _UseTo; + + private string _AccessPoint; + + private string _AccessPointNo; + + private string _AccessPointAddress; + + private string _WorkingVoltage; + + private string _ElectricianPhone; + + private string _HasSpecialProgramme; + + private string _OtherAttach; + + private string _EquipmentLoadList; + + private string _EquipmentLoadDes; + private EntityRef _Base_Project; private EntityRef _Base_Unit; @@ -227007,6 +227509,28 @@ namespace Model partial void OnElectricianChanged(); partial void OnToolsChanging(string value); partial void OnToolsChanged(); + partial void OnWorkLeaderIdChanging(string value); + partial void OnWorkLeaderIdChanged(); + partial void OnUseToChanging(string value); + partial void OnUseToChanged(); + partial void OnAccessPointChanging(string value); + partial void OnAccessPointChanged(); + partial void OnAccessPointNoChanging(string value); + partial void OnAccessPointNoChanged(); + partial void OnAccessPointAddressChanging(string value); + partial void OnAccessPointAddressChanged(); + partial void OnWorkingVoltageChanging(string value); + partial void OnWorkingVoltageChanged(); + partial void OnElectricianPhoneChanging(string value); + partial void OnElectricianPhoneChanged(); + partial void OnHasSpecialProgrammeChanging(string value); + partial void OnHasSpecialProgrammeChanged(); + partial void OnOtherAttachChanging(string value); + partial void OnOtherAttachChanged(); + partial void OnEquipmentLoadListChanging(string value); + partial void OnEquipmentLoadListChanged(); + partial void OnEquipmentLoadDesChanging(string value); + partial void OnEquipmentLoadDesChanged(); #endregion public License_TempElectricity() @@ -227524,6 +228048,226 @@ namespace Model } } + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkLeaderId", DbType="NVarChar(50)")] + public string WorkLeaderId + { + get + { + return this._WorkLeaderId; + } + set + { + if ((this._WorkLeaderId != value)) + { + this.OnWorkLeaderIdChanging(value); + this.SendPropertyChanging(); + this._WorkLeaderId = value; + this.SendPropertyChanged("WorkLeaderId"); + this.OnWorkLeaderIdChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UseTo", DbType="NVarChar(50)")] + public string UseTo + { + get + { + return this._UseTo; + } + set + { + if ((this._UseTo != value)) + { + this.OnUseToChanging(value); + this.SendPropertyChanging(); + this._UseTo = value; + this.SendPropertyChanged("UseTo"); + this.OnUseToChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccessPoint", DbType="NVarChar(50)")] + public string AccessPoint + { + get + { + return this._AccessPoint; + } + set + { + if ((this._AccessPoint != value)) + { + this.OnAccessPointChanging(value); + this.SendPropertyChanging(); + this._AccessPoint = value; + this.SendPropertyChanged("AccessPoint"); + this.OnAccessPointChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccessPointNo", DbType="NVarChar(50)")] + public string AccessPointNo + { + get + { + return this._AccessPointNo; + } + set + { + if ((this._AccessPointNo != value)) + { + this.OnAccessPointNoChanging(value); + this.SendPropertyChanging(); + this._AccessPointNo = value; + this.SendPropertyChanged("AccessPointNo"); + this.OnAccessPointNoChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_AccessPointAddress", DbType="NVarChar(50)")] + public string AccessPointAddress + { + get + { + return this._AccessPointAddress; + } + set + { + if ((this._AccessPointAddress != value)) + { + this.OnAccessPointAddressChanging(value); + this.SendPropertyChanging(); + this._AccessPointAddress = value; + this.SendPropertyChanged("AccessPointAddress"); + this.OnAccessPointAddressChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkingVoltage", DbType="NVarChar(50)")] + public string WorkingVoltage + { + get + { + return this._WorkingVoltage; + } + set + { + if ((this._WorkingVoltage != value)) + { + this.OnWorkingVoltageChanging(value); + this.SendPropertyChanging(); + this._WorkingVoltage = value; + this.SendPropertyChanged("WorkingVoltage"); + this.OnWorkingVoltageChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ElectricianPhone", DbType="NVarChar(50)")] + public string ElectricianPhone + { + get + { + return this._ElectricianPhone; + } + set + { + if ((this._ElectricianPhone != value)) + { + this.OnElectricianPhoneChanging(value); + this.SendPropertyChanging(); + this._ElectricianPhone = value; + this.SendPropertyChanged("ElectricianPhone"); + this.OnElectricianPhoneChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_HasSpecialProgramme", DbType="NVarChar(5)")] + public string HasSpecialProgramme + { + get + { + return this._HasSpecialProgramme; + } + set + { + if ((this._HasSpecialProgramme != value)) + { + this.OnHasSpecialProgrammeChanging(value); + this.SendPropertyChanging(); + this._HasSpecialProgramme = value; + this.SendPropertyChanged("HasSpecialProgramme"); + this.OnHasSpecialProgrammeChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherAttach", DbType="NVarChar(50)")] + public string OtherAttach + { + get + { + return this._OtherAttach; + } + set + { + if ((this._OtherAttach != value)) + { + this.OnOtherAttachChanging(value); + this.SendPropertyChanging(); + this._OtherAttach = value; + this.SendPropertyChanged("OtherAttach"); + this.OnOtherAttachChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentLoadList", DbType="NVarChar(5)")] + public string EquipmentLoadList + { + get + { + return this._EquipmentLoadList; + } + set + { + if ((this._EquipmentLoadList != value)) + { + this.OnEquipmentLoadListChanging(value); + this.SendPropertyChanging(); + this._EquipmentLoadList = value; + this.SendPropertyChanged("EquipmentLoadList"); + this.OnEquipmentLoadListChanged(); + } + } + } + + [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_EquipmentLoadDes", DbType="NVarChar(50)")] + public string EquipmentLoadDes + { + get + { + return this._EquipmentLoadDes; + } + set + { + if ((this._EquipmentLoadDes != value)) + { + this.OnEquipmentLoadDesChanging(value); + this.SendPropertyChanging(); + this._EquipmentLoadDes = value; + this.SendPropertyChanged("EquipmentLoadDes"); + this.OnEquipmentLoadDesChanged(); + } + } + } + [global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_License_TempElectricity_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)] public Base_Project Base_Project { diff --git a/SGGL/WebAPI/ErrLog.txt b/SGGL/WebAPI/ErrLog.txt index e02abfc9..cd86c551 100644 --- a/SGGL/WebAPI/ErrLog.txt +++ b/SGGL/WebAPI/ErrLog.txt @@ -1 +1,41 @@  + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 BLL.APILicenseDataService.SaveLicenseData(LicenseDataItem newItem) 位置 D:\project\vs\sggl_cd\SGGL\BLL\API\HSSE\APILicenseDataService.cs:行号 1479 + 在 WebAPI.Controllers.LicenseController.SaveLicenseData(LicenseDataItem licenseDataItem) 位置 D:\project\vs\sggl_cd\SGGL\WebAPI\Controllers\HSSE\LicenseController.cs:行号 172 +出错时间:02/05/2024 09:34:48 +出错时间:02/05/2024 09:34:48 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 BLL.APILicenseDataService.SaveLicenseData(LicenseDataItem newItem) 位置 D:\project\vs\sggl_cd\SGGL\BLL\API\HSSE\APILicenseDataService.cs:行号 1479 + 在 WebAPI.Controllers.LicenseController.SaveLicenseData(LicenseDataItem licenseDataItem) 位置 D:\project\vs\sggl_cd\SGGL\WebAPI\Controllers\HSSE\LicenseController.cs:行号 172 +出错时间:02/05/2024 09:35:35 +出错时间:02/05/2024 09:35:35 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 BLL.APILicenseDataService.SaveLicenseData(LicenseDataItem newItem) 位置 D:\project\vs\sggl_cd\SGGL\BLL\API\HSSE\APILicenseDataService.cs:行号 1479 + 在 WebAPI.Controllers.LicenseController.SaveLicenseData(LicenseDataItem licenseDataItem) 位置 D:\project\vs\sggl_cd\SGGL\WebAPI\Controllers\HSSE\LicenseController.cs:行号 172 +出错时间:02/05/2024 09:43:28 +出错时间:02/05/2024 09:43:28 + + +错误信息开始=====> +错误类型:NullReferenceException +错误信息:未将对象引用设置到对象的实例。 +错误堆栈: + 在 BLL.APILicenseDataService.SaveLicenseData(LicenseDataItem newItem) 位置 D:\project\vs\sggl_cd\SGGL\BLL\API\HSSE\APILicenseDataService.cs:行号 1479 + 在 WebAPI.Controllers.LicenseController.SaveLicenseData(LicenseDataItem licenseDataItem) 位置 D:\project\vs\sggl_cd\SGGL\WebAPI\Controllers\HSSE\LicenseController.cs:行号 172 +出错时间:02/05/2024 09:43:51 +出错时间:02/05/2024 09:43:51 +