From 51ca66dab6490df9e094675074c4fd6837ec2c33 Mon Sep 17 00:00:00 2001 From: wendy <408182087@qq.com> Date: Fri, 29 May 2026 14:39:26 +0800 Subject: [PATCH] =?UTF-8?q?20260529=20=E7=84=8A=E6=9D=90=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../版本日志/HJGLDB_DS_2026-05-28_bwj.sql | 72 +++++++++++-- .../WeldingJointInspection.aspx | 2 +- .../WeldingJointInspection.aspx.cs | 101 ++++++++++++------ .../JGZL/TeamWeldingInspection.aspx.cs | 8 +- HJGL_DS/FineUIPro.Web/Web.config | 2 +- HJGL_DS/WebAPI/WebAPI.csproj.user | 2 +- 6 files changed, 140 insertions(+), 47 deletions(-) diff --git a/DataBase/版本日志/HJGLDB_DS_2026-05-28_bwj.sql b/DataBase/版本日志/HJGLDB_DS_2026-05-28_bwj.sql index 6aef542..def9327 100644 --- a/DataBase/版本日志/HJGLDB_DS_2026-05-28_bwj.sql +++ b/DataBase/版本日志/HJGLDB_DS_2026-05-28_bwj.sql @@ -661,14 +661,68 @@ GO +ALTER PROCEDURE [dbo].[HJGL_sp_WeldInspectionCheckRecordNew] +( + @ProjectId NVARCHAR(50)=null, + @ISO_ID VARCHAR(1000)=NULL, + @VICheckDate DATETIME=NULL, + @NDTR_ID VARCHAR(50)=NULL, + @JOTY_Group NCHAR(1)=NULL, + @WeldingDate datetime=null +) +AS +--ܵԽӺӽͷ/¼ +SELECT ROW_NUMBER() OVER(ORDER BY IsoInfo.ISO_IsoNo,joint.JOT_JointNo)%12 AS Num, + NEWID() as New_ID, Project.ProjectId,Project.ProjectCode,Project.ProjectName, + batchDetail.JOT_ID, joint.JOT_JointNo,joint.JOT_JointDesc,joint.ISO_ID,batch.NDTR_ID, + IsoInfo.ISO_IsoNo,batchDetail.VICheckDate, + (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Code+'/'+CellWelder.WED_Code ELSE FloorWelder.WED_Code END) AS WED_Code, -- + (CASE WHEN joint.JOT_CellWelder!=joint.JOT_FloorWelder THEN FloorWelder.WED_Name+'/'+CellWelder.WED_Name ELSE FloorWelder.WED_Name END) AS WED_Name, -- + (CASE WHEN Steel.STE_Code IS NOT NULL AND Steel2.STE_Code IS NOT NULL and Steel.STE_Code!=Steel2.STE_Code + THEN Steel.STE_Code + '/' + Steel2.STE_Code + WHEN Steel.STE_Code IS NOT NULL THEN Steel.STE_Code + ELSE ISNULL(Steel2.STE_Code,'') END) AS STE_Code, -- + (CASE batchDetail.IsVI WHEN 1 THEN '' ELSE NULL END) AS PassVI, + (CASE batchDetail.IsVI WHEN 0 THEN '' ELSE NULL END) AS NoPassVI, +joint.JOT_Location --λ +,WeldMethod.WME_Name --ӷ +,CASE WHEN WeldMat.WeldName IS NULL THEN ISNULL(WeldSilk.WeldName,'') + ELSE (CASE WHEN WeldSilk.WeldName IS NULL + THEN ISNULL(WeldMat.WeldName,'') + ELSE (ISNULL(WeldSilk.WeldName,'') +'/'+ ISNULL(WeldMat.WeldName,'')) END) END AS WMT_MatName --ƺ +,joint.JOT_PrepareTemp --Ԥ¶ +,batchDetail.Remark +,jointType.JOTY_Group +,weldReport.JOT_WeldDate +,joint.Sort1 +,joint.Sort2 +,joint.Sort3 +,joint.Sort4 +,joint.Sort5 +FROM dbo.HJGL_BO_BatchDetail batchDetail +LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId +LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID +LEFT JOIN dbo.Base_Project AS Project ON Project.ProjectId = joint.ProjectId +LEFT JOIN dbo.HJGL_PW_IsoInfo AS IsoInfo ON IsoInfo.ISO_ID = joint.ISO_ID +LEFT JOIN dbo.HJGL_BS_Welder AS CellWelder ON CellWelder.WED_ID=joint.JOT_CellWelder +LEFT JOIN dbo.HJGL_BS_Welder AS FloorWelder ON FloorWelder.WED_ID=joint.JOT_FloorWelder +LEFT JOIN dbo.HJGL_BS_Steel AS Steel ON Steel.STE_ID = joint.STE_ID +LEFT JOIN dbo.HJGL_BS_Steel AS Steel2 ON Steel2.STE_ID=joint.STE_ID2 +LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID +LEFT JOIN dbo.HJGL_BS_WeldMethod AS WeldMethod ON WeldMethod.WME_ID=joint.WME_ID +LEFT JOIN View_WeldInfoDropDownLists as WeldMat on WeldMat.WeldId = joint.JOT_WeldMat and WeldMat.WeldTypeName like '%%' +LEFT JOIN View_WeldInfoDropDownLists as WeldSilk on WeldSilk.WeldId = joint.JOT_WeldSilk and WeldSilk.WeldTypeName like '%˿%' +left join HJGL_BO_WeldReportMain as weldReport on weldReport.DReportID= joint.DReportID +WHERE (jointType.JOTY_Group=@JOTY_Group OR @JOTY_Group IS NULL) AND + (joint.ProjectId=@projectId OR @projectId IS NULL) AND + (joint.ISO_ID in(select Id from dbo.StrToTable(@ISO_ID)) OR @ISO_ID IS NULL) + AND (batchDetail.VICheckDate=@VICheckDate OR @VICheckDate IS NULL) + AND (batch.NDTR_ID=@NDTR_ID OR @NDTR_ID IS NULL) + --AND batchDetail.VICheckDate IS NOT NULL + and weldReport.JOT_WeldDate is not null + and (weldReport.JOT_WeldDate=@WeldingDate or @WeldingDate is null) + +order by joint.Sort1,joint.Sort2,joint.Sort3,joint.Sort4,joint.Sort5 +GO --- SELECT * FROM View_WeldInfoDropDownLists WHERE WeldName='CHE422R' - - ---select distinct JOT_WeldSilk,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo ---left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldSilk = HJGL_BS_WeldMaterial.WMT_ID -----where HJGL_BS_WeldMaterial.WMT_MatCode not in (select WeldName from Weld_WeldInfo) - ---select distinct JOT_WeldMat,HJGL_BS_WeldMaterial.WMT_MatCode from HJGL_PW_JointInfo ---left join HJGL_BS_WeldMaterial on HJGL_PW_JointInfo.JOT_WeldMat = HJGL_BS_WeldMaterial.WMT_ID \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx index 8d69a16..0086e9d 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx @@ -78,7 +78,7 @@ - + <%----%> diff --git a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs index d94e778..b0b6758 100644 --- a/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/ContinuousPrint/WeldingJointInspection.aspx.cs @@ -22,11 +22,6 @@ namespace FineUIPro.Web.ContinuousPrint { if (!IsPostBack) { - this.drpIsoId.DataTextField = "ISO_IsoNo"; - this.drpIsoId.DataValueField = "ISO_ID"; - Funs.FineUIPleaseSelect(this.drpIsoId); - this.drpIsoId.SelectedValue = BLL.Const._Null; - BindGrid(); } } @@ -56,21 +51,6 @@ namespace FineUIPro.Web.ContinuousPrint /// public void BindGrid1(string ProjectId) { - //string strSql = @" SELECT v.ProjectId,project.ProjectCode,project.ProjectName,v.JOTY_Group, - // (CASE WHEN v.JOTY_Group='1' THEN '对接焊缝' WHEN v.JOTY_Group='2' THEN '角焊缝' - // WHEN v.JOTY_Group='3' THEN '支管连接焊缝' END) AS JointType, - // v.VICheckDate,v.NDTR_ID,rate.NDTR_Name - // FROM - // (SELECT batch.ProjectId,batchDetail.VICheckDate,batch.NDTR_ID,jointType.JOTY_Group - // FROM dbo.HJGL_BO_BatchDetail batchDetail - // LEFT JOIN dbo.HJGL_BO_Batch batch ON batch.BatchId=batchDetail.BatchId - // LEFT JOIN dbo.HJGL_PW_JointInfo joint ON joint.JOT_ID=batchDetail.JOT_ID - // LEFT JOIN dbo.HJGL_BS_JointType jointType ON jointType.JOTY_ID = joint.JOTY_ID - // WHERE BatchDetail.VICheckDate IS NOT NULL - // GROUP BY batch.ProjectId,jointType.JOTY_Group,batchDetail.VICheckDate,batch.NDTR_ID) v - // LEFT JOIN dbo.Base_Project project ON project.ProjectId = v.ProjectId - // LEFT JOIN dbo.HJGL_BS_NDTRate rate ON rate.NDTR_ID = v.NDTR_ID - // where v.ProjectId= @ProjectId"; string strSql = @" select distinct batch.ProjectId, Project.ProjectCode, Project.ProjectName, @@ -99,7 +79,7 @@ namespace FineUIPro.Web.ContinuousPrint strSql += " AND isoInfo.ISO_ID=@isoId"; listStr.Add(new SqlParameter("@isoId", this.drpIsoId.SelectedValue)); } - if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue)) + if (!string.IsNullOrEmpty(this.drpWeldingDate.SelectedValue) && this.drpWeldingDate.SelectedValue != BLL.Const._Null) { strSql += " AND weldReport.JOT_WeldDate=@weldingDate"; listStr.Add(new SqlParameter("@weldingDate", this.drpWeldingDate.SelectedValue)); @@ -156,25 +136,56 @@ namespace FineUIPro.Web.ContinuousPrint protected void Grid1_RowClick(object sender, GridRowClickEventArgs e) { this.drpIsoId.Items.Clear(); - this.drpIsoId.DataSource = from x in Funs.DB.HJGL_PW_IsoInfo where x.ProjectId == this.Grid1.SelectedRowID orderby x.ISO_IsoNo select x; + var isoList = (from x in Funs.DB.HJGL_BO_BatchDetail + join y in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals y.JOT_ID + join z in Funs.DB.HJGL_PW_IsoInfo on y.ISO_ID equals z.ISO_ID + where y.ProjectId == this.Grid1.SelectedRowID + select new { z.ISO_ID, z.ISO_IsoNo }).Distinct().ToList(); + this.drpIsoId.DataTextField = "ISO_IsoNo"; + this.drpIsoId.DataValueField = "ISO_ID"; + this.drpIsoId.DataSource = isoList; this.drpIsoId.DataBind(); Funs.FineUIPleaseSelect(this.drpIsoId); this.drpIsoId.SelectedValue = BLL.Const._Null; - BindGrid1(this.Grid1.SelectedRowID); - - //焊接日期 + ////焊接日期 + List dateLists = new List(); this.drpWeldingDate.Items.Clear(); this.drpWeldingDate.DataTextField = "Date"; this.drpWeldingDate.DataValueField = "Date"; - List dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail - join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId - join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID - join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID - where y.ProjectId== this.Grid1.SelectedRowID - select w.JOT_WeldDate.ToShortDateString()).Distinct().ToList(); + if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue)) + { + dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail + join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId + join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID + join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID + where y.ProjectId == this.Grid1.SelectedRowID + && z.ISO_ID == this.drpIsoId.SelectedValue + select w.JOT_WeldDate) + .Distinct() + .OrderBy(d => d) + .Select(d => d.ToShortDateString()) + .ToList(); + } + else + { + dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail + join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId + join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID + join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID + where y.ProjectId == this.Grid1.SelectedRowID + select w.JOT_WeldDate) + .Distinct() + .OrderBy(d => d) // 按日期升序 + .Select(d => d.ToShortDateString()) + .ToList(); + } this.drpWeldingDate.DataSource = dateLists; this.drpWeldingDate.DataBind(); + Funs.FineUIPleaseSelect(this.drpWeldingDate); + this.drpWeldingDate.SelectedValue = BLL.Const._Null; + + BindGrid1(this.Grid1.SelectedRowID); } #endregion @@ -862,5 +873,33 @@ namespace FineUIPro.Web.ContinuousPrint { BindGrid1(this.Grid1.SelectedRowID); } + + protected void drpIsoId_SelectedIndexChanged(object sender, EventArgs e) + { + ////焊接日期 + List dateLists = new List(); + this.drpWeldingDate.Items.Clear(); + this.drpWeldingDate.DataTextField = "Date"; + this.drpWeldingDate.DataValueField = "Date"; + if (this.drpIsoId.SelectedValue != BLL.Const._Null && !string.IsNullOrEmpty(this.drpIsoId.SelectedValue)) + { + dateLists = (from x in Funs.DB.HJGL_BO_BatchDetail + join y in Funs.DB.HJGL_BO_Batch on x.BatchId equals y.BatchId + join z in Funs.DB.HJGL_PW_JointInfo on x.JOT_ID equals z.JOT_ID + join w in Funs.DB.HJGL_BO_WeldReportMain on z.DReportID equals w.DReportID + where y.ProjectId == this.Grid1.SelectedRowID + && z.ISO_ID == this.drpIsoId.SelectedValue + select w.JOT_WeldDate) + .Distinct() + .OrderBy(d => d) + .Select(d => d.ToShortDateString()) + .ToList(); + } + this.drpWeldingDate.DataSource = dateLists; + this.drpWeldingDate.DataBind(); + Funs.FineUIPleaseSelect(this.drpWeldingDate); + this.drpWeldingDate.SelectedValue = BLL.Const._Null; + BindGrid1(this.Grid1.SelectedRowID); + } } } \ No newline at end of file diff --git a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs index b230fee..4a68c4b 100644 --- a/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/JGZL/TeamWeldingInspection.aspx.cs @@ -211,18 +211,18 @@ namespace FineUIPro.Web.JGZL newItem.WeldingJointNo = item.JOT_JointNo; //焊口编号 if (!string.IsNullOrEmpty(item.JOT_WeldSilk)) { - var silk = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk); + var silk = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId == item.JOT_WeldSilk && x.WeldTypeName.Contains("焊丝") select x).FirstOrDefault(); //BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldSilk); if (silk != null) { - newItem.WeldingWire = silk.WMT_MatCode;//所用焊丝牌号 + newItem.WeldingWire = silk.WeldName;//所用焊丝牌号 } } if (!string.IsNullOrEmpty(item.JOT_WeldMat)) { - var weldMat = BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat); + var weldMat = (from x in Funs.DB.View_WeldInfoDropDownLists where x.WeldId == item.JOT_WeldMat && x.WeldTypeName.Contains("焊条") select x).FirstOrDefault(); //BLL.HJGL_ConsumablesService.getConsumablesByConsumablesId(item.JOT_WeldMat); if (weldMat != null) { - newItem.WeldingRod = weldMat.WMT_MatCode;//所用焊条牌号 + newItem.WeldingRod = weldMat.WeldName;//所用焊条牌号 } } itemLists.Add(newItem); diff --git a/HJGL_DS/FineUIPro.Web/Web.config b/HJGL_DS/FineUIPro.Web/Web.config index 070a5f8..3c98f31 100644 --- a/HJGL_DS/FineUIPro.Web/Web.config +++ b/HJGL_DS/FineUIPro.Web/Web.config @@ -11,7 +11,7 @@ - + diff --git a/HJGL_DS/WebAPI/WebAPI.csproj.user b/HJGL_DS/WebAPI/WebAPI.csproj.user index 28be9c4..8cd7f1f 100644 --- a/HJGL_DS/WebAPI/WebAPI.csproj.user +++ b/HJGL_DS/WebAPI/WebAPI.csproj.user @@ -1,4 +1,4 @@ - + Release|Any CPU