This commit is contained in:
2026-05-30 12:34:20 +08:00
parent 47a22572b1
commit 029988ec28
19 changed files with 21 additions and 11 deletions
@@ -101,10 +101,10 @@ namespace FineUIPro.Web.HJGL.JoinMarking
SqlParameter[] parameter1 = new SqlParameter[] { new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId) };
DataTable tb1 = SQLHelper.GetDataTableRunText(sqlData, parameter1);
string sqlTrust = @"select a.JOT_ID, c.DetectionTypeCode,b.CH_TrustType from CH_TrustItem AS a
LEFT JOIN CH_Trust AS b ON a.CH_TrustID = b.CH_TrustID
left join Base_DetectionType c on b.CH_NDTMethod = c.DetectionTypeId
where a.JOT_ID in ('" + string.Join("','", jotids) + "') ";
string sqlTrust = @"select a.WeldJointId, c.DetectionTypeCode,b.TrustType from HJGL_Batch_BatchTrustItem AS a
LEFT JOIN HJGL_Batch_BatchTrust AS b ON a.TrustBatchId = b.TrustBatchId
left join Base_DetectionType c on b.DetectionTypeId = c.DetectionTypeId
where a.WeldJointId in ('" + string.Join("','", jotids) + "') ";
DataTable tbTrust = SQLHelper.GetDataTableRunText(sqlTrust, null);
Dictionary<string, string> DetectionTypeDic = new Dictionary<string, string>();
Dictionary<string, string> TrustTypeDic = new Dictionary<string, string>();