diff --git a/DataBase/版本日志/HJGLDB_2024.05.22.sql b/DataBase/版本日志/HJGLDB_2024.05.22.sql index 95aea3a..f408402 100644 --- a/DataBase/版本日志/HJGLDB_2024.05.22.sql +++ b/DataBase/版本日志/HJGLDB_2024.05.22.sql @@ -12,6 +12,73 @@ 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 /*ڵʱѯϢ*/ diff --git a/HJGL/.vs/HJGL/v17/.suo b/HJGL/.vs/HJGL/v17/.suo index 4fbd847..61f0f84 100644 Binary files a/HJGL/.vs/HJGL/v17/.suo and b/HJGL/.vs/HJGL/v17/.suo differ diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs index 3b106df..085ca01 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageEdit.aspx.cs @@ -752,8 +752,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage protected void btnDownLoad_Click(object sender, EventArgs e) { string rootPath = Server.MapPath("~/"); - string uploadfilepath = rootPath + Const.HJGL_DataInTemplateUrl; - string filePath = Const.HJGL_DataInTemplateUrl; + string uploadfilepath = rootPath + Const.HJGL_TestTemplateUrl; + string filePath = Const.HJGL_TestTemplateUrl; string fileName = Path.GetFileName(filePath); FileInfo info = new FileInfo(uploadfilepath); long fileSize = info.Length; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs index b381b88..2bdb381 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/TestPackageManageItemEdit.aspx.cs @@ -234,7 +234,8 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage FROM dbo.Pipeline_Pipeline AS IsoInfo LEFT JOIN DBO.Project_WorkArea AS WorkArea ON IsoInfo.WorkAreaId =WorkArea.WorkAreaId LEFT JOIN dbo.Base_Medium AS bs ON bs.MediumId = IsoInfo.MediumId - LEFT JOIN dbo.PTP_PipelineList AS IsoList ON IsoList.PipelineId = IsoInfo.PipelineId and IsoInfo.WorkAreaId=IsoList.WorkAreaId + LEFT JOIN dbo.PTP_PipelineList AS IsoList ON IsoList.PipelineId = IsoInfo.PipelineId + and IsoInfo.WorkAreaId=IsoList.WorkAreaId and IsoList.PTP_ID=@PTP_ID WHERE IsoInfo.ProjectId= @ProjectId AND IsoInfo.UnitId= @UnitId AND WorkArea.InstallationId= @InstallationId "; } @@ -244,11 +245,10 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage listStr.Add(new SqlParameter("@UnitId", this.drpUnit.SelectedValue)); listStr.Add(new SqlParameter("@InstallationId", this.drpInstallation.SelectedValue)); - //if (!string.IsNullOrEmpty(this.PTP_ID)) - //{ - // strSql += " AND IsoList.PTP_ID=@PTP_ID"; - // listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); - //} + if (!string.IsNullOrEmpty(this.PTP_ID)) + { + listStr.Add(new SqlParameter("@PTP_ID", this.PTP_ID)); + } if (this.drpWorkArea.SelectedValue != Const._Null && drpWorkArea.SelectedValue!=null) { @@ -541,6 +541,7 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage { string PipelineId = teamGroupRow["id"].ToString(); string status = teamGroupRow.Value("status"); + if (listSelects.Contains(PipelineId)) { JObject values = teamGroupRow.Value("values"); @@ -548,6 +549,27 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage string workAreaId = values.Value("WorkAreaId"); if (string.IsNullOrEmpty(WeldJonintCodes)) WeldJonintCodes = "全部"; + + //处理剩下来的口 + List listJointCode = new List(); + var tempData = Funs.DB.PTP_PipelineList.Where(t=>t.PipelineId== PipelineId && t.IsAll==false).Select(t => t.WeldJonintCode).ToList(); + foreach (var item in tempData) + { + if (!string.IsNullOrEmpty(item)) + { + string[] arr=item.Split(','); + for (int i = 0; i < arr.Length; i++) + { + listJointCode.Add(arr[i]); + } + } + } + if(WeldJonintCodes=="全部" && listJointCode.Count > 0) + { + var nextJointCode = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineId && !listJointCode.Contains(t.WeldJointCode)) + .Select(t => t.WeldJointCode).ToList().ToArray(); + WeldJonintCodes = String.Join(",", nextJointCode.ToArray()); + } Model.PTP_PipelineList newitem = new Model.PTP_PipelineList(); newitem.PTP_ID = this.PTP_ID; newitem.PipelineId = PipelineId; diff --git a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs index df89af8..5080d63 100644 --- a/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs +++ b/HJGL/FineUIPro.Web/WeldingProcess/TestPackageManage/selectJointCode.aspx.cs @@ -55,19 +55,30 @@ namespace FineUIPro.Web.WeldingProcess.TestPackageManage } private List GetDataJointGrid2(string PipelineID) { - string[] arr = null; + List listData = new List(); var tempData = Funs.DB.PTP_PipelineList.Where(t => t.PipelineId == PipelineID && t.IsAll == false) - .Select(t => t.WeldJonintCode).FirstOrDefault(); + .Select(t => t.WeldJonintCode).ToList(); - if (tempData != null) + foreach (var item in tempData) { - arr = tempData.Split(','); + if (!string.IsNullOrEmpty(item)) + { + string[] strcode = item.Split(','); + for (int i = 0; i < strcode.Length; i++) + { + if (!listData.Contains(strcode[i])) + { + listData.Add(strcode[i]); + } + } + } + } var query = Funs.DB.Pipeline_WeldJoint.Where(t => t.PipelineId == PipelineID) .OrderBy(t => t.WeldJointCode).AsQueryable(); - if (arr != null) + if (listData.Count>0) { - query = query.Where(t => !arr.Contains(t.WeldJointCode)); + query = query.Where(t => !listData.Contains(t.WeldJointCode)); } return query.ToList(); diff --git a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache index af49122..0cf5aa3 100644 Binary files a/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache and b/HJGL/WebApi/obj/Release/WebApi.csproj.AssemblyReference.cache differ diff --git a/HJGLPackFile.rar b/HJGLPackFile.rar new file mode 100644 index 0000000..619d195 Binary files /dev/null and b/HJGLPackFile.rar differ diff --git a/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql b/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql deleted file mode 100644 index f59c982..0000000 --- a/HJGLPackFile/版本日志/HJGLDB_2024.05.12.sql +++ /dev/null @@ -1,312 +0,0 @@ --- ߺ Ƿ PMI -alter table Pipeline_WeldJoint add isPMI bit NULL -GO -update Pipeline_WeldJoint set isPMI=0 -GO - -ALTER VIEW [dbo].[View_Pipeline_WeldJoint] -AS -/************Ϣͼ*****************/ -SELECT WeldJoint.WeldJointId, -WeldJoint.ProjectId, -WeldJoint.PipelineId, -WeldJoint.WeldJointCode, -dbo.Fun_GetParseInt(WeldJoint.WeldJointCode) AS ConvertWeldJoint, -WeldJoint.WeldTypeId, -WeldJoint.Material1Id, -WeldJoint.Material2Id, -WeldJoint.ANSISCH, -WeldJoint.Thickness, -WeldJoint.Dia, -WeldJoint.Size, -WeldJoint.JointAttribute, -WeldJoint.JointArea, -WeldJoint.WeldingMethodId, -WeldJoint.IsHotProess, -WeldJoint.WeldingLocationId, -WeldJoint.WeldMatId, -WeldJoint.WeldSilkId, -WeldJoint.GrooveTypeId, -WeldJoint.PipeSegment, -WeldJoint.PipeAssembly1Id, -WeldJoint.PipeAssembly2Id, -WeldJoint.PipeAssemblyCount, -WeldJoint.HeartNo1, -WeldJoint.HeartNo2, -WeldJoint.LastTemp, -WeldJoint.CellTemp, -WeldJoint.PrepareTemp, -WeldJoint.Electricity, -WeldJoint.SystemNumber, -WeldJoint.Remark, -WeldJoint.DoneDin, -WeldJoint.Voltage, -WeldJoint.TestPackageNo, -WeldJoint.WeldingDailyCode, -WeldJoint.WeldingDailyId, -WeldJoint.BackingWelderId, -WeldJoint.CoverWelderId, -WeldJoint.PipingClassId, -WeldJoint.Specification, -WeldJoint.CancelResult, -Project.ProjectCode, -Project.ProjectName, -Pipeline.PipelineCode, -Pipeline.InstallationId, -Pipeline.UnitId, -Pipeline.SingleNumber, -Pipeline.WorkAreaId, -WeldType.WeldTypeCode, -Material1.MaterialCode AS Material1Code, -Material2.MaterialCode AS Material2Code, -WeldingMethod.WeldingMethodCode, -WeldingLocation.WeldingLocationCode, -WeldMat.ConsumablesCode AS WeldMatCode, ---WeldSilk.ConsumablesCode AS WeldSilkCode, -'' AS WeldSilkCode, -GrooveType.GrooveTypeCode, -CASE WHEN WeldJoint.WeldingDailyId IS NULL THEN '' ELSE '' END AS Is_hjName, -CASE WHEN WeldJoint.IsHotProess=1 THEN '' ELSE '' END AS IsHotProessStr, -Components1.ComponentsCode AS ComponentsCode1, -Components2.ComponentsCode AS ComponentsCode2, -BackingWelder.WelderCode AS BackingWelderCode, -BackingWelder.WelderName AS BackingWelderName, -CoverWelder.WelderCode AS CoverWelderCode, -CoverWelder.WelderName AS CoverWelderName, -(CASE WHEN CoverWelder.WelderCode IS NOT NULL AND BackingWelder.WelderCode IS NOT NULL - THEN CoverWelder.WelderCode + '/' + BackingWelder.WelderCode - ELSE (ISNULL(CoverWelder.WelderCode,'') + ISNULL(BackingWelder.WelderCode,'')) END) AS WelderCode, -- - (CASE WHEN Material1.MaterialCode IS NOT NULL AND Material2.MaterialCode IS NOT NULL - THEN Material1.MaterialCode + '/' + Material2.MaterialCode - ELSE (ISNULL(Material1.MaterialCode,'') + ISNULL(Material2.MaterialCode,'')) END) AS MaterialCode, -- -pipingClass.PipingClassCode,pip.PIPClassCode, -CONVERT(VARCHAR(100), WeldingDaily.WeldingDate, 23) AS WeldingDate, -WeldJoint.IsCancel, -WeldJoint.IsPMI, -WeldJoint.IsGoldJoint, -WeldJoint.WPQId,wps.WPQCode, -WeldJoint.DetectionType, -WeldJoint.PageNum -FROM Pipeline_WeldJoint AS WeldJoint -LEFT JOIN Base_Project AS Project ON Project.ProjectId=WeldJoint.ProjectId -LEFT JOIN Pipeline_Pipeline AS Pipeline ON Pipeline.PipelineId = WeldJoint.PipelineId -LEFT JOIN Base_WeldType AS WeldType ON WeldType.WeldTypeId=WeldJoint.WeldTypeId -LEFT JOIN Base_Material AS Material1 ON Material1.MaterialId = WeldJoint.Material1Id -LEFT JOIN Base_Material AS Material2 ON Material2.MaterialId = WeldJoint.Material2Id -LEFT JOIN Base_WeldingMethod AS WeldingMethod ON WeldingMethod.WeldingMethodId=WeldJoint.WeldingMethodId -LEFT JOIN Base_WeldingLocation AS WeldingLocation ON WeldingLocation.WeldingLocationId=WeldJoint.WeldingLocationId -LEFT JOIN Base_Consumables AS WeldMat ON WeldMat.ConsumablesId=WeldJoint.WeldMatId ---LEFT JOIN Base_Consumables AS WeldSilk ON WeldSilk.ConsumablesId=WeldJoint.WeldSilkId -LEFT JOIN Base_GrooveType AS GrooveType ON GrooveType.GrooveTypeId=WeldJoint.GrooveTypeId -LEFT JOIN Base_Components AS Components1 ON Components1.ComponentsId = WeldJoint.PipeAssembly1Id -LEFT JOIN Base_Components AS Components2 ON Components2.ComponentsId = WeldJoint.PipeAssembly2Id -LEFT JOIN Welder_Welder AS BackingWelder ON BackingWelder.WelderId=WeldJoint.BackingWelderId -LEFT JOIN Welder_Welder AS CoverWelder ON CoverWelder.WelderId=WeldJoint.CoverWelderId -LEFT JOIN Pipeline_WeldingDaily AS WeldingDaily ON WeldingDaily.WeldingDailyId=WeldJoint.WeldingDailyId -LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId -LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId -LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId=WeldJoint.WPQId - - - -GO - - - - -ALTER PROC [dbo].[sp_rpt_JointComprehensive] - @projectId NVARCHAR(50), - @workAreaId NVARCHAR(50)=NULL, - @pipelineIds NVARCHAR(MAX) = NULL - -AS -/**********ۺϢ**********/ -SELECT - weldJoint.WeldJointId, - weldJoint.ProjectId, - WorkArea.WorkAreaId, - WorkArea.WorkAreaCode, - weldJoint.SystemNumber, - weldJoint.TestPackageNo, - pipeline.SingleNumber, - pipeline.PipelineCode, - pipeline.DrawingsNum, - pipingClass.PipingClassCode,pip.PIPClassCode, - weldJoint.PageNum, - weldJoint.PipeSegment,--ܶ - weldJoint.WeldJointCode, - weldType.WeldTypeCode, - weldJoint.JointAttribute, - wl.WeldingLocationCode, - weldJoint.Dia, - weldJoint.Thickness,--ں - weldJoint.HeartNo1, - weldJoint.HeartNo2, - com1.ComponentsName AS PipeAssembly1, - com2.ComponentsName AS PipeAssembly2, - --material.MaterialCode, - mat1.MaterialCode AS MaterialCode1, - mat2.MaterialCode AS MaterialCode2, - cw.WelderCode AS CoverWelderCode, - fw.WelderCode AS BackingWelderCode, - WeldMethod.WeldingMethodName, - medium.MediumName, - weldingDaily.WeldingDate, - weldingDaily.WeldingDailyCode, - trust.TrustBatchCode, - --TrustBatchCode.DetectionRateCode, - --TrustBatchCode.AcceptLevel, - (CASE WHEN weldJoint.IsHotProess=1 THEN '' ELSE '' END) AS IsHotProess, - null as TrustBatchCode, - null as DetectionRateCode, - null as AcceptLevel, - nde.NDEDate AS CHT_CHECKDATE, - ndeItem.NDEReportNo, - CAST(CAST(ISNULL(weldJoint.Size,0) AS REAL) AS NVARCHAR(8)) AS JOT_Size, - WeldMaterialMat.ConsumablesCode AS WMT_MatCode, - WeldMaterialMat.ConsumablesName AS WMT_Matname, - weldJoint.WeldSilkId, - --WeldMaterialSilk.ConsumablesCode AS hsCode, - --WeldMaterialSilk.ConsumablesName AS hsname, - --WeldMaterialSilk.UserFlux, - weldJoint.Specification, - wps.WPQCode,ndttype.DetectionTypeCode,NULL AS HotReportCode, - (CASE WHEN (PointBatchItem.PointState='1' OR PointBatchItem.PointState='2') - THEN (CASE WHEN PointBatchItem.IsWelderFirst=1 THEN '' ELSE '' END) ELSE '' END) AS if_dk -FROM Pipeline_WeldJoint AS weldJoint - LEFT JOIN Pipeline_Pipeline AS pipeline ON pipeline.PipelineId = weldJoint.PipelineId - LEFT JOIN Project_WorkArea AS WorkArea ON WorkArea.WorkAreaId = pipeline.WorkAreaId - LEFT JOIN Base_Material AS mat1 ON mat1.MaterialId = weldJoint.Material1Id - LEFT JOIN Base_Material AS mat2 ON mat2.MaterialId = weldJoint.Material2Id - LEFT JOIN Base_WeldingMethod AS WeldMethod ON WeldMethod.WeldingMethodId = weldJoint.WeldingMethodId - LEFT JOIN dbo.Base_WeldType weldType ON weldType.WeldTypeId = weldJoint.WeldTypeId - LEFT JOIN dbo.Base_WeldingLocation wl ON wl.WeldingLocationId = weldJoint.WeldingLocationId - LEFT JOIN Base_Medium AS medium ON medium.MediumId = pipeline.MediumId - LEFT JOIN Base_Components com1 ON com1.ComponentsId=weldJoint.PipeAssembly1Id - LEFT JOIN Base_Components com2 ON com2.ComponentsId=weldJoint.PipeAssembly2Id - LEFT JOIN Base_PipingClass AS pipingClass ON pipingClass.PipingClassId=WeldJoint.PipingClassId - LEFT JOIN dbo.Base_PIPClass pip ON pip.PIPClassId = Pipeline.PIPClassId - LEFT JOIN Pipeline_WeldingDaily AS weldingDaily ON weldingDaily.WeldingDailyId = weldJoint.WeldingDailyId - LEFT JOIN dbo.WPQ_WPQList wps ON wps.WPQId = weldJoint.WPQId - left join Welder_Welder AS fw on weldJoint.BackingWelderId = fw.WelderId - left join Welder_Welder AS cw on weldJoint.CoverWelderId = cw.WelderId - LEFT JOIN Base_Consumables AS WeldMaterialMat ON WeldMaterialMat.ConsumablesId =weldJoint.WeldMatId - --LEFT JOIN Base_Consumables AS WeldMaterialSilk ON WeldMaterialSilk.ConsumablesId =weldJoint.WeldSilkId - LEFT JOIN Batch_PointBatchItem AS PointBatchItem ON PointBatchItem.WeldJointId =weldJoint.WeldJointId - LEFT JOIN dbo.Batch_PointBatch point ON point.PointBatchId = PointBatchItem.PointBatchId - LEFT JOIN dbo.Base_DetectionType ndttype ON ndttype.DetectionTypeId = point.DetectionTypeId - LEFT JOIN dbo.Batch_BatchTrustItem trustItem ON trustItem.PointBatchItemId = PointBatchItem.PointBatchItemId - LEFT JOIN dbo.Batch_BatchTrust trust ON trust.TrustBatchId = trustItem.TrustBatchId - LEFT JOIN dbo.Batch_NDEItem ndeItem ON ndeItem.TrustBatchItemId = trustItem.TrustBatchItemId - LEFT JOIN dbo.Batch_NDE nde ON nde.NDEID = ndeItem.NDEID - - WHERE weldJoint.ProjectId=@projectId - AND(pipeline.WorkAreaId=@workAreaId OR @workAreaId IS NULL) - AND (CHARINDEX(weldJoint.PipelineId,@pipelineIds)>0 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 deleted file mode 100644 index 5015273..0000000 --- a/HJGLPackFile/版本日志/HJGLDB_2024.05.17（邮件）.sql +++ /dev/null @@ -1,193 +0,0 @@ -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 + +