From a5b12ff9a697c24ef98609d79a98f23d952f4c67 Mon Sep 17 00:00:00 2001 From: shecs <408299694@qq.com> Date: Sun, 26 May 2024 09:08:19 +0800 Subject: [PATCH] 11 --- HJGL/.vs/HJGL/v17/.suo | Bin 1400832 -> 1420800 bytes HJGL/FineUIPro.Web/FineUIPro.Web.csproj.user | 2 +- .../PublicInfo/WPQ/WPQEdit.aspx.cs | 1 + HJGL/FineUIPro.Web/Web.config | 2 +- .../WelderManage/QualifiedProject.aspx.cs | 4 +- .../WeldingManage/PipelineManage.aspx.cs | 2 +- HJGL/WebApi/WebApi.csproj.user | 2 +- .../WebApi.csproj.AssemblyReference.cache | Bin 32130 -> 43182 bytes HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql | 312 ++++++++++++++++++ .../版本日志/HJGLDB_2024.05.17（邮件）.sql | 193 +++++++++++ HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql | 106 ++++++ 11 files changed, 619 insertions(+), 5 deletions(-) create mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql create mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql create mode 100644 HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 49d07f0ce4112890547a24d4a7d28ff800ef4521..9260cd750cd04179083c4a2d145fca0f3cbe24f5 100644 GIT binary patch delta 19127 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 BSAYNj delta 15438 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 ProjectFiles - Debug|Any CPU + Release|Any CPU true diff --git a/HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs b/HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs index 3294351..de67cfe 100644 --- a/HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/PublicInfo/WPQ/WPQEdit.aspx.cs @@ -21,6 +21,7 @@ namespace FineUIPro.Web.PublicInfo.WPQ ckbWelders.DataTextField = "WelderCode"; ckbWelders.DataSource = from x in Funs.DB.Welder_Welder join y in Funs.DB.Welder_ProjectWelder on x.WelderId equals y.WelderId + orderby x.WelderCode where y.ProjectId == CurrUser.LoginProjectId select x; ckbWelders.DataBind(); diff --git a/HJGL/FineUIPro.Web/Web.config b/HJGL/FineUIPro.Web/Web.config index baa8804..8868ed3 100644 --- a/HJGL/FineUIPro.Web/Web.config +++ b/HJGL/FineUIPro.Web/Web.config @@ -51,7 +51,7 @@ - + diff --git a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs index 0e133a4..5a73361 100644 --- a/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs +++ b/HJGL/FineUIPro.Web/WelderManage/QualifiedProject.aspx.cs @@ -95,10 +95,12 @@ namespace FineUIPro.Web.WelderManage { welders = welders.Where(e => e.WelderName.Contains(this.txtWelderNameS.Text.Trim())).ToList(); } + + welders= welders.OrderBy(x=>x.WelderCode).ToList(); foreach (var item in welders) { TreeNode newNode = new TreeNode(); - newNode.Text = item.WelderName; + newNode.Text = item.WelderName + "(" + item.WelderCode + ")"; newNode.NodeID = item.WelderId; newNode.ToolTip = item.WelderCode; newNode.EnableClickEvent = true; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs index a2e46f9..5a1ba82 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/WeldingManage/PipelineManage.aspx.cs @@ -188,7 +188,7 @@ namespace FineUIPro.Web.WeldingManage FROM View_Pipeline_Pipeline WHERE ProjectId= @ProjectId"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId)); - + strSql += " AND WorkAreaId =@WorkAreaId"; listStr.Add(new SqlParameter("@WorkAreaId", this.tvControlItem.SelectedNodeID)); if (!string.IsNullOrEmpty(this.txtPipelineCode.Text.Trim())) diff --git a/HJGL/WebApi/WebApi.csproj.user b/HJGL/WebApi/WebApi.csproj.user index 6db81e9..33091aa 100644 --- a/HJGL/WebApi/WebApi.csproj.user +++ b/HJGL/WebApi/WebApi.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU FolderProfile diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index 56db75de8f4915b9a620b9f81909e3b0c0571278..797f44e9cd4f3e1fd53fb0861232a6d2952f385d 100644 GIT binary patch delta 1773 zcma)7OH30{6m`Z@K5hAnRA^C%QHhQO5G{g=78OiIXpPZG!gCn#h3QP487p02;&&^0 zSL%YeHIZnlD;Gw$CZdUnd*i~T8W(;xzWbP01|-HVnwh@)&OP_sb8oNymge8dvq${T z?sl5tnJ0-iKL6f@pGJ5lzp3blJRq%MAE}6a1r5_m({Y0+hMo!Fi!q^kp2zW-2N@Gn z{6M_$6KE*8E=xXm(0CM5TjTI4GElQdlBDuv&UUo463-bVO;wO0F=)wF!=n;Ime%s{ z17}AdPAcJT_a1(bkn2X3xHFMmE5l4Pa@_QOjJ>El&Q=PDaPjp{|8sHLfn zY2~~U{fCOp2omwsH=<2m)QQzUov}3Arl!HguEMa8$fenI5^hg+^S(u)H5i3qe+=c? zf^p3vZY3w>gk?IWYU+y(9MTgTFn*mI?^0($ti?Q}9*>22P=D}yUR!W`E?+SM)Gz}<1L^~~y> zLOZYQR(NsBqRZ7sTwUo?9h!x&_3iLwXOJ6hb*hJS3KhPkX>e76`{lpHT(SYEMgG;x zYQ3Pt%a)$PR4$mKcPg9UW6>ZV7_nBELwH>{Fgq&QqVjW{#W90k=3kFAx-x)U!ywFS z%$wE7Ae2nRDVa1(+o7rrx1%wUKmVfg)jpox0}V_~kv)HFXg>58JzQT%k1n=pFb(bqOwG9ebMuNi-PM)vGS0 or @pipelineIds IS NULl) + --AND(pipeline.PipelineCode=@pipelineCode OR @pipelineCode IS NULl) + + GO + +UPDATE dbo.Template_Files SET title=REPLACE(title,cast(sortindex as nvarchar(50))+'-','') +GO + +UPDATE dbo.Template_Files SET SortIndex=SortIndex+1 where SortIndex>24 +GO + +INSERT INTO [dbo].[Template_Files]([id],[title],[filePath],[SortIndex]) +VALUES('95125974-3DD4-4E16-B4F0-A9D9C9A1406D','¹ÜµÀº¸½Ó½ÓÍ·PMI¼ì²â±ÈÀýÈ·Èϱí','',25) +GO + +-- PMI´¦ÀíίÍÐ +create table PMI_Delegation +( + Id nvarchar(50) not null primary key, + DelegationNo nvarchar(50) not null, + DelegationDate datetime, + ProjectId nvarchar(50) not null, + InstallationId nvarchar(50), + UnitId nvarchar(50), + DetectionStandard nvarchar(50), + Tabler nvarchar(50), + Remark nvarchar(255), + CreatedTime datetime default getdate() +) +go +---- PMI´¦ÀíίÍÐ Ã÷ϸ +create table PMI_DelegationDetails +( + Id nvarchar(50) not null primary key, + PMIId nvarchar(50) not null, + JointId nvarchar(50) not null, + QualityNo nvarchar(255), + Acceptance nvarchar(255), + Status int not null, + CreatedTime datetime default getdate() +) +go + + +-- ²åÈëPMIίÍв˵¥ +insert into Sys_Menu values('A6FB44C3-0920-4F77-862F-D814FD5E5D23','PMI¼ì²â¹ÜÀí','PMI detection management','',21,0,3,NUll,1) +insert into Sys_Menu values(NEWID(),'PMIίÍÐ','PMI delegation','/WeldingProcess/PMI/PMIDelegation.aspx',1,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +insert into Sys_Menu values(NEWID(),'PMI¼ì²â¼Èë','PMI detection entry','/WeldingProcess/PMI/PMIDetectionEntry.aspx',2,'A6FB44C3-0920-4F77-862F-D814FD5E5D23',3,NULL,1) +GO + + +/*******PMIίÍÐÃ÷ϸÊÓͼ***********/ + +USE [HJGLDB_ZJBSF] +GO + +/****** Object: View [dbo].[View_PMI_DelegationDetails] Script Date: 2024-5-13 9:06:44 ******/ +SET ANSI_NULLS ON +GO + +SET QUOTED_IDENTIFIER ON +GO + + + + +-- Ôö¼Ó±¨¸æ±àºÅ +ALTER TABLE dbo.PMI_DelegationDetails ADD reportNo NVARCHAR(50) +-- Ôö¼Ó±¨¸æÈÕÆÚ +ALTER TABLE dbo.PMI_DelegationDetails ADD reportTime datetime +GO + + +ALTER VIEW [dbo].[View_PMI_DelegationDetails] +AS +/********PMI´¦ÀíÃ÷ϸ********/ +SELECT +TrustItem.Id, +TrustItem.Acceptance, +TrustItem.checkTime, +TrustItem.reportTime, +TrustItem.JointId as WeldJointId, +TrustItem.status, +TrustItem.QualityNo, +TrustItem.PMIId, +Trust.ProjectId, +Trust.DelegationNo, +Trust.DelegationDate, +ISNULL(TrustItem.reportNo,Trust.DelegationNo) as reportNo, +WeldJoint.WeldJointCode, +Pipeline.PipelineCode, +WeldJoint.Specification, +Material.MaterialCode, +Pipeline.WorkAreaId +FROM PMI_DelegationDetails AS TrustItem +LEFT JOIN PMI_Delegation AS Trust ON Trust.Id=TrustItem.PMIId +LEFT JOIN Pipeline_WeldJoint AS WeldJoint ON WeldJoint.WeldJointId=TrustItem.JointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=WeldJoint.PipelineId +LEFT JOIN Base_Material AS Material ON Material.MaterialId=WeldJoint.Material1Id +GO + + + + + + + + diff --git a/HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql b/HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql new file mode 100644 index 0000000..5015273 --- /dev/null +++ b/HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql @@ -0,0 +1,193 @@ +USE [HJGLDB_ZJBSF] +GO +/****** Object: Table [dbo].[Email_Params] Script Date: 2024-5-17 15:35:13 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE TABLE [dbo].[Email_Params]( + [ID] [varchar](50) NOT NULL, + [MailClassName] [varchar](100) NULL, + [MailClassID] [varchar](50) NOT NULL, + [CreateName] [varchar](100) NOT NULL, + [CreateTime] [datetime] NOT NULL, + [UpdateName] [nchar](10) NULL, + [UpdateTime] [datetime] NULL, + CONSTRAINT [PK_Email_Params] PRIMARY KEY CLUSTERED +( + [ID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO +/****** Object: Table [dbo].[Email_Pop] Script Date: 2024-5-17 15:35:13 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE TABLE [dbo].[Email_Pop]( + [EmailID] [varchar](50) NOT NULL, + [EmailFwq] [varchar](50) NULL, + [EmailDk] [varchar](50) NULL, + [EmailYx] [varchar](50) NULL, + [EmailUsername] [varchar](50) NULL, + [EmailPass] [varchar](50) NULL, + [CreateTime] [varchar](50) NULL, + [CreateName] [varchar](50) NULL, + [UpdateTime] [varchar](50) NULL, + [UpdateName] [varchar](50) NULL, + CONSTRAINT [PK_Email_Pop] PRIMARY KEY CLUSTERED +( + [EmailID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO +/****** Object: Table [dbo].[Email_SendLog] Script Date: 2024-5-17 15:35:13 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE TABLE [dbo].[Email_SendLog]( + [EmailId] [varchar](50) NOT NULL, + [EmailTile] [varchar](255) NULL, + [EmailContent] [text] NULL, + [EmailURL] [varchar](50) NULL, + [EmailName] [varchar](50) NULL, + [EmailStatus] [varchar](10) NULL, + [CreateTime] [datetime] NULL, + [CreateName] [varchar](50) NULL, + CONSTRAINT [PK_Email_Send] PRIMARY KEY CLUSTERED +( + [EmailId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO +/****** Object: Table [dbo].[Email_SendTemplate] Script Date: 2024-5-17 15:35:13 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE TABLE [dbo].[Email_SendTemplate]( + [EmailId] [varchar](50) NOT NULL, + [EmailParamsID] [varchar](50) NOT NULL, + [EailTiaoJian] [varchar](500) NULL, + [EmailUserYN] [int] NULL, + [EmailTitle] [varchar](500) NULL, + [EmailContext] [text] NULL, + [CreateName] [varchar](500) NULL, + [CreateTime] [datetime] NULL, + [UpdateName] [varchar](500) NULL, + [UpdateTime] [datetime] NULL, + [EmailDesc] [varchar](500) NULL, + CONSTRAINT [PK_Email_SendTemplate] PRIMARY KEY CLUSTERED +( + [EmailId] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] TEXTIMAGE_ON [PRIMARY] +GO +/****** Object: Table [dbo].[Email_ToPeople] Script Date: 2024-5-17 15:35:13 ******/ +SET ANSI_NULLS ON +GO +SET QUOTED_IDENTIFIER ON +GO +CREATE TABLE [dbo].[Email_ToPeople]( + [EmID] [varchar](50) NOT NULL, + [EmtempID] [varchar](50) NOT NULL, + [EmuserID] [varchar](50) NULL, + [EmuserName] [varchar](50) NULL, + [EmuaerEmailAddress] [varchar](100) NULL, + [EMPeopleType] [varchar](5) NULL, + CONSTRAINT [PK_Email_ToPeople] PRIMARY KEY CLUSTERED +( + [EmID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, IGNORE_DUP_KEY = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +) ON [PRIMARY] +GO +INSERT [dbo].[Email_Params] ([ID], [MailClassName], [MailClassID], [CreateName], [CreateTime], [UpdateName], [UpdateTime]) VALUES (N'1a800170-48e2-4b41-a2af-20258aa74907', N'¼àÀíÉóºË', N'¼àÀí', N'¹ÜÀíÔ±', CAST(N'2024-05-16T14:53:01.747' AS DateTime), N'¹ÜÀíÔ± ', CAST(N'2024-05-16T17:05:42.987' AS DateTime)) +GO +INSERT [dbo].[Email_Params] ([ID], [MailClassName], [MailClassID], [CreateName], [CreateTime], [UpdateName], [UpdateTime]) VALUES (N'859e5eaf-6a9e-46a8-8eb1-f3ba61f3be79', N'¹ÜÀí¹«Ë¾ÉóºË', N'¹ÜÀí¹«Ë¾', N'¹ÜÀíÔ±', CAST(N'2024-05-14T17:39:53.640' AS DateTime), N'¹ÜÀíÔ± ', CAST(N'2024-05-16T17:05:48.370' AS DateTime)) +GO +INSERT [dbo].[Email_Pop] ([EmailID], [EmailFwq], [EmailDk], [EmailYx], [EmailUsername], [EmailPass], [CreateTime], [CreateName], [UpdateTime], [UpdateName]) VALUES (N'7EC5E991-B7A0-495A-90ED-2BE15370C959', N'smtp.163.com', N'25', N'Scs13965090560@163.com', N'scs', N'CLXGLMKBGQBEXSSW', N'2024-5-16 14:46:25', N'¹ÜÀíÔ±', NULL, NULL) +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'3cfa3bbf-e73a-494b-bb60-f682b52dad84', N'¼àÀí¡ªµã¿ÚδÉóºËµÄº¸¿Ú', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ2105Ìõµã¿Ú¼Ç¼´ýÉóºË£¡


', N'jackchenyang@sina.cn', N'jackchenyang@sina.cn', N'·¢Ëͳɹ¦', CAST(N'2024-05-17T14:32:14.573' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'3f61427f-2b6f-42cb-8028-27726807f8e8', N'²âÊÔÔÙ·¢ËÍÒ»¸öÓʼþ', N'ÕâÊÇÒ»¸öÓʼþÄÚÈÝ£¬Çë²éÊÕ£¡', N'408299694@qq.com', N'408299694@qq.com', N'·¢Ëͳɹ¦', CAST(N'2024-05-16T14:51:03.117' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'632f4c12-08c6-4f19-88a1-5ed760486ae0', N'²âÊÔ·¢Óʼþ', N'Õâ¸öÊÇÒ»¸ö²âÊԵķ¢ËÍÓʼþÄÚÈÝ¡£¡£¡£¡£', N'874821510@qq.com', N'874821510@qq.com', N'·¢ËÍʧ°Ü', CAST(N'2024-05-16T14:45:45.350' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'6488713b-86f4-4dc2-989c-32152fe53727', N'¹ÜÀí¹«Ë¾¡ªµã¿ÚδÉóºËµÄº¸¿Ú', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ2176Ìõµã¿Ú¼Ç¼´ýÉóºË£¡



', N'jackchenyang@sina.cn', N'jackchenyang@sina.cn', N'·¢Ëͳɹ¦', CAST(N'2024-05-17T14:32:16.627' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'709cb7de-0564-4ab9-84e6-0b0b2f6732d8', N'²âÊÔÔÙ·¢ËÍÒ»¸öÓʼþ', N'ÕâÊÇÒ»¸öÓʼþÄÚÈÝ£¬Çë²éÊÕ£¡', N'874821510@qq.com', N'874821510@qq.com', N'·¢Ëͳɹ¦', CAST(N'2024-05-16T14:51:03.113' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'9857506c-83a4-4b79-b09a-d6e061376f17', N'µã¿ÚδÉóºËµÄº¸¿Ú', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ2176Ìõµã¿Ú¼Ç¼´ýÉóºË£¡



', N'jackchenyang@sina.cn', N'jackchenyang@sina.cn', N'·¢Ëͳɹ¦', CAST(N'2024-05-17T14:26:32.310' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'd349818c-9434-4ff9-ab73-c868c81de870', N'µã¿ÚδÉóºËµÄº¸¿Ú', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ2105Ìõµã¿Ú¼Ç¼´ýÉóºË£¡


', N'jackchenyang@sina.cn', N'jackchenyang@sina.cn', N'·¢Ëͳɹ¦', CAST(N'2024-05-17T14:26:10.880' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendLog] ([EmailId], [EmailTile], [EmailContent], [EmailURL], [EmailName], [EmailStatus], [CreateTime], [CreateName]) VALUES (N'd8740146-2ce5-4582-baa0-45063e967f02', N'²âÊÔ·¢Óʼþ', N'Õâ¸öÊÇÒ»¸ö²âÊԵķ¢ËÍÓʼþÄÚÈÝ¡£¡£¡£¡£', N'874821510@qq.com', N'874821510@qq.com', N'·¢Ëͳɹ¦', CAST(N'2024-05-16T14:46:31.487' AS DateTime), N'sys') +GO +INSERT [dbo].[Email_SendTemplate] ([EmailId], [EmailParamsID], [EailTiaoJian], [EmailUserYN], [EmailTitle], [EmailContext], [CreateName], [CreateTime], [UpdateName], [UpdateTime], [EmailDesc]) VALUES (N'1a605eaf-6e0a-49d2-a0db-9e1238b65e8a', N'¼àÀí', N'µã¿ÚδÉóºËµÄº¸¿Ú', 1, N'¼àÀíµã¿ÚÉóºË', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ{{totalCount}}Ìõµã¿Ú¼Ç¼´ýÉóºË£¡


', N'¹ÜÀíÔ±', CAST(N'2024-05-16T17:04:30.020' AS DateTime), N'¹ÜÀíÔ±', CAST(N'2024-05-17T14:16:54.980' AS DateTime), NULL) +GO +INSERT [dbo].[Email_SendTemplate] ([EmailId], [EmailParamsID], [EailTiaoJian], [EmailUserYN], [EmailTitle], [EmailContext], [CreateName], [CreateTime], [UpdateName], [UpdateTime], [EmailDesc]) VALUES (N'ad5201c3-0398-4316-a880-0a285e0f06fa', N'¹ÜÀí¹«Ë¾', N'µã¿ÚδÉóºËµÄº¸¿Ú', 1, N'¹ÜÀí¹«Ë¾µã¿ÚÉóºË', N'

×𾴵ĸ÷λÁìµ¼,

      

       ÄúÓÐ{{totalCount}}Ìõµã¿Ú¼Ç¼´ýÉóºË£¡



', N'¹ÜÀíÔ±', CAST(N'2024-05-16T14:54:15.743' AS DateTime), N'¹ÜÀíÔ±', CAST(N'2024-05-17T14:16:58.267' AS DateTime), NULL) +GO +INSERT [dbo].[Email_ToPeople] ([EmID], [EmtempID], [EmuserID], [EmuserName], [EmuaerEmailAddress], [EMPeopleType]) VALUES (N'33e99721-b831-46f5-83b6-039be6a89050', N'1a605eaf-6e0a-49d2-a0db-9e1238b65e8a', N'29188391-731e-4645-ad09-c99c2a9fc6ce', N'ÀîÇ컪', N'jackchenyang@sina.cn', N'0') +GO +INSERT [dbo].[Email_ToPeople] ([EmID], [EmtempID], [EmuserID], [EmuserName], [EmuaerEmailAddress], [EMPeopleType]) VALUES (N'6144c9f6-6e91-4e88-ae3a-fe9f99bc78af', N'ad5201c3-0398-4316-a880-0a285e0f06fa', N'29188391-731e-4645-ad09-c99c2a9fc6ce', N'ÀîÇ컪', N'jackchenyang@sina.cn', N'0') +GO +INSERT [dbo].[Email_ToPeople] ([EmID], [EmtempID], [EmuserID], [EmuserName], [EmuaerEmailAddress], [EMPeopleType]) VALUES (N'd78fa8fb-b675-4264-8040-8a0cf3d9649d', N'1a605eaf-6e0a-49d2-a0db-9e1238b65e8a', N'18485804-501b-4123-9e9a-1afb3c53aed0', N'³ÂÑô', N'874821510@qq.com', N'1') +GO +INSERT [dbo].[Email_ToPeople] ([EmID], [EmtempID], [EmuserID], [EmuserName], [EmuaerEmailAddress], [EMPeopleType]) VALUES (N'ff5fefa1-2ab8-4643-b3f7-b38fd049597a', N'ad5201c3-0398-4316-a880-0a285e0f06fa', N'18485804-501b-4123-9e9a-1afb3c53aed0', N'³ÂÑô', N'874821510@qq.com', N'1') +GO +SET ANSI_PADDING ON +GO +/****** Object: Index [IX_Email_Params] Script Date: 2024-5-17 15:35:13 ******/ +ALTER TABLE [dbo].[Email_Params] ADD CONSTRAINT [IX_Email_Params] UNIQUE NONCLUSTERED +( + [MailClassID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +GO +SET ANSI_PADDING ON +GO +/****** Object: Index [IX_Email_SendTemplate] Script Date: 2024-5-17 15:35:13 ******/ +ALTER TABLE [dbo].[Email_SendTemplate] ADD CONSTRAINT [IX_Email_SendTemplate] UNIQUE NONCLUSTERED +( + [EmailParamsID] ASC +)WITH (PAD_INDEX = OFF, STATISTICS_NORECOMPUTE = OFF, SORT_IN_TEMPDB = OFF, IGNORE_DUP_KEY = OFF, ONLINE = OFF, ALLOW_ROW_LOCKS = ON, ALLOW_PAGE_LOCKS = ON) ON [PRIMARY] +GO +ALTER TABLE [dbo].[Email_Params] ADD CONSTRAINT [DF_Email_Params_CreateName] DEFAULT ('sys') FOR [CreateName] +GO +ALTER TABLE [dbo].[Email_Params] ADD CONSTRAINT [DF_Email_Params_CreateTime] DEFAULT (getdate()) FOR [CreateTime] +GO +ALTER TABLE [dbo].[Email_ToPeople] ADD CONSTRAINT [DF_Email_ToPeople_EMPeopleType] DEFAULT ((0)) FOR [EMPeopleType] +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Óʼþ·ÖÀàÃû³Æ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_Params', @level2type=N'COLUMN',@level2name=N'MailClassName' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Óʼþ·ÖÀàID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_Params', @level2type=N'COLUMN',@level2name=N'MailClassID' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'²ÎÊýMailClassID' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_SendTemplate', @level2type=N'COLUMN',@level2name=N'EmailParamsID' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'ÄÚÈÝÌõ¼þ˵Ã÷' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_SendTemplate', @level2type=N'COLUMN',@level2name=N'EailTiaoJian' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Óʼþ±êÌâ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_SendTemplate', @level2type=N'COLUMN',@level2name=N'EmailTitle' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'Óʼþ¾ßÌåÄÚÈÝ' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_SendTemplate', @level2type=N'COLUMN',@level2name=N'EmailContext' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'±¸×¢' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_SendTemplate', @level2type=N'COLUMN',@level2name=N'EmailDesc' +GO +EXEC sys.sp_addextendedproperty @name=N'MS_Description', @value=N'·¢ËÍÈËÀàÐÍ 0-·¢ËÍÈË 1-³­ËÍÈË' , @level0type=N'SCHEMA',@level0name=N'dbo', @level1type=N'TABLE',@level1name=N'Email_ToPeople', @level2type=N'COLUMN',@level2name=N'EMPeopleType' +GO + +--- ²åÈë²Ëµ¥ +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'97143EDB-6A32-4BBA-9F49-E33E87912BC8', N'·¢ËÍÓʼþ', N'Send Email', N'Email_Send/Email_Send_Edit.aspx', 10, N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'2 ', NULL, 1) +GO +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'9E9DD8E3-D91B-4FD4-B922-2F5CC23D2745', N'ÓʼþÅäÖÃ', N'Send Email Pop', N'Email_Send/Email_Pop_Edit.aspx', 20, N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'2 ', NULL, 1) +GO +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'·¢ËÍÓʼþ', N'Send Email', N'', 60, N'0', N'2 ', NULL, 1) +GO +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'F19A6438-C757-4BC2-ADC2-72AAF02089E5', N'ÓʼþÀàÐÍ', N'Mail Parameters', N'Email_Send/Email_Params_List.aspx', 60, N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'2 ', NULL, 1) +GO +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'06EB7C08-6F6E-433B-91A7-579BFC435A0C', N'ÓʼþÄ£°åÉèÖÃ', N'Send Email Template', N'Email_Send/Email_SendTemplate_List.aspx', 40, N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'2 ', NULL, 1) +GO +INSERT [dbo].[Sys_Menu] ([MenuId], [MenuName], [MenuEnName], [Url], [SortIndex], [SuperMenu], [MenuModule], [IsAudiFlow], [IsUse]) VALUES (N'5941BE0C-C262-48C7-899F-F0BE5A779926', N'·¢ËÍÓʼþÈÕÖ¾', N'Send Email Log', N'Email_Send/Email_SendLog_List.aspx', 30, N'D05CSEAC-2854-4822-A7E9-24AD3EAF0A6E', N'2 ', NULL, 1) +GO + + +SELECT * FROM dbo.Sys_Menu WHERE MenuName LIKE '%Óʼþ%' \ No newline at end of file diff --git a/HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql b/HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql new file mode 100644 index 0000000..f408402 --- /dev/null +++ b/HJGLPackFile/版本日志/HJGLDB_2024.05.22.sql @@ -0,0 +1,106 @@ + UPDATE dbo.Batch_PointBatchItem SET PointState=NULL,PointDate=NULL, + JLAudit=NULL,GLGSAudit=NULL,QTAudit=NULL + WHERE PointState='1' AND + PointBatchItemId NOT IN(SELECT PointBatchItemId FROM dbo.Batch_BatchTrustItem) + GO + + UPDATE dbo.Batch_PointBatchItem SET IsCompletedPoint=1 + GO + +alter table PTP_PipelineList add WorkAreaId nvarchar(50) +alter table PTP_PipelineList add isAll bit +alter table PTP_PipelineList add WeldJonintCode nvarchar(max) +GO + + +ALTER VIEW [dbo].[View_Batch_PointBatchItem] +AS +/*************µã¿ÚÃ÷ϸ±í*************/ +SELECT PointBatchItem.PointBatchItemId, +PointBatchItem.PointBatchId, +PointBatch.ProjectId, +PointBatch.InstallationId, +PointBatch.UnitId, +PointBatch.PointBatchCode, +PointBatch.DetectionTypeId, +Pipeline.WorkAreaId, +PointBatchItem.WeldJointId, +PointBatchItem.PointState AS PState, +(CASE PointBatchItem.PointState WHEN '1' THEN 'µã¿Ú' WHEN '2' THEN 'À©Í¸' END) AS PointState, +--(CASE PointBatchItem.IsAudit WHEN 1 THEN 'ÊÇ' ELSE '·ñ' END) AS PointIsAudit, +--(CASE WHEN PointBatchItem.IsAudit=1 THEN 'ÊÇ' +-- WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NOT NULL THEN '·ñ' +-- WHEN (PointBatchItem.IsAudit IS NULL OR PointBatchItem.IsAudit=0) AND PointBatchItem.PointState IS NULL THEN '' END) AS PointIsAudit, +PointBatchItem.PointDate,--µã¿ÚÈÕÆÚ +PointBatchItem.RepairDate,--·µÐÞÈÕÆÚ +PointBatchItem.CutDate,--ÇгýÈÕÆÚ +PointBatchItem.RepairRecordId, +PointBatchItem.IsBuildTrust,--ÊÇ·ñίÍÐ +WorkArea.WorkAreaCode,--¹¤ÇøºÅ +jot.WeldJointCode,--º¸¿ÚºÅ +jot.BackingWelderId AS WelderId, --º¸¹¤ID +jot.JointArea,--º¸½ÓÇøÓò +jot.Dia, +jot.Size,--ʵ¼Ê´ç¾¶ +WeldingDaily.WeldingDate,--º¸½ÓÈÕÆÚ +jot.PipelineId, --¹ÜÏßID +jot.Material1Id AS Mat, --²ÄÖÊ +jot.Specification, --¹æ¸ñ +jot.JointAttribute, +weldType.Flag, --º¸·ìÀàÐÍ +Pipeline.PipelineCode, --¹ÜÏߺŠ+PipingClass.PipingClassName, --¹ÜµÀµÈ¼¶ +PointBatchItem.IsWelderFirst, +PointBatchItem.IsCompletedPoint, +trust.TrustBatchItemId, +(CASE WHEN PointBatchItem.JLAudit IS NOT NULL THEN userJL.UserName ELSE (CASE WHEN PointBatchItem.PointState IS NOT NULL THEN 'δÉóºË' ELSE '' END) END) AS JLAudit, +(CASE WHEN PointBatchItem.GLGSAudit IS NOT NULL THEN userGLGS.UserName ELSE (CASE WHEN PointBatchItem.PointState IS NOT NULL THEN 'δÉóºË' ELSE '' END) END) AS GLGSAudit, +(CASE WHEN PointBatchItem.QTAudit IS NOT NULL THEN userQT.UserName ELSE (CASE WHEN PointBatchItem.PointState IS NOT NULL THEN 'δÉóºË' ELSE '' END) END) AS QTAudit, +(CASE WHEN jot.BackingWelderId!=jot.CoverWelderId THEN backingWelder.WelderCode+'/'+coverWelder.WelderCode ELSE backingWelder.WelderCode END) AS WelderCode, --º¸¹¤ºÅ +(CASE WHEN PointBatchItem.JLAudit IS NOT NULL AND PointBatchItem.GLGSAudit IS NOT NULL THEN 1 ELSE 0 END) AS IsPointAudit +FROM Batch_PointBatchItem AS PointBatchItem +LEFT JOIN Batch_PointBatch AS PointBatch ON PointBatch.PointBatchId=PointBatchItem.PointBatchId +LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.PointBatchItemId = PointBatchItem.PointBatchItemId +LEFT JOIN Pipeline_WeldJoint AS jot ON jot.WeldJointId=PointBatchItem.WeldJointId +LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId=jot.PipelineId +LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = jot.WeldTypeId +LEFT JOIN dbo.Welder_Welder backingWelder ON backingWelder.WelderId = jot.BackingWelderId +LEFT JOIN dbo.Welder_Welder coverWelder ON coverWelder.WelderId = jot.CoverWelderId +LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId=Pipeline.WorkAreaId +LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=jot.WeldingDailyId +LEFT JOIN Base_PipingClass AS PipingClass ON PipingClass.PipingClassId=Pipeline.PipingClassId +LEFT JOIN dbo.Sys_User userJL ON userJL.UserId = PointBatchItem.JLAudit +LEFT JOIN dbo.Sys_User userGLGS ON userGLGS.UserId = PointBatchItem.GLGSAudit +LEFT JOIN dbo.Sys_User userQT ON userQT.UserId = PointBatchItem.QTAudit + + +GO + + + + +CREATE VIEW [dbo].[View_TrustBathcIn] +AS +/*ÓÃÓÚµ¼ÈëÊý¾Ýʱ£¬²éѯº¸¿ÚÐÅÏ¢*/ +SELECT + pitem.PointBatchItemId,pitem.PointBatchId,jot.ProjectId + ,pipeline.InstallationId,ins.InstallationCode + ,pipeline.WorkAreaId,workArea.WorkAreaCode + ,jot.PipelineId,pipeline.PipelineCode + ,pitem.WeldJointId,jot.WeldJointCode + ,point.DetectionTypeId,nde.DetectionTypeCode + ,pitem.IsWelderFirst,trust.TrustBatchItemId +FROM dbo.Batch_PointBatchItem AS pitem +LEFT JOIN dbo.Batch_PointBatch point ON point.PointBatchId = pitem.PointBatchId +LEFT JOIN Pipeline_WeldJoint jot ON jot.WeldJointId = pitem.WeldJointId +LEFT JOIN Pipeline_Pipeline AS pipeline ON jot.PipelineId = pipeline.PipelineId +LEFT JOIN dbo.Project_WorkArea AS workArea ON workArea.WorkAreaId=pipeline.WorkAreaId +LEFT JOIN dbo.Project_Installation ins ON ins.InstallationId = workArea.InstallationId +LEFT JOIN dbo.Base_DetectionType nde ON nde.DetectionTypeId = point.DetectionTypeId +LEFT JOIN dbo.Batch_BatchTrustItem trust ON trust.PointBatchItemId = pitem.PointBatchItemId + + + +GO + +