diff --git a/DataBase/菜单初始化脚本/1-5焊接管理(Menu_HJGL).sql b/DataBase/菜单初始化脚本/1-5焊接管理(Menu_HJGL).sql index a7ec99cf..ef10e48f 100644 --- a/DataBase/菜单初始化脚本/1-5焊接管理(Menu_HJGL).sql +++ b/DataBase/菜单初始化脚本/1-5焊接管理(Menu_HJGL).sql @@ -27,16 +27,16 @@ GO INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1D85B9EB-CFAF-4CF2-BA7D-A25D9E5374C2','8IDKGJE2-09B1-4607-BC6D-865CE48F0014','鿴',5) GO - INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES('8IDKGJE2-09B1-4607-BC6D-865CE48F0009','װ','HJGL/BaseInfo/Components.aspx',30,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1) - GO - /*װ*/ - INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('647F4167-0DBC-4589-994C-71D3F1FBCAB1','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','',1) - INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('E67B14CE-A0FA-424A-B8B7-10E05A516E09','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','޸',2) - INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('5BDA2335-1B97-4FCA-855B-AA108AF13FB6','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','ɾ',3) - INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('094166A4-7CC9-4C21-8DB1-EE02AA2B9B9A','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','',4) - INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B1675007-EA87-4280-BAE0-DE4067CB4FDF','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','鿴',5) - GO + --INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + --VALUES('8IDKGJE2-09B1-4607-BC6D-865CE48F0009','װ','HJGL/BaseInfo/Components.aspx',30,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1) + --GO + --/*װ*/ + -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('647F4167-0DBC-4589-994C-71D3F1FBCAB1','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','',1) + -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('E67B14CE-A0FA-424A-B8B7-10E05A516E09','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','޸',2) + -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('5BDA2335-1B97-4FCA-855B-AA108AF13FB6','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','ɾ',3) + -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('094166A4-7CC9-4C21-8DB1-EE02AA2B9B9A','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','',4) + -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B1675007-EA87-4280-BAE0-DE4067CB4FDF','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','鿴',5) + -- GO -- INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --VALUES('55DB671A-7DEB-4DA4-8429-E66AA69DBE7D','ϱ','HJGL/BaseInfo/MaterialCodeLib.aspx',50,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1) --GO @@ -233,11 +233,11 @@ GO INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'15450068-414a-4dde-a175-3b5a34df85d6',N'6ce0b6bc-aa4d-4f0d-9f1f-75a553810793',N'ɾ',3) INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'21743940-338a-4adc-8753-64bb90c16dd8',N'6ce0b6bc-aa4d-4f0d-9f1f-75a553810793',N'',4) GO - INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) - VALUES ( N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'Ԥύձ',N'HJGL/WeldingManage/PreWeldReportAudit.aspx',40,N'4D36E99E-B3D8-4C61-826A-CBD98EC51515',N'Menu_HJGL',0,1,1) - GO - INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'BED081DC-44FC-40E0-8D15-AC57738CE9D1',N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'',1) - GO + --INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) + --VALUES ( N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'Ԥύձ',N'HJGL/WeldingManage/PreWeldReportAudit.aspx',40,N'4D36E99E-B3D8-4C61-826A-CBD98EC51515',N'Menu_HJGL',0,1,1) + --GO + -- INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'BED081DC-44FC-40E0-8D15-AC57738CE9D1',N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'',1) + --GO INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) VALUES ( N'5TYHMD2F-2582-4DEB-905E-6E9DCFEFBGHO',N'ձ',N'HJGL/WeldingManage/WeldReport.aspx',50,N'4D36E99E-B3D8-4C61-826A-CBD98EC51515',N'Menu_HJGL',0,1,1) GO diff --git a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs index efd8c56f..95784829 100644 --- a/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs +++ b/SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs @@ -180,6 +180,10 @@ namespace BLL db.Check_SpotCheckApprove.InsertOnSubmit(newApprove); db.SubmitChanges(); + if (newApprove.ApproveType != "S" && newApprove.ApproveType != BLL.Const.SpotCheck_Compile) + { + APICommonService.SendSubscribeMessage(approve.ApproveMan, "工序验收待办理", newApprove.ApproveIdea, string.Format("{0:yyyy-MM-dd HH:mm:ss}", DateTime.Now)); + } return newKeyID; } }