diff --git a/HJGL_DS/.vs/SGGL/v15/.suo b/HJGL_DS/.vs/SGGL/v15/.suo index 7d91946..1587606 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-shm b/HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm index 5959897..a10f3fa 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 8556135..657c42c 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 3a12a0e..23f4f49 100644 --- a/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs @@ -158,10 +158,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 BatchDetail.BatchId=@BatchId 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.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.CurrUser.LoginProjectId)); - listStr.Add(new SqlParameter("@BatchId", this.BatchId)); + //listStr.Add(new SqlParameter("@BatchId", this.BatchId)); listStr.Add(new SqlParameter("@WelderId", this.WelderId ?? "")); listStr.Add(new SqlParameter("@WelderId2", this.WelderId2 ?? "")); listStr.Add(new SqlParameter("@JOT_ID", this.JOT_ID));