gaofei
/
HJGL_DS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2025-03-13 08:57:52 +08:00
parent 31e1076015
commit 6d0c6e28de
4 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HJGL_DS/.vs/SGGL/v15/.suo
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-shm
View File

Binary file not shown.

BIN
HJGL_DS/.vs/SGGL/v15/Server/sqlite3/storage.ide-wal
View File

Binary file not shown.

4
HJGL_DS/FineUIPro.Web/HJGL/WeldingManage/RepairItemRecordTrustExtend.aspx.cs
View File

@ -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<SqlParameter> listStr = new List<SqlParameter>();
//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));