lpf
/
SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

This commit is contained in:
李鹏飞 2022-09-15 13:25:57 +08:00
parent d3788a310e 2914b96cd6
commit f4640cf410
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
DataBase/菜单初始化脚本/1-5焊接管理（Menu_HJGL）.sql
View File

@ -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) INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('1D85B9EB-CFAF-4CF2-BA7D-A25D9E5374C2','8IDKGJE2-09B1-4607-BC6D-865CE48F0014','查看',5)
GO GO
INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --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) --VALUES('8IDKGJE2-09B1-4607-BC6D-865CE48F0009','安装组件','HJGL/BaseInfo/Components.aspx',30,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1)
GO --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('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('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('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('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) -- INSERT INTO Sys_ButtonToMenu(ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES('B1675007-EA87-4280-BAE0-DE4067CB4FDF','8IDKGJE2-09B1-4607-BC6D-865CE48F0009','查看',5)
GO -- GO
-- INSERT INTO dbo.Sys_Menu(MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) -- 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) --VALUES('55DB671A-7DEB-4DA4-8429-E66AA69DBE7D','材料编码库','HJGL/BaseInfo/MaterialCodeLib.aspx',50,'60F4B988-4D1D-48D6-A959-2EA4BD2978A1','Menu_HJGL',0,1,1)
--GO --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'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) INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'21743940-338a-4adc-8753-64bb90c16dd8',N'6ce0b6bc-aa4d-4f0d-9f1f-75a553810793',N'保存',4)
GO GO
INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) --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) --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 --GO
INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'BED081DC-44FC-40E0-8D15-AC57738CE9D1',N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'审核',1) -- INSERT Sys_ButtonToMenu (ButtonToMenuId,MenuId,ButtonName,SortIndex) VALUES ( N'BED081DC-44FC-40E0-8D15-AC57738CE9D1',N'294A4F70-B19E-4D84-A09D-484128D9CC19',N'审核',1)
GO --GO
INSERT Sys_Menu (MenuId,MenuName,Url,SortIndex,SuperMenu,MenuType,IsOffice,IsEnd,IsUsed) 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) 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 GO

4
SGGL/BLL/CQMS/Check/SpotCheckApproveService.cs
View File

@ -180,6 +180,10 @@ namespace BLL
db.Check_SpotCheckApprove.InsertOnSubmit(newApprove); db.Check_SpotCheckApprove.InsertOnSubmit(newApprove);
db.SubmitChanges(); 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; return newKeyID;
} }
} }