diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index ed83018..7d7e765 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/.suo and b/HJGL_DS/.vs/SGGL/v15/.suo differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide index 39a0cb6..f4b3835 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index a10f3fa..994c1a4 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm differ diff --git a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal index 3ad5e13..6fc8f99 100644 Binary files a/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal and b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal differ diff --git a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs index 9eac8ac..ae281b3 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs @@ -72,6 +72,20 @@ namespace FineUIPro.Web.HJGL.WeldingManage } } /// + /// 管线主键 + /// + public string ISO_ID + { + get + { + return (string)ViewState["ISO_ID"]; + } + set + { + ViewState["ISO_ID"] = value; + } + } + /// /// 焊口主键 /// public string JOT_ID @@ -131,6 +145,7 @@ namespace FineUIPro.Web.HJGL.WeldingManage Model.HJGL_PW_JointInfo joint = BLL.HJGL_PW_JointInfoService.GetJointInfoByJotID(record.JOT_ID); BatchId = record.BatchId; ProjectId = record.ProjectId; + ISO_ID = joint.ISO_ID; WelderId = joint.JOT_CellWelder; WelderId2= joint.JOT_FloorWelder; NDT_ID = record.NDT_ID; @@ -173,10 +188,10 @@ namespace FineUIPro.Web.HJGL.WeldingManage + @" LEFT JOIN HJGL_BS_Welder AS Welder1 ON Welder1.WED_ID = JointInfo.JOT_CellWelder" + @" LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = JointInfo.JOT_FloorWelder" + @" LEFT JOIN HJGL_BO_WeldReportMain AS WeldReportMain on WeldReportMain.DReportID=JointInfo.DReportID" - + @" WHERE JointInfo.ProjectId=@ProjectId and JointInfo.JOT_CellWelder=@WelderId and JointInfo.JOT_FloorWelder=@WelderId2 and BatchDetail.JOT_ID<>@JOT_ID and (BatchDetail.PointType is null or BatchDetail.PointType= '2')"; + + @" WHERE JointInfo.ProjectId=@ProjectId and JointInfo.ISO_ID=@ISO_ID and JointInfo.JOT_CellWelder=@WelderId and JointInfo.JOT_FloorWelder=@WelderId2 and BatchDetail.JOT_ID<>@JOT_ID and (BatchDetail.PointType is null or BatchDetail.PointType= '2')"; List listStr = new List(); listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); - //listStr.Add(new SqlParameter("@BatchId", this.BatchId)); + listStr.Add(new SqlParameter("@ISO_ID", this.ISO_ID)); listStr.Add(new SqlParameter("@WelderId", this.WelderId ?? "")); listStr.Add(new SqlParameter("@WelderId2", this.WelderId2 ?? "")); listStr.Add(new SqlParameter("@JOT_ID", this.JOT_ID));